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

For #14636 - Update preference section headers to use correct color, spacing and rulers (#16332)

Browse Source
upstream-sync
Gabriel Luong 4 years ago committed by GitHub
parent 2b621fcb1b
commit 2bd2a5651d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/res/layout/preference_cat_style.xml
Unescape Escape View File

@ -5,11 +5,9 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@android:id/title"
style="?android:attr/listViewStyle"
style="@style/PreferenceSectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/section_header_height"
android:layout_marginStart="@dimen/top_bar_alignment_margin_start"
android:layout_marginTop="16dp"
android:gravity="start|center_vertical"
android:textAlignment="viewStart"
app:fontFamily="@font/metropolis_semibold" />
app:allowDividerAbove="true" />

15
app/src/main/res/layout/preference_category_main_style.xml
Unescape Escape View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@android:id/title"
style="?android:attr/listViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:gravity="start|center_vertical"
android:textAlignment="viewStart"
app:fontFamily="@font/metropolis_semibold" />

1
app/src/main/res/values-night/colors.xml
Unescape Escape View File

@ -51,6 +51,7 @@
<color name="search_suggestion_indicator_icon_color_normal_theme">@color/search_suggestion_indicator_icon_color_dark_theme</color>
<color name="search_suggestion_indicator_icon_bookmark_color_normal_theme">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</color>
<color name="select_login_header_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="preference_section_header_normal_theme">@color/preference_section_header_dark_theme</color>
<color name="mozac_widget_favicon_background_normal_theme">@color/mozac_widget_favicon_background_dark_theme</color>
<color name="mozac_widget_favicon_border_normal_theme">@color/mozac_widget_favicon_border_dark_theme</color>

1
app/src/main/res/values/attrs.xml
Unescape Escape View File

@ -26,6 +26,7 @@
<attr name="scrimEnd" format="reference"/>
<attr name="toolbarDivider" format="reference"/>
<attr name="menuCategoryText" format="reference"/>
<attr name="preferenceSectionHeader" format="reference"/>
<!-- Misc -->
<attr name="homeBackground" format="reference"/>

2
app/src/main/res/values/colors.xml
Unescape Escape View File

@ -60,6 +60,7 @@
<color name="readermode_end_gradient_normal_theme">#FF0250bb</color>
<color name="search_suggestion_indicator_icon_color_light_theme">#008787</color>
<color name="search_suggestion_indicator_icon_bookmark_color_light_theme">#0060df</color>
<color name="preference_section_header_normal_theme">@color/accent_bright_light_theme</color>
<color name="mozac_widget_favicon_background_light_theme">@color/photonWhite</color>
<color name="mozac_widget_favicon_border_light_theme">@color/photonLightGrey30</color>
@ -129,6 +130,7 @@
<color name="prompt_login_edit_text_cursor_color_dark_theme">#9059ff</color>
<color name="search_suggestion_indicator_icon_color_dark_theme">#2ac3a2</color>
<color name="search_suggestion_indicator_icon_bookmark_color_dark_theme">#0090ed</color>
<color name="preference_section_header_dark_theme">@color/accent_high_contrast_dark_theme</color>
<color name="mozac_widget_favicon_background_dark_theme">@color/photonDarkGrey50</color>
<color name="mozac_widget_favicon_border_dark_theme">@color/photonDarkGrey10</color>

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

@ -56,6 +56,7 @@
<dimen name="checkbox_preference_padding_vertical">12dp</dimen>
<dimen name="radiobutton_preference_margin_start">8dp</dimen>
<dimen name="top_bar_alignment_margin_start">72dp</dimen>
<dimen name="section_header_height">48dp</dimen>
<!--Quick Settings-->
<dimen name="quicksettings_item_height">28dp</dimen>

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

