diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomeIndicatorAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/HomeIndicatorAdapter.java index d303867c5..b05559c24 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomeIndicatorAdapter.java +++ b/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); diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/ContactsIndicatorAdapter.java index 1818d12e4..5db3ca348 100644 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/ContactsIndicatorAdapter.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/HomeRecommendIndicatorAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/HomeRecommendIndicatorAdapter.java index bf38df914..03472aefe 100644 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/HomeRecommendIndicatorAdapter.java +++ b/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; diff --git a/app/src/main/res/drawable-xhdpi/ic_login_checked.webp b/app/src/main/res/drawable-xhdpi/ic_login_checked.webp deleted file mode 100644 index 2857ccf40..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_login_checked.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_login_unchecked.webp b/app/src/main/res/drawable-xhdpi/ic_login_unchecked.webp deleted file mode 100644 index 0993cce26..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_login_unchecked.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/base_ic_indicator.png b/app/src/main/res/drawable-xxhdpi/base_ic_indicator.png index 602899a0b..d68b42049 100644 Binary files a/app/src/main/res/drawable-xxhdpi/base_ic_indicator.png and b/app/src/main/res/drawable-xxhdpi/base_ic_indicator.png differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_theme_top.webp b/app/src/main/res/drawable-xxhdpi/bg_theme_top.webp index cd4a013ff..1a20c787b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/bg_theme_top.webp and b/app/src/main/res/drawable-xxhdpi/bg_theme_top.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_theme_top_home.webp b/app/src/main/res/drawable-xxhdpi/bg_theme_top_home.webp index e492f089a..d0606a081 100644 Binary files a/app/src/main/res/drawable-xxhdpi/bg_theme_top_home.webp and b/app/src/main/res/drawable-xxhdpi/bg_theme_top_home.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/home_ic_search.png b/app/src/main/res/drawable-xxhdpi/home_ic_search.png index 770651ab8..7a75afef6 100644 Binary files a/app/src/main/res/drawable-xxhdpi/home_ic_search.png and b/app/src/main/res/drawable-xxhdpi/home_ic_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_checked.png b/app/src/main/res/drawable-xxhdpi/ic_login_checked.png new file mode 100644 index 000000000..1c05ae4d1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_login_checked.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_login_unchecked.png b/app/src/main/res/drawable-xxhdpi/ic_login_unchecked.png new file mode 100644 index 000000000..bf3c89853 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_login_unchecked.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_logo_text.png b/app/src/main/res/drawable-xxhdpi/ic_logo_text.png index 0aa876407..a28175004 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_logo_text.png and b/app/src/main/res/drawable-xxhdpi/ic_logo_text.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game.png index 0abfb85ee..5ca81a72f 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.png index a6ba882b6..d2e76bbf8 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png index 44a0dcb0f..09b5a3297 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png index fbe4688d6..7093b5e14 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png index 588e8f41c..90b156535 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png index f31e9a289..167f83338 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png index 98515e99b..a6a983d06 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png index 12af1e714..9c4a8abc1 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_square.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_square.png index d0eaa4bbb..cd94d2d5d 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_square.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_square.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_square_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_square_pressed.png index be87661c8..e9f87d30a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_square_pressed.png and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_square_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png deleted file mode 100644 index f016f8536..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png deleted file mode 100644 index b03ba1f4f..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png and /dev/null differ diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index 939cc0e61..2ae55474c 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/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" /> #7F191919 #CC191919 #FEFFBF + #0C1D18 + #990C1D18 + #002512 diff --git a/gradle.properties b/gradle.properties index c6e084071..26f19b157 100644 --- a/gradle.properties +++ b/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 diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml index f090a4024..e3efd5a52 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml index f116c30bf..0736aaebb 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_26dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_26dp.xml index 9cf66f7a4..5c28e60eb 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_26dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_26dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml index b2be0791c..36658b46f 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml index 99e295e9c..2f09f8aab 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme2_24dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme2_24dp.xml deleted file mode 100644 index 9992c4b83..000000000 --- a/modules/module_base/src/main/res/drawable/base_shape_theme2_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml index f090a4024..e3efd5a52 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_15dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_20dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_20dp.xml index 8f85d38a1..8df00175f 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_20dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_20dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml index f8a003ad5..32d95f99d 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml index a9a557644..445fd54e2 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_24dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_26dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_26dp.xml index 9cf66f7a4..5c28e60eb 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_26dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_26dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml index b2be0791c..36658b46f 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_30dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_8dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_8dp.xml index f7a4d956f..8fe540f76 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_8dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_8dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml index 1730c4451..7795c452d 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_26dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_26dp.xml index 085d036fe..da3c6e99a 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_26dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_unselected_26dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file