diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt index 0e5410342..142e734aa 100644 --- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt +++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt @@ -9,6 +9,7 @@ import androidx.annotation.IntRange import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.platform.AbstractComposeView import androidx.compose.ui.platform.ViewCompositionStrategy @@ -27,19 +28,22 @@ class ReaderProgressIndicator @JvmOverloads constructor( } private var progress by mutableFloatStateOf(0f) + private var visible by mutableStateOf(false) @Composable override fun Content() { Mdc3Theme { - CombinedCircularProgressIndicator(progress = progress) + if (visible) CombinedCircularProgressIndicator(progress = progress) } } fun show() { + visible = true isVisible = true } fun hide() { + visible = false isVisible = false } diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 78e4ccc12..46f34afba 100644 --- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -149,6 +149,7 @@ class PagerPageHolder( */ private fun setImage(drawable: Drawable) { progressIndicator.setProgress(0) + progressIndicator.hide() errorLayout?.root?.isVisible = false setImage( drawable, diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index 1ab973947..e62f5c991 100644 --- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -195,6 +195,7 @@ class WebtoonPageHolder( */ private fun setImage(drawable: Drawable) { progressIndicator.setProgress(0) + progressIndicator.hide() removeErrorLayout() frame.setImage( drawable,