修改部分样式问题

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactPersonListFragment.java

@@ -81,6 +81,7 @@ public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContact
         IMThemManager.getInstance().setSearchIconStyles(mViewBinding.ivSearchIcon);
         IMThemManager.getInstance().setSearchButtonStyles(mViewBinding.tvSearch);
         IMThemManager.getInstance().setEditStyle(mViewBinding.etTargetName);
+        IMThemManager.getInstance().setTextDrawableStyle(mViewBinding.tvHint);
 
         mViewBinding.etTargetName.setHint("请输入联系人名称");
         CustomIndexBarDataHelperImpl indexBarDataHelper = new CustomIndexBarDataHelperImpl();

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactRoomListFragment.java

@@ -67,6 +67,7 @@ public class ContactRoomListFragment extends BaseMVPFragment<TcFragmentContactRo
         IMThemManager.getInstance().setSearchIconStyles(mViewBinding.ivSearchIcon);
         IMThemManager.getInstance().setSearchButtonStyles(mViewBinding.tvSearch);
         IMThemManager.getInstance().setEditStyle(mViewBinding.etTargetName);
+        IMThemManager.getInstance().setTextDrawableStyle(mViewBinding.tvHint);
 
         mViewBinding.etTargetName.setHint("请输入群聊名称");
         mViewBinding.tvSearch.setOnClickListener(this);

chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMThemManager.java

@@ -38,6 +38,8 @@ import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
 public class IMThemManager {
     private Drawable tabIndicatorDrawable = null;
     private int mainStyleColor = -1;
+
+    private int mainStyleColor2 = -1;
     private int searchTextColor = -1;
     private int searchIconRes = -1;
     private int searchBtBackgroundRes = -1;
@@ -54,6 +56,7 @@ public class IMThemManager {
     }
 
 
+
     private static final class IMThemManagerHolder {
         private static IMThemManager mManager = new IMThemManager();
     }
@@ -161,6 +164,18 @@ public class IMThemManager {
         }
     }
 
