blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For issue #11835 - Update text fonts 

Updated the fonts and colors for several texts throughout the application.
master
Mihai Eduard Badea 2020-06-26 12:01:25 +03:00 committed by Emily Kager
parent ed334788e8
commit e0fa1c0db4
9 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/displayName" android:layout_below="@id/displayName"
android:layout_alignStart="@id/displayName" android:layout_alignStart="@id/displayName"
android:textColor="?secondaryText"
android:maxLines="4" android:maxLines="4"
android:text="@string/preferences_account_default_name" android:text="@string/preferences_account_default_name" />
android:textColor="?primaryText"
app:fontFamily="@font/metropolis_bold" />
</RelativeLayout> </RelativeLayout>

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

@ -56,7 +56,7 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:minLines="2" android:minLines="2"
android:textAppearance="@style/SubtitleTextStyle" android:textColor="?secondaryText"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/collection_item" app:layout_constraintEnd_toEndOf="@+id/collection_item"
app:layout_constraintStart_toStartOf="@+id/collection_item" app:layout_constraintStart_toStartOf="@+id/collection_item"

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

@ -47,6 +47,7 @@
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/neutral_text" android:textColor="@color/neutral_text"
android:textSize="16sp" android:textSize="16sp"
android:fontFamily="@font/metropolis_bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@+id/guideline" app:layout_constraintStart_toEndOf="@+id/guideline"
@ -163,7 +164,7 @@
android:text="@string/create_collection_save_to_collection_empty" android:text="@string/create_collection_save_to_collection_empty"
android:textColor="?neutral" android:textColor="?neutral"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_button" app:layout_constraintEnd_toStartOf="@id/save_button"
app:layout_constraintStart_toEndOf="@id/bottom_bar_icon_button" app:layout_constraintStart_toEndOf="@id/bottom_bar_icon_button"
@ -176,7 +177,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save" android:text="@string/create_collection_save"
android:textColor="?neutral" android:textColor="@color/photonWhite"
app:fontFamily="@font/metropolis_medium"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@ -140,6 +140,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:singleLine="true" android:singleLine="true"
android:text="@string/create_collection_add_new_collection" android:text="@string/create_collection_add_new_collection"
android:fontFamily="@font/metropolis"
android:textColor="?neutral" android:textColor="?neutral"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"

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

@ -14,14 +14,14 @@
<TextView <TextView
android:id="@+id/details_blocking_header" android:id="@+id/details_blocking_header"
style="@style/QuickSettingsText" style="@style/QuickSettingsText"
android:fontFamily="@font/metropolis_bold"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/tracking_protection_item_height" android:layout_height="@dimen/tracking_protection_item_height"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:text="@string/enhanced_tracking_protection_blocked" android:text="@string/enhanced_tracking_protection_blocked" />
android:textStyle="bold" />
<org.mozilla.fenix.trackingprotection.TrackingProtectionCategoryItem <org.mozilla.fenix.trackingprotection.TrackingProtectionCategoryItem
android:id="@+id/category_social_media" android:id="@+id/category_social_media"

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

@ -20,8 +20,9 @@
android:id="@+id/header_title" android:id="@+id/header_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="17sp" android:textSize="14sp"
android:textColor="?primaryText" android:textColor="?primaryText"
android:fontFamily="@font/metropolis_semibold"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"

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

@ -30,10 +30,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:text="@string/no_collections_description1" android:text="@string/no_collections_description1"
android:textColor="?primaryText"
android:textSize="14sp" android:textSize="14sp"
android:textAlignment="viewStart" android:textAlignment="viewStart" />
app:fontFamily="@font/metropolis_medium" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/add_tabs_to_collections_button" android:id="@+id/add_tabs_to_collections_button"

2
app/src/main/res/values/dimens.xml
View File

@ -79,7 +79,7 @@
<dimen name="search_fragment_clipboard_item_horizontal_margin">12dp</dimen> <dimen name="search_fragment_clipboard_item_horizontal_margin">12dp</dimen>
<dimen name="search_fragment_clipboard_item_vertical_margin">8dp</dimen> <dimen name="search_fragment_clipboard_item_vertical_margin">8dp</dimen>
<dimen name="search_fragment_clipboard_item_title_margin_start">8dp</dimen> <dimen name="search_fragment_clipboard_item_title_margin_start">8dp</dimen>
<dimen name="search_fragment_shortcuts_label_margin_horizontal">8dp</dimen> <dimen name="search_fragment_shortcuts_label_margin_horizontal">18dp</dimen>
<dimen name="search_fragment_shortcuts_label_margin_vertical">18dp</dimen> <dimen name="search_fragment_shortcuts_label_margin_vertical">18dp</dimen>
<dimen name="search_fragment_pill_height">40dp</dimen> <dimen name="search_fragment_pill_height">40dp</dimen>
<dimen name="search_fragment_pill_padding_start">20dp</dimen> <dimen name="search_fragment_pill_padding_start">20dp</dimen>

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

@ -450,7 +450,7 @@
</style> </style>
<style name="SearchShortcutsLabelStyle"> <style name="SearchShortcutsLabelStyle">
<item name="android:fontFamily">Inter UI</item> <item name="android:fontFamily">@font/metropolis_semibold</item>
<item name="android:letterSpacing">0.15</item> <item name="android:letterSpacing">0.15</item>
<item name="android:textAllCaps">true</item> <item name="android:textAllCaps">true</item>
<item name="android:textColor">?secondaryText</item> <item name="android:textColor">?secondaryText</item>
@ -485,6 +485,7 @@
<item name="android:minHeight">40dp</item> <item name="android:minHeight">40dp</item>
<item name="android:layout_marginTop">32dp</item> <item name="android:layout_marginTop">32dp</item>
<item name="android:textColor">?accentUsedOnDarkBackground</item> <item name="android:textColor">?accentUsedOnDarkBackground</item>
<item name="android:fontFamily">@font/metropolis_semibold</item>
</style> </style>
<style name="ShareHeaderTextStyle"> <style name="ShareHeaderTextStyle">