Merge branch 'main' into bottom_row_keyboard

Helium314 · Sep 1, 2024 · 93bd2e7 · 93bd2e7
2 parents b88b566 + be13ca4
commit 93bd2e7
Show file tree

Hide file tree

Showing 219 changed files with 2,051 additions and 1,201 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ tl;dr (you should still read the full list though):
 
 Further
 * When the PR contains "fixes" <issue number>, the related issue will be linked and automatically closed if the PR is merged (also works for other words like "fix", "resolve", "resolves", "closes", ...)
-* If you add a keyboard layout, make sure you have read https://github.com/Helium314/HeliBoard/blob/main/layouts.md#adding-new-layouts--languages
-* Please avoid force-pushing when doing changes. This way it's not possible which parts have changed since the previous state.
+* If you add a keyboard layout, make sure you also read https://github.com/Helium314/HeliBoard/blob/main/layouts.md#adding-new-layouts--languages
+* Please avoid force-pushing when doing changes. This way it's not possible to see which parts have changed since the previous state.
 
 <!-- (please remove the text above before submitting the PR) -->
diff --git a/.github/workflows/build-test-auto.yml b/.github/workflows/build-test-auto.yml
@@ -10,7 +10,7 @@ on:
 #      - 'app/**'
   pull_request:
     paths:
-      - 'app/**'
+      - 'app/src/main/java**'
   workflow_dispatch:
 
 jobs:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Once everything is up correctly, you're ready to go!
 
 HeliBoard is a complex application, when contributing, you must take a step back and make sure your contribution:
 - **Is actually wanted**. Best check related open issues before you start working on a PR. Issues with "PR" and "contributor needed" labels are accepted, but still it would be good if you announced that you are working on it, so we can discuss how changes are best implemented.
-  If there is no issue related to your intended contribution, it's a good idea to open a new one to avoid disappointment of the contribution not being accepted. For small changes or fixing obvious bugs this step is not necessary.
+  If there is no accepted issue related to your intended contribution, it's a good idea to open a new one to avoid disappointment of the contribution not being accepted. For small changes or fixing obvious bugs this step is not necessary.
 - **Is only about a single thing**. Mixing unrelated or semi-related contributions into a single PR is hard to review and can get messy.
 - **Is finished or a draft**. When you keep changing the PR without reviewer's feedback, any attempt to review it is doomed and a waste of time. Better mark it as a draft in this case.
 - **Has a proper description**. What your contribution does is usually less obvious to reviewers than for yourself. A good description helps _a lot_ for understanding what is going on, and for separating wanted from unintended changes in behavior. Therefore the changes should be as described, not more and not less.
