Add possibility to hide the article image

prof18 · prof18 · commit 6c3ff988b16a · 2025-02-14T21:18:42.000+01:00
diff --git a/androidApp/src/main/kotlin/com/prof18/feedflow/android/settings/SettingsScreen.kt b/androidApp/src/main/kotlin/com/prof18/feedflow/android/settings/SettingsScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.material.icons.automirrored.outlined.PlaylistAddCheck
 import androidx.compose.material.icons.outlined.AddCircleOutline
 import androidx.compose.material.icons.outlined.BugReport
 import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.HideImage
 import androidx.compose.material.icons.outlined.HideSource
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.MarkAsUnread
@@ -95,6 +96,7 @@ fun SettingsScreen(
         isReaderModeEnabled = settingState.isReaderModeEnabled,
         isRemoveTitleFromDescriptionEnabled = settingState.isRemoveTitleFromDescriptionEnabled,
         isHideDescriptionEnabled = settingState.isHideDescriptionEnabled,
+        isHideImagesEnabled = settingState.isHideImagesEnabled,
         showAccounts = appConfig.isDropboxSyncEnabled,
         fontSizes = fontSizesState,
         autoDeletePeriod = settingState.autoDeletePeriod,
@@ -130,6 +132,9 @@ fun SettingsScreen(
         setHideDescription = { enabled ->
             settingsViewModel.updateHideDescription(enabled)
         },
+        setHideImages = { enabled ->
+            settingsViewModel.updateHideImages(enabled)
+        },
         updateFontScale = { newFontSize ->
             settingsViewModel.updateFontScale(newFontSize)
         },
@@ -147,6 +152,7 @@ private fun SettingsScreenContent(
     isReaderModeEnabled: Boolean,
     isRemoveTitleFromDescriptionEnabled: Boolean,
     isHideDescriptionEnabled: Boolean,
+    isHideImagesEnabled: Boolean,
     showAccounts: Boolean,
     fontSizes: FeedFontSizes,
     autoDeletePeriod: AutoDeletePeriod,
@@ -163,6 +169,7 @@ private fun SettingsScreenContent(
     setReaderMode: (Boolean) -> Unit,
     setRemoveTitleFromDescription: (Boolean) -> Unit,
     setHideDescription: (Boolean) -> Unit,
+    setHideImages: (Boolean) -> Unit,
     updateFontScale: (Int) -> Unit,
     onAutoDeletePeriodSelected: (AutoDeletePeriod) -> Unit,
 ) {
@@ -276,6 +283,11 @@ private fun SettingsScreenContent(
                     isHideDescriptionEnabled = isHideDescriptionEnabled,
                     setHideDescription = setHideDescription,
                 )
+
+                HideImagesSwitch(
+                    isHideImagesEnabled = isHideImagesEnabled,
+                    setHideImages = setHideImages,
+                )
             }
 
             item {
@@ -561,6 +573,43 @@ private fun HideDescriptionSwitch(
     }
 }
 
+@Composable
+private fun HideImagesSwitch(
+    isHideImagesEnabled: Boolean,
+    setHideImages: (Boolean) -> Unit,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .clickable {
+                setHideImages(!isHideImagesEnabled)
+            }
+            .fillMaxWidth()
+            .padding(vertical = Spacing.xsmall)
+            .padding(horizontal = Spacing.regular),
+        horizontalArrangement = Arrangement.spacedBy(Spacing.regular),
+    ) {
+        Icon(
+            Icons.Outlined.HideImage,
+            contentDescription = null,
+        )
+
+        Text(
+            text = LocalFeedFlowStrings.current.settingsHideImages,
+            style = MaterialTheme.typography.bodyLarge,
+            modifier = Modifier
+                .weight(1f),
+        )
+        Switch(
+            interactionSource = interactionSource,
+            checked = isHideImagesEnabled,
+            onCheckedChange = setHideImages,
+        )
+    }
+}
+
 @Composable
 private fun SettingsNavBar(navigateBack: () -> Unit) {
     TopAppBar(
@@ -595,6 +644,7 @@ private fun SettingsScreenPreview() {
             isReaderModeEnabled = false,
             isRemoveTitleFromDescriptionEnabled = false,
             isHideDescriptionEnabled = false,
+            isHideImagesEnabled = false,
             showAccounts = true,
             fontSizes = FeedFontSizes(),
             autoDeletePeriod = AutoDeletePeriod.DISABLED,
@@ -611,6 +661,7 @@ private fun SettingsScreenPreview() {
             setReaderMode = {},
             setRemoveTitleFromDescription = {},
             setHideDescription = {},
+            setHideImages = {},
             updateFontScale = {},
             onAutoDeletePeriodSelected = {},
         )
diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt
@@ -273,6 +273,7 @@ fun main() = application {
                                 isRemoveTitleFromDescriptionEnabled = settingsState.isRemoveTitleFromDescriptionEnabled,
                                 autoDeletePeriod = settingsState.autoDeletePeriod,
                                 isHideDescriptionEnabled = settingsState.isHideDescriptionEnabled,
+                                isHideImagesEnabled = settingsState.isHideImagesEnabled,
                                 feedFilter = currentFeedFilter,
                                 onRefreshClick = {
                                     scope.launch {
@@ -332,6 +333,9 @@ fun main() = application {
                                 setHideDescription = { enabled ->
                                     settingsViewModel.updateHideDescription(enabled)
                                 },
+                                setHideImages = { enabled ->
+                                    settingsViewModel.updateHideImages(enabled)
+                                },
                             )
 
                             ScaleTransition(navigator)
diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/MenuBar.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/MenuBar.kt
@@ -23,6 +23,7 @@ fun FrameWindowScope.FeedFlowMenuBar(
     isReaderModeEnabled: Boolean,
     isRemoveTitleFromDescriptionEnabled: Boolean,
     isHideDescriptionEnabled: Boolean,
+    isHideImagesEnabled: Boolean,
     autoDeletePeriod: AutoDeletePeriod,
     feedFilter: FeedFilter,
     onRefreshClick: () -> Unit,
@@ -38,6 +39,7 @@ fun FrameWindowScope.FeedFlowMenuBar(
     setReaderMode: (Boolean) -> Unit,
     setRemoveTitleFromDescription: (Boolean) -> Unit,
     setHideDescription: (Boolean) -> Unit,
+    setHideImages: (Boolean) -> Unit,
     onFeedFontScaleClick: () -> Unit,
     onAutoDeletePeriodSelected: (AutoDeletePeriod) -> Unit,
 ) {
@@ -147,6 +149,12 @@ fun FrameWindowScope.FeedFlowMenuBar(
                 onCheckedChange = setHideDescription,
             )
 
+            CheckboxItem(
+                text = LocalFeedFlowStrings.current.settingsHideImages,
+                checked = isHideImagesEnabled,
+                onCheckedChange = setHideImages,
+            )
+
             Menu(LocalFeedFlowStrings.current.settingsAutoDelete) {
                 RadioButtonItem(
                     text = LocalFeedFlowStrings.current.settingsAutoDeletePeriodDisabled,
diff --git a/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt b/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt
@@ -39,4 +39,4 @@ expect fun String.format(vararg args: Any): String
 
 @Suppress("UnusedPrivateProperty")
 // This is a trick to be sure that KSP re-generates the strings when there's no code updates
-private const val StringsVersion = 85
+private const val StringsVersion = 86
diff --git a/i18n/src/commonMain/resources/locale/values/strings.xml b/i18n/src/commonMain/resources/locale/values/strings.xml
@@ -118,6 +118,7 @@
     <string name="no_icloud_sync_yet">Data are not synced yet with iCloud. Click the backup button to trigger a sync</string>
     <string name="settings_hide_duplicated_title_from_desc">Hide title from article description</string>
     <string name="settings_hide_description">Hide article description</string>
+    <string name="settings_hide_images">Hide article image</string>
     <string name="reader_mode_font_size">Font Size</string>
     <string name="edit_feed_source_name_button">Edit</string>
     <string name="edit_feed">Edit feed</string>
diff --git a/iosApp/Source/Settings/SettingsScreen.swift b/iosApp/Source/Settings/SettingsScreen.swift
@@ -23,6 +23,7 @@ struct SettingsScreen: View {
   @State private var isReaderModeEnabled = false
   @State private var isRemoveTitleFromDescriptionEnabled = false
   @State private var isHideDescriptionEnabled = false
+  @State private var isHideImagesEnabled = false
   @State private var autoDeletePeriod: AutoDeletePeriod = .disabled
   @State private var feedFontSizes: FeedFontSizes = defaultFeedFontSizes()
   @State private var scaleFactor = 0.0
@@ -36,6 +37,7 @@ struct SettingsScreen: View {
           isReaderModeEnabled = state.isReaderModeEnabled
           isRemoveTitleFromDescriptionEnabled = state.isRemoveTitleFromDescriptionEnabled
           isHideDescriptionEnabled = state.isHideDescriptionEnabled
+          isHideImagesEnabled = state.isHideImagesEnabled
           autoDeletePeriod = state.autoDeletePeriod
         }
       }
@@ -61,6 +63,9 @@ struct SettingsScreen: View {
       .onChange(of: isHideDescriptionEnabled) {
         vmStoreOwner.instance.updateHideDescription(value: isHideDescriptionEnabled)
       }
+      .onChange(of: isHideImagesEnabled) {
+        vmStoreOwner.instance.updateHideImages(value: isHideImagesEnabled)
+      }
       .onChange(of: autoDeletePeriod) {
         vmStoreOwner.instance.updateAutoDeletePeriod(period: autoDeletePeriod)
       }
@@ -174,6 +179,12 @@ struct SettingsScreen: View {
       }.onTapGesture {
         isHideDescriptionEnabled.toggle()
       }
+
+      Toggle(isOn: $isHideImagesEnabled) {
+        Label(feedFlowStrings.settingsHideImages, systemImage: "square.slash")
+      }.onTapGesture {
+        isHideImagesEnabled.toggle()
+      }
     }
   }
 
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/data/SettingsHelper.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/data/SettingsHelper.kt
@@ -68,6 +68,12 @@ internal class SettingsHelper(
     fun setAutoDeletePeriod(period: AutoDeletePeriod) =
         settings.set(SettingsFields.AUTO_DELETE_PERIOD.name, period.name)
 
+    fun getHideImages(): Boolean =
+        settings.getBoolean(SettingsFields.HIDE_IMAGES.name, false)
+
+    fun setHideImages(value: Boolean) =
+        settings.set(SettingsFields.HIDE_IMAGES.name, value)
+
     private companion object {
         const val DEFAULT_READER_MODE_FONT_SIZE = 16
         const val DEFAULT_FEED_LIST_FONT_SCALE_FACTOR = 0
@@ -85,4 +91,5 @@ internal enum class SettingsFields {
     READER_MODE_FONT_SIZE,
     FEED_LIST_FONT_SCALE_FACTOR,
     AUTO_DELETE_PERIOD,
+    HIDE_IMAGES,
 }
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feed/retriever/FeedRetrieverRepository.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feed/retriever/FeedRetrieverRepository.kt
@@ -124,6 +124,7 @@ internal class FeedRetrieverRepository(
             currentPage = 1
             val removeTitleFromDesc = settingsHelper.getRemoveTitleFromDescription()
             val hideDesc = settingsHelper.getHideDescription()
+            val hideImages = settingsHelper.getHideImages()
             if (feeds.isNotEmpty()) {
                 updateMutableState.update { FinishedFeedUpdateStatus }
             }
@@ -133,6 +134,7 @@ internal class FeedRetrieverRepository(
                         dateFormatter = dateFormatter,
                         removeTitleFromDesc = removeTitleFromDesc,
                         hideDescription = hideDesc,
+                        hideImages = hideImages,
                     )
                 }.toImmutableList()
             }
@@ -159,12 +161,14 @@ internal class FeedRetrieverRepository(
             currentPage += 1
             val removeTitleFromDesc = settingsHelper.getRemoveTitleFromDescription()
             val hideDesc = settingsHelper.getHideDescription()
+            val hideImages = settingsHelper.getHideImages()
             mutableFeedState.update { currentItems ->
                 val newList = feeds.map {
                     it.toFeedItem(
                         dateFormatter,
                         removeTitleFromDesc,
                         hideDesc,
+                        hideImages,
                     )
                 }.toImmutableList()
                 (currentItems + newList).toImmutableList()
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/mappers/SelectedFeedsMapper.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/mappers/SelectedFeedsMapper.kt
@@ -12,6 +12,7 @@ internal fun SelectFeeds.toFeedItem(
     dateFormatter: DateFormatter,
     removeTitleFromDesc: Boolean,
     hideDescription: Boolean,
+    hideImages: Boolean,
 ) = FeedItem(
     id = url_hash,
     url = sanitizeUrl(url),
@@ -25,7 +26,7 @@ internal fun SelectFeeds.toFeedItem(
         }
     }.takeIf { !hideDescription },
     content = null,
-    imageUrl = image_url,
+    imageUrl = image_url.takeIf { !hideImages },
     feedSource = FeedSource(
         id = feed_source_id,
         url = feed_source_url,
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/settings/SettingsRepository.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/settings/SettingsRepository.kt
@@ -53,6 +53,13 @@ class SettingsRepository internal constructor(
         settingsHelper.setHideDescription(value)
     }
 
+    fun isHideImagesEnabled(): Boolean =
+        settingsHelper.getHideImages()
+
+    fun setHideImages(value: Boolean) {
+        settingsHelper.setHideImages(value)
+    }
+
     fun getReaderModeFontSize(): Int =
         settingsHelper.getReaderModeFontSize()
 
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/SettingsViewModel.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/SettingsViewModel.kt
@@ -32,6 +32,7 @@ class SettingsViewModel internal constructor(
             val isReaderModeEnabled = settingsRepository.isUseReaderModeEnabled()
             val isRemoveTitleFromDescriptionEnabled = settingsRepository.isRemoveTitleFromDescriptionEnabled()
             val isHideDescriptionEnabled = settingsRepository.isHideDescriptionEnabled()
+            val isHideImagesEnabled = settingsRepository.isHideImagesEnabled()
             val autoDeletePeriod = settingsRepository.getAutoDeletePeriod()
             settingsMutableState.update {
                 SettingsState(
@@ -40,6 +41,7 @@ class SettingsViewModel internal constructor(
                     isReaderModeEnabled = isReaderModeEnabled,
                     isRemoveTitleFromDescriptionEnabled = isRemoveTitleFromDescriptionEnabled,
                     isHideDescriptionEnabled = isHideDescriptionEnabled,
+                    isHideImagesEnabled = isHideImagesEnabled,
                     autoDeletePeriod = autoDeletePeriod,
                 )
             }
@@ -113,4 +115,16 @@ class SettingsViewModel internal constructor(
             feedRetrieverRepository.getFeeds()
         }
     }
+
+    fun updateHideImages(value: Boolean) {
+        settingsRepository.setHideImages(value)
+        settingsMutableState.update {
+            it.copy(
+                isHideImagesEnabled = value,
+            )
+        }
+        viewModelScope.launch {
+            feedRetrieverRepository.getFeeds()
+        }
+    }
 }
diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/model/SettingsState.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/model/SettingsState.kt
@@ -8,5 +8,6 @@ data class SettingsState(
     val isReaderModeEnabled: Boolean = false,
     val isRemoveTitleFromDescriptionEnabled: Boolean = false,
     val isHideDescriptionEnabled: Boolean = false,
+    val isHideImagesEnabled: Boolean = false,
     val autoDeletePeriod: AutoDeletePeriod = AutoDeletePeriod.DISABLED,
 )

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ struct SettingsScreen: View {`
`23`	`23`	`@State private var isReaderModeEnabled = false`
`24`	`24`	`@State private var isRemoveTitleFromDescriptionEnabled = false`
`25`	`25`	`@State private var isHideDescriptionEnabled = false`
	`26`	`+ @State private var isHideImagesEnabled = false`
`26`	`27`	`@State private var autoDeletePeriod: AutoDeletePeriod = .disabled`
`27`	`28`	`@State private var feedFontSizes: FeedFontSizes = defaultFeedFontSizes()`
`28`	`29`	`@State private var scaleFactor = 0.0`
`@@ -36,6 +37,7 @@ struct SettingsScreen: View {`
`36`	`37`	`isReaderModeEnabled = state.isReaderModeEnabled`
`37`	`38`	`isRemoveTitleFromDescriptionEnabled = state.isRemoveTitleFromDescriptionEnabled`
`38`	`39`	`isHideDescriptionEnabled = state.isHideDescriptionEnabled`
	`40`	`+ isHideImagesEnabled = state.isHideImagesEnabled`
`39`	`41`	`autoDeletePeriod = state.autoDeletePeriod`
`40`	`42`	`}`
`41`	`43`	`}`
`@@ -61,6 +63,9 @@ struct SettingsScreen: View {`
`61`	`63`	`.onChange(of: isHideDescriptionEnabled) {`
`62`	`64`	`vmStoreOwner.instance.updateHideDescription(value: isHideDescriptionEnabled)`
`63`	`65`	`}`
	`66`	`+ .onChange(of: isHideImagesEnabled) {`
	`67`	`+ vmStoreOwner.instance.updateHideImages(value: isHideImagesEnabled)`
	`68`	`+ }`
`64`	`69`	`.onChange(of: autoDeletePeriod) {`
`65`	`70`	`vmStoreOwner.instance.updateAutoDeletePeriod(period: autoDeletePeriod)`
`66`	`71`	`}`
`@@ -174,6 +179,12 @@ struct SettingsScreen: View {`
`174`	`179`	`}.onTapGesture {`
`175`	`180`	`isHideDescriptionEnabled.toggle()`
`176`	`181`	`}`
	`182`	`+`
	`183`	`+ Toggle(isOn: $isHideImagesEnabled) {`
	`184`	`+ Label(feedFlowStrings.settingsHideImages, systemImage: "square.slash")`
	`185`	`+ }.onTapGesture {`
	`186`	`+ isHideImagesEnabled.toggle()`
	`187`	`+ }`
`177`	`188`	`}`
`178`	`189`	`}`
`179`	`190`