From b56d19e8656b06fa460ae7bb91e9404b2c0fc35c Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 6 Jan 2020 16:05:57 +1100 Subject: [PATCH] Implement QR code screen redesign --- AndroidManifest.xml | 3 + res/layout/activity_qr_code.xml | 14 ++ res/layout/activity_settings.xml | 16 +++ res/layout/fragment_view_my_qr_code.xml | 74 ++++++++++ .../redesign/activities/QRCodeActivity.kt | 131 ++++++++++++++++++ .../redesign/activities/SettingsActivity.kt | 4 +- .../fragments/ScanQRCodeFragmentV2.kt | 6 +- .../redesign/utilities/QRCodeUtilities.kt | 31 +++++ .../loki/redesign/views/ProfilePictureView.kt | 2 +- 9 files changed, 278 insertions(+), 3 deletions(-) create mode 100644 res/layout/activity_qr_code.xml create mode 100644 res/layout/fragment_view_my_qr_code.xml create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/utilities/QRCodeUtilities.kt diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 57b9a1b4ce..8e577f757e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -153,6 +153,9 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml index b1e43dba48..81410f42bf 100644 --- a/res/layout/activity_settings.xml +++ b/res/layout/activity_settings.xml @@ -115,6 +115,22 @@ android:layout_height="1px" android:background="@color/separator" /> + + + + + + + + + + + + + + + + + + + + +