TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 08:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Make Multi Device Instructions Clearer
This commit is contained in:
gmbnt 2020-03-25 11:48:47 +11:00 committed by GitHub
commit b600e8c6a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-sw400dp/fragment_enter_session_id.xml
View File

@ -30,7 +30,7 @@
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/medium_font_size" android:textSize="@dimen/medium_font_size"
android:textColor="@color/text" 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 <EditText
style="@style/SessionEditText" style="@style/SessionEditText"

3
res/layout/dialog_link_device_master_mode.xml
View File

@ -39,9 +39,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing" 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:textColor="@color/text"
android:alpha="0.6"
android:textSize="@dimen/small_font_size" android:textSize="@dimen/small_font_size"
android:textAlignment="center" /> android:textAlignment="center" />

1
res/layout/dialog_link_device_slave_mode.xml
View File

@ -38,7 +38,6 @@
android:layout_marginTop="@dimen/large_spacing" android:layout_marginTop="@dimen/large_spacing"
android:text="Please check that the words below match those shown on your other device." android:text="Please check that the words below match those shown on your other device."
android:textColor="@color/text" android:textColor="@color/text"
android:alpha="0.6"
android:textSize="@dimen/small_font_size" android:textSize="@dimen/small_font_size"
android:textAlignment="center" /> android:textAlignment="center" />

6
res/layout/fragment_enter_session_id.xml
View File

@ -17,7 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing" android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/large_font_size" android:textSize="19sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/text" android:textColor="@color/text"
android:text="Link your device" /> android:text="Link your device" />
@ -28,9 +28,9 @@
android:layout_marginLeft="@dimen/large_spacing" android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/small_font_size" android:textSize="14sp"
android:textColor="@color/text" 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 <EditText
style="@style/SmallSessionEditText" style="@style/SmallSessionEditText"

2
src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
View File

@ -64,7 +64,7 @@ private class LinkDeviceActivityAdapter(val activity: LinkDeviceActivity) : Frag
1 -> { 1 -> {
val result = ScanQRCodeWrapperFragment() val result = ScanQRCodeWrapperFragment()
result.delegate = activity 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 result
} }
else -> throw IllegalStateException() else -> throw IllegalStateException()