@ -81,6 +81,7 @@
<item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_normal_theme</item>
<item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_normal_theme</item>
<item name="selectLoginHeaderTextColor">@color/select_login_header_normal_theme</item>
<item name="preferenceSectionHeader">@color/preference_section_header_normal_theme</item>
<!-- Shared widget colors -->
<item name="mozac_primary_text_color">@color/primary_text_normal_theme</item>
<item name="mozac_caption_text_color">@color/caption_text_normal_theme</item>
@ -228,6 +229,7 @@
<item name="awesomeBarIndicatorColor">@color/search_suggestion_indicator_icon_color_dark_theme</item>
<item name="awesomeBarIndicatorBookmarkColor">@color/search_suggestion_indicator_icon_bookmark_color_dark_theme</item>
<item name="selectLoginHeaderTextColor">@color/accent_high_contrast_private_theme</item>
<item name="preferenceSectionHeader">@color/preference_section_header_dark_theme</item>
<!-- Shared widget colors -->
<item name="mozac_primary_text_color">@color/primary_text_private_theme</item>
@ -557,6 +559,11 @@
<item name="android:lineSpacingExtra">@dimen/about_header_text_line_spacing_extra</item>
</style>
<style name="PreferenceSectionHeader" parent="@android:style/Widget.ListView">
<item name="android:textColor">?preferenceSectionHeader</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="EngineTextField" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
</style>

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

@ -7,7 +7,6 @@
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_theme"
app:allowDividerBelow="true"
app:iconSpaceReserved="false">
<org.mozilla.fenix.settings.RadioButtonPreference
android:defaultValue="@bool/underAPI28"
@ -35,7 +34,6 @@
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_toolbar"
app:allowDividerAbove="true"
app:iconSpaceReserved="false">
<org.mozilla.fenix.settings.RadioButtonPreference
android:key="@string/pref_key_toolbar_top"
@ -48,7 +46,6 @@
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_home"
app:allowDividerAbove="true"
app:iconSpaceReserved="false">
<androidx.preference.SwitchPreference
android:key="@string/pref_key_enable_top_frecent_sites"
@ -58,7 +55,6 @@
<androidx.preference.PreferenceCategory
android:layout="@layout/preference_cat_style"
android:title="@string/preferences_gestures"
app:allowDividerAbove="true"
app:iconSpaceReserved="false">
<androidx.preference.SwitchPreference
android:key="@string/pref_key_website_pull_to_refresh"

11
app/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -8,7 +8,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.Preference
app:allowDividerBelow="false"
android:key="@string/pref_key_sign_in"
android:layout="@layout/sign_in_preference"
android:summary="@string/preferences_sign_in_description"
@ -19,7 +18,7 @@
android:title="@string/preferences_category_account"
app:iconSpaceReserved="false"
app:isPreferenceVisible="false"
android:layout="@layout/preference_category_main_style" >
android:layout="@layout/preference_cat_style" >
<org.mozilla.fenix.settings.account.AccountPreference
android:icon="@drawable/ic_account"
@ -47,7 +46,7 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_general"
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_main_style" >
android:layout="@layout/preference_cat_style" >
<androidx.preference.Preference
android:icon="@drawable/ic_search"
android:key="@string/pref_key_search_settings"
@ -87,7 +86,7 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_privacy_security"
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_main_style">
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/ic_private_browsing"
@ -130,7 +129,7 @@
android:title="@string/preferences_category_advanced"
app:iconSpaceReserved="false"
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_category_main_style">
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/ic_addons_extensions"
android:key="@string/pref_key_addons"
@ -171,7 +170,7 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_main_style">
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/ic_bookmark_outline"
android:key="@string/pref_key_rate"

1
app/src/main/res/xml/search_preferences.xml
Unescape Escape View File

@ -22,7 +22,6 @@
android:title="@string/preferences_search_address_bar"
android:selectable="false"
app:iconSpaceReserved="false"
app:allowDividerAbove="true"
android:layout="@layout/preference_cat_style">
<SwitchPreference
android:defaultValue="true"

Write Preview
Loading…
Cancel
Save