From 385101a729b08722970d40b1f91d967cec8fd43f Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 23 Aug 2022 19:04:51 +0800
Subject: [PATCH] Make swiperefreshlayout and ProgressIndicator follow dyncolor

---
 .../ui/scene/GalleryCommentsScene.java        |  9 +------
 .../java/com/hippo/widget/ContentLayout.java  | 18 +------------
 .../main/res/layout/widget_content_layout.xml |  1 +
 app/src/main/res/values/colors.xml            | 25 -------------------
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
index 40d4fff2e..ba3c77015 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java
@@ -184,14 +184,7 @@ public final class GalleryCommentsScene extends ToolbarScene
                 mEditPanel,
                 mFabLayout
         ));
-
-        mRefreshLayout.setColorSchemeResources(
-                R.color.loading_indicator_red,
-                R.color.loading_indicator_purple,
-                R.color.loading_indicator_blue,
-                R.color.loading_indicator_cyan,
-                R.color.loading_indicator_green,
-                R.color.loading_indicator_yellow);
+        mRefreshLayout.setColorSchemeColors(ResourcesKt.resolveColor(getTheme(), androidx.appcompat.R.attr.colorPrimary));
         mRefreshLayout.setOnRefreshListener(this);
 
         Context context = requireContext();
diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java
index 1e256a193..40783599e 100644
--- a/app/src/main/java/com/hippo/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/widget/ContentLayout.java
@@ -102,27 +102,11 @@ public class ContentLayout extends FrameLayout {
         mFastScroller = mContentView.findViewById(R.id.fast_scroller);
         mRecyclerView = mRefreshLayout.findViewById(R.id.recycler_view);
 
+        mRefreshLayout.setColorSchemeColors(ResourcesKt.resolveColor(context.getTheme(), androidx.appcompat.R.attr.colorPrimary));
         mFastScroller.attachToRecyclerView(mRecyclerView);
         HandlerDrawable drawable = new HandlerDrawable();
         drawable.setColor(ResourcesKt.resolveColor(context.getTheme(), androidx.appcompat.R.attr.colorPrimary));
         mFastScroller.setHandlerDrawable(drawable);
-
-        mRefreshLayout.setColorSchemeResources(
-                R.color.loading_indicator_red,
-                R.color.loading_indicator_purple,
-                R.color.loading_indicator_blue,
-                R.color.loading_indicator_cyan,
-                R.color.loading_indicator_green,
-                R.color.loading_indicator_yellow);
-
-        Resources resources = getResources();
-        mBottomProgress.setIndicatorColor(
-                resources.getColor(R.color.loading_indicator_red),
-                resources.getColor(R.color.loading_indicator_blue),
-                resources.getColor(R.color.loading_indicator_green),
-                resources.getColor(R.color.loading_indicator_orange));
-        mBottomProgress.setIndeterminateAnimationType(LinearProgressIndicator.INDETERMINATE_ANIMATION_TYPE_CONTIGUOUS);
-
         mRecyclerViewOriginBottom = mRecyclerView.getPaddingBottom();
         mFastScrollerOriginBottom = mFastScroller.getPaddingBottom();
     }
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index 00d16ce3c..98e058218 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -60,6 +60,7 @@
             android:layout_gravity="bottom"
             android:indeterminate="true"
             android:visibility="gone"
+            app:fitsSystemWindowsInsets="end"
             app:hideAnimationBehavior="inward"
             app:showAnimationBehavior="outward" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bcfc2d376..325ed6a6b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,36 +24,11 @@
     <color name="yellow_800">#fff9a825</color>
     <color name="deep_orange_400">#ffff7043</color>
     <color name="brown_500">#ff795548</color>
-    <color name="loading_indicator_red">#ffe53935</color>
-    <color name="loading_indicator_purple">@color/purple_a700</color>
-    <color name="loading_indicator_blue">#ff1d87e4</color>
-    <color name="loading_indicator_cyan">@color/cyan_600</color>
-    <color name="loading_indicator_green">@color/light_green_600</color>
-    <color name="loading_indicator_yellow">@color/yellow_800</color>
-    <color name="loading_indicator_orange">@color/deep_orange_400</color>
-
     <color name="navigation_bar_divider">#1f000000</color>
 
-    <!-- Red -->
-    <!-- Orange -->
-    <!-- Yellow 700 -->
-    <!-- Green -->
-    <!-- Light Green -->
-    <!-- Blue -->
-    <!-- Indigo -->
-    <!-- Purple -->
-    <!-- Deep Purple 300 -->
-    <!-- Pink 300 -->
-
     <!-- divider -->
     <color name="divider">#20000000</color>
-
     <color name="divider_black">#20ffffff</color>
-    <!-- shadow -->
-
-    <!-- Gallery Activity -->
-
-    <!-- Lock pattern view -->
 
     <!--Shortcut background-->
     <color name="shortcut_bg">#F5F5F5</color>