fix: toolbar elevation

This commit is contained in:
junkfood 2024-11-22 23:27:23 +08:00
parent 3ba1eed774
commit 368ed14801
No known key found for this signature in database
GPG Key ID: 2EA5B648DB112A34

View File

@ -48,6 +48,7 @@ import me.ash.reader.infrastructure.preference.LocalReadingPageTonalElevation
import me.ash.reader.infrastructure.preference.LocalReadingRenderer import me.ash.reader.infrastructure.preference.LocalReadingRenderer
import me.ash.reader.infrastructure.preference.LocalReadingTheme import me.ash.reader.infrastructure.preference.LocalReadingTheme
import me.ash.reader.infrastructure.preference.ReadingFontsPreference import me.ash.reader.infrastructure.preference.ReadingFontsPreference
import me.ash.reader.infrastructure.preference.ReadingPageTonalElevationPreference
import me.ash.reader.infrastructure.preference.ReadingRendererPreference import me.ash.reader.infrastructure.preference.ReadingRendererPreference
import me.ash.reader.infrastructure.preference.ReadingThemePreference import me.ash.reader.infrastructure.preference.ReadingThemePreference
import me.ash.reader.infrastructure.preference.not import me.ash.reader.infrastructure.preference.not
@ -85,12 +86,17 @@ fun ReadingStylePage(
var rendererDialogVisible by remember { mutableStateOf(false) } var rendererDialogVisible by remember { mutableStateOf(false) }
var fontsDialogVisible by remember { mutableStateOf(false) } var fontsDialogVisible by remember { mutableStateOf(false) }
val launcher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> val launcher =
uri?.let { rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
ExternalFonts(context, it, ExternalFonts.FontType.ReadingFont).copyToInternalStorage() uri?.let {
ReadingFontsPreference.External.put(context, scope) ExternalFonts(
} ?: context.showToast("Cannot get activity result with launcher") context,
} it,
ExternalFonts.FontType.ReadingFont
).copyToInternalStorage()
ReadingFontsPreference.External.put(context, scope)
} ?: context.showToast("Cannot get activity result with launcher")
}
RYScaffold( RYScaffold(
containerColor = MaterialTheme.colorScheme.surface onLight MaterialTheme.colorScheme.inverseOnSurface, containerColor = MaterialTheme.colorScheme.surface onLight MaterialTheme.colorScheme.inverseOnSurface,
@ -111,7 +117,8 @@ fun ReadingStylePage(
// Preview // Preview
item { item {
Row(modifier = Modifier.horizontalScroll(rememberScrollState()) Row(
modifier = Modifier.horizontalScroll(rememberScrollState())
) { ) {
Spacer(modifier = Modifier.width(24.dp)) Spacer(modifier = Modifier.width(24.dp))
ReadingThemePreference.values.map { ReadingThemePreference.values.map {