diff --git a/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt index 223266e8e..32f12b7f2 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt @@ -53,8 +53,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { bindAutoBatteryTheme() setupRadioGroups() setupToolbarCategory() - setupTabsTrayCategory() - setupFabCategory() setupHomeCategory() setupGesturesCategory() setupAddonsCustomizationCategory() @@ -148,76 +146,6 @@ class CustomizationFragment : PreferenceFragmentCompat() { addToRadioGroup(topPreference, bottomPreference) } - private fun setupTabsTrayCategory() { - requirePreference(R.string.pref_key_tabs_tray_top_tray).apply { - isChecked = context.settings().useTopTabsTray - onPreferenceChangeListener = SharedPreferenceUpdater() - } - - requirePreference(R.string.pref_key_use_fullscreen_tabs_screen).apply { - isChecked = context.settings().useFullScreenTabScreen - onPreferenceChangeListener = SharedPreferenceUpdater() - } - - val reverseOrderPref = requirePreference( - R.string.pref_key_tabs_tray_reverse_tab_order).apply { - if (context.settings().enableCompactTabs) { - isChecked = false - isEnabled = false - } else { - isChecked = context.settings().reverseTabOrderInTabsTray - isEnabled = true - } - onPreferenceChangeListener = SharedPreferenceUpdater() - } - - requirePreference(R.string.pref_key_tabs_tray_compact_tab).apply { - isChecked = context.settings().enableCompactTabs - - onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue -> - val newValueBoolean = newValue as Boolean - preference.context.settings().preferences.edit { - putBoolean(preference.key, newValueBoolean) - if (newValueBoolean) { - reverseOrderPref.isChecked = false - putBoolean(getString(R.string.pref_key_tabs_tray_reverse_tab_order), false) - } - reverseOrderPref.isEnabled = !newValueBoolean - } - true - } - } - } - - private fun setupFabCategory() { - val fabPositionTop = requirePreference(R.string.pref_key_tabs_tray_fab_top_position).apply { - if (context.settings().useNewTabFloatingActionButton) { - isChecked = context.settings().placeNewTabFloatingActionButtonAtTop - isEnabled = true - } else { - isChecked = false - isEnabled = false - } - onPreferenceChangeListener = SharedPreferenceUpdater() - } - - requirePreference(R.string.pref_key_tabs_tray_use_fab).apply { - isChecked = context.settings().useNewTabFloatingActionButton - onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue -> - val newValueBoolean = newValue as Boolean - preference.context.settings().preferences.edit { - putBoolean(preference.key, newValueBoolean) - if (!newValueBoolean) { - fabPositionTop.isChecked = false - putBoolean(getString(R.string.pref_key_tabs_tray_fab_top_position), false) - } - fabPositionTop.isEnabled = newValueBoolean - } - true - } - } - } - private fun setupHomeCategory() { requirePreference(R.string.pref_key_enable_top_frecent_sites).apply { isChecked = context.settings().showTopFrecentSites diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 78c074d41..92c3e3d3d 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -923,39 +923,6 @@ class Settings(private val appContext: Context) : PreferencesHolder { BuildConfig.AMO_COLLECTION ) - var enableCompactTabs by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tabs_tray_compact_tab), - default = true - ) - - val useTopTabsTray by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tabs_tray_top_tray), - default = false - ) - - var useFullScreenTabScreen by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_use_fullscreen_tabs_screen), - default = true - ) - - val shouldUseFennecStyleTabsScreen: Boolean - get() = enableCompactTabs && useFullScreenTabScreen - - var reverseTabOrderInTabsTray by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tabs_tray_reverse_tab_order), - default = false - ) - - var useNewTabFloatingActionButton by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tabs_tray_use_fab), - default = false - ) - - var placeNewTabFloatingActionButtonAtTop by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_tabs_tray_fab_top_position), - default = false - ) - private var savedLoginsSortingStrategyString by stringPreference( appContext.getPreferenceKey(R.string.pref_key_saved_logins_sorting_strategy), default = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort.strategyString diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 2736ec8a2..d66fb8dc0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -74,9 +74,6 @@ 3dp 8dp - - 8dp - 56dp @@ -176,10 +173,6 @@ 40dp - 125dp - 130dp - 92dp - 69dp 88dp 92dp 72dp @@ -191,7 +184,6 @@ 4dp 11dp 0dp - 0dp 24dp 28dp diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index b3c76ee19..37f7ac984 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -135,19 +135,6 @@ pref_key_swipe_toolbar_switch_tabs pref_key_swipe_toolbar_show_tabs - - pref_tabs_tray_settings_category - pref_key_tabs_tray_compact_tab - pref_key_tabs_tray_top_tray - pref_key_use_fullscreen_tabs_screen - pref_key_use_fenix_tabs_tray - pref_key_tabs_tray_reverse_tab_order - - - pref_tabs_tray_fab_settings_category - pref_key_tabs_tray_use_fab - pref_key_tabs_tray_fab_top_position - pref_addons_settings_category pref_key_addons_custom_account diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f785a4476..9a75ff457 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -274,11 +274,6 @@ @anim/fade_out - - - - -