migrate to dev.chrisbanes.haze:haze to v1

This commit is contained in:
Cuong-Tran 2024-11-13 02:12:59 +07:00
parent 99386aebe2
commit 398d50a3e5
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
3 changed files with 12 additions and 15 deletions

View file

@ -60,14 +60,10 @@ import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastAll import androidx.compose.ui.util.fastAll
import androidx.compose.ui.util.fastAny import androidx.compose.ui.util.fastAny
import androidx.compose.ui.util.fastMap import androidx.compose.ui.util.fastMap
import com.materialkolor.ktx.blend
import dev.chrisbanes.haze.HazeDefaults
import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.HazeStyle
import dev.chrisbanes.haze.haze import dev.chrisbanes.haze.haze
import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.source.service.SourcePreferences
import eu.kanade.domain.ui.UiPreferences import eu.kanade.domain.ui.UiPreferences
@ -431,7 +427,6 @@ private fun MangaScreenSmallImpl(
val relatedMangasEnabled by Injekt.get<SourcePreferences>().relatedMangas().collectAsState() val relatedMangasEnabled by Injekt.get<SourcePreferences>().relatedMangas().collectAsState()
val expandRelatedMangas by uiPreferences.expandRelatedMangas().collectAsState() val expandRelatedMangas by uiPreferences.expandRelatedMangas().collectAsState()
val showRelatedMangasInOverflow by uiPreferences.relatedMangasInOverflow().collectAsState() val showRelatedMangasInOverflow by uiPreferences.relatedMangasInOverflow().collectAsState()
val fullCoverBackground = MaterialTheme.colorScheme.surfaceTint.blend(MaterialTheme.colorScheme.surface)
var layoutSize by remember { mutableStateOf(IntSize.Zero) } var layoutSize by remember { mutableStateOf(IntSize.Zero) }
var fabSize by remember { mutableStateOf(IntSize.Zero) } var fabSize by remember { mutableStateOf(IntSize.Zero) }
@ -579,10 +574,6 @@ private fun MangaScreenSmallImpl(
} }
.haze( .haze(
state = hazeState, state = hazeState,
style = HazeStyle(
tint = HazeDefaults.tint(fullCoverBackground),
blurRadius = 10.dp,
),
), ),
// KMK <-- // KMK <--
) { contentPadding -> ) { contentPadding ->
@ -890,7 +881,6 @@ private fun MangaScreenLargeImpl(
val relatedMangasEnabled by Injekt.get<SourcePreferences>().relatedMangas().collectAsState() val relatedMangasEnabled by Injekt.get<SourcePreferences>().relatedMangas().collectAsState()
val expandRelatedMangas by uiPreferences.expandRelatedMangas().collectAsState() val expandRelatedMangas by uiPreferences.expandRelatedMangas().collectAsState()
val showRelatedMangasInOverflow by uiPreferences.relatedMangasInOverflow().collectAsState() val showRelatedMangasInOverflow by uiPreferences.relatedMangasInOverflow().collectAsState()
val fullCoverBackground = MaterialTheme.colorScheme.surfaceTint.blend(MaterialTheme.colorScheme.surface)
var layoutSize by remember { mutableStateOf(IntSize.Zero) } var layoutSize by remember { mutableStateOf(IntSize.Zero) }
var fabSize by remember { mutableStateOf(IntSize.Zero) } var fabSize by remember { mutableStateOf(IntSize.Zero) }
@ -1037,10 +1027,6 @@ private fun MangaScreenLargeImpl(
} }
.haze( .haze(
state = hazeState, state = hazeState,
style = HazeStyle(
tint = HazeDefaults.tint(fullCoverBackground),
blurRadius = 10.dp,
),
), ),
// KMK <-- // KMK <--
) { contentPadding -> ) { contentPadding ->

View file

@ -10,6 +10,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
@ -26,6 +27,7 @@ import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.unit.dp
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -35,7 +37,10 @@ import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.Navigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.materialkolor.ktx.blend
import dev.chrisbanes.haze.HazeDefaults
import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.HazeStyle
import dev.chrisbanes.haze.hazeChild import dev.chrisbanes.haze.hazeChild
import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.domain.manga.model.toSManga import eu.kanade.domain.manga.model.toSManga
@ -259,6 +264,7 @@ class MangaScreen(
// KMK --> // KMK -->
val coverRatio = remember { mutableFloatStateOf(1f) } val coverRatio = remember { mutableFloatStateOf(1f) }
val hazeState = remember { HazeState() } val hazeState = remember { HazeState() }
val fullCoverBackground = MaterialTheme.colorScheme.surfaceTint.blend(MaterialTheme.colorScheme.surface)
// KMK <-- // KMK <--
MangaScreen( MangaScreen(
@ -516,6 +522,11 @@ class MangaScreen(
modifier = Modifier modifier = Modifier
.hazeChild( .hazeChild(
state = hazeState, state = hazeState,
style = HazeStyle(
backgroundColor = Color.Transparent,
tint = HazeDefaults.tint(fullCoverBackground),
blurRadius = 10.dp,
),
), ),
// KMK <-- // KMK <--
) )

View file

@ -67,7 +67,7 @@ compose-grid = "io.woong.compose.grid:grid:1.2.2"
compose-stablemarker = "com.github.skydoves:compose-stable-marker:1.0.5" compose-stablemarker = "com.github.skydoves:compose-stable-marker:1.0.5"
palette-ktx = "androidx.palette:palette-ktx:1.0.0" palette-ktx = "androidx.palette:palette-ktx:1.0.0"
materialKolor = "com.materialkolor:material-kolor:2.0.0" materialKolor = "com.materialkolor:material-kolor:2.0.0"
haze = "dev.chrisbanes.haze:haze:0.7.3" haze = "dev.chrisbanes.haze:haze:1.0.1"
swipe = "me.saket.swipe:swipe:1.3.0" swipe = "me.saket.swipe:swipe:1.3.0"