From e46008df5515c8454a64f35577daaadd8d3ddb7e Mon Sep 17 00:00:00 2001 From: tarsin Date: Sat, 8 Jul 2023 14:36:42 +0800 Subject: [PATCH] Cleanup: Move ReaderProgressIndicator to compose --- .../tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt | 4 +--- .../tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt index 1828af27d..19f6714f3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt @@ -19,9 +19,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate @Composable -fun CombinedCircularProgressIndicator( - progress: Float, -) { +fun CombinedCircularProgressIndicator(progress: Float) { val animatedProgress by animateFloatAsState( targetValue = progress, animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 786aa48f6..78e4ccc12 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -37,7 +37,7 @@ class PagerPageHolder( /** * Loading progress bar to indicate the current progress. */ - private val progressIndicator: ReaderProgressIndicator = ReaderProgressIndicator(readerThemedContext) + private val progressIndicator = ReaderProgressIndicator(readerThemedContext) /** * Error layout to show when the image fails to load.