From 4457f7fa3fa93fc2b2a298e7609d975aa2092751 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 14 Jan 2019 17:45:24 +0000
Subject: [PATCH] Improved setup layout

---
 .../res/drawable/baseline_fast_forward_24.xml |  10 +
 .../main/res/drawable/baseline_looks_3_24.xml |  10 +
 .../main/res/drawable/baseline_looks_4_24.xml |  10 +
 .../main/res/drawable/baseline_looks_5_24.xml |  10 +
 .../main/res/drawable/baseline_looks_6_24.xml |  10 +
 .../res/drawable/baseline_looks_one_24.xml    |  10 +
 .../res/drawable/baseline_looks_two_24.xml    |  10 +
 app/src/main/res/layout/fragment_setup.xml    | 217 ++++++++++++------
 app/src/main/res/values/strings.xml           |  10 +-
 9 files changed, 224 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_fast_forward_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_3_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_4_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_5_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_6_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_one_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_looks_two_24.xml

diff --git a/app/src/main/res/drawable/baseline_fast_forward_24.xml b/app/src/main/res/drawable/baseline_fast_forward_24.xml
new file mode 100644
index 0000000000..b0b9aeca6d
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_fast_forward_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_3_24.xml b/app/src/main/res/drawable/baseline_looks_3_24.xml
new file mode 100644
index 0000000000..2f5c067c5c
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_3_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.01,3h-14c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21.01,5c0,-1.1 -0.9,-2 -2,-2zM15.01,10.5c0,0.83 -0.67,1.5 -1.5,1.5 0.83,0 1.5,0.67 1.5,1.5L15.01,15c0,1.11 -0.9,2 -2,2h-4v-2h4v-2h-2v-2h2L13.01,9h-4L9.01,7h4c1.1,0 2,0.89 2,2v1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_4_24.xml b/app/src/main/res/drawable/baseline_looks_4_24.xml
new file mode 100644
index 0000000000..9241e4ef66
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_4_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,17h-2v-4L9,13L9,7h2v4h2L13,7h2v10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_5_24.xml b/app/src/main/res/drawable/baseline_looks_5_24.xml
new file mode 100644
index 0000000000..6a6692617c
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_5_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h2c1.1,0 2,0.89 2,2v2c0,1.11 -0.9,2 -2,2L9,17v-2h4v-2L9,13L9,7h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_6_24.xml b/app/src/main/res/drawable/baseline_looks_6_24.xml
new file mode 100644
index 0000000000..2a8028b4c2
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_6_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,15h2v-2h-2v2zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h2c1.1,0 2,0.89 2,2v2c0,1.11 -0.9,2 -2,2h-2c-1.1,0 -2,-0.89 -2,-2L9,9c0,-1.11 0.9,-2 2,-2h4v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_one_24.xml b/app/src/main/res/drawable/baseline_looks_one_24.xml
new file mode 100644
index 0000000000..28c85725b7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_one_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17h-2L12,9h-2L10,7h4v10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_looks_two_24.xml b/app/src/main/res/drawable/baseline_looks_two_24.xml
new file mode 100644
index 0000000000..2ed25cc986
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_looks_two_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,11c0,1.11 -0.9,2 -2,2h-2v2h4v2L9,17v-4c0,-1.11 0.9,-2 2,-2h2L13,9L9,9L9,7h4c1.1,0 2,0.89 2,2v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 2762b98882..97e37e6312 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -12,86 +12,120 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <Button
-            android:id="@+id/btnQuick"
+        <ImageView
+            android:id="@+id/fast"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/baseline_fast_forward_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
             android:text="@string/title_setup_quick"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/fast"
+            app:layout_constraintStart_toEndOf="@id/fast" />
 
         <TextView
-            android:id="@+id/tvQuickRemark"
+            android:id="@+id/tvQuick"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="6dp"
             android:text="@string/title_setup_quick_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
+            app:layout_constraintTop_toBottomOf="@id/fast" />
+
+        <Button
+            android:id="@+id/btnQuick"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_go"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvQuick" />
+
+        <!-- account -->
 
         <View
-            android:id="@+id/vSeparatorQuick"
+            android:id="@+id/vSeparatorAccount"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="12dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvQuickRemark" />
+            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
 
-        <!-- account -->
+        <ImageView
+            android:id="@+id/one"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_looks_one_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
 
-        <Button
-            android:id="@+id/btnAccount"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginStart="6dp"
             android:text="@string/title_setup_account"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorQuick" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/one"
+            app:layout_constraintStart_toEndOf="@id/one" />
 
         <TextView
             android:id="@+id/tvAccount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="6dp"
             android:text="@string/title_setup_account_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnAccount" />
+            app:layout_constraintTop_toBottomOf="@id/one" />
 
         <TextView
             android:id="@+id/tvAccountDone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:drawableStart="@drawable/baseline_check_24"
-            android:gravity="center_horizontal"
             android:text="@string/title_setup_done"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
