From 02bbd3b8bfd70c36bfea33ad85f7e1d705dd990e Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 25 May 2021 11:48:59 +1000
Subject: [PATCH] Clean up onboarding

---
 .../thoughtcrime/securesms/loki/activities/PNModeActivity.kt  | 1 +
 .../res/layout-sw400dp/activity_recovery_phrase_restore.xml   | 4 ++--
 app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml  | 4 ++--
 app/src/main/res/layout/activity_pn_mode.xml                  | 2 +-
 app/src/main/res/layout/activity_recovery_phrase_restore.xml  | 4 ++--
 app/src/main/res/layout/fragment_recovery_phrase.xml          | 4 ++--
 app/src/main/res/values/dimens.xml                            | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
index fe29f58914..5ddc8b9682 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
@@ -43,6 +43,7 @@ class PNModeActivity : BaseActionBarActivity() {
         backgroundPollingOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
         backgroundPollingOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         registerButton.setOnClickListener { register() }
+        toggleFCM()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
index 83bd3e1244..b88592a68c 100644
--- a/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout-sw400dp/activity_recovery_phrase_restore.xml
@@ -35,7 +35,7 @@
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="12dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -43,7 +43,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
diff --git a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
index da017889fe..ee4176b83f 100644
--- a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
@@ -34,7 +34,7 @@
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="12dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +42,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index b7bf6b2332..3e53a88b1c 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -104,7 +104,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginTop="20dp"
             android:layout_marginRight="@dimen/massive_spacing"
             android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
             android:text="@string/continue_2" />
diff --git a/app/src/main/res/layout/activity_recovery_phrase_restore.xml b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
index 47cf545565..188c592e97 100644
--- a/app/src/main/res/layout/activity_recovery_phrase_restore.xml
+++ b/app/src/main/res/layout/activity_recovery_phrase_restore.xml
@@ -35,7 +35,7 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -43,7 +43,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
diff --git a/app/src/main/res/layout/fragment_recovery_phrase.xml b/app/src/main/res/layout/fragment_recovery_phrase.xml
index 9d0986111f..c0cf7bb3b2 100644
--- a/app/src/main/res/layout/fragment_recovery_phrase.xml
+++ b/app/src/main/res/layout/fragment_recovery_phrase.xml
@@ -34,7 +34,7 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
@@ -42,7 +42,7 @@
         android:paddingBottom="0dp"
         android:gravity="center_vertical"
         android:inputType="textMultiLine"
-        android:maxLines="2"
+        android:maxLines="3"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 67565fe6ba..d77fbf56aa 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,7 +7,7 @@
     <dimen name="very_small_font_size">12sp</dimen>
     <dimen name="small_font_size">15sp</dimen>
     <dimen name="medium_font_size">17sp</dimen>
-    <dimen name="large_font_size">22sp</dimen>
+    <dimen name="large_font_size">20sp</dimen>
     <dimen name="very_large_font_size">26sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>