fix loading state issue for first time search

momintahir · Mar 26, 2024 · a3502e5 · a3502e5
1 parent 257266b
commit a3502e5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/composeApp/src/commonMain/kotlin/momin/tahir/kmp/newsapp/presentation/Components.kt b/composeApp/src/commonMain/kotlin/momin/tahir/kmp/newsapp/presentation/Components.kt
@@ -35,7 +35,7 @@ import org.jetbrains.compose.resources.painterResource
 
 @Composable
 fun NewsList(
-    articles: List<Article>,
+    articles: List<Article>?,
     savedNews: List<Article>? = null,
     onItemClick: (String) -> Unit,
     showSaveIcon: Boolean,
@@ -47,16 +47,19 @@ fun NewsList(
         verticalArrangement = Arrangement.Top,
         contentPadding = PaddingValues(bottom = 70.dp)
     ) {
-        itemsIndexed(articles) { index, article ->
-            NewsItem(
-                article = article,
-                showSaveIcon = showSaveIcon,
-                isSelected = savedNews?.contains(article) == true,
-                onClick = { onItemClick(article.url) },
-                onActionSave = {
-                    onActionSave(article, index) },
-                onActionRemove = {onActionRemove(article, index)}
-            )
+        if (articles != null) {
+            itemsIndexed(articles) { index, article ->
+                NewsItem(
+                    article = article,
+                    showSaveIcon = showSaveIcon,
+                    isSelected = savedNews?.contains(article) == true,
+                    onClick = { onItemClick(article.url) },
+                    onActionSave = {
+                        onActionSave(article, index)
+                    },
+                    onActionRemove = { onActionRemove(article, index) }
+                )
+            }
         }
     }
 }

diff --git a/...nMain/kotlin/momin/tahir/kmp/newsapp/presentation/screens/search_news/SearchNewsScreen.kt b/...nMain/kotlin/momin/tahir/kmp/newsapp/presentation/screens/search_news/SearchNewsScreen.kt
@@ -57,16 +57,14 @@ class SearchNewsScreen : Screen {
                 search = it
                 viewModel.onSearchTextChange(it)
             })
-            val news = viewModel.search.collectAsState().value ?: return
+            val news = viewModel.search.collectAsState().value
             val isSearching = viewModel.isSearching.collectAsState().value
-
             Spacer(Modifier.height(20.dp))
             Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                NewsList(news.articles, onActionSave = { article, _ ->
+                NewsList(news?.articles, onActionSave = { article, _ ->
                     viewModel.saveArticle(article) }, onItemClick = { navigateToWebViewScreen(it, navigator) }, showSaveIcon = true)
                 if (isSearching) {
-                    println("isSearching $isSearching")
-                    CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+                    CircularProgressIndicator(modifier = Modifier.align(Alignment.TopCenter))
                 }
             }
         }