Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

Rip out most other hooks into the tab tray customization code except the translations

Browse Source
pull/257/head
Adam Novak 3 years ago
parent 7b9eaa9304
commit c8b0326836
6 changed files with 0 additions and 191 deletions
Show Stats Download Patch File Download Diff File

72
app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
Unescape Escape View File

@ -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<SwitchPreference>(R.string.pref_key_tabs_tray_top_tray).apply {
isChecked = context.settings().useTopTabsTray
onPreferenceChangeListener = SharedPreferenceUpdater()
}
requirePreference<SwitchPreference>(R.string.pref_key_use_fullscreen_tabs_screen).apply {
isChecked = context.settings().useFullScreenTabScreen
onPreferenceChangeListener = SharedPreferenceUpdater()
}
val reverseOrderPref = requirePreference<SwitchPreference>(
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<SwitchPreference>(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<SwitchPreference>(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<SwitchPreference>(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<SwitchPreference>(R.string.pref_key_enable_top_frecent_sites).apply {
isChecked = context.settings().showTopFrecentSites

33
app/src/main/java/org/mozilla/fenix/utils/Settings.kt
Unescape Escape View File

@ -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

8
app/src/main/res/values/dimens.xml
Unescape Escape View File

@ -74,9 +74,6 @@
<dimen name="bottom_sheet_handle_height">3dp</dimen>
<dimen name="bottom_sheet_handle_top_margin">8dp</dimen>
<!-- Top Sheet Fragment card -->
<dimen name="top_sheet_handle_bottom_margin">8dp</dimen>
<!-- Browser Toolbar -->
<dimen name="browser_toolbar_height">56dp</dimen>
@ -176,10 +173,6 @@
<!-- Tabs Tray -->
<dimen name="tab_tray_top_offset">40dp</dimen>
<dimen name="tab_tray_thumbnail_width">125dp</dimen>
<dimen name="tab_tray_thumbnail_height">130dp</dimen>
<dimen name="tab_tray_thumbnail_width_original">92dp</dimen>
<dimen name="tab_tray_thumbnail_height_original">69dp</dimen>
<dimen name="tab_tray_tab_item_height">88dp</dimen>
<dimen name="tab_tray_list_item_thumbnail_width">92dp</dimen>
<dimen name="tab_tray_list_item_thumbnail_height">72dp</dimen>
@ -191,7 +184,6 @@
<dimen name="tab_tray_favicon_border_radius">4dp</dimen>
<dimen name="tab_tray_multiselect_handle_height">11dp</dimen>
<dimen name="tab_tray_multiselect_handle_top_margin">0dp</dimen>
<dimen name="tab_tray_multiselect_handle_bottom_margin">0dp</dimen>
<dimen name="tab_tray_new_collection_padding_start">24dp</dimen>
<dimen name="tab_tray_new_collection_drawable_padding">28dp</dimen>

13
app/src/main/res/values/preference_keys.xml
Unescape Escape View File

@ -135,19 +135,6 @@
<string name="pref_key_swipe_toolbar_switch_tabs" translatable="false">pref_key_swipe_toolbar_switch_tabs</string>
<string name="pref_key_swipe_toolbar_show_tabs" translatable="false">pref_key_swipe_toolbar_show_tabs</string>
<!-- Tabs Tray Customization Settings -->
<string name="pref_tabs_tray_settings_category" translatable="false">pref_tabs_tray_settings_category</string>
<string name="pref_key_tabs_tray_compact_tab" translatable="false">pref_key_tabs_tray_compact_tab</string>
<string name="pref_key_tabs_tray_top_tray" translatable="false">pref_key_tabs_tray_top_tray</string>
<string name="pref_key_use_fullscreen_tabs_screen" translatable="false">pref_key_use_fullscreen_tabs_screen</string>
<string name="pref_key_use_fenix_tabs_tray" translatable="false">pref_key_use_fenix_tabs_tray</string>
<string name="pref_key_tabs_tray_reverse_tab_order" translatable="false">pref_key_tabs_tray_reverse_tab_order</string>
<!-- Tabs Tray FAB Customization Settings -->
<string name="pref_tabs_tray_fab_settings_category" translatable="false">pref_tabs_tray_fab_settings_category</string>
<string name="pref_key_tabs_tray_use_fab" translatable="false">pref_key_tabs_tray_use_fab</string>
<string name="pref_key_tabs_tray_fab_top_position" translatable="false">pref_key_tabs_tray_fab_top_position</string>
<!-- Add-ons Source Customization Settings -->
<string name="pref_addons_settings_category" translatable="false">pref_addons_settings_category</string>
<string name="pref_key_addons_custom_account" translatable="false">pref_key_addons_custom_account</string>

23
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -274,11 +274,6 @@
<item name="android:windowExitAnimation">@anim/fade_out</item>
</style>
<style name="TopTabTrayAnimation">
<item name="android:windowEnterAnimation">@anim/fade_in_down</item>
<item name="android:windowExitAnimation">@anim/fade_out_up</item>
</style>
<!-- UI button styling -->
<style name="NeutralButton" parent="Widget.MaterialComponents.Button.TextButton">
<item name="iconTint">@color/button_text_color</item>
@ -598,24 +593,6 @@
<style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase" />
<!-- Stuff to make the top sheet with round bottom borders -->
<style name="TopSheetShapeAppearance" parent="ShapeAppearance.MaterialComponents.LargeComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeBottomLeft">16dp</item>
<item name="cornerSizeBottomRight">16dp</item>
<item name="colorSurface">@color/photonPurple50</item>
<item name="android:backgroundTint">@color/photonPurple50</item>
<item name="android:colorBackground">@color/photonPurple50</item>
</style>
<style name="TopSheetModal" parent="Widget.Design.BottomSheet.Modal">
<item name="shapeAppearance">@style/TopSheetShapeAppearance</item>
<item name="behavior_fitToContents">false</item>
<item name="behavior_expandedOffset">80dp</item>
<item name="behavior_skipCollapsed">false</item>
<item name="behavior_halfExpandedRatio">0.4</item>
</style>
<!-- Stuff to make the bottom sheet with round top borders -->
<style name="BottomSheetShapeAppearance" parent="ShapeAppearance.MaterialComponents.LargeComponent">
<item name="cornerFamily">rounded</item>

42
app/src/main/res/xml/customization_preferences.xml
Unescape Escape View File

@ -48,48 +48,6 @@
android:title="@string/preferences_strip_url_title" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_tabs_tray_settings_category"
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_tabs_tray"
app:allowDividerAbove="true"
app:iconSpaceReserved="false">
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_tabs_tray_compact_tab"
android:title="@string/enable_compact_tabs" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_tabs_tray_top_tray"
android:title="@string/enable_top_tabs_tray" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_use_fullscreen_tabs_screen"
android:title="@string/use_fullscreen_tabs_screen" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_tabs_tray_reverse_tab_order"
android:title="@string/reverse_tab_order_tabs_tray"
android:summary="@string/reverse_tab_order_description" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:key="@string/pref_tabs_tray_fab_settings_category"
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_tabs_tray_fab"
app:allowDividerAbove="false"
app:iconSpaceReserved="false">
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_tabs_tray_use_fab"
android:title="@string/enable_fab_tabs_tray" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_tabs_tray_fab_top_position"
android:title="@string/fab_tabs_tray_top"
android:summary="@string/fab_tabs_tray_top_description" />
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_home"

Write Preview
Loading…
Cancel
Save