diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt index 42d8d09de..632a3ff51 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt @@ -70,16 +70,17 @@ class SettingsActivity : SimpleActivity() { setupHideExtendedDetails() setupManageExtendedDetails() setupSkipDeleteConfirmation() - updateTextColors(settings_holder) - setupSectionColors() + setupManageBottomActions() setupUseRecycleBin() setupEmptyRecycleBin() + updateTextColors(settings_holder) + setupSectionColors() } private fun setupSectionColors() { val adjustedPrimaryColor = getAdjustedPrimaryColor() arrayListOf(visibility_label, videos_label, thumbnails_label, scrolling_label, fullscreen_media_label, security_label, - file_operations_label, extended_details_label, recycle_bin_label).forEach { + file_operations_label, extended_details_label, bottom_actions_label, recycle_bin_label).forEach { it.setTextColor(adjustedPrimaryColor) } } @@ -291,14 +292,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupBottomActions() { - settings_bottom_actions.isChecked = config.bottomActions - settings_bottom_actions_holder.setOnClickListener { - settings_bottom_actions.toggle() - config.bottomActions = settings_bottom_actions.isChecked - } - } - private fun setupShowMediaCount() { settings_show_media_count.isChecked = config.showMediaCount settings_show_media_count_holder.setOnClickListener { @@ -414,6 +407,22 @@ class SettingsActivity : SimpleActivity() { else -> R.string.screen_rotation_aspect_ratio }) + private fun setupBottomActions() { + settings_bottom_actions.isChecked = config.bottomActions + settings_bottom_actions_holder.setOnClickListener { + settings_bottom_actions.toggle() + config.bottomActions = settings_bottom_actions.isChecked + settings_manage_bottom_actions_holder.beVisibleIf(config.bottomActions) + } + } + + private fun setupManageBottomActions() { + settings_manage_bottom_actions_holder.beVisibleIf(config.bottomActions) + settings_manage_bottom_actions_holder.setOnClickListener { + + } + } + private fun setupUseRecycleBin() { settings_empty_recycle_bin_holder.beVisibleIf(config.useRecycleBin) settings_use_recycle_bin.isChecked = config.useRecycleBin diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt index f02a4ef4d..c758bb6fa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt @@ -261,10 +261,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(ALLOW_VIDEO_GESTURES, true) set(allowVideoGestures) = prefs.edit().putBoolean(ALLOW_VIDEO_GESTURES, allowVideoGestures).apply() - var bottomActions: Boolean - get() = prefs.getBoolean(BOTTOM_ACTIONS, true) - set(bottomActions) = prefs.edit().putBoolean(BOTTOM_ACTIONS, bottomActions).apply() - var showMediaCount: Boolean get() = prefs.getBoolean(SHOW_MEDIA_COUNT, true) set(showMediaCount) = prefs.edit().putBoolean(SHOW_MEDIA_COUNT, showMediaCount).apply() @@ -360,4 +356,12 @@ class Config(context: Context) : BaseConfig(context) { var useRecycleBin: Boolean get() = prefs.getBoolean(USE_RECYCLE_BIN, true) set(useRecycleBin) = prefs.edit().putBoolean(USE_RECYCLE_BIN, useRecycleBin).apply() + + var bottomActions: Boolean + get() = prefs.getBoolean(BOTTOM_ACTIONS, true) + set(bottomActions) = prefs.edit().putBoolean(BOTTOM_ACTIONS, bottomActions).apply() + + var visibleBottomActions: Int + get() = prefs.getInt(VISIBLE_BOTTOM_ACTIONS, BOTTOM_ACTION_TOGGLE_FAVORITE or BOTTOM_ACTION_EDIT or BOTTOM_ACTION_SHARE or BOTTOM_ACTION_DELETE) + set(visibleBottomActions) = prefs.edit().putInt(VISIBLE_BOTTOM_ACTIONS, visibleBottomActions).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt index f77035eba..b42118322 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt @@ -52,6 +52,7 @@ const val LAST_FILEPICKER_PATH = "last_filepicker_path" const val WAS_OTG_HANDLED = "was_otg_handled" const val TEMP_SKIP_DELETE_CONFIRMATION = "temp_skip_delete_confirmation" const val BOTTOM_ACTIONS = "bottom_actions" +const val VISIBLE_BOTTOM_ACTIONS = "visible_bottom_actions" const val WERE_FAVORITES_PINNED = "were_favorites_pinned" const val WAS_RECYCLE_BIN_PINNED = "was_recycle_bin_pinned" const val USE_RECYCLE_BIN = "use_recycle_bin" @@ -129,3 +130,15 @@ const val GROUP_BY_FILE_TYPE = 8 const val GROUP_BY_EXTENSION = 16 const val GROUP_BY_FOLDER = 32 const val GROUP_DESCENDING = 1024 + +// bottom actions +const val BOTTOM_ACTION_TOGGLE_FAVORITE = 1 +const val BOTTOM_ACTION_EDIT = 2 +const val BOTTOM_ACTION_SHARE = 4 +const val BOTTOM_ACTION_DELETE = 8 +const val BOTTOM_ACTION_ROTATE = 16 +const val BOTTOM_ACTION_PROPERTIES = 32 +const val BOTTOM_ACTION_LOCK_ORIENTATION = 64 +const val BOTTOM_ACTION_SLIDESHOW = 128 +const val BOTTOM_ACTION_SHOW_ON_MAP = 256 +const val BOTTOM_ACTION_TOGGLE_VISIBILITY = 512 diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 6cd4aa7c7..e9ef6cb2e 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -649,29 +649,6 @@ - - - - - - + + + + + + + + + + + + + + + + Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility كيف يمكنني جعل الاستوديو البسيط معرض الأجهزة الافتراضي؟ diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d3d20b96f..b4e9355ba 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Com puc fer que Simple Gallery sigui la galeria de dispositius predeterminada? diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 33c7a3658..762323257 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 01363207a..736e1dac3 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f3490591a..27e229ae3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Wie kann ich Schlichte Galerie als Standardanwendung auswählen? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2697ab865..453242957 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -161,6 +161,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Πώς μπορώ να κάνω το Simple Gallery προκαθορισμένη εφαρμογή συλλογής πολυμέσων; diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ff05ca191..f26a61a20 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility ¿Cómo puedo hacer que Simple Gallery sea la galería de dispositivos predeterminada? diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 825b612fd..3e8859b27 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Miten voin tehdä Simple Gallerystä oletusgalleriasovelluksen? diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 30a6b5540..cd0bced61 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Comment faire de Simple Galerie ma galerie par défaut ? diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 3583e17a4..9943dbe99 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Cómo podo facer que Simple Gallery sexa a galería por omisión no dispositivo? diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 55113bf85..175487d57 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Kako mogu postaviti Jednostavnu galeriju kao zadanu galeriju uređaja? diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 194168de4..93c3b79e2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a3e089579..c52196402 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Come posso impostare Simple Gallery come galleria predefinita del dispositivo? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b12aa6b69..9d013e6b9 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 3e57aa520..b6ac72379 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 84d42acf1..bdb81ffee 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Kaip galiu padaryti paprastą galeriją kaip numatytąją įrenginio galeriją? diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 553c85d58..9e0e9fcd8 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9fa564293..73f5ce0dc 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6dca11f26..1a92a3ae1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility    Jak mogę ustawić tą aplikację jako domyślną aplikację galerii? diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3b0b549ac..9e500c08f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibilityv How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9e39d81bb..e70b982be 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 044ffa136..c0b1380a0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility Как сделать Simple Gallery галереей по умолчанию? diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e19888643..3bb1baf86 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -158,8 +158,9 @@ Upraviť viditeľné spodné akčné tlačidlá - Prepnúť obľúbené + Prepnutie obľúbenosti Uzamykanie orientácie zariadenia + Prepnutie viditeľnosti súboru Ako viem spraviť Jednoduchú Galériu predvolenou galériou zariadenia? diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4ee5e5e44..c85f02242 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cd38601e1..4e2185c60 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index aba42f2c7..509eba00e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility 如何把简约图库设置为设备的默认图库? diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5870032ac..bf165679d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility 我如何將簡易相簿設為預設相簿? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b12edb633..d7f325872 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -160,6 +160,7 @@ Manage visible bottom actions Toggle favorite Orientation locking + Toggle file visibility How can I make Simple Gallery the default device gallery?