Merge pull request #580 from PhilKes/feat/hide-images-overview

Add setting to hide images in overview

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt

@@ -237,6 +237,7 @@ abstract class NotallyFragment : Fragment(), ItemListener {
                         maxLines.value,
                         maxTitle.value,
                         labelTagsHiddenInOverview.value,
+                        imagesHiddenInOverview.value,
                     ),
                     model.imageRoot,
                     this@NotallyFragment,

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt

@@ -351,6 +351,17 @@ class SettingsFragment : Fragment() {
                     model.savePreference(labelTagsHiddenInOverview, enabled)
                 }
             }
+            imagesHiddenInOverview.observe(viewLifecycleOwner) { value ->
+                binding.ImagesHiddenInOverview.setup(
+                    imagesHiddenInOverview,
+                    value,
+                    requireContext(),
+                    layoutInflater,
+                    R.string.images_hidden_in_overview,
+                ) { enabled ->
+                    model.savePreference(imagesHiddenInOverview, enabled)
+                }
+            }
         }
     }
 

app/src/main/java/com/philkes/notallyx/presentation/activity/note/PickNoteActivity.kt

@@ -52,6 +52,7 @@ open class PickNoteActivity : LockedActivity<ActivityPickNoteBinding>(), ItemLis
                         maxLines.value,
                         maxTitle.value,
                         labelTagsHiddenInOverview.value,
+                        imagesHiddenInOverview.value,
                     ),
                     application.getExternalImagesDirectory(),
                     this@PickNoteActivity,

app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt

