From 6fc03aa0a146f0e17feb035eed40b390810ef6ac Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Wed, 6 Nov 2024 19:34:57 +0700 Subject: [PATCH] fix Reader's dialog font size --- .../java/eu/kanade/presentation/theme/TachiyomiTheme.kt | 7 +++---- .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt b/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt index 2cbba5712..f68be5565 100644 --- a/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt +++ b/app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt @@ -5,6 +5,7 @@ import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Typography import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.ui.graphics.Color @@ -53,15 +54,13 @@ fun TachiyomiTheme( @Composable fun TachiyomiTheme( - // KMK --> seedColor: Color?, - // KMK <-- appTheme: AppTheme? = null, amoled: Boolean? = null, + typography: Typography = MaterialTheme.typography, content: @Composable () -> Unit, ) { val uiPreferences = Injekt.get() - // KMK --> val context = LocalContext.current val isAmoled = amoled ?: uiPreferences.themeDarkAmoled().get() if (seedColor != null) { @@ -70,6 +69,7 @@ fun TachiyomiTheme( useDarkTheme = isSystemInDarkTheme(), withAmoled = isAmoled, style = uiPreferences.themeCoverBasedStyle().get(), + typography = typography, animate = true, content = content, contrastLevel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { @@ -79,7 +79,6 @@ fun TachiyomiTheme( }, ) } else { - // KMK <-- BaseTachiyomiTheme( appTheme = appTheme ?: uiPreferences.appTheme().get(), isAmoled = isAmoled, 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 b2f34a64e..94666cafd 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 @@ -163,10 +163,6 @@ class ReaderActivity : BaseActivity() { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) } } - - const val SHIFT_DOUBLE_PAGES = "shiftingDoublePages" - const val SHIFTED_PAGE_INDEX = "shiftedPageIndex" - const val SHIFTED_CHAP_INDEX = "shiftedChapterIndex" } private val readerPreferences = Injekt.get() @@ -735,6 +731,9 @@ class ReaderActivity : BaseActivity() { binding.dialogRoot.setComposeContent { TachiyomiTheme( seedColor = seedColorState().takeIf { themeCoverBased }, + typography = MaterialTheme.typography.copy( + bodyLarge = MaterialTheme.typography.bodySmall, + ), ) { dialogRootContent() }