From df61cbb30d5bb58a49f366154a4df21a0f200bdb Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 8 Jan 2020 15:16:34 +1100 Subject: [PATCH] Partially implement device linking redesign & fix copy --- AndroidManifest.xml | 33 +++--- res/anim/slide_from_bottom.xml | 12 +- res/anim/slide_from_right.xml | 1 - res/layout/activity_link_device.xml | 14 +++ res/layout/activity_restore.xml | 4 +- res/layout/activity_settings.xml | 4 +- res/layout/dialog_link_device_slave_mode.xml | 63 +++++++++++ res/layout/dialog_seed.xml | 4 +- res/layout/fragment_enter_chat_url.xml | 2 +- res/layout/fragment_enter_session_id.xml | 59 ++++++++++ res/layout/fragment_view_my_qr_code.xml | 2 +- res/layout/view_fake_chat.xml | 4 +- res/layout/view_separator.xml | 2 +- .../securesms/loki/DisplayNameActivity.kt | 3 +- .../securesms/loki/SeedActivity.kt | 2 +- .../loki/redesign/activities/HomeActivity.kt | 7 +- .../activities/JoinPublicChatActivity.kt | 10 +- .../redesign/activities/LandingActivity.kt | 103 +++++++++++++++++- .../redesign/activities/LinkDeviceActivity.kt | 103 ++++++++++++++++++ .../redesign/activities/QRCodeActivity.kt | 2 +- .../redesign/activities/SettingsActivity.kt | 9 +- .../dialogs/LinkDeviceSlaveModeDialog.kt | 76 +++++++++++++ .../redesign/utilities/ActivityUtilities.kt | 17 ++- 23 files changed, 487 insertions(+), 49 deletions(-) create mode 100644 res/layout/activity_link_device.xml create mode 100644 res/layout/dialog_link_device_slave_mode.xml create mode 100644 res/layout/fragment_enter_session_id.xml create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceSlaveModeDialog.kt diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6f0abd9bad..ad4497c9ea 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -126,37 +126,32 @@ + android:name="org.thoughtcrime.securesms.loki.redesign.activities.LandingActivity" /> - + android:name="org.thoughtcrime.securesms.loki.redesign.activities.RegisterActivity" /> + + - - + android:name="org.thoughtcrime.securesms.loki.redesign.activities.QRCodeActivity" /> + + - + + + android:duration="250" + android:fromYDelta="100%" + android:toYDelta="0%" /> + \ No newline at end of file diff --git a/res/anim/slide_from_right.xml b/res/anim/slide_from_right.xml index c9e7c215e6..18de5567f5 100644 --- a/res/anim/slide_from_right.xml +++ b/res/anim/slide_from_right.xml @@ -1,5 +1,4 @@ - diff --git a/res/layout/activity_link_device.xml b/res/layout/activity_link_device.xml new file mode 100644 index 0000000000..d6bf8f66d7 --- /dev/null +++ b/res/layout/activity_link_device.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml index d8951e878c..3433c90157 100644 --- a/res/layout/activity_restore.xml +++ b/res/layout/activity_restore.xml @@ -30,7 +30,7 @@ android:layout_marginRight="@dimen/very_large_spacing" android:textSize="@dimen/medium_font_size" android:textColor="@color/text" - android:text="Enter the seed that was given to you when you signed up to restore your account." /> + android:text="Enter the recovery phrase that was given to you when you signed up to restore your account." /> + android:hint="Enter your recovery phrase" /> @@ -221,6 +222,7 @@ android:text="Linked Devices" /> @@ -234,7 +236,7 @@ android:textSize="@dimen/medium_font_size" android:textStyle="bold" android:gravity="center" - android:text="Show Seed" /> + android:text="Show Recovery Phrase" /> + + + + + + + + + + +