From e0fa1c0db4ff806c991b13906ef6a30ba4d6054d Mon Sep 17 00:00:00 2001
From: Mihai Eduard Badea <mihai.badea@softvision.ro>
Date: Fri, 26 Jun 2020 12:01:25 +0300
Subject: [PATCH] For issue #11835 - Update text fonts

Updated the fonts and colors for several texts throughout the application.
---
 app/src/main/res/layout/account_preference.xml              | 5 ++---
 app/src/main/res/layout/collections_list_item.xml           | 2 +-
 app/src/main/res/layout/component_collection_creation.xml   | 6 ++++--
 .../component_collection_creation_select_collection.xml     | 1 +
 .../res/layout/fragment_tracking_protection_blocking.xml    | 4 ++--
 app/src/main/res/layout/history_list_item.xml               | 3 ++-
 app/src/main/res/layout/no_collections_message.xml          | 4 +---
 app/src/main/res/values/dimens.xml                          | 2 +-
 app/src/main/res/values/styles.xml                          | 3 ++-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/account_preference.xml b/app/src/main/res/layout/account_preference.xml
index d125df395..1a6f0af47 100644
--- a/app/src/main/res/layout/account_preference.xml
+++ b/app/src/main/res/layout/account_preference.xml
@@ -46,10 +46,9 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/displayName"
             android:layout_alignStart="@id/displayName"
+            android:textColor="?secondaryText"
             android:maxLines="4"
-            android:text="@string/preferences_account_default_name"
-            android:textColor="?primaryText"
-            app:fontFamily="@font/metropolis_bold" />
+            android:text="@string/preferences_account_default_name" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/collections_list_item.xml b/app/src/main/res/layout/collections_list_item.xml
index ccf81e587..99fb2b038 100644
--- a/app/src/main/res/layout/collections_list_item.xml
+++ b/app/src/main/res/layout/collections_list_item.xml
@@ -56,7 +56,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:minLines="2"
-            android:textAppearance="@style/SubtitleTextStyle"
+            android:textColor="?secondaryText"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/collection_item"
             app:layout_constraintStart_toStartOf="@+id/collection_item"
diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index 10d9e3cb6..88e156ef4 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -47,6 +47,7 @@
         android:textAllCaps="false"
         android:textColor="@color/neutral_text"
         android:textSize="16sp"
+        android:fontFamily="@font/metropolis_bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1"
         app:layout_constraintStart_toEndOf="@+id/guideline"
@@ -163,7 +164,7 @@
             android:text="@string/create_collection_save_to_collection_empty"
             android:textColor="?neutral"
             android:textSize="16sp"
-            android:textStyle="bold"
+            android:fontFamily="@font/metropolis_semibold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/save_button"
             app:layout_constraintStart_toEndOf="@id/bottom_bar_icon_button"
@@ -176,7 +177,8 @@
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackground"
             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_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index 5e396d4a2..f08e5937b 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -140,6 +140,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="@string/create_collection_add_new_collection"
+            android:fontFamily="@font/metropolis"
             android:textColor="?neutral"
             android:textSize="16sp"
             android:textStyle="bold"
diff --git a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
index 0fe88a045..cf63025bb 100644
--- a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
+++ b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
@@ -14,14 +14,14 @@
         <TextView
             android:id="@+id/details_blocking_header"
             style="@style/QuickSettingsText"
+            android:fontFamily="@font/metropolis_bold"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tracking_protection_item_height"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:paddingStart="0dp"
             android:paddingEnd="0dp"
-            android:text="@string/enhanced_tracking_protection_blocked"
-            android:textStyle="bold" />
+            android:text="@string/enhanced_tracking_protection_blocked" />
 
         <org.mozilla.fenix.trackingprotection.TrackingProtectionCategoryItem
             android:id="@+id/category_social_media"
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
index 98d17de8a..a40877e72 100644
--- a/app/src/main/res/layout/history_list_item.xml
+++ b/app/src/main/res/layout/history_list_item.xml
@@ -20,8 +20,9 @@
             android:id="@+id/header_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="17sp"
+            android:textSize="14sp"
             android:textColor="?primaryText"
+            android:fontFamily="@font/metropolis_semibold"
             android:paddingStart="20dp"
             android:paddingEnd="0dp"
             android:layout_marginBottom="8dp"
diff --git a/app/src/main/res/layout/no_collections_message.xml b/app/src/main/res/layout/no_collections_message.xml
index 335bb1637..a37d36062 100644
--- a/app/src/main/res/layout/no_collections_message.xml
+++ b/app/src/main/res/layout/no_collections_message.xml
@@ -30,10 +30,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:text="@string/no_collections_description1"
-        android:textColor="?primaryText"
         android:textSize="14sp"
-        android:textAlignment="viewStart"
-        app:fontFamily="@font/metropolis_medium" />
+        android:textAlignment="viewStart" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/add_tabs_to_collections_button"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 08e09bdd2..294a50b4b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -79,7 +79,7 @@
     <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_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_pill_height">40dp</dimen>
     <dimen name="search_fragment_pill_padding_start">20dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 961374f94..e84b80112 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -450,7 +450,7 @@
     </style>
 
     <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:textAllCaps">true</item>
         <item name="android:textColor">?secondaryText</item>
@@ -485,6 +485,7 @@
         <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>
     </style>
 
     <style name="ShareHeaderTextStyle">