fix: Fixed incorrect bookmark status on home screen recomposition (#199)

Author: rob729

app/src/main/java/com/rob729/newsfeed/model/state/home/HomeFeedState.kt

@@ -9,4 +9,5 @@ data class HomeFeedState(
     val showNewsSourceBottomSheet: Boolean = false,
     val newsSources: List<NewsSource> = listOf(),
     val shouldOpenLinksUsingInAppBrowser: Boolean = true,
+    val bookmarkedArticleUrls: Set<String> = emptySet()
 )

app/src/main/java/com/rob729/newsfeed/ui/components/CommonComponents.kt

@@ -17,6 +17,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -41,6 +42,14 @@ fun BottomStrip(
 ) {
     var isBookmarked by remember { mutableStateOf(isArticleBookmarked) }
 
+    LaunchedEffect(isArticleBookmarked) {
+        isBookmarked = isArticleBookmarked
+    }
+
+    val timeSincePublish = remember(publishedAt) {
+        getHowOldIsArticle(publishedAt)
+    }
+
     ConstraintLayout(
         modifier =
             modifier
@@ -84,7 +93,7 @@ fun BottomStrip(
             },
         )
         Text(
-            text = getHowOldIsArticle(publishedAt),
+            text = timeSincePublish,
             fontWeight = FontWeight.Light,
             fontSize = 12.sp,
             textAlign = TextAlign.End,

app/src/main/java/com/rob729/newsfeed/ui/components/NewsFeedItem.kt

@@ -40,7 +40,7 @@ import kotlin.time.Instant
 fun NewsFeedItem(
     modifier: Modifier = Modifier,
     newsArticleUiData: NewsArticleUiData,
-    isArticleBookmarked: Boolean,
+    isBookmarked: Boolean,
     onItemClick: () -> Unit,
     onBookmarkClick: (isBookmarked: Boolean) -> Unit,
 ) {
@@ -107,7 +107,7 @@ fun NewsFeedItem(
                 newsArticleUiData.source,
                 newsArticleUiData.publishedAt,
                 newsArticleUiData.url,
-                isArticleBookmarked,
+                isBookmarked,
                 onBookmarkClick,
                 Modifier.padding(start = 12.dp, end = 12.dp, bottom = 8.dp),
             )
@@ -139,5 +139,5 @@ fun shareArticle(
         }
 
     val shareIntent = Intent.createChooser(sendIntent, null)
-    startActivity(context, shareIntent, null)
+    context.startActivity(shareIntent, null)
 }

app/src/main/java/com/rob729/newsfeed/ui/components/NewsSourceBottomSheetContent.kt

@@ -14,11 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import com.rob729.newsfeed.AppPreferences
+import androidx.compose.ui.platform.LocalResources
 
 private const val VISIBLE_CARDS = 4.25f
 private const val ITEM_SPACING = 12
@@ -30,7 +31,8 @@ fun NewsSourceBottomSheetContent(
     currentSelectedNewsSource: String,
 ) {
     val vibrator = LocalContext.current.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-    val screenWidthDp = LocalConfiguration.current.screenWidthDp
+    val screenWidthDp =
+        LocalWindowInfo.current.containerSize.width / LocalResources.current.displayMetrics.density
     val itemWidth = (screenWidthDp - (ITEM_SPACING * VISIBLE_CARDS)).div(VISIBLE_CARDS)
     val rowState = rememberLazyListState()
 

app/src/main/java/com/rob729/newsfeed/ui/screen/BookmarkedArticlesScreen.kt

@@ -93,7 +93,7 @@ fun BookmarkedArticlesScreen(
                         NewsFeedItem(
                             Modifier.animateItem(),
                             newsArticleUiData = item,
-                            true,
+                            isBookmarked = true,
                             { viewModel.newsFeedItemClicked(item) },
                             { isBookmarked ->
                                 viewModel.newsFeedItemBookmarkClicked(

app/src/main/java/com/rob729/newsfeed/ui/screen/HomeScreen.kt

@@ -275,7 +275,7 @@ private fun DisplayNewsFeed(
                     NewsFeedItem(
                         Modifier,
                         newsArticleUiData = item,
-                        false,
+                        newsState.bookmarkedArticleUrls.contains(item.url),
                         { viewModel.newsFeedItemClicked(item) },
                         { isBookmarked ->
                             viewModel.newsFeedItemBookmarkClicked(

app/src/main/java/com/rob729/newsfeed/vm/HomeViewModel.kt

@@ -33,13 +33,26 @@ class HomeViewModel(
             newsRepository.fetchNewsArticles(state.selectedNewsSource).collectLatest {
                 this.updateStateFromNewsResource(it)
             }
+        }
+
+        intent {
             preferenceRepository.getNewsSources().collectLatest {
                 this.reduce {
                     state.copy(newsSources = it)
                 }
             }
         }
 
+        intent {
+            newsRepository.getBookmarkedNewsArticles().collectLatest { bookmarkedArticles ->
+                this.reduce {
+                    state.copy(
+                        bookmarkedArticleUrls = bookmarkedArticles.map { it.url }.toSet()
+                    )
+                }
+            }
+        }
+
         intent {
             preferenceRepository.shouldOpenLinksUsingInAppBrowser().collectLatest {
                 this.reduce {