From e6cc49368e2801577034c70a85473cb2c44dea01 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 15 Jun 2022 08:32:20 -0400 Subject: [PATCH] Update some dialogs to MaterialAlertDialog. --- .../securesms/backup/BackupDialog.java | 12 +++++------ .../create/CreatePaymentFragment.java | 20 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java index 444fdfd24..e7885e84d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java @@ -159,12 +159,12 @@ public class BackupDialog { public static void showVerifyBackupPassphraseDialog(@NonNull Context context) { View view = LayoutInflater.from(context).inflate(R.layout.enter_backup_passphrase_dialog, null); EditText prompt = view.findViewById(R.id.restore_passphrase_input); - AlertDialog dialog = new AlertDialog.Builder(context) - .setTitle(R.string.BackupDialog_enter_backup_passphrase_to_verify) - .setView(view) - .setPositiveButton(R.string.BackupDialog_verify, null) - .setNegativeButton(android.R.string.cancel, null) - .show(); + AlertDialog dialog = new MaterialAlertDialogBuilder(context) + .setTitle(R.string.BackupDialog_enter_backup_passphrase_to_verify) + .setView(view) + .setPositiveButton(R.string.BackupDialog_verify, null) + .setNegativeButton(android.R.string.cancel, null) + .show(); Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE); positiveButton.setEnabled(false); diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java index 918ec4390..5030bab0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentFragment.java @@ -20,6 +20,8 @@ import androidx.navigation.NavDirections; import androidx.navigation.Navigation; import androidx.transition.TransitionManager; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; @@ -102,15 +104,15 @@ public class CreatePaymentFragment extends LoggingFragment { //noinspection CodeBlock2Expr infoTapTarget.setOnClickListener(v -> { - new AlertDialog.Builder(requireContext()) - .setMessage(R.string.CreatePaymentFragment__conversions_are_just_estimates) - .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()) - .setNegativeButton(R.string.LearnMoreTextView_learn_more, (dialog, which) -> { - dialog.dismiss(); - CommunicationActions.openBrowserLink(requireContext(), getString(R.string.CreatePaymentFragment__learn_more__conversions)); - }) - .show(); - }); + new MaterialAlertDialogBuilder(requireContext()) + .setMessage(R.string.CreatePaymentFragment__conversions_are_just_estimates) + .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss()) + .setNegativeButton(R.string.LearnMoreTextView_learn_more, (dialog, which) -> { + dialog.dismiss(); + CommunicationActions.openBrowserLink(requireContext(), getString(R.string.CreatePaymentFragment__learn_more__conversions)); + }) + .show(); + }); initializeInfoIcon();