Merge branch 'google' into qiye

.idea/misc.xml

@@ -46,8 +46,10 @@
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_12.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_37.xml" value="0.2745" />
+        <entry key="baseswago/src/main/res/drawable/shape_ff56b7_5.xml" value="0.251" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_5_stroke.xml" value="0.251" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9300_20.xml" value="0.21927083333333333" />
+        <entry key="baseswago/src/main/res/drawable/shape_ff9f00_37.xml" value="0.251" />
         <entry key="baseswago/src/main/res/drawable/shape_touming.xml" value="0.37333333333333335" />
         <entry key="baseswago/src/main/res/drawable/shape_tranparent.xml" value="0.2415" />
         <entry key="baseswago/src/main/res/drawable/shape_white_20.xml" value="0.35794871794871796" />

baseswago/src/main/res/drawable/shape_ff56b7_5.xml

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

baseswago/src/main/res/drawable/shape_ff9f00_37.xml

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

login/src/main/res/layout/activity_login.xml

@@ -61,8 +61,8 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginStart="30dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_width="24dp"
+            android:layout_height="24dp"/>
 
 
         <com.swago.baseswago.cusview.MediumTextView
@@ -84,7 +84,7 @@
         android:layout_marginBottom="128dp"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
-        android:background="@drawable/shape_131b23_37"
+        android:background="@drawable/shape_ff9f00_37"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"
         android:layout_height="56dp">
@@ -95,8 +95,9 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginStart="30dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:padding="2dp"
+            android:layout_width="24dp"
+            android:layout_height="24dp"/>
 
 
         <com.swago.baseswago.cusview.MediumTextView

user/src/main/java/com/swago/user/task/TaskAdapter.kt

@@ -38,7 +38,7 @@ class TaskAdapter : BaseQuickAdapter<TaskModel, BaseViewHolder>(
                     setTextColor(R.id.tvStatus,ContextCompat.getColor(mContext,R.color._ffffff))
                     setTextColor(R.id.tvCount,ContextCompat.getColor(mContext,R.color._ffffff))
                     setText(R.id.tvStatus,R.string.receive)
-                    setBackgroundRes(R.id.clReceive,R.drawable.shape_black_5)
+                    setBackgroundRes(R.id.clReceive,R.drawable.shape_ff56b7_5)
                 }
 
                 2 -> {