feat:完成部分页面主题UI修改

app/src/main/java/com/chwl/app/home/adapter/HomeIndicatorAdapter.java

@@ -39,8 +39,8 @@ public class HomeIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.white_transparent_60));
-        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_FFFFFF));
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_990C1D18));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_0C1D18));
         scaleTransitionPagerTitleView.setMinScale(minScale);
         scaleTransitionPagerTitleView.setTextSize(textSize);
         int padding = UIUtil.dip2px(context, 13);
@@ -59,10 +59,10 @@ public class HomeIndicatorAdapter extends CommonNavigatorAdapter {
     public IPagerIndicator getIndicator(Context context) {
         LinePagerIndicator indicator = new LinePagerIndicator(context);
         indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
-        indicator.setLineHeight(UIUtil.dip2px(mContext, 2.5));
-        indicator.setRoundRadius(UIUtil.dip2px(mContext, 1.5));
-        indicator.setLineWidth(UIUtil.dip2px(mContext, 10));
-        indicator.setColors(context.getResources().getColor(R.color.color_10ECD6));
+        indicator.setLineHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_4));
+        indicator.setRoundRadius(context.getResources().getDimensionPixelOffset(R.dimen.dp_2));
+        indicator.setLineWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_13));
+        indicator.setColors(context.getResources().getColor(R.color.color_002512));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 //        lp.bottomMargin = mBottomMargin;
         indicator.setLayoutParams(lp);

app/src/main/java/com/chwl/app/ui/user/adapter/ContactsIndicatorAdapter.java

@@ -57,8 +57,8 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter {
         if (!showIndicator) return null;
         DrawableIndicator indicator = new DrawableIndicator(context);
         indicator.setMode(DrawableIndicator.MODE_EXACTLY);
-        indicator.setDrawableWidth(UIUtil.dip2px(context, 24));
-        indicator.setDrawableHeight(UIUtil.dip2px(context, 8));
+        indicator.setDrawableWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_24));
+        indicator.setDrawableHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_7));
         indicator.setIndicatorDrawable(context.getResources().getDrawable(R.drawable.base_ic_indicator));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.END;

app/src/main/java/com/chwl/app/ui/user/adapter/HomeRecommendIndicatorAdapter.java

@@ -63,8 +63,8 @@ public class HomeRecommendIndicatorAdapter extends CommonNavigatorAdapter {
         if (!showIndicator) return null;
         DrawableIndicator indicator = new DrawableIndicator(context);
         indicator.setMode(DrawableIndicator.MODE_EXACTLY);
-        indicator.setDrawableWidth(UIUtil.dip2px(context, 24));
-        indicator.setDrawableHeight(UIUtil.dip2px(context, 8));
+        indicator.setDrawableWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_24));
+        indicator.setDrawableHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_7));
         indicator.setIndicatorDrawable(context.getResources().getDrawable(R.drawable.base_ic_indicator));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.END;

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
-        android:src="@drawable/bg_theme_top"
+        android:src="@drawable/bg_theme_top_home"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -150,7 +150,7 @@
         android:layout_height="@dimen/dp_48"
         android:layout_marginHorizontal="@dimen/dp_36"
         android:layout_marginBottom="@dimen/dp_30"
-        android:background="@drawable/base_shape_theme2_24dp"
+        android:background="@drawable/base_shape_theme_24dp"
         android:gravity="center"
         android:text="@string/room_type_use"
         android:textColor="@color/white"

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

@@ -742,4 +742,7 @@
     <color name="color_7F191919">#7F191919</color>
     <color name="color_CC191919">#CC191919</color>
     <color name="color_FEFFBF">#FEFFBF</color>
+    <color name="color_0C1D18">#0C1D18</color>
+    <color name="color_990C1D18">#990C1D18</color>
+    <color name="color_002512">#002512</color>
 </resources>

gradle.properties

@@ -32,7 +32,7 @@ COMPILE_SDK_VERSION=33
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=33
 
-version_name=1.0.9
+version_name=1.0.10
 version_code=12
 
 #systemProp.https.proxyHost=127.0.0.1

modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="15dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="19dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_positive_26dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="26dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="30dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="5dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme2_24dp.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:endColor="#14D2A6"
-        android:startColor="#57E193" />
-    <corners android:radius="24dp" />
-</shape>

modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="15dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_20dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="20dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="23dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="24dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_26dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="26dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="30dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_8dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <gradient android:startColor="#57E193" android:endColor="#14D2A6"/>
     <corners android:radius="8dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#B7F2FF" android:centerColor="#D5C1FF" android:endColor="#FDACF1"/>
+    <gradient android:startColor="#A5EEC8" android:endColor="#ABF5E3"/>
     <corners android:radius="24dp" />
 </shape>

modules/module_base/src/main/res/drawable/base_shape_theme_unselected_26dp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient android:startColor="#B7F2FF" android:centerColor="#D5C1FF" android:endColor="#FDACF1"/>
+    <gradient android:startColor="#A5EEC8" android:endColor="#ABF5E3"/>
     <corners android:radius="26dp" />
 </shape>