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

migrate to dev.chrisbanes.haze:haze to v1

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
View file

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

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

@ -10,6 +10,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.Crossfade
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
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.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.unit.dp
import androidx.core.net.toUri
import androidx.lifecycle.compose.LocalLifecycleOwner
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.currentOrThrow
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.HazeStyle
import dev.chrisbanes.haze.hazeChild
import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.domain.manga.model.toSManga
@ -259,6 +264,7 @@ class MangaScreen(
// KMK -->
val coverRatio = remember { mutableFloatStateOf(1f) }
val hazeState = remember { HazeState() }
val fullCoverBackground = MaterialTheme.colorScheme.surfaceTint.blend(MaterialTheme.colorScheme.surface)
// KMK <--
MangaScreen(
@ -516,6 +522,11 @@ class MangaScreen(
modifier = Modifier
.hazeChild(
state = hazeState,
style = HazeStyle(
backgroundColor = Color.Transparent,
tint = HazeDefaults.tint(fullCoverBackground),
blurRadius = 10.dp,
),
),
// KMK <--
)

2
gradle/libs.versions.toml
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"
palette-ktx = "androidx.palette:palette-ktx:1.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"