ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #22692: Remove Metropolis font.

This commit is contained in:
mcarare 2021-12-14 10:01:54 +02:00 committed by mergify[bot]
parent db38b722a2
commit 4b5b15aa53
44 changed files with 92 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
View File

@ -5,12 +5,14 @@
package org.mozilla.fenix.addons
import android.content.Context
import android.graphics.Typeface
import android.graphics.fonts.FontStyle.FONT_WEIGHT_MEDIUM
import android.os.Build
import android.os.Bundle
import android.view.Gravity
import android.view.View
import android.view.accessibility.AccessibilityEvent
import androidx.annotation.VisibleForTesting
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
@ -181,11 +183,17 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
}
private fun createAddonStyle(context: Context): AddonsManagerAdapter.Style {
val sectionsTypeFace = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
Typeface.create(Typeface.DEFAULT, FONT_WEIGHT_MEDIUM, false)
} else {
Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
}
return AddonsManagerAdapter.Style(
sectionsTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
addonNameTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.textSecondary, context),
sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold),
sectionsTypeFace = sectionsTypeFace,
addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label
)
}

10
app/src/main/java/org/mozilla/fenix/compose/SectionHeader.kt
View File

@ -7,12 +7,8 @@ package org.mozilla.fenix.compose
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import org.mozilla.fenix.R
import org.mozilla.fenix.theme.FirefoxTheme
/**
@ -30,11 +26,9 @@ fun SectionHeader(
text = text,
modifier = modifier,
color = FirefoxTheme.colors.textPrimary,
fontSize = 16.sp,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
lineHeight = 20.sp,
overflow = TextOverflow.Ellipsis,
maxLines = 2
maxLines = 2,
style = FirefoxTheme.typography.headline7
)
}

7
app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
View File

@ -45,8 +45,6 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
@ -134,10 +132,9 @@ private fun WallpaperSnackbar(
text = stringResource(R.string.wallpaper_updated_snackbar_message),
textAlign = TextAlign.Start,
color = FirefoxTheme.colors.textOnColorPrimary,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
fontSize = 18.sp,
overflow = TextOverflow.Ellipsis,
maxLines = 2
maxLines = 2,
style = FirefoxTheme.typography.headline7
)
},
action = {

5
app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt
View File

@ -31,8 +31,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@ -190,8 +188,7 @@ private fun InactiveTabsAutoClosePrompt(
text = stringResource(R.string.tab_tray_inactive_auto_close_title),
color = FirefoxTheme.colors.textPrimary,
modifier = Modifier.weight(1f),
fontSize = 14.sp,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
style = FirefoxTheme.typography.headline8
)
IconButton(

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

@ -1,77 +0,0 @@
<?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
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

7
app/src/main/res/layout/component_collection_creation.xml
View File

@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:fontFamily="@font/metropolis_bold"
android:textStyle="bold"
android:gravity="start|center_vertical"
android:paddingStart="8dp"
android:paddingTop="16dp"
@ -161,13 +161,12 @@
<TextView
android:id="@+id/bottom_bar_text"
style="@style/Header16TextStyle"
android:layout_width="0dp"
android:layout_height="0dp"
android:fontFamily="@font/metropolis_semibold"
android:gravity="center_vertical"
android:text="@string/create_collection_save_to_collection_empty"
android:textColor="?textActionPrimary"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_button"
app:layout_constraintStart_toEndOf="@id/bottom_bar_icon_button"
@ -181,7 +180,7 @@
android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save"
android:textColor="?textActionPrimary"
app:fontFamily="@font/metropolis_medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -140,7 +140,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/metropolis"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/create_collection_add_new_collection"

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

@ -56,14 +56,13 @@
<TextView
android:id="@+id/multiselect_title"
style="Header20TextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:focusableInTouchMode="true"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="20sp"
android:importantForAccessibility="no"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="@id/topBar"
app:layout_constraintEnd_toStartOf="@id/collect_multi_select"
app:layout_constraintHorizontal_bias="0.0"

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

@ -38,7 +38,6 @@
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:textColor="?attr/textPrimary"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toEndOf="@+id/navigate_back"
app:layout_constraintTop_toTopOf="parent"
android:text="@string/enhanced_tracking_protection_details" />
@ -219,14 +218,13 @@
<TextView
android:id="@+id/category_title"
style="@style/Header16TextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="52dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="19dp"
android:textColor="?attr/textPrimary"
android:textSize="16sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem" />

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

@ -33,7 +33,6 @@
android:textAlignment="textStart"
android:textColor="@color/photonWhite"
android:textSize="18sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/snackbar_btn"
app:layout_constraintStart_toStartOf="parent"
@ -57,7 +56,6 @@
android:textColor="@color/photonWhite"
android:textSize="14sp"
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"

9
app/src/main/res/layout/fragment_add_login.xml
View File

@ -18,6 +18,7 @@
<TextView
android:id="@+id/hostnameHeaderText"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="3dp"
@ -25,9 +26,7 @@
android:gravity="center_vertical"
android:text="@string/preferences_passwords_saved_logins_site"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:letterSpacing="0.05"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -88,6 +87,7 @@
<TextView
android:id="@+id/usernameHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -96,9 +96,7 @@
android:layout_marginTop="20dp"
android:text="@string/preferences_passwords_saved_logins_username"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:letterSpacing="0.05"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/inputLayoutUsername"
app:layout_constraintEnd_toStartOf="@id/clearUsernameTextButton"
app:layout_constraintStart_toStartOf="parent"
@ -159,6 +157,7 @@
<TextView
android:id="@+id/passwordHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -168,8 +167,6 @@
android:paddingEnd="0dp"
android:text="@string/preferences_passwords_saved_logins_password"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/inputLayoutPassword"
app:layout_constraintEnd_toStartOf="@+id/clearPasswordTextButton"
app:layout_constraintStart_toStartOf="parent"

34
app/src/main/res/layout/fragment_address_editor.xml
View File

@ -17,6 +17,7 @@
<!-- First Name -->
<TextView
android:id="@+id/first_name_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -26,8 +27,6 @@
android:paddingEnd="0dp"
android:text="@string/addresses_first_name"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -61,6 +60,7 @@
<!-- Middle Name -->
<TextView
android:id="@+id/middle_name_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -70,8 +70,6 @@
android:paddingEnd="0dp"
android:text="@string/addresses_middle_name"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/first_name_layout" />
@ -105,6 +103,7 @@
<!-- Last Name -->
<TextView
android:id="@+id/last_name_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -114,8 +113,6 @@
android:paddingEnd="0dp"
android:text="@string/addresses_last_name"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/middle_name_layout" />
@ -149,6 +146,7 @@
<!-- Street Address -->
<TextView
android:id="@+id/street_address_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -158,9 +156,7 @@
android:paddingEnd="0dp"
android:text="@string/addresses_street_address"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/street_address_input"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/last_name_layout" />
@ -193,6 +189,7 @@
<!-- City -->
<TextView
android:id="@+id/city_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -202,9 +199,7 @@
android:paddingEnd="0dp"
android:text="@string/addresses_city"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/city_input"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/street_address_layout" />
@ -248,13 +243,13 @@
<TextView
android:id="@+id/subregion_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/subregion_drop_down"
app:fontFamily="@font/metropolis_semibold"
android:letterSpacing="0.05"
android:text="@string/addresses_state" />
<androidx.appcompat.widget.AppCompatSpinner
@ -272,6 +267,7 @@
<!-- Zip -->
<TextView
android:id="@+id/zip_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -281,9 +277,7 @@
android:paddingEnd="0dp"
android:text="@string/addresses_zip"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/zip_input"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="@+id/zip_layout"
app:layout_constraintTop_toBottomOf="@+id/subregion_layout" />
@ -328,13 +322,13 @@
app:layout_constraintBottom_toTopOf="@id/phone_title">
<TextView
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/country_drop_down"
app:fontFamily="@font/metropolis_semibold"
android:letterSpacing="0.05"
android:text="@string/addresses_country" />
<androidx.appcompat.widget.AppCompatSpinner
@ -352,6 +346,7 @@
<!-- Phone -->
<TextView
android:id="@+id/phone_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -361,9 +356,7 @@
android:paddingEnd="0dp"
android:text="@string/addresses_phone"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/phone_input"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/country_layout" />
@ -396,6 +389,7 @@
<!-- Email -->
<TextView
android:id="@+id/email_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -405,9 +399,7 @@
android:paddingEnd="0dp"
android:text="@string/addresses_email"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/city_input"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/phone_layout" />
@ -449,7 +441,6 @@
android:textAllCaps="false"
android:textColor="@color/fx_mobile_text_color_warning"
android:visibility="gone"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintTop_toBottomOf="@+id/email_layout"
app:layout_constraintStart_toStartOf="parent" />
@ -465,7 +456,6 @@
android:textAllCaps="false"
android:textColor="?attr/textPrimary"
android:textStyle="bold"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintTop_toBottomOf="@+id/email_layout"
app:layout_constraintEnd_toStartOf="@id/save_button" />

17
app/src/main/res/layout/fragment_credit_card_editor.xml
View File

@ -17,6 +17,7 @@
<!-- Card Number -->
<TextView
android:id="@+id/card_number_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -25,9 +26,7 @@
android:paddingEnd="0dp"
android:text="@string/credit_cards_card_number"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/card_number_input"
app:fontFamily="@font/metropolis_semibold" />
android:labelFor="@id/card_number_input" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/card_number_layout"
@ -58,6 +57,7 @@
<!-- Name on Card -->
<TextView
android:id="@+id/name_on_card_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -67,9 +67,7 @@
android:paddingEnd="0dp"
android:text="@string/credit_cards_name_on_card"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:labelFor="@id/name_on_card_input"
app:fontFamily="@font/metropolis_semibold" />
android:labelFor="@id/name_on_card_input" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/name_on_card_layout"
@ -98,6 +96,7 @@
<!-- Expiration Date -->
<TextView
android:id="@+id/expiration_date_title"
style="@style/CaptionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -106,9 +105,7 @@
android:paddingStart="3dp"
android:paddingEnd="0dp"
android:text="@string/credit_cards_expiration_date"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold" />
android:textColor="?attr/textPrimary" />
<LinearLayout
android:layout_width="match_parent"
@ -184,7 +181,6 @@
android:textAllCaps="false"
android:textColor="@color/fx_mobile_text_color_warning"
android:visibility="gone"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@ -199,7 +195,6 @@
android:textAllCaps="false"
android:textColor="?attr/textPrimary"
android:textStyle="bold"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_button" />

9
app/src/main/res/layout/fragment_edit_login.xml
View File

@ -18,6 +18,7 @@
<TextView
android:id="@+id/hostnameHeaderText"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="3dp"
@ -25,9 +26,7 @@
android:gravity="center_vertical"
android:text="@string/preferences_passwords_saved_logins_site"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:letterSpacing="0.05"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -75,6 +74,7 @@
<TextView
android:id="@+id/usernameHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="16dp"
android:gravity="center_vertical"
@ -83,9 +83,7 @@
android:layout_marginTop="20dp"
android:text="@string/preferences_passwords_saved_logins_username"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:letterSpacing="0.05"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/inputLayoutUsername"
app:layout_constraintEnd_toStartOf="@id/clearUsernameTextButton"
app:layout_constraintStart_toStartOf="parent"
@ -145,6 +143,7 @@
<TextView
android:id="@+id/passwordHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
@ -152,10 +151,8 @@
android:paddingEnd="0dp"
android:text="@string/preferences_passwords_saved_logins_password"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
android:layout_marginTop="10dp"
android:letterSpacing="0.05"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/inputLayoutPassword"
app:layout_constraintEnd_toStartOf="@id/revealPasswordButton"
app:layout_constraintStart_toStartOf="parent"

9
app/src/main/res/layout/fragment_login_detail.xml
View File

@ -14,6 +14,7 @@
<TextView
android:id="@+id/webAddressHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="24dp"
android:gravity="center_vertical"
@ -21,8 +22,6 @@
android:paddingBottom="5dp"
android:text="@string/preferences_passwords_saved_logins_site"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/webAddressText"
app:layout_constraintEnd_toStartOf="@id/openWebAddress"
app:layout_constraintStart_toStartOf="parent"
@ -58,6 +57,7 @@
<TextView
android:id="@+id/usernameHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_marginTop="16dp"
@ -65,8 +65,6 @@
android:letterSpacing="0.05"
android:text="@string/preferences_passwords_saved_logins_username"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/usernameText"
app:layout_constraintEnd_toStartOf="@id/copyUsername"
app:layout_constraintStart_toStartOf="parent"
@ -104,6 +102,7 @@
<TextView
android:id="@+id/passwordHeader"
style="@style/CaptionTextStyle"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
@ -111,8 +110,6 @@
android:letterSpacing="0.05"
android:text="@string/preferences_passwords_saved_logins_password"
android:textColor="?attr/textPrimary"
android:textSize="12sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toTopOf="@id/passwordText"
app:layout_constraintEnd_toStartOf="@id/revealPasswordButton"
app:layout_constraintStart_toStartOf="parent"

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

@ -82,7 +82,6 @@
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/metropolis_semibold"
android:letterSpacing="0"
android:text="@string/add_to_homescreen_continue"
android:textAllCaps="false"

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

@ -35,7 +35,6 @@
android:textAllCaps="false"
android:textColor="?attr/textPrimary"
android:textStyle="bold"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/signOutDisconnect"
app:layout_constraintTop_toBottomOf="@id/sign_out_message" />

2
app/src/main/res/layout/fragment_tracking_protection_blocking.xml
View File

@ -14,7 +14,7 @@
<TextView
android:id="@+id/details_blocking_header"
style="@style/QuickSettingsText"
android:fontFamily="@font/metropolis_bold"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="@dimen/tracking_protection_item_height"
android:layout_marginStart="@dimen/top_bar_alignment_margin_start"

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

@ -18,13 +18,11 @@
<TextView
android:id="@+id/header_title"
style="@style/Header16TextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/metropolis_semibold"
android:textColor="?attr/textPrimary"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/chevron"
app:layout_constraintHorizontal_bias="0"

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

@ -4,6 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
@ -31,14 +32,13 @@
<TextView
android:id="@+id/header_title"
style="@style/Header14TextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="@font/metropolis_semibold"
android:layout_marginStart="16dp"
android:layout_marginEnd="0dp"
android:textColor="?attr/textPrimary"
android:textSize="14sp"
android:visibility="gone"
tools:text="Header" />

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

@ -21,7 +21,6 @@
android:text="@string/collections_header"
android:textAppearance="@style/HeaderTextStyle"
android:textSize="16sp"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintEnd_toStartOf="@id/remove_collection_placeholder"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"

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

@ -24,6 +24,7 @@
<TextView
android:id="@+id/cfr_message"
style="@style/Header16TextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -32,8 +33,6 @@
android:lineSpacingExtra="2dp"
android:text="@string/cfr_message"
android:textColor="@color/fx_mobile_text_color_oncolor_primary"
android:textSize="16sp"
app:fontFamily="@font/metropolis_medium"
app:layout_constraintBottom_toTopOf="@id/cfr_pos_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -41,7 +40,7 @@
<Button
android:id="@+id/cfr_pos_button"
style="@style/MetropolisButton"
style="@style/NeutralButton"
android:layout_width="0dp"
android:layout_height="36dp"
android:layout_marginStart="16dp"
@ -59,7 +58,7 @@
<Button
android:id="@+id/cfr_neg_button"
style="@style/MetropolisButton"
style="@style/NeutralButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"

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

@ -89,7 +89,6 @@
android:id="@+id/dismiss"
android:layout_width="0dp"
android:layout_height="48dp"
android:fontFamily="@font/metropolis_semibold"
android:gravity="center_vertical"
android:letterSpacing="0"
android:paddingHorizontal="20dp"

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

@ -24,7 +24,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/section_header_height"
android:gravity="start|center_vertical"
app:fontFamily="@font/metropolis_semibold"
android:textColor="?preferenceSectionHeader"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"

8
app/src/main/res/values/integers.xml Normal file
View File

@ -0,0 +1,8 @@
<?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/. -->
<resources>
<!-- Font weights -->
<integer name="font_weight_medium">500</integer>
</resources>

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

@ -191,14 +191,15 @@
<style name="DialogButtonStyleLight" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
<item name="android:textColor">?accentBright</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="DialogButtonStyleDark" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
<item name="android:textColor">?accentHighContrast</item>
<item name="fontFamily">@font/metropolis_semibold</item>
</style>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item> </style>
<style name="DialogStyleNormal" parent="DialogStyleLight"/>
@ -352,7 +353,8 @@
<item name="android:textColor">@color/fx_mobile_text_color_action_secondary</item>
<item name="rippleColor">?attr/textSecondary</item>
<item name="android:letterSpacing">0</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<!-- Ideally we should consolidate this with NeutralButton in the future -->
@ -414,25 +416,29 @@
<style name="HeaderTextStyle" parent="TextAppearance.MaterialComponents.Subtitle1">
<item name="android:textSize">18sp</item>
<item name="android:textColor">?attr/textPrimary</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="Header20TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?attr/textPrimary</item>
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?attr/textPrimary</item>
<item name="android:textSize">16sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="Header14TextStyle" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:textColor">?attr/textPrimary</item>
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="Body14TextStyle" parent="TextAppearance.MaterialComponents.Body2">
@ -452,19 +458,26 @@
<style name="Button14TextStyle" parent="TextAppearance.MaterialComponents.Button" tools:ignore="UnusedResources">
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/metropolis</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="Subtitle12TextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textColor">?attr/textSecondary</item>
<item name="android:textSize">12sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="CaptionTextStyle" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textSize">12sp</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="ToolbarTitleTextStyle" parent="HeaderTextStyle">
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="ListItemTextStyle" parent="TextAppearance.MaterialComponents.Subtitle1">
@ -543,10 +556,6 @@
<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>
@ -561,7 +570,8 @@
<item name="android:minHeight">40dp</item>
<item name="android:layout_marginTop">32dp</item>
<item name="android:textColor">?accentUsedOnDarkBackground</item>
<item name="android:fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="ShareHeaderTextStyle">
@ -570,7 +580,8 @@
<item name="android:textColor">?attr/textSecondary</item>
<item name="android:textSize">@dimen/share_header_text_size</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="ShareDialogStyle" parent="DialogStyleBase"/>
@ -593,7 +604,8 @@
<style name="PreferenceSectionHeader" parent="@android:style/Widget.ListView">
<item name="android:textColor">?preferenceSectionHeader</item>
<item name="fontFamily">@font/metropolis_semibold</item>
<item name="android:textFontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
<item name="android:fontWeight" tools:ignore="NewApi">@integer/font_weight_medium</item>
</style>
<style name="EngineTextField" parent="TextAppearance.AppCompat">