diff --git a/app/build.gradle b/app/build.gradle
index 5702f4a3b..828e61d38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -134,6 +134,7 @@ dependencies {
implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.biometric:biometric:1.0.1'
+ implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
implementation 'androidx.webkit:webkit:1.3.0-beta01'
final lifecycle_version = '2.2.0'
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
index 45d6d01ca..a1b3bf2b5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt
@@ -5,7 +5,6 @@ import android.util.AttributeSet
import androidx.core.content.ContextCompat
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.system.getResourceColor
class ThemedSwipeRefreshLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
SwipeRefreshLayout(context, attrs) {
@@ -15,7 +14,9 @@ class ThemedSwipeRefreshLayout @JvmOverloads constructor(context: Context, attrs
}
private fun setColors() {
- setProgressBackgroundColorSchemeColor(context.getResourceColor(R.attr.colorAccent))
+ // Background is controlled with "swipeRefreshLayoutProgressSpinnerBackgroundColor" in XML
+
+ // This updates the progress arrow color
setColorSchemeColors(
ContextCompat.getColor(context, R.color.md_white_1000),
ContextCompat.getColor(context, R.color.md_white_1000),
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3f2a1d073..11bb3c63b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -58,6 +58,7 @@
- @style/TextAppearance.Widget.Button
- @style/Theme.Widget.TextInputLayout.OutlinedBox
- @style/TextAppearance.Widget.Menu
+ - ?attr/colorAccent
- ?attr/colorSurface
@@ -140,6 +141,7 @@
- @style/TextAppearance.Widget.Button
- @style/Theme.Widget.TextInputLayout.OutlinedBox
- @style/TextAppearance.Widget.Menu
+ - ?attr/colorAccent
- ?attr/colorSurface