From d0394f6a187327a73ddcf11b584697e68a77fe34 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 30 Mar 2018 15:13:06 +0200 Subject: [PATCH] Correctly handle dismissing a dialog without a preselected color --- .../kuschku/quasseldroid/ui/chat/input/Editor.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt index 9c7fa8b34..2a938902e 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt @@ -221,8 +221,8 @@ class Editor( showColorChooser( activity, R.string.label_foreground, - formatHandler.foregroundColor(chatline.selection) - ?: formatHandler.defaultForegroundColor + formatHandler.foregroundColor(chatline.selection), + formatHandler.defaultForegroundColor ) { color -> formatHandler.toggleForeground(chatline.selection, color, formatHandler.mircColorMap[color]) @@ -235,8 +235,8 @@ class Editor( showColorChooser( activity, R.string.label_background, - formatHandler.backgroundColor(chatline.selection) - ?: formatHandler.defaultBackgroundColor + formatHandler.backgroundColor(chatline.selection), + formatHandler.defaultBackgroundColor ) { color -> formatHandler.toggleBackground(chatline.selection, color, formatHandler.mircColorMap[color]) @@ -287,7 +287,11 @@ class Editor( } private fun showColorChooser( - activity: FragmentActivity, @StringRes title: Int, @ColorInt preselect: Int, f: (Int?) -> Unit + activity: FragmentActivity, + @StringRes title: Int, + @ColorInt preselect: Int?, + @ColorInt default: Int, + f: (Int?) -> Unit ) { var selectedColor: Int? = preselect ColorChooserDialog.Builder(chatline.context, title) @@ -314,7 +318,7 @@ class Editor( .backButton(R.string.label_back) .customButton(R.string.label_colors_custom) .presetsButton(R.string.label_colors_mirc) - .preselect(preselect) + .preselect(preselect ?: default) .dynamicButtonColor(false) .allowUserColorInputAlpha(false) .callback(object : ColorChooserDialog.ColorCallback { -- GitLab