+    public void setTextDrawableStyle(TextView textView) {
+        Drawable backgroundDrawable = null;
+            backgroundDrawable = textView.getBackground();
+            if (backgroundDrawable != null) {
+                if (mainStyleColor2 != -1) {
+                    backgroundDrawable.setTint(mainStyleColor2);
+                } else {
+                    backgroundDrawable.setTintList(null);
+                }
+            }
+    }
+
     public void setEmptyDrawable(Drawable emptyDrawable) {
         MessageProperties instance = MessageProperties.getInstance();
         instance.setConversationListEmptyDrawable(emptyDrawable);
@@ -172,6 +187,10 @@ public class IMThemManager {
         instance.setMainStyleColor(mainStyleColor);
     }
 
+    public void setMainStyleColor2(int color) {
+        this.mainStyleColor2 = color;
+    }
+
     public void setSearchTextColor(int searchTextColor) {
         this.searchTextColor = searchTextColor;
         MessageProperties instance = MessageProperties.getInstance();
@@ -202,6 +221,7 @@ public class IMThemManager {
     public void resetStyleValue() {
         this.tabIndicatorDrawable = null;
         setMainStyleColor(-1);
+        this.mainStyleColor2 =-1;
         setSearchIconRes(-1);
         setSearchTextColor(-1);
         this.searchBtBackgroundRes = -1;

chatModule/src/main/res/layout/tc_fragment_contact_list_layout.xml

@@ -62,7 +62,7 @@
         android:paddingStart="8dp"
         android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
         android:textColor="@color/color_999999"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintLeft_toRightOf="@+id/iv_search_icon"
         app:layout_constraintRight_toLeftOf="@+id/tv_search"

chatModule/src/main/res/layout/tc_fragment_contact_room_list.xml

@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:paddingStart="8dp"
         android:textColor="@color/color_999999"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintLeft_toRightOf="@+id/iv_search_icon"
         app:layout_constraintRight_toLeftOf="@+id/tv_search"

chatModule/src/main/res/layout/tc_fragment_conversation_list_layout.xml

@@ -36,7 +36,7 @@
         android:paddingStart="8dp"
         android:text="查找聊天记录"
         android:textColor="@color/color_999999"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/view_search_bg"
         app:layout_constraintLeft_toRightOf="@+id/iv_search_icon"
         app:layout_constraintRight_toLeftOf="@+id/tv_search"

institution/src/main/java/com/cooleshow/institution/stu/ui/main/MainActivity.java

@@ -103,6 +103,7 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
         StyleConfig.isStudentStyle = false;
         IMThemManager.getInstance().setEmptyDrawable(getResources().getDrawable(R.drawable.jg_icon_empty_content));
         IMThemManager.getInstance().setMainStyleColor(getResources().getColor(R.color.color_fe2451));
+        IMThemManager.getInstance().setMainStyleColor2(getResources().getColor(R.color.color_ff4d72));
         IMThemManager.getInstance().setSearchTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
         IMThemManager.getInstance().setSearchBtBackgroundRes(R.drawable.shape_ff3c81_toff76a6_14dp);
         IMThemManager.getInstance().setSearchIconRes(R.drawable.jg_icon_search);

institution/src/main/res/layout/fg_home_music_layout.xml

@@ -109,7 +109,7 @@
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:paddingStart="6dp"
-        android:text="请输入专辑关键词"
+        android:text="请输入歌曲关键词"
         android:textColor="@color/color_66000000"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="@+id/iv_search"
@@ -117,14 +117,13 @@
         app:layout_constraintTop_toTopOf="@+id/iv_search" />
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="56dp"
         android:layout_height="28dp"
         android:layout_marginEnd="3dp"
         android:background="@drawable/shape_ff76a6_to_ff3c81_14dp"
         android:gravity="center"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
         android:text="搜索"
+        android:textSize="@dimen/sp_14"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="@+id/iv_search"
         app:layout_constraintRight_toRightOf="@+id/view_search_bg"

institution/src/main/res/layout/jg_activity_personal_setting.xml

@@ -103,7 +103,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
                         android:text="--"
-                        android:textColor="@color/color_999999"
+                        android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -152,7 +152,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
                         android:text="--"
-                        android:textColor="@color/color_999999"
+                        android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -201,7 +201,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="15dp"
                         android:text="--"
-                        android:textColor="@color/color_999999"
+                        android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -252,7 +252,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
                         android:text="--"
-                        android:textColor="@color/color_999999"
+                        android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -301,7 +301,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="28dp"
                         android:text="--"
-                        android:textColor="@color/color_999999"
+                        android:textColor="@color/color_aaaaaa"
                         android:textSize="@dimen/sp_16"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintRight_toRightOf="parent"

institution/src/main/res/values/colors.xml

@@ -9,4 +9,5 @@
     <color name="color_777777">#777777</color>
     <color name="color_fe2c57">#FE2C57</color>
     <color name="color_f25756">#F25756</color>
+    <color name="color_ff4d72">#ff4d72</color>
 </resources>

student/src/main/res/layout/activity_check_modify_phonenum.xml

@@ -32,7 +32,7 @@
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -58,7 +58,7 @@
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line" />

student/src/main/res/layout/activity_modify_nickname.xml

@@ -29,13 +29,13 @@
             android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
             android:paddingRight="30dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16" />
 
         <ImageView
             android:id="@+id/im_close"
-            android:layout_width="@dimen/dp_50"
-            android:layout_height="@dimen/dp_50"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:padding="13dp"

student/src/main/res/layout/activity_modify_phonenum.xml

@@ -32,7 +32,7 @@
             android:maxLength="11"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -58,7 +58,7 @@
             android:paddingLeft="14dp"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
-            android:textColorHint="@color/color_999999"
+            android:textColorHint="@color/color_aaaaaa"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line" />

usercenter/src/main/res/drawable/shape_sign_out_edit_drawable.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="?attr/klx_main_color"/>
+    <size android:width="1.5dp"/>
+</shape>

usercenter/src/main/res/layout/ac_sign_out_account_layout.xml

@@ -225,6 +225,7 @@
         android:maxLength="6"
         android:maxLines="1"
         android:paddingStart="12dp"
+        android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
         android:textColor="@color/color_333333"
         android:textColorHint="@color/color_999999"
         android:textSize="@dimen/sp_16"
@@ -240,9 +241,10 @@
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
         android:layout_marginBottom="23dp"
+        android:textStyle="bold"
         android:background="?attr/klx_main_bt_background"
         android:gravity="center"
-        android:text="注销账号"
+        android:text="确认注销"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_18"
         app:layout_constraintBottom_toBottomOf="@+id/view_bg"