fix: 修复主题颜色bug

goweii · Jan 14, 2023 · 92f1226 · 92f1226
1 parent 1e7d66c
commit 92f1226
Show file tree

Hide file tree

Showing 13 changed files with 507 additions and 273 deletions.
diff --git a/app/src/main/java/per/goweii/wanandroid/module/main/dialog/DownloadDialog.java b/app/src/main/java/per/goweii/wanandroid/module/main/dialog/DownloadDialog.java
@@ -130,7 +130,7 @@ public void onError(DownloadInfo info, Throwable e) {
                         } else if (retryCount <= 6) {
                             startDownload(DownloadDialog.this.urlBackup);
                         } else {
-                            ToastMaker.showShort("下载失败，可前往酷安手动更新");
+                            ToastMaker.showShort("下载失败，可前往Github仓库下载：我的-系统设置-关于我们-项目仓库");
                             dismiss();
                         }
                     }

diff --git a/app/src/main/res/layout/dialog_copied_link.xml b/app/src/main/res/layout/dialog_copied_link.xml
@@ -25,7 +25,7 @@
             android:padding="5dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_close"
-            android:tint="?colorIconInvert"
+            android:tint="?colorIconOnMain"
             tools:ignore="UseAppTint" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:layout_marginTop="@dimen/margin_def"
             android:layout_toRightOf="@+id/dialog_copied_link_iv_close"
             android:text="打开链接"
-            android:textColor="?colorTextInvert"
+            android:textColor="?colorTextOnMain"
             android:textSize="@dimen/text_content" />
 
         <TextView
@@ -47,7 +47,8 @@
             android:layout_alignLeft="@+id/dialog_copied_link_tv_open"
             android:layout_marginBottom="@dimen/margin_def"
             android:maxWidth="200dp"
-            android:textColor="?colorTextInvertAlpha"
+            android:textColor="?colorTextOnMain"
+            android:alpha="0.6"
             android:textSize="@dimen/text_notes"
             tools:text="https://www.github.goweii/WanAndroid" />
 

diff --git a/app/src/main/res/values-night/themes_gold.xml b/app/src/main/res/values-night/themes_gold.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="theme_gold_color_primary">#C8A753</color>
-    <color name="theme_gold_color_primary_a60">#99C8A753</color>
-    <color name="theme_gold_color_primary_light">#C8AF6F</color>
+    <color name="theme_gold_color_primary">#D5C591</color>
+    <color name="theme_gold_color_primary_a60">#99D5C591</color>
+    <color name="theme_gold_color_primary_light">#B8AF91</color>
     <color name="theme_gold_color_primary_light_a05">#11C8AF6F</color>
     <color name="theme_gold_color_primary_dark_a60">#999A8140</color>
     <color name="theme_gold_color_accent">#F65442</color>
@@ -13,38 +13,70 @@
         <item name="colorPrimary">@color/theme_gold_color_primary</item>
         <item name="colorAccent">@color/theme_gold_color_primary</item>
         <item name="colorPrimaryDark">@color/color_transparent</item>
-        <!-- 主题颜色 -->
+
+
+        <!-- app/src/main/res/values-night/themes.xml -->
+
+        <item name="colorIcLauncherBackgroundStart">@color/theme_gold_color_primary</item>
+        <item name="colorIcLauncherBackgroundEnd">@color/theme_gold_color_primary</item>
+        <item name="colorLoginBg">@color/color_black_dark1</item>
+        <item name="colorBottomBarOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorMineBlurOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorAboutMeBlurOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorScrollbar">@color/color_white_a05</item>
+        <item name="colorHeartUncheckedOnMain">@color/color_black_dark3</item>
+        <item name="colorHeartOuter">@color/theme_gold_color_accent</item>
+        <item name="colorHeartCenter">@color/theme_gold_color_accent</item>
+
+
+        <!-- basic_res/src/main/res/values-night/themes.xml -->
+
+        <item name="colorTransparent">@color/color_transparent</item>
+
         <item name="colorMain">@color/theme_gold_color_primary</item>
         <item name="colorMainAlpha">@color/theme_gold_color_primary_a60</item>
         <item name="colorStriking">@color/theme_gold_color_accent</item>
         <item name="colorAssist">@color/theme_gold_color_assist</item>
