ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
override fun Content() {
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'.
*/
@Composable
fun CombinedCircularProgressIndicator(progress: Float) {
val animatedProgress by animateFloatAsState(
targetValue = progress,
animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
label = "progress",
)
fun CombinedCircularProgressIndicator(
progress: () -> Float,
modifier: Modifier = Modifier,
) {
AnimatedContent(
targetState = progress == 0f,
targetState = progress() == 0f,
transitionSpec = { fadeIn() togetherWith fadeOut() },
label = "progressState",
modifier = modifier,
) { indeterminate ->
if (indeterminate) {
// Indeterminate
@ -63,8 +62,13 @@ fun CombinedCircularProgressIndicator(progress: Float) {
),
label = "rotation",
)
val animatedProgress by animateFloatAsState(
targetValue = progress(),
animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
label = "progress",
)
CircularProgressIndicator(
progress = animatedProgress,
progress = { animatedProgress },
modifier = Modifier.rotate(rotation),
)
}
@ -101,7 +105,7 @@ private fun CombinedCircularProgressIndicatorPreview() {
.fillMaxSize()
.padding(it),
) {
CombinedCircularProgressIndicator(progress = progress)
CombinedCircularProgressIndicator(progress = { progress })
}
}
}