luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-08 07:37:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

after upgrade, disable new toolbar keys if the toolbar is customized

Browse source
This commit is contained in:
Helium314 2024-05-17 18:36:41 +02:00
parent 71727de5a0
commit 4a6ef14309
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
View file

@ -128,18 +128,19 @@ val defaultClipboardToolbarPref by lazy {
/** add missing keys, typically because a new key has been added */ /** add missing keys, typically because a new key has been added */
fun upgradeToolbarPrefs(prefs: SharedPreferences) { fun upgradeToolbarPrefs(prefs: SharedPreferences) {
upgradeToolbarPref(prefs, Settings.PREF_TOOLBAR_KEYS, defaultToolbarPref, "true") upgradeToolbarPref(prefs, Settings.PREF_TOOLBAR_KEYS, defaultToolbarPref)
upgradeToolbarPref(prefs, Settings.PREF_CLIPBOARD_TOOLBAR_KEYS, defaultClipboardToolbarPref, "false") upgradeToolbarPref(prefs, Settings.PREF_CLIPBOARD_TOOLBAR_KEYS, defaultClipboardToolbarPref)
} }
private fun upgradeToolbarPref(prefs: SharedPreferences, pref: String, default: String, defaultEnabled: String) { private fun upgradeToolbarPref(prefs: SharedPreferences, pref: String, default: String) {
if (!prefs.contains(pref)) return
val list = prefs.getString(pref, default)!!.split(";").toMutableList() val list = prefs.getString(pref, default)!!.split(";").toMutableList()
val splitDefault = defaultToolbarPref.split(";") val splitDefault = defaultToolbarPref.split(";")
if (list.size == splitDefault.size) return if (list.size == splitDefault.size) return
splitDefault.forEach { entry -> splitDefault.forEach { entry ->
val keyWithComma = entry.substringBefore(",") + "," val keyWithComma = entry.substringBefore(",") + ","
if (list.none { it.startsWith(keyWithComma) }) if (list.none { it.startsWith(keyWithComma) })
list.add("${keyWithComma}$defaultEnabled") list.add("${keyWithComma}false")
} }
// likely not needed, but better prepare for possibility of key removal // likely not needed, but better prepare for possibility of key removal
list.removeAll { list.removeAll {