-        <item name="colorDialogBg">@color/color_black_a50</item>
-        <item name="colorToastBg">@color/color_black_dark1</item>
-        <item name="colorRippleDark">@color/theme_gold_color_primary_light_a05</item>
-        <item name="colorRippleLight">@color/color_white_a20</item>
-        <item name="colorLauncherBackground">@color/theme_gold_color_primary</item>
-        <item name="colorTransparent">@color/color_transparent</item>
-        <item name="colorLine">@color/color_black_dark1</item>
+        <item name="colorSecond">@color/color_white_a50</item>
+        <item name="colorThird">@color/color_white_a33</item>
+        <item name="colorFourth">@color/color_white_a20</item>
+        <item name="colorInvert">@color/color_white_a70</item>
+        <item name="colorInvertAlpha">@color/color_white_a05</item>
+
         <item name="colorBackground">@color/color_black_dark1</item>
         <item name="colorBackgroundAlpha">@color/color_black_dark1_a86</item>
         <item name="colorBackgroundMask">@color/color_white_a05</item>
+
         <item name="colorForeground">@color/color_black_dark1</item>
         <item name="colorForegroundAlpha">@color/color_black_dark1_a86</item>
         <item name="colorForegroundMask">@color/color_white_a05</item>
         <item name="colorForegroundTop">@color/color_black_dark3</item>
+
         <item name="colorSurface">@color/color_black_dark3</item>
         <item name="colorSurfaceAlpha">@color/color_black_dark3_a80</item>
         <item name="colorSurfaceMask">@color/color_white_a05</item>
         <item name="colorSurfaceTop">@color/color_black_dark4</item>
         <item name="colorSurfaceTopAlpha">@color/color_black_dark4_a93</item>
         <item name="colorSurfaceTopMask">@color/color_white_a05</item>
-        <item name="colorInvert">@color/color_white_a70</item>
-        <item name="colorInvertAlpha">@color/color_white_a05</item>
-        <item name="colorSecond">@color/color_white_a50</item>
-        <item name="colorThird">@color/color_white_a33</item>
-        <item name="colorFourth">@color/color_white_a20</item>
+
+        <item name="colorMainOrSurface">@color/color_black_dark3</item>
+
+        <item name="colorOnMainOrSurface">@color/color_white_a70</item>
+        <item name="colorOnMainOrSurfaceAlpha">@color/color_white_a30</item>
+
+        <item name="colorRippleDark">@color/theme_gold_color_primary_light_a05</item>
+        <item name="colorRippleLight">@color/color_white_a20</item>
+
         <item name="colorShadow">@color/color_black_a40</item>
         <item name="colorShadowMain">@color/theme_gold_color_primary_dark_a60</item>
+
+        <item name="colorLine">@color/color_black_dark1</item>
+
+        <item name="colorLauncherBackground">@color/theme_gold_color_primary</item>
+        <item name="colorDialogBg">@color/color_black_a50</item>
+        <item name="colorToastBg">@color/color_black_dark5_a93</item>
+        <item name="colorDialogCard">@color/color_black_dark4</item>
+
         <item name="colorTextMain">@color/theme_gold_color_primary</item>
         <item name="colorTextMainAlpha">@color/theme_gold_color_primary_a60</item>
         <item name="colorTextAccent">@color/theme_gold_color_accent</item>
@@ -56,6 +88,9 @@
         <item name="colorTextInvert">@color/color_black_a93</item>
         <item name="colorTextInvertAlpha">@color/color_black_a47</item>
         <item name="colorTextOnMain">@color/color_black_a93</item>
+        <item name="colorTextOnShadow">@color/color_white_a70</item>
+        <item name="colorTextToast">@color/color_white_a70</item>
+
         <item name="colorIconMain">@color/theme_gold_color_primary</item>
         <item name="colorIconAccent">@color/theme_gold_color_accent</item>
         <item name="colorIconSurface">@color/color_white_a70</item>
