From 3f71a97cbd18495778581e5570d7ed391781d1cf Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 25 Oct 2018 19:26:06 +0800
Subject: [PATCH] Change colorEdgeEffect

---
 .../com/hippo/ehviewer/ui/GalleryActivity.java |  7 ++-----
 app/src/main/res/values-v21/themes.xml         | 12 ++++++++++++
 app/src/main/res/values/attrs.xml              |  2 ++
 app/src/main/res/values/themes.xml             | 18 +++++++++++++++---
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 94f2a907d..a3e1e5b21 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -48,7 +48,6 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.hippo.android.resource.AttrResources;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.BuildConfig;
@@ -77,7 +76,6 @@
 import com.hippo.yorozuya.SimpleAnimatorListener;
 import com.hippo.yorozuya.SimpleHandler;
 import com.hippo.yorozuya.ViewUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -295,7 +293,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mGLRootView = (GLRootView) ViewUtils.$$(this, R.id.gl_root_view);
         mGalleryAdapter = new GalleryAdapter(mGLRootView, mGalleryProvider);
         Resources resources = getResources();
-        int primaryColor = ResourcesUtils.getAttrColor(this, R.attr.colorPrimary);
         mGalleryView = new GalleryView.Builder(this, mGalleryAdapter)
                 .setListener(this)
                 .setLayoutMode(Settings.getReadingDirection())
@@ -303,12 +300,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 .setStartPosition(Settings.getStartPosition())
                 .setStartPage(startPage)
                 .setBackgroundColor(AttrResources.getAttrColor(this, android.R.attr.colorBackground))
-                .setEdgeColor(primaryColor & 0xffffff | 0x33000000)
+                .setEdgeColor(AttrResources.getAttrColor(this, R.attr.colorEdgeEffect) & 0xffffff | 0x33000000)
                 .setPagerInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_pager_interval) : 0)
                 .setScrollInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_scroll_interval) : 0)
                 .setPageMinHeight(resources.getDimensionPixelOffset(R.dimen.gallery_page_min_height))
                 .setPageInfoInterval(resources.getDimensionPixelOffset(R.dimen.gallery_page_info_interval))
-                .setProgressColor(primaryColor)
+                .setProgressColor(ResourcesUtils.getAttrColor(this, R.attr.colorPrimary))
                 .setProgressSize(resources.getDimensionPixelOffset(R.dimen.gallery_progress_size))
                 .setPageTextColor(AttrResources.getAttrColor(this, android.R.attr.textColorSecondary))
                 .setPageTextSize(resources.getDimensionPixelOffset(R.dimen.gallery_page_text_size))
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 1a7a7512f..a8562186b 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -17,6 +17,18 @@
 
 <resources>
 
+    <style name="AppTheme" parent="BaseTheme">
+        <item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
+    </style>
+
+    <style name="AppTheme.Dark" parent="BaseTheme.Dark">
+        <item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
+    </style>
+
+    <style name="AppTheme.Black" parent="BaseTheme.Black">
+        <item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
+    </style>
+
     <style name="AppTheme.NoActionBar.Translucent">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c037617e0..87ad60d12 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,6 +18,8 @@
 <resources>
 
     <declare-styleable name="Theme">
+        <attr name="colorEdgeEffect" format="color"/>
+
         <attr name="dividerColor" format="color"/>
         <attr name="toolbarColor" format="color"/>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4d39bde17..cb75ec4a2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,12 +20,13 @@
     <!-- ========== -->
     <!-- Base Theme -->
     <!-- ========== -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="BaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="actionBarStyle">@style/ActionBarStyle</item>
 
+        <item name="colorEdgeEffect">@color/colorPrimary</item>
         <item name="dividerColor">@color/divider_light</item>
         <item name="toolbarColor">@color/colorPrimary</item>
         <item name="textColorThemePrimary">@color/colorPrimary</item>
@@ -53,6 +54,9 @@
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail_light</item>
     </style>
 
+    <style name="AppTheme" parent="BaseTheme">
+    </style>
+
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -63,7 +67,7 @@
     <!-- =============== -->
     <!-- Base Dark Theme -->
     <!-- =============== -->
-    <style name="AppTheme.Dark" parent="Theme.AppCompat">
+    <style name="BaseTheme.Dark" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/grey_900</item>
         <item name="colorAccent">@color/colorPrimary</item>
@@ -74,6 +78,7 @@
         <item name="android:colorBackground">@color/grey_850</item>
         <item name="colorBackgroundFloating">@color/grey_850</item>
 
+        <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider_dark</item>
         <item name="toolbarColor">?android:attr/colorBackground</item>
         <item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
@@ -101,6 +106,9 @@
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
     </style>
 
+    <style name="AppTheme.Dark" parent="BaseTheme.Dark">
+    </style>
+
     <style name="AppTheme.Dark.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -111,7 +119,7 @@
     <!-- =============== -->
     <!-- Base Black Theme -->
     <!-- =============== -->
-    <style name="AppTheme.Black" parent="Theme.AppCompat">
+    <style name="BaseTheme.Black" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="colorAccent">@color/colorPrimary</item>
@@ -124,6 +132,7 @@
 
         <item name="android:textColorPrimary">@color/primary_text_material_black</item>
 
+        <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider_dark</item>
         <item name="toolbarColor">@android:color/black</item>
         <item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
@@ -151,6 +160,9 @@
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
     </style>
 
+    <style name="AppTheme.Black" parent="BaseTheme.Black">
+    </style>
+
     <style name="AppTheme.Black.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>