@@ -45,6 +45,7 @@ data class BaseNoteVHPreferences(
     val maxLines: Int,
     val maxTitleLines: Int,
     val hideLabels: Boolean,
+    val hideImages: Boolean,
 )
 
 class BaseNoteVH(
@@ -209,9 +210,8 @@ class BaseNoteVH(
     }
 
     private fun setImages(images: List<FileAttachment>, mediaRoot: File?) {
-
         binding.apply {
-            if (images.isNotEmpty()) {
+            if (images.isNotEmpty() && !preferences.hideImages) {
                 ImageView.visibility = VISIBLE
                 Message.visibility = GONE
 

app/src/main/java/com/philkes/notallyx/presentation/viewmodel/preference/NotallyXPreferences.kt

@@ -84,6 +84,13 @@ class NotallyXPreferences private constructor(private val context: Context) {
             false,
             R.string.labels_hidden_in_overview_title,
         )
+    val imagesHiddenInOverview =
+        BooleanPreference(
+            "imagesHiddenInOverview",
+            preferences,
+            false,
+            R.string.images_hidden_in_overview_title,
+        )
     val maxLabels =
         IntPreference(
             "maxLabelsInNavigation",
@@ -233,6 +240,7 @@ class NotallyXPreferences private constructor(private val context: Context) {
                 backupPassword,
                 backupOnSave,
                 autoSaveAfterIdleTime,
+                imagesHiddenInOverview,
             )
             .forEach { it.refresh() }
     }

app/src/main/res/layout/fragment_settings.xml

@@ -88,6 +88,10 @@
           android:id="@+id/LabelsHiddenInOverview"
           layout="@layout/preference" />
 
+        <include
+          android:id="@+id/ImagesHiddenInOverview"
+          layout="@layout/preference" />
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"

app/src/main/res/values-cs/strings.xml

@@ -163,6 +163,8 @@
     <string name="help">Nápověda</string>
     <string name="hours">Hodiny</string>
     <string name="image_format_not_supported">Formát obrázku není podporován</string>
+    <string name="images_hidden_in_overview">Pokud tuto funkci povolíte, obrázky poznámek budou v přehledu skryty.</string>
+    <string name="images_hidden_in_overview_title">Skrýt obrázky v přehledu</string>
     <string name="import_action">Importovat</string>
     <string name="import_backup">Importovat zálohu</string>
     <string name="import_backup_password_hint">Pokud vaše záloha není chráněna heslem, jednoduše stiskněte tlačítko Importovat, jinak zadejte správné heslo.</string>

app/src/main/res/values-de/strings.xml

@@ -159,6 +159,8 @@
     <string name="help">Hilfe</string>
     <string name="hours">Stunden</string>
     <string name="image_format_not_supported">Bildformat nicht unterstützt</string>
+    <string name="images_hidden_in_overview">Ist dies aktiviert, werden die Bilder der Notizen in der Übersicht ausgeblendet</string>
+    <string name="images_hidden_in_overview_title">Verberge Bilder in Übersicht</string>
     <string name="import_action">Import</string>
     <string name="import_backup">Backup importieren</string>
     <string name="import_backup_password_hint">Falls das Backup nicht passwortgeschützt ist, drücken Sie einfach auf Importieren, andernfalls geben Sie das richtige Passwort ein.</string>

app/src/main/res/values-es/strings.xml

@@ -159,6 +159,8 @@
     <string name="help">Ayuda</string>
     <string name="hours">Horas</string>
     <string name="image_format_not_supported">Formato de imagen no soportado</string>
+    <string name="images_hidden_in_overview">Al habilitar esta opción, se ocultarán las imágenes de notas de la descripción general.</string>
+    <string name="images_hidden_in_overview_title">Ocultar imágenes en vista general</string>
     <string name="import_action">Importar</string>
     <string name="import_backup">Importar copia de seguridad</string>
     <string name="import_backup_password_hint">Si su copia de seguridad no está protegida con contraseña, simplemente presione Importar, de lo contrario ingrese la contraseña correcta.</string>

app/src/main/res/values-fr/strings.xml

@@ -159,6 +159,8 @@
     <string name="help">Aide</string>
     <string name="hours">Heures</string>
     <string name="image_format_not_supported">Format d\'image non supporté</string>
+    <string name="images_hidden_in_overview">En activant cette option, les images des notes seront masquées dans l\'aperçu</string>
+    <string name="images_hidden_in_overview_title">Masquer les images dans la vue d\'ensemble</string>
     <string name="import_action">Importer</string>
     <string name="import_backup">Importer une sauvegarde</string>
     <string name="import_backup_password_hint">Si votre sauvegarde n\'est pas protégée par mot de passe, cliquez seulement sur \"Importer une sauvegarde\", sinon entrez le mot de passe correspondant.</string>

app/src/main/res/values-it/strings.xml

@@ -153,6 +153,8 @@
     <string name="help">Aiuto</string>
     <string name="hours">Ore</string>
     <string name="image_format_not_supported">Formato immagine non supportato</string>
+    <string name="images_hidden_in_overview">Abilitando questa opzione le immagini delle note verranno nascoste nella panoramica.</string>
+    <string name="images_hidden_in_overview_title">Nascondi immagini nella panoramica</string>
     <string name="import_action">Importa</string>
     <string name="import_backup">Importa backup</string>
     <string name="import_backup_password_hint">Se il tuo backup non è protetto da password premi semplicemente Importa, altrimenti inserisci la password corretta.</string>

app/src/main/res/values-pl/strings.xml

@@ -166,6 +166,8 @@
     <string name="help">Pomoc</string>
     <string name="hours">Godzin</string>
     <string name="image_format_not_supported">Format obrazu nie jest obsługiwany</string>
+    <string name="images_hidden_in_overview">Po włączeniu tej opcji obrazy notatek będą ukryte w przeglądzie</string>
+    <string name="images_hidden_in_overview_title">Ukryj obrazy w przeglądzie</string>
     <string name="import_action">Przywracanie</string>
     <string name="import_backup">Przywróć kopię zapasową</string>
     <string name="import_backup_password_hint">Jeśli kopia zapasowa nie jest chroniona hasłem, po prostu naciśnij Importuj, w przeciwnym razie wprowadź prawidłowe hasło.</string>

app/src/main/res/values-ru/strings.xml

@@ -163,6 +163,8 @@
     <string name="help">Помощь</string>
     <string name="hours">Часов</string>
     <string name="image_format_not_supported">Формат изображения не поддерживыется</string>
+    <string name="images_hidden_in_overview">Если эта функция включена, изображения заметок будут скрыты из общего списка.</string>
+    <string name="images_hidden_in_overview_title">Скрыть изображения в общем списке</string>
     <string name="import_action">Импорт</string>
     <string name="import_backup">Импорт резервной копии</string>
     <string name="import_backup_password_hint">Если резервная копия не защищена паролем, нажмите \"Импорт\". В противном случае введите пароль.</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -158,6 +158,8 @@
     <string name="help">帮助</string>
     <string name="hours">小时</string>
     <string name="image_format_not_supported">不支持该图片格式</string>
+    <string name="images_hidden_in_overview">如果启用此选项，则注释的图像将不会显示在概览中。</string>
+    <string name="images_hidden_in_overview_title">在概览中隐藏图片</string>
     <string name="import_action">导入</string>
     <string name="import_backup">导入备份</string>
     <string name="import_backup_password_hint">如果你的备份文件没有密码保护，只需按下“导入”即可。如有，起输入正确的密码</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -134,6 +134,8 @@
     <string name="help">幫助</string>
     <string name="hours">小時</string>
     <string name="image_format_not_supported">不支持的圖片格式</string>
+    <string name="images_hidden_in_overview">啟用此功能後，筆記的圖像將隱藏在概覽中。</string>
+    <string name="images_hidden_in_overview_title">在概覽中隱藏圖片</string>
     <string name="import_action">匯入</string>
     <string name="import_backup">匯入備份</string>
     <string name="import_backup_password_hint">如果您的備份沒有密碼保護，只需按匯入，否則請輸入正確的密碼。</string>

app/src/main/res/values/strings.xml

@@ -161,6 +161,8 @@
     <string name="help">Help</string>
     <string name="hours">Hours</string>
     <string name="image_format_not_supported">Image format not supported</string>
+    <string name="images_hidden_in_overview">By enabling this, the notes’ images will be hidden in the overview</string>
+    <string name="images_hidden_in_overview_title">Hide Images in Overview</string>
     <string name="import_action">Import</string>
     <string name="import_backup">Import backup</string>
     <string name="import_backup_password_hint">If your backup is not password-protected simply press Import, otherwise enter the correct password.</string>