blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For 3687 Use Metropolis Font for Header

master
Kate Glazko 2019-12-05 16:34:07 -08:00 committed by Emily Kager
parent 9043120dd7
commit d9d5de98c9
35 changed files with 152 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/src/main/res/font/metropolis.xml 100644
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- Black -->
<font
android:font="@font/metropolis_black"
android:fontStyle="normal"
android:fontWeight="900"
app:font="@font/metropolis_black"
app:fontStyle="normal"
app:fontWeight="900" />
<!-- Extra Bold -->
<font
android:font="@font/metropolis_extrabold"
android:fontStyle="normal"
android:fontWeight="800"
app:font="@font/metropolis_extrabold"
app:fontStyle="normal"
app:fontWeight="800" />
<!-- Bold -->
<font
android:font="@font/metropolis_bold"
android:fontStyle="normal"
android:fontWeight="700"
app:font="@font/metropolis_bold"
app:fontStyle="normal"
app:fontWeight="700" />
<!-- Semi-Bold -->
<font
android:font="@font/metropolis_semibold"
android:fontStyle="normal"
android:fontWeight="600"
app:font="@font/metropolis_semibold"
app:fontStyle="normal"
app:fontWeight="600" />
<!-- Medium -->
<font
android:font="@font/metropolis_medium"
android:fontStyle="normal"
android:fontWeight="500"
app:font="@font/metropolis_medium"
app:fontStyle="normal"
app:fontWeight="500" />
<!-- Normal -->
<font
android:font="@font/metropolis_regular"
android:fontStyle="normal"
android:fontWeight="400"
app:font="@font/metropolis_regular"
app:fontStyle="normal"
app:fontWeight="400" />
<!-- Thin -->
<font
android:font="@font/metropolis_thin"
android:fontStyle="normal"
android:fontWeight="200"
app:font="@font/metropolis_thin"
app:fontStyle="normal"
app:fontWeight="200" />
<!-- Light -->
<font
android:font="@font/metropolis_light"
android:fontStyle="normal"
android:fontWeight="100"
app:font="@font/metropolis_light"
app:fontStyle="normal"
app:fontWeight="100" />
</font-family>

BIN
app/src/main/res/font/metropolis_black.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_blackitalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_bold.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_bolditalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_extrabold.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_extrabolditalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_extralighitalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_extralight.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_light.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_lightitalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_medium.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_mediumitalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_regular.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_regularitalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_semibold.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_semibolditalic.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_thin.ttf 100644
View File

Binary file not shown.

BIN
app/src/main/res/font/metropolis_thinitalic.ttf 100644
View File

Binary file not shown.

4
app/src/main/res/layout/account_preference.xml
View File

@ -2,6 +2,7 @@
- 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/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/account_preference_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -47,7 +48,8 @@
android:layout_alignStart="@id/displayName"
android:maxLines="4"
android:text="@string/preferences_account_default_name"
android:textColor="?primaryText" />
android:textColor="?primaryText"
app:fontFamily="@font/metropolis_bold" />
</RelativeLayout>

6
app/src/main/res/layout/fenix_snackbar.xml
View File

@ -33,8 +33,7 @@
android:textAlignment="textStart"
android:textColor="@color/photonWhite"
android:textSize="18sp"
android:textStyle="bold"
android:typeface="sans"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/snackbar_btn"
app:layout_constraintStart_toStartOf="parent"
@ -55,9 +54,8 @@
android:textAllCaps="true"
android:textColor="@color/photonWhite"
android:textSize="14sp"
android:textStyle="bold"
android:typeface="sans"
android:visibility="gone"
app:fontFamily="@font/metropolis_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/snackbar_text"

8
app/src/main/res/layout/no_content_message.xml
View File

@ -19,8 +19,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@tools:sample/lorem"
tools:drawableEnd="@drawable/ic_tab_collection"
android:textAppearance="@style/HeaderTextStyle"
android:textSize="16sp" />
android:textSize="16sp"
app:fontFamily="@font/metropolis_semibold" />
<TextView
android:id="@+id/no_content_description"
@ -30,7 +32,7 @@
tools:text="@tools:sample/lorem"
android:textColor="?primaryText"
android:textSize="14sp"
android:textStyle="normal"
android:textAlignment="viewStart"/>
android:textAlignment="viewStart"
app:fontFamily="@font/metropolis_medium" />
</LinearLayout>

3
app/src/main/res/layout/onboarding_manual_signin.xml
View File