@@ -64,21 +99,9 @@
         <item name="colorIconFourth">@color/color_white_a20</item>
         <item name="colorIconInvert">@color/color_black_a93</item>
         <item name="colorIconOnMain">@color/color_black_a10</item>
-        <item name="colorMainOrSurface">@color/color_black_dark3</item>
-        <item name="colorOnMainOrSurface">@color/color_white_a70</item>
-        <item name="colorOnMainOrSurfaceAlpha">@color/color_white_a30</item>
         <item name="colorIconLight">@color/color_white_a70</item>
         <item name="colorIconDark">@color/color_black_a93</item>
-        <item name="colorIcLauncherBackgroundStart">@color/theme_gold_color_primary</item>
-        <item name="colorIcLauncherBackgroundEnd">@color/theme_gold_color_primary</item>
-        <item name="colorLoginBg">@color/color_black_dark1</item>
-        <item name="colorBottomBarOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorMineBlurOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorAboutMeBlurOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorScrollbar">@color/color_white_a05</item>
-        <item name="colorHeartUncheckedOnMain">@color/color_black_dark3</item>
-        <item name="colorHeartOuter">@color/theme_gold_color_accent</item>
-        <item name="colorHeartCenter">@color/theme_gold_color_accent</item>
+
     </style>
 
 </resources>
diff --git a/app/src/main/res/values-night/themes_green.xml b/app/src/main/res/values-night/themes_green.xml
@@ -13,38 +13,70 @@
         <item name="colorPrimary">@color/theme_green_color_primary</item>
         <item name="colorAccent">@color/theme_green_color_primary</item>
         <item name="colorPrimaryDark">@color/color_transparent</item>
-        <!-- 主题颜色 -->
+
+
+        <!-- app/src/main/res/values-night/themes.xml -->
+
+        <item name="colorIcLauncherBackgroundStart">@color/theme_green_color_primary</item>
+        <item name="colorIcLauncherBackgroundEnd">@color/theme_green_color_primary</item>
+        <item name="colorLoginBg">@color/color_black_dark1</item>
+        <item name="colorBottomBarOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorMineBlurOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorAboutMeBlurOverlay">@color/color_black_dark3_a80</item>
+        <item name="colorScrollbar">@color/color_white_a05</item>
+        <item name="colorHeartUncheckedOnMain">@color/color_black_dark3</item>
+        <item name="colorHeartOuter">@color/theme_green_color_accent</item>
+        <item name="colorHeartCenter">@color/theme_green_color_accent</item>
+
+
+        <!-- basic_res/src/main/res/values-night/themes.xml -->
+
+        <item name="colorTransparent">@color/color_transparent</item>
+
         <item name="colorMain">@color/theme_green_color_primary</item>
         <item name="colorMainAlpha">@color/theme_green_color_primary_a60</item>
         <item name="colorStriking">@color/theme_green_color_accent</item>
         <item name="colorAssist">@color/theme_green_color_assist</item>
-        <item name="colorDialogBg">@color/color_black_a50</item>
-        <item name="colorToastBg">@color/color_black_dark1</item>
-        <item name="colorRippleDark">@color/theme_green_color_primary_light_a05</item>
-        <item name="colorRippleLight">@color/color_white_a20</item>
-        <item name="colorLauncherBackground">@color/theme_green_color_primary</item>
-        <item name="colorTransparent">@color/color_transparent</item>
-        <item name="colorLine">@color/color_black_dark1</item>
+        <item name="colorSecond">@color/color_white_a50</item>
+        <item name="colorThird">@color/color_white_a33</item>
+        <item name="colorFourth">@color/color_white_a20</item>
+        <item name="colorInvert">@color/color_white_a70</item>
+        <item name="colorInvertAlpha">@color/color_white_a05</item>
+
         <item name="colorBackground">@color/color_black_dark1</item>
         <item name="colorBackgroundAlpha">@color/color_black_dark1_a86</item>
         <item name="colorBackgroundMask">@color/color_white_a05</item>
