From aaa2a690c9737222fdd602900fd88e4a50160449 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Wed, 18 Nov 2020 17:44:26 +0800
Subject: [PATCH] Fix some theme issue

---
 .../com/hippo/ehviewer/ui/scene/GalleryDetailScene.java    | 1 -
 .../java/com/hippo/widget/lockpattern/LockPatternView.java | 2 +-
 app/src/main/res/values-night/colors.xml                   | 7 +++++++
 app/src/main/res/values/colors.xml                         | 6 ++----
 app/src/main/res/values/themes.xml                         | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index b2ccd0bec..9e938d9e0 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -519,7 +519,6 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         mTip.setCompoundDrawables(null, drawable, null, null);
         mTip.setOnClickListener(this);
 
-        boolean isDarkTheme = !AttrResources.getAttrBoolean(context, R.attr.isLightTheme);
         mHeader = ViewUtils.$$(mainView, R.id.header);
         mColorBg = ViewUtils.$$(mHeader, R.id.color_bg);
         mThumb = (LoadImageView) ViewUtils.$$(mHeader, R.id.thumb);
diff --git a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
index 005cbaaf3..5a22bf742 100644
--- a/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
+++ b/app/src/main/java/com/hippo/widget/lockpattern/LockPatternView.java
@@ -140,7 +140,7 @@ public class LockPatternView extends View {
         mPathPaint.setAntiAlias(true);
         mPathPaint.setDither(true);
 
-        mRegularColor = getResources().getColor(AttrResources.getAttrBoolean(context, R.attr.isLightTheme) ? R.color.lock_pattern_view_regular_color_light : R.color.lock_pattern_view_regular_color_dark);
+        mRegularColor = getResources().getColor(R.color.lock_pattern_view_regular_color);
         mErrorColor = getResources().getColor(R.color.lock_pattern_view_error_color);
         mSuccessColor = getResources().getColor(R.color.lock_pattern_view_success_color);
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index fb91402a8..fb24d9e5a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -120,10 +120,17 @@
     <!-- shadow -->
     <color name="shadow">#38000000</color>
 
+    <!-- Gallery Activity -->
+    <color name="gallery_slider_background">@color/grey_900</color>
+
     <color name="big_icon">#1f000000</color>
 
     <color name="guide_bg">#e5009688</color>
 
+    <!-- Lock pattern view -->
+    <color name="lock_pattern_view_regular_color">#8affffff</color>
+    <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
+    <color name="lock_pattern_view_error_color">@color/red_500</color>
 
     <!--Shortcut background-->
     <color name="shortcut_bg">#F5F5F5</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1acc4b2b1..22c8ce11d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -152,16 +152,14 @@
     <color name="shadow">#38000000</color>
 
     <!-- Gallery Activity -->
-    <color name="gallery_slider_background_dark">@color/grey_800</color>
-    <color name="gallery_slider_background_black">@color/grey_900</color>
+    <color name="gallery_slider_background">@color/grey_100</color>
 
     <color name="big_icon">#1f000000</color>
 
     <color name="guide_bg">#e5009688</color>
 
     <!-- Lock pattern view -->
-    <color name="lock_pattern_view_regular_color_light">#8a000000</color>
-    <color name="lock_pattern_view_regular_color_dark">#8affffff</color>
+    <color name="lock_pattern_view_regular_color">#8a000000</color>
     <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
     <color name="lock_pattern_view_error_color">@color/red_500</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a8a5c9988..6b509bbe9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -136,7 +136,7 @@
     <style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar" />
 
     <style name="AppTheme.Gallery" parent="AppTheme.NoActionBar">
-        <item name="gallerySliderBackgroundColor">@color/gallery_slider_background_dark</item>
+        <item name="gallerySliderBackgroundColor">@color/gallery_slider_background</item>
     </style>
 
     <!-- ============ -->