From 6c53bb4d515d15c39bb4ba8e0eae46341fd58c45 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 3 Jun 2021 09:30:50 -0400
Subject: [PATCH] Allow center aligned side nav icons (closes #5177)

---
 .../tachiyomi/data/preference/PreferenceKeys.kt   |  2 +-
 .../data/preference/PreferencesHelper.kt          |  2 +-
 .../eu/kanade/tachiyomi/ui/main/MainActivity.kt   |  8 ++++++--
 .../kanade/tachiyomi/ui/more/AboutController.kt   |  1 -
 .../ui/setting/SettingsGeneralController.kt       | 15 +++++++++++----
 app/src/main/res/values/strings.xml               |  5 ++++-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index f8b419bb6c..dc6617740f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -15,7 +15,7 @@ object PreferenceKeys {
 
     const val hideBottomBarOnScroll = "pref_hide_bottom_bar_on_scroll"
 
-    const val showSideNavOnBottom = "pref_show_side_nav_on_bottom"
+    const val sideNavIconAlignment = "pref_side_nav_icon_alignment"
 
     const val enableTransitions = "pref_enable_transitions_key"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 7591b94464..a195fadfea 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -66,7 +66,7 @@ class PreferencesHelper(val context: Context) {
 
     fun hideBottomBarOnScroll() = flowPrefs.getBoolean(Keys.hideBottomBarOnScroll, true)
 
-    fun showSideNavOnBottom() = flowPrefs.getBoolean(Keys.showSideNavOnBottom, false)
+    fun sideNavIconAlignment() = flowPrefs.getInt(Keys.sideNavIconAlignment, 0)
 
     fun useAuthenticator() = flowPrefs.getBoolean(Keys.useAuthenticator, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index 1b61d859a4..c0180966c1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -142,9 +142,13 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
         }
 
         if (binding.sideNav != null) {
-            preferences.showSideNavOnBottom()
+            preferences.sideNavIconAlignment()
                 .asImmediateFlow {
-                    binding.sideNav?.menuGravity = if (!it) Gravity.TOP else Gravity.BOTTOM
+                    binding.sideNav?.menuGravity = when (it) {
+                        1 -> Gravity.CENTER
+                        2 -> Gravity.BOTTOM
+                        else -> Gravity.TOP
+                    }
                 }
                 .launchIn(lifecycleScope)
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
index 1a86c17c73..1f8e902fe6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
@@ -26,7 +26,6 @@ import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.util.system.toast
 import timber.log.Timber
 import java.text.DateFormat
-import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.TimeZone
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 61a15ac2b8..b3bcd4e41e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -47,10 +47,17 @@ class SettingsGeneralController : SettingsController() {
             defaultValue = false
         }
         if (context.isTablet()) {
-            switchPreference {
-                key = Keys.showSideNavOnBottom
-                titleRes = R.string.pref_move_side_nav_to_bottom
-                defaultValue = false
+            intListPreference {
+                key = Keys.sideNavIconAlignment
+                titleRes = R.string.pref_side_nav_icon_alignment
+                entriesRes = arrayOf(
+                    R.string.alignment_top,
+                    R.string.alignment_center,
+                    R.string.alignment_bottom,
+                )
+                entryValues = arrayOf("0", "1", "2")
+                defaultValue = "0"
+                summary = "%s"
             }
         } else {
             switchPreference {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 905d9ed870..90f6b5bc6e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,7 +161,10 @@
     <string name="pref_date_format">Date format</string>
     <string name="pref_confirm_exit">Confirm exit</string>
     <string name="pref_hide_bottom_bar_on_scroll">Hide bottom bar on scroll</string>
-    <string name="pref_move_side_nav_to_bottom">Move side navigation buttons to bottom</string>
+    <string name="pref_side_nav_icon_alignment">Side navigation icon alignment</string>
+    <string name="alignment_top">Top</string>
+    <string name="alignment_center">Center</string>
+    <string name="alignment_bottom">Bottom</string>
     <string name="pref_manage_notifications">Manage notifications</string>
 
     <string name="pref_category_security">Security</string>