From 03701818da3e291ab7595ff87284bf3fb6bc8dd1 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 26 Sep 2022 18:55:10 +0200
Subject: [PATCH] move navigation bar settings to appearance

---
 .../libretube/ui/preferences/AppearanceSettings.kt     | 10 ++++++++++
 .../github/libretube/ui/preferences/GeneralSettings.kt |  9 ---------
 app/src/main/res/layout/dialog_navbar_options.xml      |  2 +-
 app/src/main/res/xml/appearance_settings.xml           |  6 ++++++
 app/src/main/res/xml/general_settings.xml              |  9 ---------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
index 7be32162a..799a2d63d 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/AppearanceSettings.kt
@@ -12,6 +12,7 @@ import com.github.libretube.R
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.ui.activities.SettingsActivity
 import com.github.libretube.ui.base.BasePreferenceFragment
+import com.github.libretube.ui.dialogs.NavBarOptionsDialog
 import com.github.libretube.ui.dialogs.RequireRestartDialog
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.ThemeHelper
@@ -59,6 +60,15 @@ class AppearanceSettings : BasePreferenceFragment() {
             true
         }
 
+        val navBarOptions = findPreference<Preference>(PreferenceKeys.NAVBAR_ITEMS)
+        navBarOptions?.setOnPreferenceClickListener {
+            NavBarOptionsDialog().show(
+                childFragmentManager,
+                null
+            )
+            true
+        }
+
         val systemCaptionStyle =
             findPreference<SwitchPreferenceCompat>(PreferenceKeys.SYSTEM_CAPTION_STYLE)
         val captionSettings = findPreference<Preference>(PreferenceKeys.CAPTION_SETTINGS)
diff --git a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
index 90810156b..1a2445f61 100644
--- a/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
+++ b/app/src/main/java/com/github/libretube/ui/preferences/GeneralSettings.kt
@@ -39,15 +39,6 @@ class GeneralSettings : BasePreferenceFragment() {
             true
         }
 
-        val navBarOptions = findPreference<Preference>(PreferenceKeys.NAVBAR_ITEMS)
-        navBarOptions?.setOnPreferenceClickListener {
-            NavBarOptionsDialog().show(
-                childFragmentManager,
-                null
-            )
-            true
-        }
-
         val breakReminder =
             findPreference<SwitchPreferenceCompat>(PreferenceKeys.BREAK_REMINDER_TOGGLE)
         val breakReminderTime = findPreference<EditTextPreference>(PreferenceKeys.BREAK_REMINDER)
diff --git a/app/src/main/res/layout/dialog_navbar_options.xml b/app/src/main/res/layout/dialog_navbar_options.xml
index 9c7d17286..0f8eca75f 100644
--- a/app/src/main/res/layout/dialog_navbar_options.xml
+++ b/app/src/main/res/layout/dialog_navbar_options.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="10dp">
+    android:paddingTop="20dp">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/options_recycler"
diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index 96506ea06..f7faed2a2 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/app/src/main/res/xml/appearance_settings.xml
@@ -38,6 +38,12 @@
             app:title="@string/app_icon"
             app:useSimpleSummaryProvider="true" />
 
+        <Preference
+            android:icon="@drawable/ic_home"
+            app:key="nav_bar_items"
+            app:title="@string/navigation_bar" />
+
+
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/app_behavior">
diff --git a/app/src/main/res/xml/general_settings.xml b/app/src/main/res/xml/general_settings.xml
index 0f3572997..423f831c8 100644
--- a/app/src/main/res/xml/general_settings.xml
+++ b/app/src/main/res/xml/general_settings.xml
@@ -38,15 +38,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory app:title="@string/behavior">
-
-        <Preference
-            android:icon="@drawable/ic_home"
-            app:key="nav_bar_items"
-            app:title="@string/navigation_bar" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory app:title="@string/misc">
 
         <SwitchPreferenceCompat