Procházet zdrojové kódy

增加橙色文字

zhaoyi před 8 roky
rodič
revize
aa036002c6

+ 1 - 1
app/src/main/res/drawable/sp_btn_common.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/colorPrimary" />
-    <corners android:radius="6dp" />
+    <corners android:radius="100dp" />
 
 </shape>

+ 11 - 5
app/src/main/res/layout/bind_wx_activity.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:background="@color/background_light_gray"
               android:orientation="vertical">
 
     <include
@@ -50,18 +51,23 @@
         android:textColor="@color/sheep_red"
         android:textSize="12sp"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
     <TextView
         android:id="@+id/tv_wx"
+        style="@style/style_btn"
         android:layout_width="match_parent"
         android:layout_height="35dp"
         android:layout_gravity="center"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginBottom="@dimen/content_padding"
+        android:layout_marginLeft="@dimen/content_padding_big"
+        android:layout_marginRight="@dimen/content_padding_big"
         android:layout_marginTop="100dp"
-        android:background="@drawable/text_backgroud"
         android:gravity="center"
         android:text="绑定微信"
-        android:textColor="@color/black_dark"
-        android:textSize="16sp"/>
+        android:textSize="@dimen/text_size_2"/>
 
 </LinearLayout>

+ 24 - 11
app/src/main/res/layout/withdraw_activity.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:background="@color/background_light_gray"
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
@@ -13,10 +14,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:paddingBottom="@dimen/content_padding_big"
         android:paddingLeft="15dp"
-        android:text="余 额:25.5"
-        android:textColor="@color/sheep_red"
-        android:textSize="14sp"/>
+        android:paddingTop="@dimen/content_padding_big"
+        android:text="账户余额:¥250"
+        android:textColor="@color/orange_text_light"
+        android:textSize="@dimen/text_size_7"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/content_padding"
+        android:layout_marginTop="@dimen/content_padding_big"
+        android:text="请选择提现金额"
+        android:textColor="@color/black_text_gray"/>
 
     <GridView
         android:id="@+id/gv_money"
@@ -27,20 +38,22 @@
 
     </GridView>
 
-    <include
-        layout="@layout/line_h_1px"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
 
     <TextView
         android:id="@+id/tv_wx"
-        android:layout_width="200dp"
+        style="@style/style_btn"
+        android:layout_width="match_parent"
         android:layout_height="35dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="15dp"
-        android:background="@drawable/text_backgroud"
+        android:layout_marginLeft="@dimen/content_padding_big"
+        android:layout_marginRight="@dimen/content_padding_big"
+        android:layout_marginBottom="@dimen/content_padding"
         android:gravity="center"
         android:text="提现到微信"
-        android:textColor="@drawable/text_color"
-        android:textSize="16sp"/>
+        android:textSize="@dimen/text_size_2"/>
 
 
 </LinearLayout>

+ 1 - 1
app/src/main/res/values/colors.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <color name="theme_bule">@color/theme_app_dark</color>
-    <color name="theme_app_dark">#e15920</color>
+    <color name="theme_app_dark">#fac208</color>
     <color name="theme_sheep_dark">#b73701</color>
     <color name="theme">@color/theme_bule</color>
     <color name="theme_light">@color/theme_app_dark</color>

+ 1 - 0
app/src/main/res/values/common.xml

@@ -8,6 +8,7 @@
     <color name="black_text_deep">#333333</color>
     <color name="black_text_gray">#666666</color>
     <color name="black_text_light">#bbbbbb</color>
+    <color name="orange_text_light">#ef712c</color>
     <!--APP中的主要非白色背景的底色-->
     <color name="background_light_gray">#dddddd</color>
     <!--分割线的统一颜色-->

+ 1 - 1
app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>