+        <Button
+            android:id="@+id/btnAccount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_manage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAccountDone" />
+
         <TextView
             android:id="@+id/tvNoPrimaryDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="12dp"
             android:text="@string/title_no_primary_drafts"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
             android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAccountDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnAccount" />
+
+        <!-- identity -->
 
         <View
-            android:id="@+id/vSeparatorAccount"
+            android:id="@+id/vSeparatorIdentity"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="12dp"
@@ -99,133 +133,179 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNoPrimaryDrafts" />
 
-        <!-- identity -->
+        <ImageView
+            android:id="@+id/two"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_looks_two_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
 
-        <Button
-            android:id="@+id/btnIdentity"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginStart="6dp"
             android:text="@string/title_setup_identity"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/two"
+            app:layout_constraintStart_toEndOf="@id/two" />
 
         <TextView
             android:id="@+id/tvIdentity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="6dp"
             android:text="@string/title_setup_identity_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
+            app:layout_constraintTop_toBottomOf="@id/two" />
 
         <TextView
             android:id="@+id/tvIdentityDone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:drawableStart="@drawable/baseline_check_24"
-            android:gravity="center_horizontal"
             android:text="@string/title_setup_done"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
+        <Button
+            android:id="@+id/btnIdentity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_manage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvIdentityDone" />
+
+        <!-- permissions -->
+
         <View
-            android:id="@+id/vSeparatorIdentity"
+            android:id="@+id/vSeparatorPermissions"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="12dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentityDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
 
-        <!-- permissions -->
+        <ImageView
+            android:id="@+id/three"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_looks_3_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions" />
 
-        <Button
-            android:id="@+id/btnPermissions"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:enabled="false"
+            android:layout_marginStart="6dp"
             android:text="@string/title_setup_permissions"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/three"
+            app:layout_constraintStart_toEndOf="@id/three" />
 
         <TextView
             android:id="@+id/tvPermissions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="6dp"
             android:text="@string/title_setup_permissions_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnPermissions" />
+            app:layout_constraintTop_toBottomOf="@id/three" />
 
         <TextView
             android:id="@+id/tvPermissionsDone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:drawableStart="@drawable/baseline_check_24"
-            android:gravity="center_horizontal"
             android:text="@string/title_setup_done"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvPermissions" />
 
+        <Button
+            android:id="@+id/btnPermissions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_manage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvPermissionsDone" />
+
+        <!-- doze -->
+
         <View
-            android:id="@+id/vSeparatorPermissions"
+            android:id="@+id/vSeparatorDoze"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="12dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvPermissionsDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnPermissions" />
 
-        <!-- doze -->
+        <ImageView
+            android:id="@+id/four"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:src="@drawable/baseline_looks_4_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorDoze" />
 
-        <Button
-            android:id="@+id/btnDoze"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_setup_doze"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/four"
+            app:layout_constraintStart_toEndOf="@id/four" />
 
         <TextView
             android:id="@+id/tvDoze"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="6dp"
             android:text="@string/title_setup_doze_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnDoze" />
+            app:layout_constraintTop_toBottomOf="@id/four" />
 
         <TextView
             android:id="@+id/tvDozeDone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:drawableStart="@drawable/baseline_check_24"
-            android:gravity="center_horizontal"
             android:text="@string/title_setup_done"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDoze" />
 
+        <Button
+            android:id="@+id/btnDoze"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_manage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvDozeDone" />
+
         <!-- data saver -->
 
         <Button
@@ -237,8 +317,7 @@
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/title_setup_data"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDozeDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnDoze" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 383838f7e6..0e0dd3c98d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,17 +88,19 @@
     <string name="title_setup_imported">Settings imported</string>
     <string name="title_setup_quick">Quick config</string>
     <string name="title_setup_quick_remark">Quick config can be used for most major providers</string>
+    <string name="title_setup_go">Go</string>
     <string name="title_setup_setting_gmail">Enable access for "less secure" apps</string>
     <string name="title_setup_no_settings">No settings found for \'%1$s\'</string>
     <string name="title_setup_quick_success">An account and an identity have successfully been added</string>
     <string name="title_setup_quick_failed">You can try to configure an account and an identity below too</string>
-    <string name="title_setup_account">Manage accounts</string>
+    <string name="title_setup_manage">Manage</string>
+    <string name="title_setup_account">Setup accounts</string>
     <string name="title_setup_account_remark">To receive email</string>
-    <string name="title_setup_identity">Manage identities</string>
+    <string name="title_setup_identity">Setup identities</string>
     <string name="title_setup_identity_remark">To send email</string>
-    <string name="title_setup_permissions">Grant permissions</string>
+    <string name="title_setup_permissions">Setup permissions</string>
     <string name="title_setup_permissions_remark">To access contact information (optional)</string>
-    <string name="title_setup_doze">Disable battery optimizations</string>
+    <string name="title_setup_doze">Setup battery optimizations</string>
     <string name="title_setup_doze_remark">To continuously receive email (optional)</string>
     <string name="title_setup_doze_instructions">In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\"</string>
     <string name="title_setup_data">Disable data saving</string>