Merge branch 'master' of http://10.8.230.114:3000/kemllor/small_sheep_android

# Conflicts:
#	app/src/main/res/values/common.xml

Signed-off-by: 刁铃刚 <315096953@qq.com>

app/src/main/res/drawable/texe_background_normal.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="100dp"/>
+    <corners android:radius="10dp"/>
     <stroke
         android:width="1dp"
-        android:color="@color/theme"/>
+        android:color="@color/orange_text_light"/>
 </shape>

app/src/main/res/drawable/texe_background_normal_orange.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="5dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="@color/theme"/>
+</shape>

app/src/main/res/drawable/texe_background_round_orange.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="5dp"/>
+
+    <solid android:color="@color/orange_text_light"/>
+
+</shape>

app/src/main/res/drawable/texe_background_round_red.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="100dp"/>
+    <corners android:radius="10dp"/>
 
-    <solid android:color="@color/sheep_red"/>
+    <solid android:color="@color/orange_text_light"/>
 
 </shape>

app/src/main/res/drawable/text_backgroud.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/texe_background_normal" android:state_selected="false"/>
-    <item android:drawable="@drawable/texe_background_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/texe_background_normal_orange" android:state_selected="false"/>
+    <item android:drawable="@drawable/texe_background_round_orange" android:state_selected="true"/>
 
 </selector>

app/src/main/res/drawable/text_color.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_selected="true"/>
-    <item android:color="@color/theme" android:state_pressed="true"/> <!-- pressed -->
-    <item android:color="@color/theme"/> <!-- default -->
+    <item android:color="@color/orange_text_light" android:state_pressed="true"/> <!-- pressed -->
+    <item android:color="@color/orange_text_light"/> <!-- default -->
 
 </selector>

app/src/main/res/layout/bind_wx_activity.xml

@@ -68,6 +68,6 @@
         android:layout_marginTop="100dp"
         android:gravity="center"
         android:text="绑定微信"
-        android:textSize="@dimen/text_size_2"/>
+        android:textSize="@dimen/text_size_3"/>
 
 </LinearLayout>

app/src/main/res/layout/withdraw_activity.xml

@@ -33,9 +33,8 @@
         android:id="@+id/gv_money"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:numColumns="3">
-
+        android:layout_marginTop="@dimen/content_padding_big"
+        android:numColumns="2">
     </GridView>
 
     <View
@@ -48,12 +47,11 @@
         style="@style/style_btn"
         android:layout_width="match_parent"
         android:layout_height="35dp"
+        android:layout_marginBottom="@dimen/content_padding"
         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:textSize="@dimen/text_size_2"/>
-
+        android:textSize="@dimen/text_size_3"/>
 
 </LinearLayout>

app/src/main/res/layout/withdraw_item.xml

@@ -6,8 +6,8 @@
 
     <RadioButton
         android:id="@+id/rb_money"
-        android:layout_width="100dp"
-        android:layout_height="30dp"
+        android:layout_width="150dp"
+        android:layout_height="@dimen/layout_heigh_small"
         android:layout_centerInParent="true"
         android:layout_margin="10dp"
         android:background="@drawable/text_backgroud"
@@ -15,4 +15,14 @@
         android:gravity="center"
         android:textColor="@drawable/text_color"/>
 
+    <ImageView
+        android:id="@+id/img_checked"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@drawable/icon"
+        android:layout_marginBottom="21dp"
+        android:layout_alignBottom="@+id/rb_money"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="95dp"/>
+
 </RelativeLayout>