From f56e3be1d42d178a5745b58ea9b9e2e0016eb751 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 30 Jul 2020 16:53:34 +1000 Subject: [PATCH] Implement multi device removal sheet --- res/layout-sw400dp/activity_landing.xml | 1 + res/layout/activity_landing.xml | 1 + ...ment_multi_device_removal_bottom_sheet.xml | 42 +++++++++ .../securesms/loki/activities/HomeActivity.kt | 22 +++++ .../loki/activities/LandingActivity.kt | 2 +- .../loki/activities/PNModeActivity.kt | 2 +- .../loki/activities/SettingsActivity.kt | 6 +- .../dialogs/MultiDeviceRemovalBottomSheet.kt | 86 +++++++++++++++++++ .../securesms/util/TextSecurePreferences.java | 16 ++-- 9 files changed, 165 insertions(+), 13 deletions(-) create mode 100644 res/layout/fragment_multi_device_removal_bottom_sheet.xml create mode 100644 src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml index 815f4f9732..c87a549920 100644 --- a/res/layout-sw400dp/activity_landing.xml +++ b/res/layout-sw400dp/activity_landing.xml @@ -57,6 +57,7 @@ android:layout_height="@dimen/onboarding_button_bottom_offset" android:layout_marginLeft="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing" + android:visibility="invisible" android:gravity="center" android:background="@color/transparent" android:textAllCaps="false" diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml index 195020c0d9..3e3ba009dd 100644 --- a/res/layout/activity_landing.xml +++ b/res/layout/activity_landing.xml @@ -57,6 +57,7 @@ android:layout_height="@dimen/onboarding_button_bottom_offset" android:layout_marginLeft="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing" + android:visibility="invisible" android:gravity="center" android:background="@color/transparent" android:textAllCaps="false" diff --git a/res/layout/fragment_multi_device_removal_bottom_sheet.xml b/res/layout/fragment_multi_device_removal_bottom_sheet.xml new file mode 100644 index 0000000000..2d0c9aef29 --- /dev/null +++ b/res/layout/fragment_multi_device_removal_bottom_sheet.xml @@ -0,0 +1,42 @@ + + + + + + + +