@ -37,5 +37,6 @@
android:textColor="@color/button_text_color"
android:textSize="14sp"
android:textStyle="bold"
app:backgroundTint="@color/foundation_light_theme" />
app:backgroundTint="@color/foundation_light_theme"
style="@style/MetropolisButton" />
</LinearLayout>

3
app/src/main/res/layout/onboarding_privacy_notice.xml
View File

@ -58,6 +58,7 @@
android:gravity="center"
android:text="@string/onboarding_privacy_notice_read_button"
android:textColor="?primaryText"
android:textSize="14sp" />
android:textSize="14sp"
app:fontFamily="@font/metropolis_regular" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/onboarding_private_browsing.xml
View File

@ -71,6 +71,7 @@
android:gravity="center"
android:text="@string/onboarding_private_browsing_button"
android:textColor="?primaryText"
android:textSize="14sp" />
android:textSize="14sp"
app:fontFamily="@font/metropolis_regular" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/layout/pbm_shortcut_popup.xml
View File

@ -34,7 +34,8 @@
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:fontFamily="@font/metropolis_medium" />
<Button
android:id="@+id/cfr_pos_button"
@ -44,27 +45,27 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/rounded_gray_corners"
android:fontFamily="sans-serif-medium"
android:text="@string/cfr_pos_button_text"
android:textAllCaps="false"
android:textColor="@color/above_dark_theme"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cfr_message" />
app:layout_constraintTop_toBottomOf="@id/cfr_message"
style="@style/MetropolisButton"/>
<Button
android:id="@+id/cfr_neg_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:fontFamily="sans-serif-medium"
android:text="@string/cfr_neg_button_text"
android:textAllCaps="false"
android:textColor="@color/white_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cfr_pos_button" />
app:layout_constraintTop_toBottomOf="@id/cfr_pos_button"
style="@style/MetropolisButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

11
app/src/main/res/layout/preference_cat_style.xml 100644
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/listViewStyle"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
app:fontFamily="@font/metropolis_semibold"
android:id="@android:id/title" />

1
app/src/main/res/layout/save_tab_group_button.xml
View File

@ -21,4 +21,5 @@
app:icon="@drawable/ic_tab_collection"
app:iconGravity="textStart"
app:iconPadding="8dp"
app:fontFamily="@font/metropolis_medium"
app:iconTint="?attr/contrastText" />

3
app/src/main/res/layout/tracking_protection_onboarding_popup.xml
View File

@ -54,7 +54,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/close_onboarding"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:fontFamily="@font/metropolis_medium" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView

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

@ -92,10 +92,12 @@
<style name="DialogButtonStyleLight" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
<item name="android:textColor">?accentBright</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="DialogButtonStyleDark" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
<item name="android:textColor">?accentHighContrast</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="DialogStyleNormal" parent="DialogStyleLight"/>
@ -179,16 +181,17 @@
</style>
<style name="ThemeIndependentMaterialGreyButton" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:letterSpacing">0</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@color/grey_button_color</item>
<item name="android:textColor">@color/button_text_color</item>
<item name="rippleColor">?secondaryText</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="ThemeIndependentMaterialGreyButtonDestructive" parent="ThemeIndependentMaterialGreyButton">
<item name="android:textColor">@color/destructive_button_text_color</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
@ -218,6 +221,7 @@
<item name="android:paddingStart">24dp</item>
<item name="android:paddingEnd">24dp</item>
<item name="android:elevation">0dp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="SitePermissionCancelButton" parent="SitePermissionButton">
@ -252,26 +256,26 @@
<style name="HeaderTextStyle" parent="TextAppearance.MaterialComponents.Subtitle1">
<item name="android:textSize">18sp</item>
<item name="android:textColor">?primaryText</item>
<item name="android:textStyle">bold</item>
<item name="android:letterSpacing">0.03</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?primaryText</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Header14TextStyle" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:textColor">?primaryText</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Header12TextStyle" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:textColor">?secondaryText</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Body14TextStyle" parent="TextAppearance.MaterialComponents.Body2">
@ -282,15 +286,18 @@
<style name="SubtitleTextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?secondaryText</item>
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="Subtitle12TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?secondaryText</item>
<item name="android:textSize">12sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="ToolbarTitleTextStyle" parent="HeaderTextStyle">
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="ListItemTextStyle" parent="TextAppearance.MaterialComponents.Subtitle1">
@ -372,6 +379,10 @@
<item name="android:textSize">@dimen/search_fragment_clipboard_title_text_size</item>
</style>
<style name="MetropolisButton">
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="SearchClipboardUrlStyle" parent="SearchClipboardStyle">
<item name="android:textAppearance">@style/Subtitle12TextStyle</item>
<item name="android:textColor">?fillLinkFromClipboard</item>
@ -382,7 +393,6 @@
<style name="CreateShortcutDialogButton" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:minHeight">40dp</item>
<item name="android:layout_marginTop">32dp</item>
<item name="android:textColor">?accentUsedOnDarkBackground</item>
@ -394,6 +404,7 @@
<item name="android:textColor">?secondaryText</item>
<item name="android:textSize">@dimen/share_header_text_size</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<style name="FirefoxAccountsDialogStyle" parent="DialogStyleBase">

