Fixed some cover images appearing twice in reader if full text

spacecowboy · Nov 30, 2023 · 8056af7 · 8056af7
1 parent e22fd5a
commit 8056af7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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
@@ -432,6 +432,7 @@ fun ArticleContent(
             },
         image = viewState.image,
         imageFromBody = viewState.imageFromBody,
+        isFeedText = viewState.textToDisplay == TextToDisplay.DEFAULT,
     ) {
         // Can take a composition or two before viewstate is set to its actual values
         if (viewState.articleId > ID_UNSET) {

diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ReaderView.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feedarticle/ReaderView.kt
@@ -89,6 +89,7 @@ fun ReaderView(
     authorDate: String?,
     image: String?,
     imageFromBody: Boolean,
+    isFeedText: Boolean,
     modifier: Modifier = Modifier,
     articleListState: LazyListState = rememberLazyListState(),
     articleBody: LazyListScope.() -> Unit,
@@ -288,7 +289,8 @@ fun ReaderView(
                 }
             }
 
-            if (!imageFromBody && image != null) {
+            // Don't show image for full text articles since it's typically inside the full article
+            if (isFeedText && !imageFromBody && image != null) {
                 item {
                     BoxWithConstraints(
                         modifier =
@@ -353,6 +355,7 @@ private fun ReaderPreview() {
                 authorDate = "2018-01-02",
                 image = "https://cowboyprogrammer.org/images/2017/10/gimp_image_mode_index.png",
                 imageFromBody = false,
+                isFeedText = true,
             ) {}
         }
     }