Migrate deprecated progress indicator components (#10142)

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

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

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

@@ -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) {
+fun CombinedCircularProgressIndicator(
-    val animatedProgress by animateFloatAsState(
+    progress: () -> Float,
-        targetValue = progress,
+    modifier: Modifier = Modifier,
-        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+) {
-        label = "progress",
-    )
     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 })
             }
         }
     }