+
         <item name="colorForeground">@color/color_black_dark1</item>
         <item name="colorForegroundAlpha">@color/color_black_dark1_a86</item>
         <item name="colorForegroundMask">@color/color_white_a05</item>
         <item name="colorForegroundTop">@color/color_black_dark3</item>
+
         <item name="colorSurface">@color/color_black_dark3</item>
         <item name="colorSurfaceAlpha">@color/color_black_dark3_a80</item>
         <item name="colorSurfaceMask">@color/color_white_a05</item>
         <item name="colorSurfaceTop">@color/color_black_dark4</item>
         <item name="colorSurfaceTopAlpha">@color/color_black_dark4_a93</item>
         <item name="colorSurfaceTopMask">@color/color_white_a05</item>
-        <item name="colorInvert">@color/color_white_a70</item>
-        <item name="colorInvertAlpha">@color/color_white_a05</item>
-        <item name="colorSecond">@color/color_white_a50</item>
-        <item name="colorThird">@color/color_white_a33</item>
-        <item name="colorFourth">@color/color_white_a20</item>
+
+        <item name="colorMainOrSurface">@color/color_black_dark3</item>
+
+        <item name="colorOnMainOrSurface">@color/color_white_a70</item>
+        <item name="colorOnMainOrSurfaceAlpha">@color/color_white_a30</item>
+
+        <item name="colorRippleDark">@color/theme_green_color_primary_light_a05</item>
+        <item name="colorRippleLight">@color/color_white_a20</item>
+
         <item name="colorShadow">@color/color_black_a40</item>
         <item name="colorShadowMain">@color/theme_green_color_primary_dark_a60</item>
+
+        <item name="colorLine">@color/color_black_dark1</item>
+
+        <item name="colorLauncherBackground">@color/theme_green_color_primary</item>
+        <item name="colorDialogBg">@color/color_black_a50</item>
+        <item name="colorToastBg">@color/color_black_dark5_a93</item>
+        <item name="colorDialogCard">@color/color_black_dark4</item>
+
         <item name="colorTextMain">@color/theme_green_color_primary</item>
         <item name="colorTextMainAlpha">@color/theme_green_color_primary_a60</item>
         <item name="colorTextAccent">@color/theme_green_color_accent</item>
@@ -56,6 +88,9 @@
         <item name="colorTextInvert">@color/color_black_a93</item>
         <item name="colorTextInvertAlpha">@color/color_black_a47</item>
         <item name="colorTextOnMain">@color/color_black_a93</item>
+        <item name="colorTextOnShadow">@color/color_white_a70</item>
+        <item name="colorTextToast">@color/color_white_a70</item>
+
         <item name="colorIconMain">@color/theme_green_color_primary</item>
         <item name="colorIconAccent">@color/theme_green_color_accent</item>
         <item name="colorIconSurface">@color/color_white_a70</item>
@@ -64,21 +99,9 @@
         <item name="colorIconFourth">@color/color_white_a20</item>
         <item name="colorIconInvert">@color/color_black_a93</item>
         <item name="colorIconOnMain">@color/color_black_a10</item>
-        <item name="colorMainOrSurface">@color/color_black_dark3</item>
-        <item name="colorOnMainOrSurface">@color/color_white_a70</item>
-        <item name="colorOnMainOrSurfaceAlpha">@color/color_white_a30</item>
         <item name="colorIconLight">@color/color_white_a70</item>
         <item name="colorIconDark">@color/color_black_a93</item>
-        <item name="colorIcLauncherBackgroundStart">@color/theme_green_color_primary</item>
-        <item name="colorIcLauncherBackgroundEnd">@color/theme_green_color_primary</item>
-        <item name="colorLoginBg">@color/color_black_dark1</item>
-        <item name="colorBottomBarOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorMineBlurOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorAboutMeBlurOverlay">@color/color_black_dark3_a80</item>
-        <item name="colorScrollbar">@color/color_white_a05</item>
-        <item name="colorHeartUncheckedOnMain">@color/color_black_dark3</item>
-        <item name="colorHeartOuter">@color/color_orange_light</item>
-        <item name="colorHeartCenter">@color/color_orange_light</item>
+
     </style>
 
 </resources>