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 @@
#fff9a825
#ffff7043
#ff795548
- #ffe53935
- @color/purple_a700
- #ff1d87e4
- @color/cyan_600
- @color/light_green_600
- @color/yellow_800
- @color/deep_orange_400
-
#1f000000
-
-
-
-
-
-
-
-
-
-
-
#20000000
-
#20ffffff
-
-
-
-
-
#F5F5F5