From ad1a787a1570125f111da9ded194c0bdbb6359f5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 6 Jan 2018 13:20:30 +0100
Subject: [PATCH] move the "Use english" button further in settings

---
 .../gallery/activities/SettingsActivity.kt    | 18 ++++----
 app/src/main/res/layout/activity_settings.xml | 42 +++++++++----------
 2 files changed, 30 insertions(+), 30 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 18cbad383..882c7aff7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -39,7 +39,7 @@ class SettingsActivity : SimpleActivity() {
         setupManageIncludedFolders()
         setupManageExcludedFolders()
         setupManageHiddenFolders()
-        setupShowHiddenFolders()
+        setupShowHiddenItems()
         setupAutoplayVideos()
         setupLoopVideos()
         setupAnimateGifs()
@@ -96,22 +96,22 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupShowHiddenFolders() {
-        settings_show_hidden_folders.isChecked = config.showHiddenMedia
-        settings_show_hidden_folders_holder.setOnClickListener {
+    private fun setupShowHiddenItems() {
+        settings_show_hidden_items.isChecked = config.showHiddenMedia
+        settings_show_hidden_items_holder.setOnClickListener {
             if (config.showHiddenMedia) {
-                toggleHiddenFolders()
+                toggleHiddenItems()
             } else {
                 handleHiddenFolderPasswordProtection {
-                    toggleHiddenFolders()
+                    toggleHiddenItems()
                 }
             }
         }
     }
 
-    private fun toggleHiddenFolders() {
-        settings_show_hidden_folders.toggle()
-        config.showHiddenMedia = settings_show_hidden_folders.isChecked
+    private fun toggleHiddenItems() {
+        settings_show_hidden_items.toggle()
+        config.showHiddenMedia = settings_show_hidden_items.isChecked
     }
 
     private fun setupAutoplayVideos() {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 7e96f52dd..8ec33b33f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -68,6 +68,25 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_manage_hidden_folders_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.MyTextView
+                android:id="@+id/settings_manage_hidden_folders"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/manage_hidden_folders"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_use_english_holder"
             android:layout_width="match_parent"
@@ -89,26 +108,7 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_manage_hidden_folders_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.MyTextView
-                android:id="@+id/settings_manage_hidden_folders"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingStart="@dimen/medium_margin"
-                android:text="@string/manage_hidden_folders"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/settings_show_hidden_folders_holder"
+            android:id="@+id/settings_show_hidden_items_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -116,7 +116,7 @@
             android:padding="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_show_hidden_folders"
+                android:id="@+id/settings_show_hidden_items"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"