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

Fix PaletteScreen crashing on app suspends

Browse source
This commit is contained in:
Cuong M. Tran 2024-06-18 12:29:20 +07:00
parent d841399f51
commit 742126e4eb
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View file

@ -316,7 +316,7 @@ class MangaScreen(
} }
}, },
onCoverLoaded = screenModel::setPaletteColor, onCoverLoaded = screenModel::setPaletteColor,
onPaletteScreenClick = { navigator.push(PaletteScreen(successState.seedColor)) } onPaletteScreenClick = { navigator.push(PaletteScreen(successState.seedColor?.toArgb())) }
// KMK <-- // KMK <--
) )

16
app/src/main/java/eu/kanade/tachiyomi/ui/manga/PaletteScreen.kt
View file

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.ui.manga package eu.kanade.tachiyomi.ui.manga
import androidx.annotation.ColorInt
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -29,29 +30,30 @@ import uy.kohesive.injekt.api.get
* A screen that displays a colors palette of current theme. * A screen that displays a colors palette of current theme.
*/ */
class PaletteScreen( class PaletteScreen(
private val seedColor: Color?, @ColorInt private val seedColor: Int?,
) : Screen() { ) : Screen() {
@Composable @Composable
override fun Content() { override fun Content() {
val seedColor = seedColor?.let { Color(it) } ?: MaterialTheme.colorScheme.primary
val uiPreferences = remember { Injekt.get<UiPreferences>() } val uiPreferences = remember { Injekt.get<UiPreferences>() }
if (uiPreferences.themeCoverBased().get()) { if (uiPreferences.themeCoverBased().get()) {
DynamicMaterialTheme( DynamicMaterialTheme(
seedColor = seedColor ?: MaterialTheme.colorScheme.primary, seedColor = seedColor,
useDarkTheme = isSystemInDarkTheme(), useDarkTheme = isSystemInDarkTheme(),
withAmoled = uiPreferences.themeDarkAmoled().get(), withAmoled = uiPreferences.themeDarkAmoled().get(),
style = uiPreferences.themeCoverBasedStyle().get(), style = uiPreferences.themeCoverBasedStyle().get(),
animate = true, animate = true,
content = { MaterialThemeContent() }, content = { MaterialThemeContent(seedColor) },
) )
} else { } else {
MaterialThemeContent() MaterialThemeContent(seedColor)
} }
} }
@Composable @Composable
fun MaterialThemeContent() { fun MaterialThemeContent(seedColor: Color) {
val navigator = LocalNavigator.currentOrThrow val navigator = LocalNavigator.currentOrThrow
Scaffold( Scaffold(
@ -68,9 +70,9 @@ class PaletteScreen(
) { ) {
ButtonsColor( ButtonsColor(
"accent & onPrimary", "accent & onPrimary",
seedColor ?: MaterialTheme.colorScheme.primary, seedColor,
"accent & contentColor", "accent & contentColor",
seedColor ?: MaterialTheme.colorScheme.primary, seedColor,
MaterialTheme.colorScheme.onPrimary, MaterialTheme.colorScheme.onPrimary,
) )