From ab2a6f5a179da6defd00ebf1aeebf717daff2f39 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 11 Jul 2023 11:34:47 +0300 Subject: [PATCH] Fix loading state --- .../main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt | 2 +- app/src/main/res/layout/activity_reader.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt index cdf31661b..424ab726e 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt @@ -34,7 +34,7 @@ abstract class BaseViewModel : ViewModel() { val isLoading: StateFlow get() = loadingCounter.map { it > 0 } - .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false) + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), loadingCounter.value > 0) protected fun launchJob( context: CoroutineContext = EmptyCoroutineContext, diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index 8c97641da..5ceef7ae4 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -93,8 +93,7 @@ android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:indeterminate="true" - app:trackCornerRadius="@dimen/mtrl_progress_indicator_full_rounded_corner_radius" /> + android:indeterminate="true" />