From d8b49f57a9043598842e0486e3e6da49d2317bb7 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 31 Jan 2025 11:58:54 +0100 Subject: [PATCH] always colorize 'Reset' as destructive-red --- .../java/org/thoughtcrime/securesms/qr/QrCodeHandler.java | 4 +++- src/main/java/org/thoughtcrime/securesms/util/Util.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java index 1ae11ad72..5a2c934b6 100644 --- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java +++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java @@ -124,7 +124,9 @@ public class QrCodeHandler { dcContext.setConfigFromQr(rawString); }); builder.setPositiveButton(R.string.ok, null); - break; + AlertDialog withdrawDialog = builder.show(); + Util.redButton(withdrawDialog, AlertDialog.BUTTON_NEUTRAL); + return; case DcContext.DC_QR_REVIVE_VERIFYCONTACT: case DcContext.DC_QR_REVIVE_VERIFYGROUP: diff --git a/src/main/java/org/thoughtcrime/securesms/util/Util.java b/src/main/java/org/thoughtcrime/securesms/util/Util.java index cf180e97e..6f98a8667 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Util.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Util.java @@ -104,8 +104,12 @@ public class Util { } public static void redPositiveButton(AlertDialog dialog) { + redButton(dialog, AlertDialog.BUTTON_POSITIVE); + } + + public static void redButton(AlertDialog dialog, int whichButton) { try { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(redDestructiveColor); + dialog.getButton(whichButton).setTextColor(redDestructiveColor); } catch (Exception e) { e.printStackTrace(); }