规范已完善

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

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="10dp" />
 
 </shape>

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

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

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

@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/background_light_gray"
+    android:orientation="vertical">
+
+    <EditText
+        style="@style/style_edt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="可可要"
+        android:text="年年年" />
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:background="@color/theme_light"
-        >
+        android:background="@color/theme_light">
 
 
         <RelativeLayout
             android:layout_width="50dp"
             android:layout_height="30dp"
             android:layout_centerVertical="true"
-            android:background="@drawable/texe_background_round_theme_left"
-            >
+            android:background="@drawable/texe_background_round_theme_left">
 
             <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/img_user"
@@ -25,8 +31,7 @@
                 android:layout_height="25dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="2.5dp"
-                />
+                android:layout_marginRight="2.5dp" />
         </RelativeLayout>
 
         <TextView
@@ -40,7 +45,7 @@
             android:paddingLeft="15dp"
             android:text="提现"
             android:textColor="@color/white"
-            android:textSize="14sp"/>
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/img_down"
@@ -50,7 +55,7 @@
             android:layout_marginTop="5dp"
             android:padding="5dp"
             android:src="@drawable/down_load"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/title"
@@ -59,8 +64,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
             android:text="我的奖金"
-            android:textColor="@color/white"
-            />
+            android:textColor="@color/white" />
 
         <TextView
             android:id="@+id/money"
@@ -74,8 +78,7 @@
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
             android:textColor="@color/sheep_red"
-            android:textSize="25dp"
-            />
+            android:textSize="25dp" />
 
         <LinearLayout
             android:layout_width="200dp"
@@ -97,7 +100,7 @@
                 android:gravity="center"
                 android:text="今日收入"
                 android:textColor="@color/white"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
         </LinearLayout>
     </RelativeLayout>
 
@@ -105,8 +108,8 @@
         android:id="@+id/ll_new_task"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         android:orientation="vertical"
+        android:visibility="gone"
 
         >
 
@@ -116,16 +119,14 @@
             android:layout_marginTop="5dp"
             android:paddingLeft="5dp"
             android:text="新手专享"
-            android:textColor="@color/black_light"
-            />
+            android:textColor="@color/black_light" />
 
         <RelativeLayout
             android:id="@+id/ll_progress"
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_marginTop="10dp"
-            android:background="@color/backgroud"
-            >
+            android:background="@color/backgroud">
 
             <TextView
                 android:id="@+id/tv_new_title"
@@ -134,7 +135,7 @@
                 android:layout_marginTop="5dp"
                 android:paddingLeft="10dp"
                 android:text="微信任务"
-                android:textColor="@color/black_dark"/>
+                android:textColor="@color/black_dark" />
 
             <TextView
                 android:id="@+id/tv_new_bouns"
@@ -145,7 +146,7 @@
                 android:layout_marginTop="10dp"
                 android:text="5.00"
                 android:textColor="@color/sheep_red"
-                android:textSize="22sp"/>
+                android:textSize="22sp" />
 
             <TextView
                 android:id="@+id/tv_text1"
@@ -158,7 +159,7 @@
                 android:layout_toLeftOf="@id/tv_new_bouns"
                 android:text="+"
                 android:textColor="@color/black_light"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/tv_new_money"
@@ -168,7 +169,7 @@
                 android:layout_toLeftOf="@id/tv_text1"
                 android:text="5.00"
                 android:textColor="@color/sheep_red"
-                android:textSize="22sp"/>
+                android:textSize="22sp" />
 
             <TextView
                 android:id="@+id/tv_new_desc"
@@ -180,7 +181,7 @@
                 android:paddingLeft="10dp"
                 android:text="提交闲置微信号，每日获取租金"
                 android:textColor="@color/black_light"
-                android:textSize="12dp"/>
+                android:textSize="12dp" />
 
             <ProgressBar
                 android:id="@+id/pb_commit"
@@ -188,8 +189,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_margin="5dp"
-                />
+                android:layout_margin="5dp" />
         </RelativeLayout>
 
     </LinearLayout>
@@ -206,10 +206,9 @@
             android:layout_height="wrap_content"
             android:padding="5dp"
             android:text="进行中"
-            android:textColor="@color/black_light"/>
+            android:textColor="@color/black_light" />
 
-        <include
-            layout="@layout/task_item"/>
+        <include layout="@layout/task_item" />
     </LinearLayout>
 
 
@@ -220,7 +219,7 @@
         android:paddingRight="5dp"
         android:paddingTop="5dp"
         android:text="发布中"
-        android:textColor="@color/black_light"/>
+        android:textColor="@color/black_light" />
 
 
 </LinearLayout>

app/src/main/res/values/common.xml

@@ -3,7 +3,8 @@
     <!--APP的相关主要颜色值-->
     <color name="colorPrimary">#FDE054</color>
     <color name="colorPrimaryDark">#FEDC56</color>
-    <color name="colorAccent">#ff842c</color>
+    <color name="colorAccent">#FF842C</color>
+    <color name="colorGreen">#4ADE15</color>
     <!--APP中的文本颜色主要值-->
     <color name="black_text_deep">#333333</color>
     <color name="black_text_gray">#666666</color>
@@ -14,20 +15,39 @@
     <color name="divier">#cdcdcd</color>
 
     <!--所有文本都用标准大小，从来不自己写数值-->
-    <dimen name="text_size_1">12sp</dimen>
-    <dimen name="text_size_2">14sp</dimen>
-    <dimen name="text_size_3">16sp</dimen>
-    <dimen name="text_size_4">18sp</dimen>
-    <dimen name="text_size_5">22sp</dimen>
-    <dimen name="text_size_6">26sp</dimen>
-    <dimen name="text_size_7">30sp</dimen>
+    <dimen name="text_size_1">9sp</dimen>
+    <dimen name="text_size_2">11sp</dimen>
+    <dimen name="text_size_3">14sp</dimen>
+    <dimen name="text_size_4">16sp</dimen>
+    <dimen name="text_size_5">18sp</dimen>
+    <dimen name="text_size_6">22sp</dimen>
+    <dimen name="text_size_7">26sp</dimen>
+    <dimen name="text_size_8">30sp</dimen>
 
     <!--下载按钮的style-->
-    <style name="style_btn">
+    <style name="style_btn" parent="android:Widget.Material.Light.Button.Borderless.Small">
+        <item name="android:minHeight">12dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:textSize">@dimen/text_size_2</item>
         <item name="android:textColor">@color/black_text_deep</item>
         <item name="android:background">@drawable/sp_btn_common</item>
     </style>
 
+
+    <style name="style_edt">
+        <item name="android:textSize">@dimen/text_size_2</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:textColorHint">@color/black_text_light</item>
+        <item name="android:background">@drawable/sp_edt_background_common</item>
+
+    </style>
+
     <!--APP中的主要内容的各种间距值pading默认值和较大值-->
     <dimen name="content_padding">12dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>