更换主题

loadinglibrary/src/main/res/drawable/sp_r20_gradient_primary.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="20dp" />
     <gradient
-        android:angle="315"
-        android:endColor="@color/colorPrimary"
-        android:startColor="@color/colorPrimary" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_base/src/main/java/com/yc/module_base/view/pwd/ForgetPwdSettingActivity.kt

@@ -29,7 +29,8 @@ class ForgetPwdSettingActivity : BaseActivity<ForgetPwdSettingVM>() {
     override fun initView() {
         this.window.decorView.systemUiVisibility =
             android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-        etId.setText(LiveSession.getUser()?.userId.toString())
+        val userId = LiveSession.getUser()?.userId
+        etId.setText(userId?.toString().orEmpty())
         if (LiveSession.getUser() != null && !TextUtils.isEmpty(LiveSession.getUser()?.phone)) {
             etPhone.setText(LiveSession.getUser()?.phone)
             etPhone.isEnabled = false
@@ -94,4 +95,4 @@ class ForgetPwdSettingActivity : BaseActivity<ForgetPwdSettingVM>() {
         timer?.pauseTime()
         timer = null
     }
-}
+}

module_base/src/main/res/drawable/bg_theme_r20_gradient.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_base/src/main/res/drawable/bg_theme_r28_gradient.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="28dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_base/src/main/res/drawable/sp_chat_send.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
     <corners android:radius="@dimen/dp_32" />
-</shape>
+</shape>

module_base/src/main/res/drawable/sp_ff6c28_ffa200_confirm.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="@dimen/dp_52" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_base/src/main/res/drawable/sp_r15_login.xml

@@ -2,6 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="16dp" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_base/src/main/res/drawable/sp_r20_primary.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/colorPrimary"/>
-</shape>
+    <corners android:radius="24dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_base/src/main/res/drawable/sp_r23_user_info_unfollow.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="23dp" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_base/src/main/res/drawable/sp_r28_primary.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="28dp" />
-    <solid android:color="@color/colorPrimary"/>
-</shape>
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_base/src/main/res/layout/module_base_activity_forget_pwd_setting.xml

@@ -106,7 +106,7 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_25"
         android:layout_marginRight="@dimen/dp_7"
-        android:background="@drawable/sp_r20_primary"
+        android:background="@drawable/sp_r15_login"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_8"
         android:paddingRight="@dimen/dp_8"
@@ -162,7 +162,7 @@
         android:layout_marginLeft="@dimen/dp_30"
         android:layout_marginTop="@dimen/dp_30"
         android:layout_marginRight="@dimen/dp_30"
-        android:background="@drawable/sp_r28_primary"
+        android:background="@drawable/bg_theme_r28_gradient"
         android:gravity="center"
         android:text="确认"
         android:textColor="@color/white"
@@ -172,4 +172,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/etConfirmPwd" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

module_follow/src/main/res/drawable/sp_r24_un_follow.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="24dp" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_main/src/main/res/drawable/bg_login_circle_gradient.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_main/src/main/res/drawable/bg_login_phone_gradient.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="24dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>
+

module_main/src/main/res/drawable/ic_login_account_user.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
+

module_main/src/main/res/layout/module_main_activity_login_home.xml

@@ -89,8 +89,9 @@
         <ImageView
             android:layout_width="@dimen/dp_52"
             android:layout_height="@dimen/dp_52"
+            android:background="@drawable/sp_r15_login"
             android:scaleType="centerCrop"
-            android:src="@drawable/icon_account" />
+            android:src="@drawable/ic_login_account_user" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -176,4 +177,4 @@
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/rlNotice"
         app:layout_constraintLeft_toLeftOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

module_me/src/main/res/drawable/sp_cancel_account.xml

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

module_me/src/main/res/drawable/sp_certify_confirm.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="@dimen/dp_52" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_me/src/main/res/drawable/sp_r12_ff5722.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="12dp" />
-    <solid android:color="#FF5722" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r16_ff5722.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="16dp" />
-    <solid android:color="#FF5722" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r16_stroke_ff5722_white.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="16dp" />
     <solid android:color="@color/white" />
-    <stroke android:width="1dp" android:color="#FF5722" />
+    <stroke android:width="1dp" android:color="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r16_stroke_ff9800.xml

@@ -4,6 +4,6 @@
     <solid android:color="@android:color/transparent" />
     <stroke
         android:width="1dp"
-        android:color="#FFFF9800" />
+        android:color="#FF6DA6" />
 </shape>
 

module_me/src/main/res/drawable/sp_r20_f56a05.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="20dp" />
-    <solid android:color="#F56A05" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r20_stroke_f56a05_white.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="20dp" />
     <solid android:color="@color/white" />
-    <stroke android:width="1dp" android:color="#F56A05" />
+    <stroke android:width="1dp" android:color="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r24_ff9800.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="24dp" />
-    <solid android:color="#FFFF9800" />
+    <gradient
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
 </shape>

module_me/src/main/res/drawable/sp_r24_gradient_ff9800_ff5722.xml

@@ -3,7 +3,7 @@
     <corners android:radius="24dp" />
     <gradient
         android:angle="0"
-        android:startColor="#FFFF9800"
-        android:endColor="#FFFF5722" />
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
 </shape>
 

module_me/src/main/res/drawable/sp_r24_un_follow.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="24dp" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_me/src/main/res/drawable/sp_real_pay.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="24dp" />
     <gradient
-        android:endColor="#FFD441"
-        android:startColor="#FFE870" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>

module_message/src/main/res/drawable/sp_friend_un_follow.xml

@@ -2,6 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="24dp" />
     <gradient
-        android:endColor="#FF6C28"
-        android:startColor="#FFA200" />
-</shape>
+        android:angle="0"
+        android:endColor="#7FD5FF"
+        android:startColor="#FF6DA6" />
+</shape>