yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Migrate deprecated progress indicator components (#10142)

Browse Source
This commit is contained in:
Ivan Iskandar 2023-11-16 21:01:45 +07:00 committed by GitHub
parent f9fb034330
commit 9ec0f73e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt
View File

@ -39,7 +39,7 @@ class ReaderProgressIndicator @JvmOverloads constructor(
@Composable @Composable
override fun Content() { override fun Content() {
TachiyomiTheme { TachiyomiTheme {
CombinedCircularProgressIndicator(progress = progress) CombinedCircularProgressIndicator(progress = { progress })
} }
} }

22
presentation-core/src/main/java/tachiyomi/presentation/core/components/CircularProgressIndicator.kt
View File

@ -37,16 +37,15 @@ import androidx.compose.ui.tooling.preview.Preview
* By always rotating we give the feedback to the user that the application isn't 'stuck'. * By always rotating we give the feedback to the user that the application isn't 'stuck'.
*/ */
@Composable @Composable
fun CombinedCircularProgressIndicator(progress: Float) { fun CombinedCircularProgressIndicator(
val animatedProgress by animateFloatAsState( progress: () -> Float,
targetValue = progress, modifier: Modifier = Modifier,
animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec, ) {
label = "progress",
)
AnimatedContent( AnimatedContent(
targetState = progress == 0f, targetState = progress() == 0f,
transitionSpec = { fadeIn() togetherWith fadeOut() }, transitionSpec = { fadeIn() togetherWith fadeOut() },
label = "progressState", label = "progressState",
modifier = modifier,
) { indeterminate -> ) { indeterminate ->
if (indeterminate) { if (indeterminate) {
// Indeterminate // Indeterminate
@ -63,8 +62,13 @@ fun CombinedCircularProgressIndicator(progress: Float) {
), ),
label = "rotation", label = "rotation",
) )
val animatedProgress by animateFloatAsState(
targetValue = progress(),
animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
label = "progress",
)
CircularProgressIndicator( CircularProgressIndicator(
progress = animatedProgress, progress = { animatedProgress },
modifier = Modifier.rotate(rotation), modifier = Modifier.rotate(rotation),
) )
} }
@ -101,7 +105,7 @@ private fun CombinedCircularProgressIndicatorPreview() {
.fillMaxSize() .fillMaxSize()
.padding(it), .padding(it),
) { ) {
CombinedCircularProgressIndicator(progress = progress) CombinedCircularProgressIndicator(progress = { progress })
} }
} }
} }