From 45082f0c06ec253859d788c4dc48fab26b6edf8e Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@cowboyprogrammer.org>
Date: Tue, 28 Jan 2025 20:32:13 +0100
Subject: [PATCH] fix: fixed feed title not showing on first open

Signed-off-by: Jonas Kalderstam <jonas@cowboyprogrammer.org>
---
 .../feeder/ui/compose/feedarticle/ArticleScreen.kt             | 3 ---
 .../feeder/ui/compose/feedarticle/ArticleViewModel.kt          | 2 +-
 .../java/com/nononsenseapps/feeder/ui/compose/text/Bidi.kt     | 2 +-
 .../nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt  | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleScreen.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleScreen.kt
index 671ab90b80..089e06e094 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleScreen.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleScreen.kt
@@ -69,7 +69,6 @@ import com.nononsenseapps.feeder.ui.compose.utils.ImmutableHolder
 import com.nononsenseapps.feeder.ui.compose.utils.ScreenType
 import com.nononsenseapps.feeder.ui.compose.utils.onKeyEventLikeEscape
 import com.nononsenseapps.feeder.util.ActivityLauncher
-import com.nononsenseapps.feeder.util.FilePathProvider
 import com.nononsenseapps.feeder.util.unicodeWrap
 import org.kodein.di.compose.LocalDI
 import org.kodein.di.instance
@@ -392,8 +391,6 @@ fun ArticleContent(
     articleListState: LazyListState,
     modifier: Modifier = Modifier,
 ) {
-    val filePathProvider by LocalDI.current.instance<FilePathProvider>()
-
     val toolbarColor = MaterialTheme.colorScheme.surface.toArgb()
 
     val context = LocalContext.current
diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleViewModel.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleViewModel.kt
index 3c845cdacd..bd46de8c2d 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleViewModel.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ArticleViewModel.kt
@@ -158,7 +158,7 @@ class ArticleViewModel(
                 articleTitle = article?.title ?: "",
                 showToolbarMenu = toolbarVisible,
                 feedDisplayTitle = article?.feedDisplayTitle ?: "",
-                isBookmarked = article?.bookmarked ?: false,
+                isBookmarked = article?.bookmarked == true,
                 wordCount =
                     if (isFullText) {
                         article?.wordCountFull ?: 0
diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/Bidi.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/Bidi.kt
index a9044cf69b..47e32e7eee 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/Bidi.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/Bidi.kt
@@ -18,7 +18,7 @@ inline fun WithBidiDeterminedLayoutDirection(
             Bidi(paragraph, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT)
         }
 
-    val content = remember { movableContentOf { content() } }
+    val content = remember(paragraph) { movableContentOf { content() } }
 
     if (bidi.baseIsLeftToRight()) {
         CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt
index 44e1b7e3cf..56d8234472 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlToComposable.kt
@@ -148,7 +148,7 @@ fun WithTooltipIfNotBlank(
     modifier: Modifier = Modifier,
     content: @Composable () -> Unit,
 ) {
-    val content = remember { movableContentOf { content() } }
+    val content = remember(tooltip) { movableContentOf { content() } }
     if (tooltip.isNotBlank()) {
         PlainTooltipBox(modifier = modifier, tooltip = { Text(tooltip) }) {
             content()