Merge pull request #156 from loki-project/multi-device

Make Multi Device Instructions Clearer

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 "Settings" > "Devices" > "Link a Device" on your other device and then enter your Session ID here to start the linking process." />
 
     <EditText
         style="@style/SessionEditText"

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 "Link to an existing account""
+        android:text="Download Session on your other device and tap "Link to an existing account" 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" />
 

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" />
 

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,9 +28,9 @@
         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="Enter your Session ID to start the linking process." />
+        android:text="Navigate to "Settings" > "Devices" > "Link a Device" on your other device and then enter your Session ID here to start the linking process." />
 
     <EditText
         style="@style/SmallSessionEditText"

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()