From 705567651fa21bb8d3a553cf17d52899ffbb58d3 Mon Sep 17 00:00:00 2001
From: "codrut.topliceanu" <codrut.topliceanu@softvision.ro>
Date: Thu, 30 Jan 2020 10:36:47 +0200
Subject: [PATCH] For #7978 - Remove ScrollView from migration activity.

---
 .../migration/MigrationProgressActivity.kt    |   2 +-
 .../res/drawable/button_background_grey.xml   |   9 +
 .../main/res/layout/activity_migration.xml    | 192 +++++++++---------
 app/src/main/res/values/dimens.xml            |   7 +
 4 files changed, 118 insertions(+), 92 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_background_grey.xml

diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
index b5f24aaa7..d93373614 100644
--- a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
@@ -75,7 +75,7 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
         migration_button.apply {
             isEnabled = true
             text = getString(R.string.migration_update_app_button, getString(R.string.app_name))
-            setBackgroundColor(ContextCompat.getColor(context, R.color.button_text_color))
+            setBackgroundResource(R.drawable.button_background)
             setTextColor(ContextCompat.getColor(context, R.color.white_color))
         }
         migration_button_progress_bar.visibility = View.INVISIBLE
diff --git a/app/src/main/res/drawable/button_background_grey.xml b/app/src/main/res/drawable/button_background_grey.xml
new file mode 100644
index 000000000..6dcdce8a8
--- /dev/null
+++ b/app/src/main/res/drawable/button_background_grey.xml
@@ -0,0 +1,9 @@
+<?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/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="4dp"/>
+    <solid android:color="@color/grey_button_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_migration.xml b/app/src/main/res/layout/activity_migration.xml
index f2a4fb2e0..d30c130a5 100644
--- a/app/src/main/res/layout/activity_migration.xml
+++ b/app/src/main/res/layout/activity_migration.xml
@@ -1,105 +1,115 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?><!-- 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/. -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:background="@color/white_color">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:background="@color/white_color"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="20dp"
-            android:paddingTop="55dp"
-            android:paddingEnd="20dp"
-            android:paddingBottom="67dp">
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/migration_firefox_logo"
+        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:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="@+id/migration_welcome_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/migration_welcome_title"
+        app:srcCompat="@drawable/ic_firefox" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/migration_firefox_logo"
-                android:layout_width="67dp"
-                android:layout_height="67dp"
-                android:importantForAccessibility="no"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_firefox" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/migration_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/migration_margin_horizontal_large"
+        android:layout_marginTop="@dimen/migration_margin_vertical"
+        android:layout_marginEnd="@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"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_vertical_center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/migration_welcome_title" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/migration_welcome_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:maxLines="2"
-                android:text="@string/migration_title"
-                android:fontFamily="sans-serif-medium"
-                android:textColor="@color/button_text_color"
-                android:textStyle="bold"
-                android:textSize="20sp"
-                app:layout_constraintBottom_toTopOf="@+id/migration_description"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/migration_firefox_logo"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Welcome to the all-new Firefox Preview" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/migration_welcome_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="@dimen/migration_margin_vertical_small"
+        android:layout_marginEnd="@dimen/migration_margin_horizontal_large"
+        android:fontFamily="sans-serif-medium"
+        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_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/migration_firefox_logo"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Welcome to the all-new Firefox Preview" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/migration_description"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:text="@string/migration_description"
-                android:textColor="@color/text_scale_example_text_color"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:fontFamily="sans-serif-light"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/migration_firefox_logo" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/migration_status_list"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/migration_margin_horizontal_large"
+        android:layout_marginTop="@dimen/migration_margin_vertical_small"
+        android:layout_marginEnd="@dimen/migration_margin_horizontal_large"
+        android:layout_marginBottom="@dimen/migration_margin_vertical_small"
+        app:layout_constraintBottom_toTopOf="@+id/migration_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline_vertical_center"
+        tools:itemCount="5"
+        tools:listitem="@layout/migration_list_item" />
 
-        <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/migration_status_list"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toTopOf="@+id/migration_button"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/migration_description"
-                tools:itemCount="5"
-                tools:listitem="@layout/migration_list_item" />
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/migration_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/migration_margin_horizontal_large"
+        android:layout_marginEnd="@dimen/migration_margin_horizontal_large"
+        android:layout_marginBottom="@dimen/migration_margin_vertical"
+        android:background="@drawable/button_background_grey"
+        android:enabled="false"
+        android:minWidth="200dp"
+        android:paddingStart="@dimen/migration_button_padding"
+        android:paddingEnd="@dimen/migration_button_padding"
+        android:text="@string/migration_updating_app_button_text"
+        android:textAllCaps="false"
+        android:textColor="@color/button_text_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="Updating Firefox…" />
 
-        <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/migration_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:enabled="false"
-                android:minWidth="200dp"
-                android:text="@string/migration_updating_app_button_text"
-                android:paddingStart="@dimen/migration_button_padding"
-                android:paddingEnd="@dimen/migration_button_padding"
-                android:textColor="@color/button_text_color"
-                android:textAllCaps="false"
-                android:background="@color/grey_button_color"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:text="Updating Firefox…" />
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_vertical_center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5" />
 
-        <ProgressBar
-                android:id="@+id/migration_button_progress_bar"
-                style="@style/Widget.AppCompat.ProgressBar"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toBottomOf="@+id/migration_button"
-                app:layout_constraintDimensionRatio="h,1:1"
-                app:layout_constraintStart_toStartOf="@+id/migration_button"
-                app:layout_constraintTop_toTopOf="@+id/migration_button" />
+    <ProgressBar
+        android:id="@+id/migration_button_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="@dimen/migration_progress_size"
+        android:layout_height="@dimen/migration_progress_size"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/migration_button"
+        app:layout_constraintStart_toStartOf="@+id/migration_button"
+        app:layout_constraintTop_toTopOf="@+id/migration_button" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3a9166818..8f8d12a30 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -105,5 +105,12 @@
 
     <!--Migration Activity-->
     <dimen name="migration_button_padding">32dp</dimen>
+    <dimen name="migration_margin_horizontal_large">24dp</dimen>
+    <dimen name="migration_margin_vertical">16dp</dimen>
+    <dimen name="migration_margin_vertical_small">8dp</dimen>
+    <dimen name="migration_firefox_logo_size">48dp</dimen>
+    <dimen name="migration_description_text_size">16sp</dimen>
+    <dimen name="migration_welcome_title_text_size">20sp</dimen>
+    <dimen name="migration_progress_size">24dp</dimen>
 
 </resources>