From ead8f209b6c541840ead1bc24557a0a759f49f2c Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 9 Nov 2023 10:26:29 -0500 Subject: [PATCH] Fix 'next' button alignment during registration. --- .../profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt | 2 +- app/src/main/res/layout/create_profile_fragment.xml | 4 ++-- .../main/res/layout/who_can_see_my_phone_number_fragment.xml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt index f37ab6ba60..deb5ddbadd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanSeeMyPhoneNumberFragment.kt @@ -46,7 +46,7 @@ class WhoCanSeeMyPhoneNumberFragment : DSLSettingsFragment( binding.save.setOnClickListener { binding.save.isEnabled = false - viewModel.onSave().subscribeBy(onComplete = { + lifecycleDisposable += viewModel.onSave().subscribeBy(onComplete = { setFragmentResult(REQUEST_KEY, Bundle()) findNavController().popBackStack() }) diff --git a/app/src/main/res/layout/create_profile_fragment.xml b/app/src/main/res/layout/create_profile_fragment.xml index 2579c6f74c..3b5b814a89 100644 --- a/app/src/main/res/layout/create_profile_fragment.xml +++ b/app/src/main/res/layout/create_profile_fragment.xml @@ -273,8 +273,8 @@ android:layout_gravity="end" android:layout_marginStart="32dp" android:layout_marginTop="16dp" - android:layout_marginEnd="32dp" - android:layout_marginBottom="16dp" + android:layout_marginEnd="@dimen/dsl_settings_gutter" + android:layout_marginBottom="10dp" android:enabled="false" app:circularProgressMaterialButton__label="@string/CreateProfileActivity_next" app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" /> diff --git a/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml b/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml index 9ade524ba1..4280e3fec7 100644 --- a/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml +++ b/app/src/main/res/layout/who_can_see_my_phone_number_fragment.xml @@ -27,4 +27,5 @@ android:text="@string/RegistrationActivity_next" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> + \ No newline at end of file