From 293a823442efd82efdfa4acbfee527a886e2790f Mon Sep 17 00:00:00 2001 From: Michatec Date: Sat, 28 Mar 2026 21:58:24 +0100 Subject: [PATCH] fix(ui): ensure theme selection dialog dismisses on button click --- .../java/com/michatec/radio/dialogs/ThemeSelectionDialog.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/michatec/radio/dialogs/ThemeSelectionDialog.kt b/app/src/main/java/com/michatec/radio/dialogs/ThemeSelectionDialog.kt index 032e308..89661bc 100644 --- a/app/src/main/java/com/michatec/radio/dialogs/ThemeSelectionDialog.kt +++ b/app/src/main/java/com/michatec/radio/dialogs/ThemeSelectionDialog.kt @@ -71,7 +71,7 @@ class ThemeSelectionDialog(private var themeSelectionDialogListener: ThemeSelect builder.setView(view) // add OK button - builder.setPositiveButton(R.string.dialog_generic_button_ok) { _, _ -> + builder.setPositiveButton(R.string.dialog_generic_button_okay) { dialog, _ -> // get selected theme val selectedTheme = when (radioGroup.checkedRadioButtonId) { R.id.radio_theme_follow_system -> Keys.STATE_THEME_FOLLOW_SYSTEM @@ -81,12 +81,14 @@ class ThemeSelectionDialog(private var themeSelectionDialogListener: ThemeSelect } // notify listener themeSelectionDialogListener.onThemeSelectionDialog(true, selectedTheme) + dialog.dismiss() } // add cancel button - builder.setNegativeButton(R.string.dialog_generic_button_cancel) { _, _ -> + builder.setNegativeButton(R.string.dialog_generic_button_cancel) { dialog, _ -> // notify listener themeSelectionDialogListener.onThemeSelectionDialog(false, Keys.STATE_THEME_FOLLOW_SYSTEM) + dialog.dismiss() } // handle outside-click as cancel