3
app/src/main/res/xml/account_settings_preferences.xml
View File

@ -18,7 +18,8 @@
<androidx.preference.PreferenceCategory
android:key="@string/preferences_sync_category"
android:title="@string/preferences_sync_category">
android:title="@string/preferences_sync_category"
android:layout="@layout/preference_cat_style">
<androidx.preference.CheckBoxPreference
android:defaultValue="true"

6
app/src/main/res/xml/customization_preferences.xml
View File

@ -7,7 +7,8 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_theme"
app:iconSpaceReserved="false"
app:allowDividerBelow="false">
app:allowDividerBelow="false"
android:layout="@layout/preference_cat_style">
<org.mozilla.fenix.settings.RadioButtonPreference
android:defaultValue="@bool/underAPI28"
android:key="@string/pref_key_light_theme"
@ -34,7 +35,8 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_toolbar"
app:iconSpaceReserved="false"
app:allowDividerAbove="false">
app:allowDividerAbove="false"
android:layout="@layout/preference_cat_style">
<org.mozilla.fenix.settings.RadioButtonPreference
android:key="@string/pref_key_toolbar_top"
android:title="@string/preference_top_toolbar" />

3
app/src/main/res/xml/delete_browsing_data_quit_preferences.xml
View File

@ -14,7 +14,8 @@
android:dependency="@string/pref_key_delete_browsing_data_on_quit"
android:key="@string/pref_key_delete_browsing_data_on_quit_categories"
app:allowDividerAbove="false"
app:iconSpaceReserved="false">
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
<CheckBoxPreference
android:key="@string/pref_key_delete_open_tabs_on_quit"
android:layout="@layout/delete_browsing_category_checkbox"

15
app/src/main/res/xml/preferences.xml
View File

@ -45,7 +45,8 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_general"
app:iconSpaceReserved="false">
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style" >
<androidx.preference.Preference
android:icon="@drawable/ic_search"
android:key="@string/pref_key_search_settings"
@ -79,7 +80,8 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_privacy_security"
app:iconSpaceReserved="false">
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/ic_private_browsing"
@ -122,7 +124,8 @@
<PreferenceCategory
android:title="@string/preferences_category_advanced"
app:iconSpaceReserved="false"
android:key="@string/pref_key_advanced">
android:key="@string/pref_key_advanced"
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/mozac_ic_extensions_black"
android:key="@string/pref_key_addons"
@ -133,7 +136,8 @@
android:icon="@drawable/ic_info"
android:key="@string/pref_key_leakcanary"
android:title="@string/preference_leakcanary"
app:isPreferenceVisible="@bool/IS_DEBUG" />
app:isPreferenceVisible="@bool/IS_DEBUG"
android:layout="@layout/preference_cat_style" />
<androidx.preference.SwitchPreference
android:icon="@drawable/ic_energy"
@ -144,7 +148,8 @@
<androidx.preference.PreferenceCategory
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false">
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
<androidx.preference.Preference
android:icon="@drawable/ic_bookmark_outline"
android:key="@string/pref_key_rate"

6
app/src/main/res/xml/search_preferences.xml
View File

@ -8,7 +8,8 @@
<PreferenceCategory
android:title="@string/preferences_default_search_engine"
android:selectable="false"
app:iconSpaceReserved="false">
app:iconSpaceReserved="false"
android:layout="@layout/preference_cat_style">
<org.mozilla.fenix.settings.search.RadioSearchEngineListPreference
android:key="@string/pref_key_search_engine_list"
android:selectable="false"/>
@ -22,7 +23,8 @@
android:title="@string/preferences_search_address_bar"
android:selectable="false"
app:iconSpaceReserved="false"
app:allowDividerAbove="false">
app:allowDividerAbove="false"
android:layout="@layout/preference_cat_style">
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_show_search_shortcuts"