Standard layout names (#386)

The names are comprised of: script, layout name, country code.

Co-authored-by: grim <verdastelo9604@hotmail.com>

2 files changed, 37 insertions, 37 deletions

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 68fd81b..ddcd587 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -342,42 +342,42 @@ final class Config
     int id;
     switch (name)
     {
-      case "azerty": id = R.xml.azerty; break;
-      case "bengali_national": id = R.xml.bengali_national; break;
-      case "bengali_provat": id = R.xml.bengali_provat; break;
-      case "bgph1": id = R.xml.local_bgph1; break;
-      case "bone": id = R.xml.bone; break;
-      case "colemak": id = R.xml.colemak; break;
-      case "dvorak": id = R.xml.dvorak; break;
-      case "devanagari_1": id = R.xml.devanagari_1; break;
-      case "devanagari_2": id = R.xml.devanagari_2; break;
-      case "jcuken_ua": id = R.xml.jcuken_ua; break;
-      case "neo2": id = R.xml.neo2; break;
-      case "qwerty": id = R.xml.qwerty; break;
-      case "qwerty_el": id = R.xml.qwerty_el; break;
-      case "qwerty_es": id = R.xml.qwerty_es; break;
-      case "qwerty_ro": id = R.xml.qwerty_ro; break;
-      case "qwerty_hu": id = R.xml.qwerty_hu; break;
-      case "qwerty_ko": id = R.xml.qwerty_ko; break;
-      case "qwerty_lv": id = R.xml.qwerty_lv; break;
-      case "qwerty_no": id = R.xml.qwerty_no; break;
-      case "qwerty_pt": id = R.xml.qwerty_pt; break;
-      case "qwerty_sv_se": id = R.xml.qwerty_sv_se; break;
-      case "qwerty_tr": id = R.xml.qwerty_tr; break;
-      case "qwerty_pl": id = R.xml.qwerty_pl; break;
-      case "qwerty_vi": id = R.xml.qwerty_vi; break;
-      case "qwertz": id = R.xml.qwertz; break;
-      case "qwertz_cs": id = R.xml.qwertz_cs; break;
-      case "qwertz_de": id = R.xml.qwertz_de; break;
-      case "qwertz_hu": id = R.xml.qwertz_hu; break;
-      case "qwertz_sk": id = R.xml.qwertz_sk; break;
-      case "ru_jcuken": id = R.xml.local_ru_jcuken; break;
-      case "he_il_1452_1": id = R.xml.he_il_1452_1; break;
-      case "he_il_1452_2": id = R.xml.he_il_1452_2; break;
-      case "ar_pc": id = R.xml.ar_pc; break;
-      case "ar_alt": id = R.xml.ar_alt; break;
-      case "persian": id = R.xml.persian; break;
-      case "kurdish": id = R.xml.kurdish; break;
+      case "arab_pc_ckb": id = R.xml.arab_pc_ckb; break;
+      case "arab_pc_ir": id = R.xml.arab_pc_ir; break;
+      case "arab_pc": id = R.xml.arab_pc; break;
+      case "arab_alt": id = R.xml.arab_alt; break;
+      case "beng_national": id = R.xml.beng_national; break;
+      case "beng_provat": id = R.xml.beng_provat; break;
+      case "cyrl_jcuken_ru": id = R.xml.cyrl_jcuken_ru; break;
+      case "cyrl_jcuken_uk": id = R.xml.cyrl_jcuken_uk; break;
+      case "cyrl_yaverti": id = R.xml.cyrl_yaverti; break;
+      case "deva_inscript": id = R.xml.deva_inscript; break;
+      case "deva_alt": id = R.xml.deva_alt; break;
+      case "grek_qwerty": id = R.xml.grek_qwerty; break;
+      case "hang_dubeolsik_kr": id = R.xml.hang_dubeolsik_kr; break;
+      case "hebr_1_il": id = R.xml.hebr_1_il; break;
+      case "hebr_2_il": id = R.xml.hebr_2_il; break;
+      case "latn_azerty_fr": id = R.xml.latn_azerty_fr; break;
+      case "latn_bone": id = R.xml.latn_bone; break;
+      case "latn_colemak": id = R.xml.latn_colemak; break;
+      case "latn_dvorak": id = R.xml.latn_dvorak; break;
+      case "latn_neo2": id = R.xml.latn_neo2; break;
+      case "latn_qwerty_hu": id = R.xml.latn_qwerty_hu; break;
+      case "latn_qwerty_br": id = R.xml.latn_qwerty_br; break;
+      case "latn_qwerty_es": id = R.xml.latn_qwerty_es; break;
+      case "latn_qwerty_lv": id = R.xml.latn_qwerty_lv; break;
+      case "latn_qwerty_no": id = R.xml.latn_qwerty_no; break;
+      case "latn_qwerty_pl": id = R.xml.latn_qwerty_pl; break;
+      case "latn_qwerty_ro": id = R.xml.latn_qwerty_ro; break;
+      case "latn_qwerty_se": id = R.xml.latn_qwerty_se; break;
+      case "latn_qwerty_tr": id = R.xml.latn_qwerty_tr; break;
+      case "latn_qwerty_us": id = R.xml.latn_qwerty_us; break;
+      case "latn_qwerty_vi": id = R.xml.latn_qwerty_vi; break;
+      case "latn_qwertz": id = R.xml.latn_qwertz; break;
+      case "latn_qwertz_cz": id = R.xml.latn_qwertz_cz; break;
+      case "latn_qwertz_de": id = R.xml.latn_qwertz_de; break;
+      case "latn_qwertz_hu": id = R.xml.latn_qwertz_hu; break;
+      case "latn_qwertz_sk": id = R.xml.latn_qwertz_sk; break;
       case "custom": return custom_layout;
       case "system": case "none": default: return null;
     }
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 8a5c69b..4b82c33 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -158,7 +158,7 @@ public class Keyboard2 extends InputMethodService
       }
     }
     if (default_layout == null)
-      default_layout = KeyboardData.load(getResources(), R.xml.qwerty);
+      default_layout = KeyboardData.load(getResources(), R.xml.latn_qwerty_us);
     _localeTextLayout = default_layout;
     if (_config.second_layout == null)
     {