feat: Graduate tab alignment and content prefs from labs (#1131)

pachli · Nov 25, 2024 · fa50b2d · fa50b2d
1 parent b8cb8cd
commit fa50b2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/app/src/main/java/app/pachli/components/preference/LabPreferencesFragment.kt b/app/src/main/java/app/pachli/components/preference/LabPreferencesFragment.kt
@@ -25,8 +25,6 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import app.pachli.R
 import app.pachli.core.preferences.PrefKeys
-import app.pachli.core.preferences.TabAlignment
-import app.pachli.core.preferences.TabContents
 import app.pachli.core.preferences.TabTapBehaviour
 import app.pachli.databinding.FragmentLabPreferencesWarningBinding
 import app.pachli.settings.enumListPreference
@@ -67,20 +65,6 @@ class LabPreferencesFragment : PreferenceFragmentCompat() {
                 key = PrefKeys.TAB_TAP_BEHAVIOUR
                 isIconSpaceReserved = false
             }
-
-            enumListPreference<TabAlignment> {
-                setDefaultValue(TabAlignment.START)
-                setTitle(app.pachli.core.preferences.R.string.pref_title_tab_alignment)
-                key = PrefKeys.TAB_ALIGNMENT
-                isIconSpaceReserved = false
-            }
-
-            enumListPreference<TabContents> {
-                setDefaultValue(TabContents.ICON_ONLY)
-                setTitle(app.pachli.core.preferences.R.string.pref_title_tab_contents)
-                key = PrefKeys.TAB_CONTENTS
-                isIconSpaceReserved = false
-            }
         }
     }
 

diff --git a/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt b/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt
@@ -55,6 +55,8 @@ import app.pachli.core.preferences.MainNavigationPosition
 import app.pachli.core.preferences.PrefKeys
 import app.pachli.core.preferences.SharedPreferencesRepository
 import app.pachli.core.preferences.ShowSelfUsername
+import app.pachli.core.preferences.TabAlignment
+import app.pachli.core.preferences.TabContents
 import app.pachli.core.ui.extensions.await
 import app.pachli.core.ui.makeIcon
 import app.pachli.databinding.AccountNotificationDetailsListItemBinding
@@ -294,6 +296,18 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                     key = PrefKeys.MAIN_NAV_POSITION
                 }
 
+                enumListPreference<TabAlignment> {
+                    setDefaultValue(TabAlignment.START)
+                    setTitle(app.pachli.core.preferences.R.string.pref_title_tab_alignment)
+                    key = PrefKeys.TAB_ALIGNMENT
+                }
+
+                enumListPreference<TabContents> {
+                    setDefaultValue(TabContents.ICON_ONLY)
+                    setTitle(app.pachli.core.preferences.R.string.pref_title_tab_contents)
+                    key = PrefKeys.TAB_CONTENTS
+                }
+
                 switchPreference {
                     setDefaultValue(true)
                     key = PrefKeys.ENABLE_SWIPE_FOR_TABS