Show loading indicator when featured posts are being refreshed

msasikanth · Aug 7, 2024 · 267d45a · 267d45a
1 parent a9a0af0
commit 267d45a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomePresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomePresenter.kt
@@ -48,7 +48,6 @@ import dev.sasikanth.rss.reader.utils.getTodayStartInstant
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -273,7 +272,6 @@ class HomePresenter(
       }
     }
 
-    @OptIn(FlowPreview::class)
     private fun init() {
       combine(observableActiveSource.activeSource, settingsRepository.postsType) {
           activeSource,
@@ -286,6 +284,7 @@ class HomePresenter(
             it.copy(
               activeSource = activeSource,
               postsType = postsType,
+              loadingState = HomeLoadingState.Loading,
               featuredPosts = null,
               posts = null
             )
@@ -339,6 +338,7 @@ class HomePresenter(
               NTuple4(activeSource, postsAfter, unreadOnly, featuredPostsIds)
             }
         }
+        .onEach { _state.update { it.copy(loadingState = HomeLoadingState.Idle) } }
         .distinctUntilChanged()
         .onEach { (activeSource, postsAfter, unreadOnly, featuredPostsIds) ->
           val posts =

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeScreen.kt
@@ -30,8 +30,6 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredSize
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
@@ -182,7 +180,7 @@ internal fun HomeScreen(
                 )
               },
               body = { paddingValues ->
-                Box {
+                Box(modifier = Modifier.fillMaxSize()) {
                   when {
                     hasFeeds == null || (posts == null || featuredPosts == null) -> {
                       // no-op
@@ -223,9 +221,7 @@ internal fun HomeScreen(
                   PullRefreshIndicator(
                     refreshing = state.isRefreshing,
                     state = swipeRefreshState,
-                    modifier =
-                      Modifier.windowInsetsPadding(WindowInsets.statusBars)
-                        .align(Alignment.TopCenter)
+                    modifier = Modifier.padding(paddingValues).align(Alignment.TopCenter)
                   )
                 }
               },