From a3d416daa0616ac5dca6d5ca7d248a498ee7c0f7 Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Wed, 25 Mar 2020 11:36:53 +1100
Subject: [PATCH 1/2] Make multi device instructions clearer

---
 res/layout-sw400dp/fragment_enter_session_id.xml               | 2 +-
 res/layout/dialog_link_device_master_mode.xml                  | 3 +--
 res/layout/dialog_link_device_slave_mode.xml                   | 1 -
 res/layout/fragment_enter_session_id.xml                       | 2 +-
 .../securesms/loki/redesign/activities/LinkDeviceActivity.kt   | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/res/layout-sw400dp/fragment_enter_session_id.xml b/res/layout-sw400dp/fragment_enter_session_id.xml
index 3eb2aff559..8a1ba7a044 100644
--- a/res/layout-sw400dp/fragment_enter_session_id.xml
+++ b/res/layout-sw400dp/fragment_enter_session_id.xml
@@ -30,7 +30,7 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="Enter your Session ID to start the linking process." />
+        android:text="Navigate to &quot;Settings&quot; > &quot;Devices&quot; > &quot;Link a Device&quot; on your other device and then enter your Session ID here to start the linking process." />
 
     <EditText
         style="@style/SessionEditText"
diff --git a/res/layout/dialog_link_device_master_mode.xml b/res/layout/dialog_link_device_master_mode.xml
index 725a11eee7..786385b823 100644
--- a/res/layout/dialog_link_device_master_mode.xml
+++ b/res/layout/dialog_link_device_master_mode.xml
@@ -39,9 +39,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
-        android:text="Open Session on your secondary device and tap &quot;Link to an existing account&quot;"
+        android:text="Download Session on your other device and tap &quot;Link to an existing account&quot; at the bottom of the landing screen. If you have an existing account on your other device already you will have to delete that account first."
         android:textColor="@color/text"
-        android:alpha="0.6"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center" />
 
diff --git a/res/layout/dialog_link_device_slave_mode.xml b/res/layout/dialog_link_device_slave_mode.xml
index ea76c63f7f..afa11f33e2 100644
--- a/res/layout/dialog_link_device_slave_mode.xml
+++ b/res/layout/dialog_link_device_slave_mode.xml
@@ -38,7 +38,6 @@
         android:layout_marginTop="@dimen/large_spacing"
         android:text="Please check that the words below match those shown on your other device."
         android:textColor="@color/text"
-        android:alpha="0.6"
         android:textSize="@dimen/small_font_size"
         android:textAlignment="center" />
 
diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
index 0d713731ef..81f4f8ec44 100644
--- a/res/layout/fragment_enter_session_id.xml
+++ b/res/layout/fragment_enter_session_id.xml
@@ -30,7 +30,7 @@
         android:layout_marginRight="@dimen/large_spacing"
         android:textSize="@dimen/small_font_size"
         android:textColor="@color/text"
-        android:text="Enter your Session ID to start the linking process." />
+        android:text="Navigate to &quot;Settings&quot; > &quot;Devices&quot; > &quot;Link a Device&quot; on your other device and then enter your Session ID here to start the linking process." />
 
     <EditText
         style="@style/SmallSessionEditText"
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
index 9c707948de..6d1b565e51 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
@@ -64,7 +64,7 @@ private class LinkDeviceActivityAdapter(val activity: LinkDeviceActivity) : Frag
             1 -> {
                 val result = ScanQRCodeWrapperFragment()
                 result.delegate = activity
-                result.message = "Link to your existing account by going into your in-app settings and clicking \"Linked Devices\""
+                result.message = "Navigate to \"Settings\" > \"Devices\" > \"Link a Device\" on your other device and then scan the QR code that comes up to start the linking process."
                 result
             }
             else -> throw IllegalStateException()

From aecbfbcc3768bf00859f5a3782202761ed665bc7 Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Wed, 25 Mar 2020 11:46:52 +1100
Subject: [PATCH 2/2] Fix layout on small screens

---
 res/layout/fragment_enter_session_id.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
index 81f4f8ec44..a73792e17f 100644
--- a/res/layout/fragment_enter_session_id.xml
+++ b/res/layout/fragment_enter_session_id.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:textSize="@dimen/large_font_size"
+        android:textSize="19sp"
         android:textStyle="bold"
         android:textColor="@color/text"
         android:text="Link your device" />
@@ -28,7 +28,7 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="6dp"
         android:layout_marginRight="@dimen/large_spacing"
-        android:textSize="@dimen/small_font_size"
+        android:textSize="14sp"
         android:textColor="@color/text"
         android:text="Navigate to &quot;Settings&quot; > &quot;Devices&quot; > &quot;Link a Device&quot; on your other device and then enter your Session ID here to start the linking process." />