copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix Reader's dialog font size

Browse source
This commit is contained in:
Cuong-Tran 2024-11-06 19:34:57 +07:00
parent 22fcd8c375
commit 6fc03aa0a1
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt
View file

@ -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<UiPreferences>()
// 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,

7
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -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<ReaderPreferences>()
@ -735,6 +731,9 @@ class ReaderActivity : BaseActivity() {
binding.dialogRoot.setComposeContent {
TachiyomiTheme(
seedColor = seedColorState().takeIf { themeCoverBased },
typography = MaterialTheme.typography.copy(
bodyLarge = MaterialTheme.typography.bodySmall,
),
) {
dialogRootContent()
}