Fix SwipeRefreshLayout theme

app/src/main/java/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.kt

@@ -0,0 +1,25 @@
+package androidx.swiperefreshlayout.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.drawable.ShapeDrawable
+import android.util.AttributeSet
+import androidx.core.graphics.ColorUtils
+import rikka.core.res.resolveColor
+
+
+@SuppressLint("PrivateResource")
+class ThemedSwipeRefreshLayout @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : SwipeRefreshLayout(context, attrs) {
+
+    init {
+        val surfaceColor =
+            context.theme.resolveColor(com.google.android.material.R.attr.colorSurface)
+        val overlayColor =
+            context.getColor(com.google.android.material.R.color.m3_popupmenu_overlay_color)
+        val backgroundColor = ColorUtils.compositeColors(overlayColor, surfaceColor)
+        (mCircleView.background as ShapeDrawable).paint.color = backgroundColor
+        setColorSchemeColors(context.theme.resolveColor(com.google.android.material.R.attr.colorAccent))
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java

@@ -194,7 +194,6 @@ public final class GalleryCommentsScene extends ToolbarScene
                 mEditPanel,
                 mFabLayout
         ));
-        mRefreshLayout.setColorSchemeColors(ResourcesKt.resolveColor(getTheme(), androidx.appcompat.R.attr.colorPrimary));
         mRefreshLayout.setOnRefreshListener(this);
 
         Context context = requireContext();

app/src/main/java/com/hippo/widget/ContentLayout.java

@@ -104,8 +104,6 @@ public class ContentLayout extends FrameLayout {
         mBottomProgress = mContentView.findViewById(R.id.bottom_progress);
         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));

app/src/main/res/layout/scene_gallery_comments.xml

@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout
         android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -34,7 +34,7 @@
             android:paddingRight="@dimen/keyline_margin"
             app:fitsSystemWindowsInsets="bottom" />
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
 
     <TextView
         android:id="@+id/tip"

app/src/main/res/layout/widget_content_layout.xml

@@ -39,7 +39,7 @@
         android:layout_height="match_parent"
         android:clipChildren="false">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -51,7 +51,7 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="false" />
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
 
         <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/bottom_progress"