From 2bb1b6edad6286817463cb4ce44050169aa2d0b5 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jalmeida@mozilla.com>
Date: Tue, 14 Apr 2020 19:14:40 -0400
Subject: [PATCH] For #8422: Add misc migration UI fixes

---
 app/src/main/res/layout/activity_migration.xml  | 15 ++++++---------
 app/src/main/res/layout/migration_list_item.xml |  5 ++---
 app/src/main/res/values/dimens.xml              |  5 +++--
 app/src/main/res/values/styles.xml              |  4 ++++
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_migration.xml b/app/src/main/res/layout/activity_migration.xml
index 279973283..e31ad17c9 100644
--- a/app/src/main/res/layout/activity_migration.xml
+++ b/app/src/main/res/layout/activity_migration.xml
@@ -29,6 +29,7 @@
                 android:layout_width="@dimen/migration_firefox_logo_size"
                 android:layout_height="@dimen/migration_firefox_logo_size"
                 android:layout_marginStart="@dimen/migration_margin_horizontal_large"
+                android:fontFamily="@font/metropolis_bold"
                 android:importantForAccessibility="no"
                 app:layout_constraintBottom_toBottomOf="@+id/migration_welcome_title"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -43,12 +44,11 @@
                 android:layout_marginStart="@dimen/migration_margin"
                 android:layout_marginTop="@dimen/migration_margin"
                 android:layout_marginEnd="@dimen/migration_margin_horizontal_large"
-                android:fontFamily="sans-serif-medium"
+                android:fontFamily="@font/metropolis_bold"
                 android:maxLines="2"
                 android:text="@string/migration_title"
                 android:textColor="@color/button_text_color"
                 android:textSize="@dimen/migration_welcome_title_text_size"
-                android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@+id/migration_description"
                 app:layout_constraintLeft_toRightOf="@id/migration_firefox_logo"
                 app:layout_constraintRight_toRightOf="parent"
@@ -62,11 +62,8 @@
                 android:layout_marginLeft="@dimen/migration_margin_horizontal_large"
                 android:layout_marginTop="@dimen/migration_margin"
                 android:layout_marginRight="@dimen/migration_margin_horizontal_large"
-                android:fontFamily="sans-serif-light"
                 android:text="@string/migration_description"
-                android:textColor="@color/text_scale_example_text_color"
-                android:textSize="@dimen/migration_description_text_size"
-                android:textStyle="bold"
+                android:textAppearance="@style/Body16TextStyle"
                 app:layout_constraintBottom_toTopOf="@+id/migration_status_list"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -82,6 +79,7 @@
                 android:nestedScrollingEnabled="false"
                 android:overScrollMode="never"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHorizontal_bias="0.45"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/migration_description"
@@ -119,9 +117,8 @@
             android:layout_marginEnd="@dimen/migration_progress_margin_compound"
             android:background="@android:color/transparent"
             android:text="@string/migration_updating_app_button_text"
-            android:textAllCaps="false"
-            android:textColor="@color/button_text_color"
-            android:textStyle="bold"
+            android:textSize="@dimen/migration_button_text_size"
+            android:textAppearance="@style/ThemeIndependentMaterialGreyButton"
             tools:text="Updating Firefox…" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/migration_list_item.xml b/app/src/main/res/layout/migration_list_item.xml
index 75e797af2..b8c23c6bc 100644
--- a/app/src/main/res/layout/migration_list_item.xml
+++ b/app/src/main/res/layout/migration_list_item.xml
@@ -14,7 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/migration_icon_description"
-            android:tint="@color/collection_icon_color_violet"
+            app:tint="@color/collection_icon_color_violet_light_theme"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/mozac_ic_check"
@@ -26,8 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="32dp"
-            android:textColor="@color/dark_grey_90"
-            android:fontFamily="sans-serif-medium"
+            android:textAppearance="@style/Body16TextStyle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/migration_status_image"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 01e5887ec..505f6164d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -108,11 +108,12 @@
     <dimen name="locale_item_subtitle_size">12sp</dimen>
 
     <!--Migration Activity-->
-    <dimen name="migration_margin_horizontal_large">24dp</dimen>
+    <dimen name="migration_margin_horizontal_large">20dp</dimen>
     <dimen name="migration_margin">16dp</dimen>
     <dimen name="migration_firefox_logo_size">48dp</dimen>
-    <dimen name="migration_description_text_size">16sp</dimen>
+    <dimen name="migration_default_text_size">16sp</dimen>
     <dimen name="migration_welcome_title_text_size">20sp</dimen>
+    <dimen name="migration_button_text_size">14sp</dimen>
     <dimen name="migration_progress_size">24dp</dimen>
     <dimen name="migration_progress_margin">8dp</dimen>
     <dimen name="migration_progress_margin_start">4dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 665902254..c5bc9600f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -306,6 +306,10 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="Body16TextStyle" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="android:textColor">?primaryText</item>
+    </style>
+
     <style name="SubtitleTextStyle" parent="TextAppearance.MaterialComponents.Body1">
         <item name="android:textColor">?secondaryText</item>
         <item name="android:textSize">14sp</item>