From 9d766f47c59288e0a0f4022cda7d46779e51e9bc Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 8 Jul 2023 14:20:22 +0800
Subject: [PATCH] Fixup PageSlider theme

---
 .../main/java/com/hippo/ehviewer/ui/Theme.kt  | 12 ----------
 .../tachiyomi/ui/reader/ReaderActivity.kt     | 23 +++++++++++++------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt
index 81a70758d..34d3f6dd4 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt
@@ -2,22 +2,10 @@ package com.hippo.ehviewer.ui
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.ComposeView
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 
 // To make sure compose theme and legacy view theme are in sync, we only use Mdc3Theme
 fun ComposeView.setMD3Content(content: @Composable () -> Unit) = setContent { Mdc3Theme(content = content) }
 fun ComponentActivity.setMD3Content(content: @Composable () -> Unit) = setContent { Mdc3Theme(content = content) }
-fun ComposeView.setReaderMD3Content(content: @Composable () -> Unit) = setMD3Content {
-    CompositionLocalProvider(
-        LocalTextStyle provides MaterialTheme.typography.bodySmall,
-        LocalContentColor provides MaterialTheme.colorScheme.onBackground,
-    ) {
-        content()
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 1317f986a..b5c10cde3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -46,6 +46,10 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.appcompat.app.AlertDialog
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -72,7 +76,7 @@ import com.hippo.ehviewer.gallery.PageLoader2
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.ui.EhActivity
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
-import com.hippo.ehviewer.ui.setReaderMD3Content
+import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.ehviewer.util.getParcelableCompat
 import com.hippo.ehviewer.util.getParcelableExtraCompat
@@ -673,15 +677,20 @@ class ReaderActivity : EhActivity() {
 
         val totalPages = mGalleryProvider?.takeIf { it.isReady }?.size ?: -1
 
-        binding.pageNumber.setReaderMD3Content {
-            PageIndicatorText(
-                currentPage = currentPage,
-                totalPages = totalPages,
-            )
+        binding.pageNumber.setMD3Content {
+            CompositionLocalProvider(
+                LocalTextStyle provides MaterialTheme.typography.bodySmall,
+                LocalContentColor provides MaterialTheme.colorScheme.onBackground,
+            ) {
+                PageIndicatorText(
+                    currentPage = currentPage,
+                    totalPages = totalPages,
+                )
+            }
         }
 
         // Init listeners on bottom menu
-        binding.readerNav.setReaderMD3Content {
+        binding.readerNav.setMD3Content {
             ChapterNavigator(
                 isRtl = isRtl,
                 currentPage = currentPage,