From 79e5e6fc5371c71367a43f205643aa7285978cc8 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 18 May 2020 10:47:28 +1000
Subject: [PATCH] Fix blocking UI issues

---
 res/layout-sw400dp/view_seed_reminder.xml     | 75 +++++++++++++++++++
 .../fragment_enter_session_id.xml             |  0
 res/layout/activity_display_name.xml          |  4 +-
 res/layout/activity_register.xml              |  4 +-
 res/layout/activity_restore.xml               |  4 +-
 res/layout/activity_seed.xml                  | 12 +--
 res/layout/fragment_enter_session_id.xml      |  4 +-
 res/layout/view_seed_reminder.xml             | 13 ++--
 8 files changed, 97 insertions(+), 19 deletions(-)
 create mode 100644 res/layout-sw400dp/view_seed_reminder.xml
 rename res/{layout-sw400dp => layout-sw420dp}/fragment_enter_session_id.xml (100%)

diff --git a/res/layout-sw400dp/view_seed_reminder.xml b/res/layout-sw400dp/view_seed_reminder.xml
new file mode 100644
index 0000000000..aa28fcb565
--- /dev/null
+++ b/res/layout-sw400dp/view_seed_reminder.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/cell_background"
+    android:orientation="vertical">
+
+    <ProgressBar
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/accent_line_thickness"
+        android:paddingLeft="-2dp"
+        android:paddingRight="-2dp"
+        android:progressTint="@color/accent"
+        android:progressBackgroundTint="@color/progress_bar_background"
+        android:progress="80" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:padding="@dimen/medium_spacing"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/titleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text"
+                android:textSize="@dimen/small_font_size"
+                android:textStyle="bold"
+                android:text="You're almost finished! 80%" />
+
+            <TextView
+                android:id="@+id/subtitleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_small_font_size"
+                android:alpha="0.6"
+                android:text="Secure your account by saving your recovery phrase" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="4dp" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            android:layout_marginLeft="4dp"
+            android:textStyle="normal"
+            android:text="Continue" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/separator" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/fragment_enter_session_id.xml b/res/layout-sw420dp/fragment_enter_session_id.xml
similarity index 100%
rename from res/layout-sw400dp/fragment_enter_session_id.xml
rename to res/layout-sw420dp/fragment_enter_session_id.xml
diff --git a/res/layout/activity_display_name.xml b/res/layout/activity_display_name.xml
index 443f6c23e0..0c501e8343 100644
--- a/res/layout/activity_display_name.xml
+++ b/res/layout/activity_display_name.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:hint="Enter a display name" />
 
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
index 636ab61f0c..da4da09770 100644
--- a/res/layout/activity_register.xml
+++ b/res/layout/activity_register.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:textSize="18dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
index 70749c5186..08e6a3f341 100644
--- a/res/layout/activity_restore.xml
+++ b/res/layout/activity_restore.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:hint="Enter your recovery phrase" />
 
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index 6ec63ecfc0..db9e3df0d3 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/large_font_size"
+        android:textSize="19sp"
         android:textStyle="bold"
         android:textColor="@color/text"
         android:text="Meet your recovery phrase" />
@@ -31,9 +31,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
+        android:textSize="14sp"
         android:textColor="@color/text"
         android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
 
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:gravity="center"
         android:textSize="@dimen/medium_font_size"
@@ -54,9 +54,9 @@
         android:id="@+id/revealButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="6dp"
         android:textAlignment="center"
-        android:textSize="@dimen/medium_font_size"
+        android:textSize="14sp"
         android:textColor="@color/text"
         android:alpha="0.6"
         android:text="Hold to reveal" />
diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
index a73792e17f..be341a2e7e 100644
--- a/res/layout/fragment_enter_session_id.xml
+++ b/res/layout/fragment_enter_session_id.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="4dp"
         android:layout_marginRight="@dimen/large_spacing"
         android:textSize="14sp"
         android:textColor="@color/text"
@@ -38,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/large_spacing"
         android:hint="Enter your session ID" />
 
diff --git a/res/layout/view_seed_reminder.xml b/res/layout/view_seed_reminder.xml
index 7ea49de182..362e25b32c 100644
--- a/res/layout/view_seed_reminder.xml
+++ b/res/layout/view_seed_reminder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/cell_background"
@@ -39,11 +40,12 @@
 
             <TextView
                 android:id="@+id/subtitleTextView"
-                android:layout_width="wrap_content"
+                android:layout_width="224dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:textColor="@color/text"
                 android:textSize="@dimen/very_small_font_size"
+                android:lines="2"
                 android:alpha="0.6"
                 android:text="Secure your account by saving your recovery phrase" />
 
@@ -52,14 +54,15 @@
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:layout_marginLeft="4dp" />
 
         <Button
             style="@style/MediumProminentOutlineButton"
             android:id="@+id/button"
             android:layout_width="wrap_content"
-            android:layout_height="27dp"
-            android:layout_marginLeft="@dimen/small_spacing"
+            android:layout_height="28dp"
+            android:layout_marginLeft="4dp"
             android:textStyle="normal"
             android:text="Continue" />