From 8c236aaf5bd9b215394d0bc887f672f4d209085e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 28 Feb 2017 20:46:12 +0100
Subject: [PATCH] remove the switch for same sorting of files and folders,
 never apply it

---
 .../gallery/activities/SettingsActivity.kt    |  9 ---------
 .../gallery/helpers/Config.kt                 |  8 ++------
 .../gallery/helpers/Constants.kt              |  1 -
 app/src/main/res/layout/activity_settings.xml | 20 -------------------
 app/src/main/res/values-ca-rES/strings.xml    |  1 -
 app/src/main/res/values-de/strings.xml        |  1 -
 app/src/main/res/values-es-rES/strings.xml    |  1 -
 app/src/main/res/values-fr/strings.xml        |  1 -
 app/src/main/res/values-gl-rES/strings.xml    |  1 -
 app/src/main/res/values-hu/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  1 -
 app/src/main/res/values-ja/strings.xml        |  1 -
 app/src/main/res/values-pt-rPT/strings.xml    |  1 -
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-sk/strings.xml        |  1 -
 app/src/main/res/values-sv/strings.xml        |  1 -
 app/src/main/res/values-tr/strings.xml        |  1 -
 app/src/main/res/values-zh-rCN/strings.xml    |  1 -
 app/src/main/res/values-zh-rTW/strings.xml    |  1 -
 app/src/main/res/values/strings.xml           |  1 -
 20 files changed, 2 insertions(+), 52 deletions(-)

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 4d3bd9491..455508bbe 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -21,7 +21,6 @@ class SettingsActivity : SimpleActivity() {
 
         setupCustomizeColors()
         setupManageExcludedFolders()
-        setupSameSorting()
         setupShowHiddenFolders()
         setupAutoplayVideos()
         setupLoopVideos()
@@ -41,14 +40,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupSameSorting() {
-        settings_same_sorting.isChecked = config.isSameSorting
-        settings_same_sorting_holder.setOnClickListener {
-            settings_same_sorting.toggle()
-            config.isSameSorting = settings_same_sorting.isChecked
-        }
-    }
-
     private fun setupShowHiddenFolders() {
         settings_show_hidden_folders.isChecked = config.showHiddenFolders
         settings_show_hidden_folders_holder.setOnClickListener {
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 6707292a4..ca095a53a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -10,13 +10,9 @@ class Config(context: Context) : BaseConfig(context) {
         fun newInstance(context: Context) = Config(context)
     }
 
-    var isSameSorting: Boolean
-        get() = prefs.getBoolean(IS_SAME_SORTING, true)
-        set(isSameSorting) = prefs.edit().putBoolean(IS_SAME_SORTING, isSameSorting).apply()
-
     var fileSorting: Int
-        get() = if (isSameSorting) directorySorting else prefs.getInt(SORT_ORDER, SORT_BY_DATE_MODIFIED or SORT_DESCENDING)
-        set(order) = if (isSameSorting) directorySorting = order else prefs.edit().putInt(SORT_ORDER, order).apply()
+        get() = prefs.getInt(SORT_ORDER, SORT_BY_DATE_MODIFIED or SORT_DESCENDING)
+        set(order) = prefs.edit().putInt(SORT_ORDER, order).apply()
 
     var directorySorting: Int
         get() = prefs.getInt(DIRECTORY_SORT_ORDER, SORT_BY_DATE_MODIFIED or SORT_DESCENDING)
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 85e5dec97..e97b043e8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -1,7 +1,6 @@
 package com.simplemobiletools.gallery.helpers
 
 // shared preferences
-val IS_SAME_SORTING = "is_same_sorting"
 val SORT_ORDER = "sort_order"
 val DIRECTORY_SORT_ORDER = "directory_sort_order"
 val SHOW_HIDDEN_FOLDERS = "show_hidden_folders"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ef9b92b7a..8435932d4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -49,26 +49,6 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/settings_same_sorting_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:padding="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_same_sorting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/same_sorting"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_show_hidden_folders_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index f62792558..333a95516 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Ordenar del mismo modo los archivos y las carpetas</string>
     <string name="show_hidden_folders">Mostrar carpetas ocultas</string>
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
     <string name="toggle_filename">Toggle filename visibility</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1cb1766e6..f23d83a55 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Hintergrundbild erfolgreich festgelegt</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Selbe Sortierung für Dateien und Ordner</string>
     <string name="show_hidden_folders">Zeige versteckte Ordner</string>
     <string name="autoplay_videos">Spiele Videos automatisch ab</string>
     <string name="toggle_filename">Toggle filename visibility</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index f62792558..333a95516 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Ordenar del mismo modo los archivos y las carpetas</string>
     <string name="show_hidden_folders">Mostrar carpetas ocultas</string>
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
     <string name="toggle_filename">Toggle filename visibility</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 55e39ff0a..e6eb31b98 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Fond d\'écran défini avec succès.</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Tri identique pour fichiers et dossiers</string>
     <string name="show_hidden_folders">Afficher les dossiers cachés</string>
     <string name="autoplay_videos">Lecture automatique des vidéos</string>
     <string name="toggle_filename">Permutter la visibilité des noms de fichier</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index f62792558..333a95516 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Ordenar del mismo modo los archivos y las carpetas</string>
     <string name="show_hidden_folders">Mostrar carpetas ocultas</string>
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
     <string name="toggle_filename">Toggle filename visibility</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d57c4f5ca..7f3108dae 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Same sorting for files and folders</string>
     <string name="show_hidden_folders">Show hidden folders</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 159c442e0..928edbfd3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Sfondo impostato correttamente</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Stesso ordinamento per file e cartelle</string>
     <string name="show_hidden_folders">Mostra cartelle nascoste</string>
     <string name="autoplay_videos">Riproduci video automaticamente</string>
     <string name="toggle_filename">Visibilità nome del file</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2155b431f..9e8d9fb5d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">壁紙を正常に設定しました</string>
 
     <!-- Settings -->
-    <string name="same_sorting">ファイルとフォルダーを同じに並べ替え</string>
     <string name="show_hidden_folders">非表示フォルダーを表示</string>
     <string name="autoplay_videos">自動的にビデオを再生</string>
     <string name="toggle_filename">ファイル名の表示を切り替え</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 9757c689e..877f7533a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Fundo definido com sucesso</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Mesma ordenação para ficheiros e pastas</string>
     <string name="show_hidden_folders">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do ficheiro</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6c540e74f..03db8043e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Обои успешно установлены</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Одинаковая сортировка для файлов и папок</string>
     <string name="show_hidden_folders">Показать скрытые папки</string>
     <string name="autoplay_videos">Воспроизводить видео автоматически</string>
     <string name="toggle_filename">Переключить отображение имени файла</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 47b582d48..957a8afb3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Tapeta bola úspešne zmenená</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Použiť rovnaké zoradenie pre súbory a priečinky</string>
     <string name="show_hidden_folders">Zobraziť skryté priečinky</string>
     <string name="autoplay_videos">Spúšťať videá automaticky</string>
     <string name="toggle_filename">Prepnúť viditeľnosť názvov súborov</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 535de608f..fe1c9edec 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Bakgrundsbilden är ändrad</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Samma sortering för filer som för mappar</string>
     <string name="show_hidden_folders">Visa dolda mappar</string>
     <string name="autoplay_videos">Spela upp videos automatiskt</string>
     <string name="toggle_filename">Visa/dölj filnamnen</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c6dc82fa2..dd1b7dc76 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Duvar kağıdı başarıyla ayarlandı</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Dosya ve klasörler için aynı sıralama</string>
     <string name="show_hidden_folders">Gizli klasörleri göster</string>
     <string name="autoplay_videos">Videoları otomatik olarak oynat</string>
     <string name="toggle_filename">Dosya adı görünürlüğünü değiştir</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 334e4e1f7..38403abfd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">壁纸应用成功</string>
 
     <!-- Settings -->
-    <string name="same_sorting">全局排序</string>
     <string name="show_hidden_folders">显示所有</string>
     <string name="autoplay_videos">自动播放</string>
     <string name="toggle_filename">显示文件名</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index efc520f17..95a9fcc8d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">成功應用軟體桌布</string>
 
     <!-- Settings -->
-    <string name="same_sorting">全部排序</string>
     <string name="show_hidden_folders">秀出隱藏資料夾</string>
     <string name="autoplay_videos">自動播放影片</string>
     <string name="toggle_filename">顯示檔案名稱</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d57c4f5ca..7f3108dae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,6 @@
     <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
 
     <!-- Settings -->
-    <string name="same_sorting">Same sorting for files and folders</string>
     <string name="show_hidden_folders">Show hidden folders</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>