From 22a8f285d557ef66173ee5faab8861e4c4ef91a1 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sun, 10 Sep 2023 10:42:35 +0200
Subject: [PATCH] allow setting space bar color for no-border themes

---
 .../inputmethod/latin/common/Colors.kt        |  4 ++--
 .../settings/AppearanceSettingsFragment.kt    | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
index b8d77bdc3..b0ba407c6 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
@@ -103,13 +103,13 @@ class Colors (
             // need to set color to background if key borders are disabled, or there will be ugly keys
             keyBackgroundFilter = backgroundFilter
             functionalKeyBackgroundFilter = keyBackgroundFilter
-            spaceBarFilter = keyBackgroundFilter
+            spaceBarFilter = colorFilter(spaceBar)
             backgroundStateList = stateList(brightenOrDarken(background, true), background)
             keyStateList = backgroundStateList
             functionalKeyStateList = backgroundStateList
             actionKeyStateList = if (themeStyle == KeyboardTheme.THEME_STYLE_HOLO) functionalKeyStateList
                 else stateList(brightenOrDarken(accent, true), accent)
-            spaceBarStateList = adjustedBackgroundStateList
+            spaceBarStateList = stateList(brightenOrDarken(spaceBar, true), spaceBar)
         }
         keyTextFilter = colorFilter(keyText, BlendModeCompat.SRC_ATOP)
         accentColorFilter = colorFilter(accent)
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt
index 2e43e96ad..0e75e88af 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt
@@ -164,33 +164,33 @@ class AppearanceSettingsFragment : SubScreenFragment() {
     private fun adjustColors(dark: Boolean) {
         val items = listOf(
             R.string.select_color_background,
+            R.string.select_color_key_background,
             R.string.select_color_key,
             R.string.select_color_key_hint,
             R.string.select_color_accent,
-            R.string.select_color_key_background
         ).map { requireContext().getString(it) }
-        val itemsArray = if (findPreference<TwoStatePreference>(Settings.PREF_THEME_KEY_BORDERS)!!.isChecked) items.toTypedArray()
-            else items.subList(0, 4).toTypedArray()
         AlertDialog.Builder(requireContext())
             .setPositiveButton(android.R.string.ok, null)
             .setTitle(R.string.select_color_to_adjust)
-            .setItems(itemsArray) { _, i ->
+            .setItems(items.toTypedArray()) { _, i ->
                 val (pref, default) =
                     if (dark)
                         when (i) {
                             0 -> Settings.PREF_THEME_USER_DARK_COLOR_BACKGROUND to Color.DKGRAY
-                            1 -> Settings.PREF_THEME_USER_DARK_COLOR_TEXT to Color.WHITE
-                            2 -> Settings.PREF_THEME_USER_DARK_COLOR_HINT_TEXT to Color.WHITE
-                            3 -> Settings.PREF_THEME_USER_DARK_COLOR_ACCENT to Color.BLUE
-                            else -> Settings.PREF_THEME_USER_DARK_COLOR_KEYS to Color.LTGRAY
+                            1 -> Settings.PREF_THEME_USER_DARK_COLOR_KEYS to Color.LTGRAY
+                            2 -> Settings.PREF_THEME_USER_DARK_COLOR_TEXT to Color.WHITE
+                            3 -> Settings.PREF_THEME_USER_DARK_COLOR_HINT_TEXT to Color.WHITE
+                            4 -> Settings.PREF_THEME_USER_DARK_COLOR_ACCENT to Color.BLUE
+                            else -> return@setItems
                         }
                     else
                         when (i) {
                             0 -> Settings.PREF_THEME_USER_COLOR_BACKGROUND to Color.DKGRAY
-                            1 -> Settings.PREF_THEME_USER_COLOR_TEXT to Color.WHITE
-                            2 -> Settings.PREF_THEME_USER_COLOR_HINT_TEXT to Color.WHITE
-                            3 -> Settings.PREF_THEME_USER_COLOR_ACCENT to Color.BLUE
-                            else -> Settings.PREF_THEME_USER_COLOR_KEYS to Color.LTGRAY
+                            1 -> Settings.PREF_THEME_USER_COLOR_KEYS to Color.LTGRAY
+                            2 -> Settings.PREF_THEME_USER_COLOR_TEXT to Color.WHITE
+                            3 -> Settings.PREF_THEME_USER_COLOR_HINT_TEXT to Color.WHITE
+                            4 -> Settings.PREF_THEME_USER_COLOR_ACCENT to Color.BLUE
+                            else -> return@setItems
                         }
                 val d = ColorPickerDialog(requireContext(), items[i], sharedPreferences, pref, default)
                 d.show()