@@ -24,7 +24,9 @@ In addition to previous elements, HeliBoard must stick to [F-Droid inclusion gui
 
 # Adding Layouts
 
-See [layouts.md](layouts.md#adding-new-layouts--languages) for how to add new layouts to the app.
+See [layouts.md](layouts.md#adding-new-layouts--languages) for how to add new layouts to the app. Please stay in line with other layouts regarding the popup keys.
+
+When editing existing layouts, please consider that people should should still get what they're used to. In case of doubt it might be better to add a new layout instead of overhauling existing layouts.
 
 # Update Emojis
 

diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ Does not use internet permission, and thus is 100% offline.
 
 ## Hidden Functionality
 Features that may go unnoticed, and further potentially useful information
-* Long-pressing toolbar keys results in additional functionality: clipboard -> paste, move left/right -> word left/right, move up/down -> page up/down, word left/right -> line start/end, page up/down -> page start/end, copy -> copy all, select word -> select all, undo <-> redo
+* Long-pressing toolbar keys results in additional functionality: clipboard -> paste, move left/right -> word left/right, move up/down -> page up/down, word left/right -> line start/end, page up/down -> page start/end, copy -> cut, select word <-> select all, undo <-> redo
 * Long-press the Comma-key to access Clipboard View, Emoji View, One-handed Mode, Settings, or Switch Language:
   * Emoji View and Language Switch will disappear if you have the corresponding key enabled;
   * For some layouts it\'s not the Comma-key, but the key at the same position (e.g. it\'s `q` for Dvorak layout).

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "helium314.keyboard"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 2100
-        versionName '2.1'
+        versionCode 2201
+        versionName '2.2'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }

diff --git a/app/src/main/assets/dictionaries_in_dict_repo.csv b/app/src/main/assets/dictionaries_in_dict_repo.csv
@@ -68,23 +68,42 @@ main,ar,exp
 main,bn_BD,exp
 main,bn,exp
 main,bg,exp
+main,ca,exp
+main,hr,exp
 main,cs,exp
+main,da,exp
+main,nl,exp
 main,en_GB,exp
 main,en_US,exp
 symbols,en,exp
+main,eo,exp
+main,et,exp
+main,fi,exp
 symbols,fr,exp
 main,fr,exp
+main,gl,exp
 main,de_AT,exp
 main,de,exp
 main,he,exp
+main,hu,exp
+main,is,exp
 main,id,exp
 main,it,exp
 main,kab,exp
 main,kk,exp
+main,lv,exp
+main,lt,exp
 addon,ml_ZZ,exp
+main,nb,exp
 main,pms,exp
+main,pl,exp
+main,pt_PT,exp
+main,ro,exp
 main,ru,exp
 main,sk,exp
+main,sl,exp
 main,es,exp
+main,sv,exp
+main,tr,exp
 main,uk,exp
 main,vi,exp
diff --git a/app/src/main/assets/layouts/esperanto.txt b/app/src/main/assets/layouts/esperanto.txt
@@ -1,9 +1,9 @@
-ŝ
-ĝ
+ŝ q
+ĝ w
 e
 r
 t
-ŭ
+ŭ y
 u
 i
 o
@@ -21,9 +21,9 @@ l
 ĵ
 
 z
-ĉ
+ĉ x
 c
-v
+v w
 b
 n
 m
diff --git a/app/src/main/assets/layouts/number_row.txt b/app/src/main/assets/layouts/number_row.txt
@@ -0,0 +1,10 @@
+1 ¹ ½ ⅓ ¼ ⅛
+2 ² ⅔
+3 ³ ¾ ⅜
+4 ⁴
+5 ⁵ ⅝
+6 ⁶
+7 ⁷ ⅞
+8 ⁸
+9 ⁹
+0 ⁰ ⁿ ∅
diff --git a/app/src/main/assets/locale_key_texts/az.txt b/app/src/main/assets/locale_key_texts/az.txt
@@ -1,12 +1,9 @@
 [popup_keys]
-a â ä á
-e ə é
-i ı î ï ì í į ī
-o ö ô œ ò ó õ ø ō
-u ü û ù ú ū
-s ş ß ś š
+e ə
+i ı
+ı i
+o ö
+u ü
+s ş
 g ğ
-n ň ñ
-c ç ć č
-y ý
-z ž
+c ç
diff --git a/app/src/main/assets/locale_key_texts/bn-BD.txt b/app/src/main/assets/locale_key_texts/bn-BD.txt
@@ -1,14 +1,14 @@
 [popup_keys]
-ঙ ং %
-য য় %
-ড ঢ %
-প ফ %
-ট ঠ %
-চ ছ %
-জ ঝ %
-হ ঞ %
-গ ঘ %
-ড় ঢ় %
+ঙ ং
+য য়
+ড ঢ
+প ফ
+ট ঠ
+চ ছ
+জ ঝ
+হ ঞ
+গ ঘ
+ড় ঢ়
 ৃ ঋ
 ু উ
 ূ ঊ

diff --git a/app/src/main/assets/locale_key_texts/bn-IN.txt b/app/src/main/assets/locale_key_texts/bn-IN.txt
@@ -1,8 +1,8 @@
 [popup_keys]
-ব ভ %
-গ ঘ %
-দ ধ %
-জ ঝ জ্ঞ %
+ব ভ
+গ ঘ
+দ ধ
+জ ঝ জ্ঞ
 ড ড়
 ও ো
 এ ে

diff --git a/app/src/main/assets/locale_key_texts/ca.txt b/app/src/main/assets/locale_key_texts/ca.txt
@@ -1,12 +1,10 @@
 [popup_keys]
-a à á ä â ã å ą æ ā ª
-e è é ë ê ę ė ē
-i í ï ì î į ī
-o ò ó ö ô õ ø œ ō º
-u ú ü ù û ū
-n ñ ń
-c ç ć č
-l l·l ł
+a à
+e è é
+i í ï
+o ò ó
+u ú ü
+c ç
 punctuation !autoColumnOrder!9 \, ? ! · # ) ( / ; ' @ : - " + \% &
 
 [extra_keys]

diff --git a/app/src/main/assets/locale_key_texts/cs.txt b/app/src/main/assets/locale_key_texts/cs.txt
@@ -1,16 +1,16 @@
 [popup_keys]
-a á à â ä æ ã å ā
-e é ě è ê ë ę ė ē
-i í î ï ì į ī
-o ó ö ô ò õ œ ø ō
-u ú ů û ü ù ū
-s š ß ś
-n ň ñ ń
-c č ç ć
-y ý ÿ
+a á
+c č
 d ď
+e é ě
+i í
+n ň
+o ó
 r ř
+s š
 t ť
-z ž ź ż
+u ú ů
+y ý
+z ž
 ' ’ ‚ ‘ › ‹
 " ” „ “ » «
diff --git a/app/src/main/assets/locale_key_texts/da.txt b/app/src/main/assets/locale_key_texts/da.txt
@@ -1,14 +1,7 @@
 [popup_keys]
-a å æ á ä à â ã ā
-e é ë
-i í ï
-o ø ö ó ô ò õ œ ō
-u ú ü û ù ū
-s ß ś š
-n ñ ń
-y ý ÿ
-d ð
-l ł
+a å æ
+e é
+o ø
 ' ’ ‚ ‘ › ‹
 " ” „ “ » «
 

diff --git a/app/src/main/assets/locale_key_texts/de-CH.txt b/app/src/main/assets/locale_key_texts/de-CH.txt
@@ -1,10 +1,7 @@
 [popup_keys]
-a ä â à á æ ã å ā
-e é è ê ë ė
-o ö ô ò ó õ œ ø ō
-u ü û ù ú ū
-s ß % ś š
-n ñ ń
+a ä
+o ö
+u ü
 ' ’ ‚ ‘ › ‹
 " ” „ “ » «
 

diff --git a/app/src/main/assets/locale_key_texts/de-DE.txt b/app/src/main/assets/locale_key_texts/de-DE.txt
@@ -1,10 +1,8 @@
 [popup_keys]
-a ä â à á æ ã å ā
-e é è ê ë ė
-o ö ô ò ó õ œ ø ō
-u ü û ù ú ū
-s ß % ś š
-n ñ ń
+a ä
+o ö
+u ü
+s ß
 ' ’ ‚ ‘ › ‹
 " ” „ “ » «
 

diff --git a/app/src/main/assets/locale_key_texts/de.txt b/app/src/main/assets/locale_key_texts/de.txt
@@ -1,9 +1,7 @@
 [popup_keys]
-a ä % â à á æ ã å ā
-e é è ê ë ė
-o ö % ô ò ó õ œ ø ō
-u ü % û ù ú ū
-s ß % ś š
-n ñ ń
+a ä
+o ö
+u ü
+s ß
 ' ’ ‚ ‘ › ‹
 " ” „ “ » «
diff --git a/app/src/main/assets/locale_key_texts/el.txt b/app/src/main/assets/locale_key_texts/el.txt
@@ -1,8 +1,8 @@
 [popup_keys]
-ε έ %
-υ ύ % ϋ ΰ
-ι ί % ϊ ΐ
-ο ό %
+ε έ
+υ ύ ϋ ΰ
+ι ί ϊ ΐ
+ο ό
 α ά
 η ή
 ω ώ

diff --git a/app/src/main/assets/locale_key_texts/eo.txt b/app/src/main/assets/locale_key_texts/eo.txt
@@ -1,23 +1,7 @@
 [popup_keys]
-a á à â ä æ ã å ā ă ą ª
-e é ě è ê ë ę ė ē
-i í î ï ĩ ì į ī ı ĳ
 j ĵ
-o ó ö ô ò õ œ ø ō ő º
-u ŭ ú ů û ü ù ū ũ ű ų µ
-s ŝ ß š ś ș ş
-n ñ ń ņ ň ŉ ŋ
-c ĉ ć č ç ċ
-ŭ y ý ŷ ÿ þ
-d ð ď đ
-r ř ŕ ŗ
-t ť ț ţ ŧ
-z ź ż ž
-k ķ ĸ
-l ĺ ļ ľ ŀ ł
-g ĝ ğ ġ ģ
-v w ŵ
-h ĥ ħ
-ĝ w ŵ
-ŝ q
-ĉ x
+u ŭ
+s ŝ
+c ĉ
+g ĝ
+h ĥ
diff --git a/app/src/main/assets/locale_key_texts/es.txt b/app/src/main/assets/locale_key_texts/es.txt
@@ -1,11 +1,11 @@
 [popup_keys]
-a á à ä â ã å ą æ ā ª
-e é è ë ê ę ė ē
-i í ï ì î į ī
-o ó ò ö ô õ ø œ ō º
-u ú ü ù û ū
-n ñ ń
-c ç ć č
+a á ª
+e é
+i í
+o ó º
+u ú ü
+n ñ
+y ý
 punctuation !autoColumnOrder!9 \, ? ! # ) ( / ; ¡ ' @ : - " + \% & ¿
 
 [extra_keys]

diff --git a/app/src/main/assets/locale_key_texts/et.txt b/app/src/main/assets/locale_key_texts/et.txt
@@ -1,25 +1,14 @@
 [popup_keys]
-a ä ā à á â ã å æ ą
-e ē è ė é ê ë ę ě
-i ī ì į í î ï ı
-o ö õ ò ó ô œ ő ø
-u ü ū ų ù ú û ů ű
-s š ß ś ş
-n ņ ñ ń
-c č ç ć
-y ý ÿ
-d ď
-r ŗ ř ŕ
-t ţ ť
-z ž ż ź
-k ķ
-l ļ ł ĺ ľ
-g ģ ğ
+a ä
+o ö õ
+u ü
+s š
+z ž
 ' ’ ‚ ‘
 " ” „ “
 
 [extra_keys]
 1: ü
 2: ö õ
 2: ä
-3: õ
+3: õ