From 84713fb0f9c9b4789040d44c678769084ca7d499 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 10 Feb 2024 19:44:20 +0100
Subject: [PATCH] slight adjustments to kannada layout for #444

---
 app/src/main/assets/language_key_texts/kn.txt | 23 +++++++++++--------
 .../keyboard_parser/KeyboardParser.kt         |  3 ++-
 .../settings/PreferencesSettingsFragment.java |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/src/main/assets/language_key_texts/kn.txt b/app/src/main/assets/language_key_texts/kn.txt
index 3d684d256..e38d2a63a 100644
--- a/app/src/main/assets/language_key_texts/kn.txt
+++ b/app/src/main/assets/language_key_texts/kn.txt
@@ -1,14 +1,14 @@
 [popup_keys]
-ೌ ಔ ೧ %
-ೈ ಐ ೨ %
-ಾ ಆ ೩ %
-ೀ ಈ ೪ %
-ೂ ಊ ೫ %
-ಬ ಭ ೬ %
-ಹ ಙ ೭ %
-ಗ ಘ ೮ %
-ದ ಧ ೯ %
-ಜ ಝ ೦ %
+ೌ ಔ %
+ೈ ಐ %
+ಾ ಆ %
+ೀ ಈ %
+ೂ ಊ %
+ಬ ಭ %
+ಹ ಙ %
+ಗ ಘ %
+ದ ಧ %
+ಜ ಝ %
 ಡ ಢ
 ೋ ಓ
 ೇ ಏ
@@ -32,3 +32,6 @@
 
 [labels]
 alphabet: ಅಆಇ
+
+[number_row]
+೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ ೦
diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
index ae38a4def..72e262d48 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
@@ -824,7 +824,8 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
                 else R.array.touch_position_correction_data_holo
             val hasZwnjKey = params.mId.locale.language in listOf("fa", "ne", "kn", "te") // determine from language, user might have custom layout
             // custom non-json layout for non-uppercase language should not have shift key
-            val hasShiftKey = !params.mId.isAlphabetKeyboard || layout !in listOf("hindi_compact", "bengali", "arabic", "arabic_pc", "hebrew", "kannada", "malayalam", "marathi", "farsi", "tamil", "telugu")
+            val hasShiftKey = !params.mId.isAlphabetKeyboard
+                    || layout !in listOf("hindi_compact", "bengali", "arabic", "arabic_pc", "hebrew", "kannada", "kannada_extended","malayalam", "marathi", "farsi", "tamil", "telugu")
             val numbersOnTopRow = layout !in listOf("pcqwerty", "lao", "thai", "korean_sebeolsik_390", "korean_sebeolsik_final")
             return LayoutInfos(labelFlags, enableProximityCharsCorrection, allowRedundantPopupKeys, touchPositionCorrectionData, hasZwnjKey, hasShiftKey, numbersOnTopRow)
         }
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
index 66060cfa5..813457652 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
@@ -103,7 +103,7 @@ public final class PreferencesSettingsFragment extends SubScreenFragment {
         final Preference pref = findPreference(Settings.PREF_LOCALIZED_NUMBER_ROW);
         if (pref == null) return;
         // locales that have a number row defined (not good to have it hardcoded, but reading a bunch of files may be noticeably slow)
-        final String[] numberRowLocales = new String[] { "ar", "bn", "fa", "gu", "hi", "mr", "ne", "ur" };
+        final String[] numberRowLocales = new String[] { "ar", "bn", "fa", "gu", "hi", "kn", "mr", "ne", "ur" };
         for (final InputMethodSubtype subtype : SubtypeSettingsKt.getEnabledSubtypes(getSharedPreferences(), true)) {
             if (ArraysKt.any(numberRowLocales, (l) -> l.equals(SubtypeUtilsKt.locale(subtype).getLanguage()))) {
                 pref.setVisible(true);