From 8ba82d2555342f6cf5e14d19c1d7bcadf46ab604 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 25 Jun 2023 15:52:24 +0200 Subject: Generate layouts arrays used in settings `gen_layouts.py` lists the layouts in `res/xml` and generate the `pref_layout_values` and `pref_layout_entries` arrays into `res/values/layouts.xml`. These arrays are hard to maintain as the order has to match, which is fragile. This relies on every layouts having a `name` attribute. --- res/values/arrays.xml | 80 ----------------------------------------- res/values/layouts.xml | 84 +++++++++++++++++++++++++++++++++++++++++++ res/xml/arab_alt.xml | 2 +- res/xml/arab_pc.xml | 2 +- res/xml/arab_pc_ckb.xml | 2 +- res/xml/arab_pc_ir.xml | 2 +- res/xml/beng_national.xml | 2 +- res/xml/beng_provat.xml | 2 +- res/xml/cyrl_jcuken_ru.xml | 2 +- res/xml/cyrl_jcuken_uk.xml | 2 +- res/xml/cyrl_yaverti.xml | 2 +- res/xml/deva_alt.xml | 2 +- res/xml/deva_inscript.xml | 2 +- res/xml/grek_qwerty.xml | 2 +- res/xml/hang_dubeolsik_kr.xml | 2 +- res/xml/hebr_1_il.xml | 2 +- res/xml/hebr_2_il.xml | 2 +- res/xml/latn_azerty_fr.xml | 2 +- res/xml/latn_bone.xml | 2 +- res/xml/latn_colemak.xml | 2 +- res/xml/latn_dvorak.xml | 2 +- res/xml/latn_neo2.xml | 2 +- res/xml/latn_qwerty_br.xml | 2 +- res/xml/latn_qwerty_es.xml | 2 +- res/xml/latn_qwerty_hu.xml | 2 +- res/xml/latn_qwerty_lv.xml | 2 +- res/xml/latn_qwerty_no.xml | 2 +- res/xml/latn_qwerty_pl.xml | 2 +- res/xml/latn_qwerty_ro.xml | 2 +- res/xml/latn_qwerty_se.xml | 2 +- res/xml/latn_qwerty_tr.xml | 2 +- res/xml/latn_qwerty_us.xml | 2 +- res/xml/latn_qwerty_vi.xml | 2 +- res/xml/latn_qwertz.xml | 2 +- res/xml/latn_qwertz_cz.xml | 2 +- res/xml/latn_qwertz_de.xml | 2 +- res/xml/latn_qwertz_hu.xml | 2 +- res/xml/latn_qwertz_sk.xml | 2 +- 38 files changed, 120 insertions(+), 116 deletions(-) create mode 100644 res/values/layouts.xml (limited to 'res') diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 713459d..14a536d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,85 +1,5 @@ - - none - latn_qwerty_us - latn_colemak - latn_dvorak - arab_pc_ckb - arab_pc - arab_alt - arab_pc_ir - beng_national - beng_provat - cyrl_jcuken_ru - cyrl_jcuken_uk - cyrl_yaverti - deva_inscript - deva_alt - grek_qwerty - hang_dubeolsik_kr - hebr_1_il - hebr_2_il - latn_azerty_fr - latn_bone - latn_neo2 - latn_qwerty_hu - latn_qwerty_br - latn_qwerty_es - latn_qwerty_lv - latn_qwerty_no - latn_qwerty_pl - latn_qwerty_se - latn_qwerty_tr - latn_qwerty_vi - latn_qwerty_ro - latn_qwertz - latn_qwertz_cz - latn_qwertz_de - latn_qwertz_hu - latn_qwertz_sk - custom - - - None - QWERTY (US) - Colemak - Dvorak - Arabic (کوردی) - Arabic PC - Arabic Alt - Persian PC - বাংলা (জাতীয়) - বাংলা (প্রভাত) - ЙЦУКЕН (Русский) - ЙЦУКЕН (Українська) - ЯВЕРТЪ - देवनागरी (हिंदी)-1 - देवनागरी (हिंदी)-2 - QWERTY (Greek) - 두벌식 (Korean) - Hebrew 1 - Hebrew 2 - AZERTY (Français) - Bone - Neo 2 - QWERTY (Magyar) - QWERTY (Brasileiro) - QWERTY (Español) - QWERTY (Latvian) - QWERTY (Norwegian) - QWERTY (Polski) - QWERTY (Swedish) - QWERTY (Türkçe) - QWERTY (Vietnamese) - QWERTY (Română) - QWERTZ - QWERTZ (Czech) - QWERTZ (Deutsch) - QWERTZ (Magyar) - QWERTZ (Slovak) - @string/pref_layout_e_custom - @string/pref_accents_e_all_installed @string/pref_accents_e_selected diff --git a/res/values/layouts.xml b/res/values/layouts.xml new file mode 100644 index 0000000..6042437 --- /dev/null +++ b/res/values/layouts.xml @@ -0,0 +1,84 @@ + + + + + none + latn_qwerty_us + latn_colemak + latn_dvorak + arab_alt + arab_pc + arab_pc_ckb + arab_pc_ir + beng_national + beng_provat + cyrl_jcuken_ru + cyrl_jcuken_uk + cyrl_yaverti + deva_alt + deva_inscript + grek_qwerty + hang_dubeolsik_kr + hebr_1_il + hebr_2_il + latn_azerty_fr + latn_bone + latn_neo2 + latn_qwerty_br + latn_qwerty_es + latn_qwerty_hu + latn_qwerty_lv + latn_qwerty_no + latn_qwerty_pl + latn_qwerty_ro + latn_qwerty_se + latn_qwerty_tr + latn_qwerty_vi + latn_qwertz + latn_qwertz_cz + latn_qwertz_de + latn_qwertz_hu + latn_qwertz_sk + custom + + + None + QWERTY (US) + Colemak + Dvorak + Arabic Alt + Arabic PC + Arabic (کوردی) + Persian PC + বাংলা (জাতীয়) + বাংলা (প্রভাত) + ЙЦУКЕН (Русский) + ЙЦУКЕН (Українська) + ЯВЕРТЪ + देवनागरी (हिंदी)-2 + देवनागरी (हिंदी)-1 + QWERTY (Greek) + 두벌식 (Korean) + Hebrew 1 + Hebrew 2 + AZERTY (Français) + Bone + Neo 2 + QWERTY (Brasileiro) + QWERTY (Español) + QWERTY (Magyar) + QWERTY (Latvian) + QWERTY (Norwegian) + QWERTY (Polski) + QWERTY (Română) + QWERTY (Swedish) + QWERTY (Türkçe) + QWERTY (Vietnamese) + QWERTZ + QWERTZ (Czech) + QWERTZ (Deutsch) + QWERTZ (Magyar) + QWERTZ (Slovak) + @string/pref_layout_e_custom + + \ No newline at end of file diff --git a/res/xml/arab_alt.xml b/res/xml/arab_alt.xml index bc5f123..f594f92 100644 --- a/res/xml/arab_alt.xml +++ b/res/xml/arab_alt.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/arab_pc.xml b/res/xml/arab_pc.xml index 8ab8650..9fb9dad 100644 --- a/res/xml/arab_pc.xml +++ b/res/xml/arab_pc.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/arab_pc_ckb.xml b/res/xml/arab_pc_ckb.xml index bc8bb4a..53f09d9 100644 --- a/res/xml/arab_pc_ckb.xml +++ b/res/xml/arab_pc_ckb.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml index be2720c..f285123 100644 --- a/res/xml/arab_pc_ir.xml +++ b/res/xml/arab_pc_ir.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/beng_national.xml b/res/xml/beng_national.xml index 9d70e37..2df7bce 100644 --- a/res/xml/beng_national.xml +++ b/res/xml/beng_national.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/beng_provat.xml b/res/xml/beng_provat.xml index caaa836..572e0ef 100644 --- a/res/xml/beng_provat.xml +++ b/res/xml/beng_provat.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/cyrl_jcuken_ru.xml b/res/xml/cyrl_jcuken_ru.xml index 5f392ca..eb4b939 100644 --- a/res/xml/cyrl_jcuken_ru.xml +++ b/res/xml/cyrl_jcuken_ru.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/cyrl_jcuken_uk.xml b/res/xml/cyrl_jcuken_uk.xml index d5ae950..905f0e1 100644 --- a/res/xml/cyrl_jcuken_uk.xml +++ b/res/xml/cyrl_jcuken_uk.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/cyrl_yaverti.xml b/res/xml/cyrl_yaverti.xml index f4eb820..a228f24 100644 --- a/res/xml/cyrl_yaverti.xml +++ b/res/xml/cyrl_yaverti.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/deva_alt.xml b/res/xml/deva_alt.xml index 1606abd..453285c 100644 --- a/res/xml/deva_alt.xml +++ b/res/xml/deva_alt.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/deva_inscript.xml b/res/xml/deva_inscript.xml index 1f306e7..553f43d 100644 --- a/res/xml/deva_inscript.xml +++ b/res/xml/deva_inscript.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/grek_qwerty.xml b/res/xml/grek_qwerty.xml index 50da475..f5499ec 100644 --- a/res/xml/grek_qwerty.xml +++ b/res/xml/grek_qwerty.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/hang_dubeolsik_kr.xml b/res/xml/hang_dubeolsik_kr.xml index 998ab8f..29dd01b 100644 --- a/res/xml/hang_dubeolsik_kr.xml +++ b/res/xml/hang_dubeolsik_kr.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/hebr_1_il.xml b/res/xml/hebr_1_il.xml index 50ba86e..bbf5e56 100644 --- a/res/xml/hebr_1_il.xml +++ b/res/xml/hebr_1_il.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/hebr_2_il.xml b/res/xml/hebr_2_il.xml index ff83a91..090bef8 100644 --- a/res/xml/hebr_2_il.xml +++ b/res/xml/hebr_2_il.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_azerty_fr.xml b/res/xml/latn_azerty_fr.xml index 8434466..e3cc130 100644 --- a/res/xml/latn_azerty_fr.xml +++ b/res/xml/latn_azerty_fr.xml @@ -1,7 +1,7 @@ - + diff --git a/res/xml/latn_bone.xml b/res/xml/latn_bone.xml index 2f8a012..ea31131 100644 --- a/res/xml/latn_bone.xml +++ b/res/xml/latn_bone.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_colemak.xml b/res/xml/latn_colemak.xml index a7c78f2..1a73fbb 100644 --- a/res/xml/latn_colemak.xml +++ b/res/xml/latn_colemak.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_dvorak.xml b/res/xml/latn_dvorak.xml index 4dccc23..4e052ee 100644 --- a/res/xml/latn_dvorak.xml +++ b/res/xml/latn_dvorak.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_neo2.xml b/res/xml/latn_neo2.xml index 6f20f38..939e131 100644 --- a/res/xml/latn_neo2.xml +++ b/res/xml/latn_neo2.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_qwerty_br.xml b/res/xml/latn_qwerty_br.xml index fda6f93..d76c6e4 100644 --- a/res/xml/latn_qwerty_br.xml +++ b/res/xml/latn_qwerty_br.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_qwerty_es.xml b/res/xml/latn_qwerty_es.xml index 273cfed..5f1fc24 100644 --- a/res/xml/latn_qwerty_es.xml +++ b/res/xml/latn_qwerty_es.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml index 302c304..aee223c 100644 --- a/res/xml/latn_qwerty_hu.xml +++ b/res/xml/latn_qwerty_hu.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml index 7f16d5a..1e82d8e 100644 --- a/res/xml/latn_qwerty_lv.xml +++ b/res/xml/latn_qwerty_lv.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_no.xml b/res/xml/latn_qwerty_no.xml index 33e9f3b..9f38f06 100644 --- a/res/xml/latn_qwerty_no.xml +++ b/res/xml/latn_qwerty_no.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml index 1c28766..c31ae76 100644 --- a/res/xml/latn_qwerty_pl.xml +++ b/res/xml/latn_qwerty_pl.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml index e5e0a19..1282d36 100644 --- a/res/xml/latn_qwerty_ro.xml +++ b/res/xml/latn_qwerty_ro.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_se.xml b/res/xml/latn_qwerty_se.xml index 69884d7..aab6bc6 100644 --- a/res/xml/latn_qwerty_se.xml +++ b/res/xml/latn_qwerty_se.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml index 60f52a2..2093db7 100644 --- a/res/xml/latn_qwerty_tr.xml +++ b/res/xml/latn_qwerty_tr.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwerty_us.xml b/res/xml/latn_qwerty_us.xml index 06e91b9..9165283 100644 --- a/res/xml/latn_qwerty_us.xml +++ b/res/xml/latn_qwerty_us.xml @@ -20,7 +20,7 @@ See bottom_row.xml for the definition of the bottom row and neo2.xml for a layout that re-defines it. See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning. --> - + diff --git a/res/xml/latn_qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml index 8b51299..6af7bc7 100644 --- a/res/xml/latn_qwerty_vi.xml +++ b/res/xml/latn_qwerty_vi.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_qwertz.xml b/res/xml/latn_qwertz.xml index 107b738..6ba19c6 100644 --- a/res/xml/latn_qwertz.xml +++ b/res/xml/latn_qwertz.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwertz_cz.xml b/res/xml/latn_qwertz_cz.xml index 6546163..fc096ee 100644 --- a/res/xml/latn_qwertz_cz.xml +++ b/res/xml/latn_qwertz_cz.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwertz_de.xml b/res/xml/latn_qwertz_de.xml index 906c4fc..ff1ec11 100644 --- a/res/xml/latn_qwertz_de.xml +++ b/res/xml/latn_qwertz_de.xml @@ -1,6 +1,6 @@ - + diff --git a/res/xml/latn_qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml index 557b2e5..a77aa1c 100644 --- a/res/xml/latn_qwertz_hu.xml +++ b/res/xml/latn_qwertz_hu.xml @@ -1,5 +1,5 @@ - + diff --git a/res/xml/latn_qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml index 7d3d1f4..f71a825 100644 --- a/res/xml/latn_qwertz_sk.xml +++ b/res/xml/latn_qwertz_sk.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.3