From 8b236fd51a3f341fd4bd37428db94e5a9943883f Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 15 Dec 2023 11:17:35 +0100
Subject: [PATCH] only add number to integrated number row moreKeys

other moreKeys appear to be unwanted, see #324 and #314 (comment)
---
 .../keyboard/internal/keyboard_parser/LocaleKeyTexts.kt    | 7 +++++--
 .../keyboard/internal/keyboard_parser/floris/PopupSet.kt   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/LocaleKeyTexts.kt b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/LocaleKeyTexts.kt
index 59a04247a..f2d26d4bd 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/LocaleKeyTexts.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/LocaleKeyTexts.kt
@@ -172,11 +172,14 @@ class LocaleKeyTexts(dataStream: InputStream?, locale: Locale) {
             label.toTextKey(numbersMoreKeys[i])
         }
 
+    fun getNumberLabel(numberIndex: Int?): String? = numberIndex?.let { numberKeys.getOrNull(it) }
+
     // get moreKeys with the number itself (as used on alphabet keyboards)
-    fun getNumberMoreKeys(numberIndex: Int?): List<String> {
+    // todo: use it or remove it
+/*    fun getNumberMoreKeys(numberIndex: Int?): List<String> {
         if (numberIndex == null) return emptyList()
         return listOf(numberKeys[numberIndex]) + numbersMoreKeys[numberIndex]
-    }
+    }*/
 }
 
 private fun mergeMoreKeys(original: Array<String>, added: List<String>): Array<String> {
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/floris/PopupSet.kt b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/floris/PopupSet.kt
index 20f6d92fd..e7d53963e 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/floris/PopupSet.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/keyboard_parser/floris/PopupSet.kt
@@ -32,7 +32,7 @@ open class PopupSet<T : AbstractKeyData>(
     fun toMoreKeys(params: KeyboardParams): Array<String>? {
         val moreKeys = mutableListOf<String>()
         // number + main + relevant in this order (label is later taken from first element in resulting array)
-        moreKeys.addAll(params.mLocaleKeyTexts.getNumberMoreKeys(numberIndex))
+        params.mLocaleKeyTexts.getNumberLabel(numberIndex)?.let { moreKeys.add(it) }
         main?.getLabel(params)?.let { moreKeys.add(transformLabel(it, params)) }
         moreKeys.addAll(relevant.map { transformLabel(it.getLabel(params), params) })
         return moreKeys.takeIf { it.isNotEmpty() }?.toTypedArray()