prefs: Add 'delete_word' and 'forward_delete_word' to extra keys

The gesture combination is mentioned. Preferred position are added.

.github/workflows/check-layouts.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Checkout repo
       uses: actions/checkout@v4
     - run: python3 gen_layouts.py
-    - name: "Check that the generated 'layouts.xml' is uptodate, otherwise run 'python3 gen_layouts.py'"
+    - name: "Run 'python3 gen_layouts.py' to update generated files"
       run: git diff --exit-code
   check-layouts:
     name: check_layout.output
@@ -22,5 +22,5 @@ jobs:
     - name: Checkout repo
       uses: actions/checkout@v4
     - run: python3 check_layout.py
-    - name: "Check that the generated 'check_layout.output' is uptodate, otherwise run 'python3 check_layout.py'"
+    - name: "Fix your layout accordingly or run 'python3 check_layout.py' to promote the warnings"
       run: git diff --exit-code

.gitignore

@@ -10,3 +10,4 @@
 /build
 # Directory _build is not used anymore
 /_build
+/release

AndroidManifest.xml

@@ -10,11 +10,13 @@
       </intent-filter>
       <meta-data android:name="android.view.im" android:resource="@xml/method"/>
     </service>
-    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true">
+
+    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/settingsTheme" android:exported="true" android:directBootAware="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
       </intent-filter>
     </activity>
+
     <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@mipmap/ic_launcher" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Python 3 is required to update generated files but not to build the app.
 For Android Studio users, no more setup is needed.
 
 For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
-Instructions to install Nix are [here](https://nixos.wiki/wiki/Nix_Installation_Guide).
+Instructions to install Nix are [here](https://wiki.nixos.org/wiki/Nix_Installation_Guide).
 
 If you don't use Android Studio or Nix, you have to inform Gradle about the
 location of your Android SDK by either:
@@ -180,7 +180,7 @@ the file and the English strings.
 To check that `strings.xml` is formatted correctly, run
 `python sync_translations.py`. This will modify your files.
 
-Store descriptions in `metadata/` are updated automatically.
+Store descriptions in `fastlane/metadata/android/` are updated automatically.
 Translating changelogs is not useful.
 
 The app name might be partially translated, the "Unexpected" word should remain
@@ -190,6 +190,12 @@ As translations need to be updated regularly, you can subscribe to this issue
 to receive a notification when an update is needed:
 https://github.com/Julow/Unexpected-Keyboard/issues/373
 
+### Adding Compose key sequences
+
+New Compose sequences can be added into `srcs/compose/compose/extra.json`.
+If a entirely new family of sequences were to be added, a new `.json` file can
+be created in the same directory to host them.
+
 ### Adding key combinations
 
 Key combinations are defined in `srcs/juloo.keyboard2/KeyModifier.java`.

README.md

@@ -20,12 +20,12 @@ This application contains no ads, doesn't make any network requests and is Open
 
 Usage: to apply the symbols located in the corners of each key, slide your finger in the direction of the symbols. For example, the Settings are opened by sliding in the left down corner.
 
-| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
+| <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
 | --- | --- | --- |
-| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
+| <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
 
 ## Similar apps
-* [Calculator++](https://github.com/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators. Works up to Android 13 but maybe unmaintained.
+* [Calculator++](https://git.bubu1.eu/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators.
 
 ## Contributing
 

build.gradle

@@ -2,25 +2,33 @@ plugins {
   id 'com.android.application' version '8.1.1'
 }
 
+dependencies {
+  testImplementation "junit:junit:4.13.2"
+}
+
 android {
   namespace 'juloo.keyboard2'
-  compileSdk 33
+  compileSdk 34
 
   defaultConfig {
     applicationId "juloo.keyboard2"
-    minSdk 11
-    targetSdkVersion 33
-    versionCode 39
-    versionName "1.27.0"
+    minSdk 21
+    targetSdkVersion 35
+    versionCode 46
+    versionName "1.30.3"
   }
 
   sourceSets {
     main {
       manifest.srcFile 'AndroidManifest.xml'
-      java.srcDirs = ['srcs']
+      java.srcDirs = ['srcs/juloo.keyboard2']
       res.srcDirs = ['res', 'build/generated-resources']
       assets.srcDirs = ['assets']
     }
+
+    test {
+      java.srcDirs = ['test']
+    }
   }
 
   signingConfigs {
@@ -84,9 +92,6 @@ android {
   }
 }
 
-dependencies {
-}
-
 tasks.register('buildKeyboardFont') {
   println "\nBuilding assets/special_font.ttf"
   mkdir "$buildDir"
@@ -103,6 +108,14 @@ tasks.register('buildKeyboardFont') {
   }
 }
 
+tasks.register('genEmojis') {
+  println "\nGenerating res/raw/emojis.txt"
+  exec {
+    workingDir = projectDir
+    commandLine "python", "gen_emoji.py"
+  }
+}
+
 tasks.withType(Test).configureEach {
   dependsOn 'genLayoutsList'
   dependsOn 'checkKeyboardLayouts'
@@ -121,12 +134,8 @@ tasks.register('genLayoutsList') {
 tasks.register('checkKeyboardLayouts') {
   println "\nChecking layouts"
   exec {
-    def layouts = new File(projectDir, "srcs/layouts").listFiles().findAll {
-      it.name.endsWith(".xml")
-    }
     workingDir = projectDir
-    commandLine("python", "check_layout.py", *layouts)
-    standardOutput = new FileOutputStream("${projectDir}/check_layout.output")
+    commandLine("python", "check_layout.py")
   }
 }
 
@@ -143,7 +152,7 @@ tasks.register('compileComposeSequences') {
   println "\nGenerating ${out}"
   exec {
     def sequences = new File(projectDir, "srcs/compose").listFiles().findAll {
-      it.name.endsWith(".pre") || it.name.endsWith(".json")
+      !it.name.endsWith(".py") && !it.name.endsWith(".md")
     }
     workingDir = projectDir
     commandLine("python", "srcs/compose/compile.py", *sequences)

check_layout.output

@@ -1,141 +1,36 @@
-# arab_alt
-Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# arab_hamvaj_tly
-Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], _, `, {, |, }
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder
-2 warnings
-# arab_pc
-Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-1 warnings
-# arab_pc_ckb
-Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
-1 warnings
-# arab_pc_hindu
-Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-1 warnings
-# arab_pc_ir
-Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-1 warnings
-# armenian_ph_am
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# beng_national
-Layout includes some ASCII punctuation but not all, missing: $
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# beng_provat
-Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# cyrl_jcuken_ru
-0 warnings
-# cyrl_jcuken_uk
-0 warnings
-# cyrl_ueishsht
-0 warnings
-# cyrl_yaverti
-Layout includes some ASCII punctuation but not all, missing: ~
-1 warnings
-# deva_alt
-Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
-2 warnings
-# deva_inscript
-Duplicate keys: ।
-Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-3 warnings
-# grek_qwerty
-Duplicate keys: ;
-1 warnings
-# guj_phonetic_in
-Duplicate keys: ટ, ડ
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# hang_dubeolsik_kr
-0 warnings
-# hebr_1_il
-Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
-1 warnings
-# hebr_2_il
-Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
-1 warnings
-# latn_azerty_fr
-0 warnings
-# latn_bepo_fr
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# latn_bone
-Layout includes some ASCII punctuation but not all, missing: $
-Layout redefines the bottom row but some important keys are missing, missing: cursor_left, cursor_right, loc compose, loc end, loc home, loc page_down, loc page_up, loc switch_greekmath, loc voice_typing, switch_backward
-2 warnings
-# latn_colemak
-Some keys contain whitespaces, unexpected:  ́
-1 warnings
-# latn_dvorak
-0 warnings
-# latn_neo2
-0 warnings
-# latn_qwerty_br
-0 warnings
-# latn_qwerty_cz
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# latn_qwerty_es
-0 warnings
-# latn_qwerty_gb
-0 warnings
-# latn_qwerty_hu
-0 warnings
-# latn_qwerty_lv
-0 warnings
-# latn_qwerty_no
-0 warnings
-# latn_qwerty_pl
-0 warnings
-# latn_qwerty_ro
-0 warnings
-# latn_qwerty_se
-Duplicate keys: !, ', ,, -, ., ?
-1 warnings
-# latn_qwerty_sk
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# latn_qwerty_tly
-Duplicate keys: a, c, j, q
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
-2 warnings
-# latn_qwerty_tr
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# latn_qwerty_us
-0 warnings
-# latn_qwerty_vi
-0 warnings
-# latn_qwertz
-0 warnings
-# latn_qwertz_cz
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-1 warnings
-# latn_qwertz_cz_multifunctional
-Layout includes some ASCII punctuation but not all, missing: `
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# latn_qwertz_de
-0 warnings
-# latn_qwertz_fr_ch
-0 warnings
-# latn_qwertz_hu
-0 warnings
-# latn_qwertz_sk
-Layout includes some ASCII punctuation but not all, missing: `
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
-# urdu_phonetic_ur
-Duplicate keys:  
-Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-Some keys contain whitespaces, unexpected:  
-4 warnings
+arab_alt: Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
+arab_hamvaj_tly: Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], _, `, {, |, }
+arab_pc: Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
+arab_pc_ckb: Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ;, <, =, >, ?, `, |, ~
+arab_pc_ckb_fa: Layout includes some ASCII punctuation but not all, missing: ", #, $, %, &, ', ,, /, ;, ?, @, \, ^, `, |, ~
+arab_pc_hindu: Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
+arab_pc_ir: Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
+beng_national: Layout includes some ASCII punctuation but not all, missing: $
+beng_provat: Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
+cyrl_yaverti: Layout includes some ASCII punctuation but not all, missing: ~
+cyrl_yqukeng_tj: These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
+cyrl_yxukeng_os: Layout includes some ASCII punctuation but not all, missing: ", #, $, &, ', @, [, ], ~
+cyrl_yxukeng_os: These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
+deva_alt: Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
+deva_alt: Layout doesn't define some important keys, missing: delete
+deva_inscript: Duplicate keys: ।
+deva_inscript: Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+deva_phonetic_in: Duplicate keys: ट
+grek_qwerty: Duplicate keys: ;
+guj_phonetic_in: Duplicate keys: ટ, ડ
+hebr_1_il: Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+hebr_2_il: Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+kann_kannada: Layout includes some ASCII punctuation but not all, missing: #, $, %, (, ), *, +, /, <, =, >, [, \, ], ^, `, {, |, }, ~
+latn_bepo_fr: Missing important key, missing: loc capslock
+latn_bone: Missing important key, missing: loc capslock
+latn_colemak: Some keys contain whitespaces, unexpected:  ́
+latn_dvorak: Missing important key, missing: loc capslock
+latn_neo2: Layout redefines the bottom row but some important keys are missing, missing: loc switch_clipboard
+latn_qwerty_se: Duplicate keys: !, ', ,, -, ., ?
+latn_qwerty_tly: Duplicate keys: a, c, j, q
+latn_qwerty_tly: Missing programming keys, missing: loc esc, loc tab
+latn_qwertz_cz_multifunctional: Layout includes some ASCII punctuation but not all, missing: `
+latn_qwertz_sk: Layout includes some ASCII punctuation but not all, missing: `
+urdu_phonetic_ur: Duplicate keys:  
+urdu_phonetic_ur: Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~
+urdu_phonetic_ur: Some keys contain whitespaces, unexpected:  

check_layout.py

@@ -1,17 +1,23 @@
 import xml.etree.ElementTree as ET
-import sys, os
+import sys, os, glob
 
-warning_count = 0
+layout_file_name = 0
+warnings = []
 
 KNOWN_NOT_LAYOUT = set([
     "number_row", "numpad", "pin",
     "bottom_row", "settings", "method",
-    "greekmath", "numeric", "emoji_bottom_row" ])
+    "greekmath", "numeric", "emoji_bottom_row",
+    "clipboard_bottom_row" ])
+
+KEY_ATTRIBUTES = set([
+    "key0", "key1", "key2", "key3", "key4", "key5", "key6", "key7", "key8",
+    "c", "nw", "ne", "sw", "se", "w", "e", "n", "s"
+    ])
 
 def warn(msg):
-    global warning_count
-    print(msg)
-    warning_count += 1
+    global warnings
+    warnings.append("%s: %s" % (layout_file_name, msg))
 
 def key_list_str(keys):
     return ", ".join(sorted(list(keys)))
@@ -38,7 +44,7 @@ def unexpected_keys(keys, symbols, msg):
 def parse_row_from_et(row, keys, dup):
     for key in row:
         for attr in key.keys():
-            if attr.startswith("key"):
+            if attr in KEY_ATTRIBUTES:
                 k = key.get(attr).removeprefix("\\")
                 if k in keys: dup.add(k)
                 keys.add(k)
@@ -67,10 +73,7 @@ def check_layout(layout):
     if len(dup) > 0: warn("Duplicate keys: " + key_list_str(dup))
     missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
     missing_some_of(keys, "0123456789", "digits")
-    missing_required(keys,
-                     ["esc", "tab", "backspace", "delete",
-                      "f11_placeholder", "f12_placeholder"],
-                     "Layout doesn't define some important keys")
+    missing_required(keys, ["backspace", "delete"], "Layout doesn't define some important keys")
     unexpected_keys(keys,
                     ["copy", "paste", "cut", "selectAll", "shareText",
                      "pasteAsPlainText", "undo", "redo" ],
@@ -82,6 +85,11 @@ def check_layout(layout):
     unexpected_keys(keys, [""], "Layout contains empty strings")
     unexpected_keys(keys, ["loc"], "Special keyword cannot be a symbol")
     unexpected_keys(keys, filter(lambda k: k.strip()!=k, keys), "Some keys contain whitespaces")
+    unexpected_keys(keys, ["f11_placeholder", "f12_placeholder"], "These keys are now added automatically")
+
+    if root.get("script", "latin") == "latin":
+        missing_required(keys, ["shift", "loc capslock"], "Missing important key")
+        missing_required(keys, ["loc esc", "loc tab"], "Missing programming keys")
 
     _, bottom_row_keys, _ = parse_row("res/xml/bottom_row.xml")
 
@@ -95,15 +103,17 @@ def check_layout(layout):
     if root.get("script") == None:
         warn("Layout doesn't specify a script.")
 
-for fname in sorted(sys.argv[1:]):
+for fname in sorted(glob.glob("srcs/layouts/*.xml")):
     layout_id, _ = os.path.splitext(os.path.basename(fname))
     if layout_id in KNOWN_NOT_LAYOUT:
         continue
+    layout_file_name = layout_id
     layout = parse_layout(fname)
     if layout == None:
-        print("Not a layout file: %s" % layout_id)
+        warn("Not a layout file")
     else:
-        print("# %s" % layout_id)
-        warning_count = 0
         check_layout(layout)
-        print("%d warnings" % warning_count)
+
+with open("check_layout.output", "w") as out:
+    for w in warnings:
+        print(w, file=out)

doc/Custom-layouts.md

@@ -0,0 +1,156 @@
+# Custom layouts
+You select a key layout for Unexpected Keyboard by calling up the Settings page (swipe the gear icon) and, at the top of the page, either tapping an existing layout or tapping _Add an alternate layout_. This displays a menu of available layouts. You can define your own layout by choosing _Custom layout_ at the bottom of this menu. Unexpected Keyboard now displays code in the XML format. You make changes by replacing this with different code and tapping OK.
+
+We recommend you keep your work in a file outside Unexpected Keyboard (named something like `MyChanges.xml`). If you installed a new version of Unexpected from a different website (with a different signature), then the work you did solely by editing the XML inside Unexpected would be lost.
+
+Put initial contents into your file in one of these ways:
+* Copypaste the code Unexpected displays for _Custom layout_.
+* Make a copy of one of the built-in layouts found in [`/srcs/layouts`](https://github.com/Julow/Unexpected-Keyboard/tree/master/srcs/layouts).
+* Use the [web-based editor](https://unexpected-keyboard-layout-editor.lixquid.com/). Interact with this web page to define keys and swipes and move keys to desired positions, and it will write the XML code for you. You can make the web page put the XML in a text file or copy it to the clipboard.
+
+When you have prepared suitable XML code in one of these ways, copy it to the clipboard and paste it into Unexpected Keyboard.
+
+## XML language overview
+A layout XML file comprises tags that start with `<` and end with `>`.
+* Every layout file starts with this declaration:
+  `<?xml version="1.0" encoding="utf-8"?>`
+* Certain tags come in pairs—an opening tag and a closing tag—and apply to everything between them.
+  * The `<keyboard>`...`</keyboard>` pair says that the material between them is the definition of your keyboard. There can be only one of these.
+  * The `<row>`...`</row>` pair encloses the definition of a single row.
+  * An optional `<modmap>`...`</modmap>` pair contains instructions if you want to change the behavior of a modifier key such as Shift.
+* Stand-alone tags include `<key`...`/>`, which defines a single key.
+
+A tag can have properties, defined using an equals sign and a pair of ASCII double quotes. For example, `<key c="a" />` defines the "a" key. The `c` property of the `key` tag says which key you are defining, and the tag's location inside `<row>`...`</row>` specifies where it will go in the row.
+
+### Example
+Here is a complete keyboard file with a single row containing an "a" key on the left and a "b" key on the right:
+
+    <?xml version="1.0" encoding="utf-8"?>
+    <keyboard name="Simple example" script="latin">
+        <row>
+            <key c="a" />
+            <key c="b" />
+        </row>
+    </keyboard>
+
+## Keyboard metadata
+
+The `<keyboard>`...`</keyboard>` pair follows the declaration tag and encloses the whole keyboard. The following properties may be used (The first two appear in the example above):
+
+* `name`: The name of the keyboard. The name you specify will appear in the Settings menu. If not present, the layout will just appear as “Custom layout”.
+
+* `script`: The (main) writing system that the keyboard supports. The possible values are `arabic`, `armenian`, `bengali`, `cyrillic`, `devanagari`, `gujarati`, `hangul`, `hebrew`, `latin`, `persian`, `shavian`, and `urdu`. It defaults to `latin`.
+
+* `numpad_script`: The script to use for the numpad. This is useful for scripts where a different, non-ASCII set of numerals is used, like Devanagari and Arabic. It defaults to the same as `script`.
+
+* `bottom_row`: Whether or not to show the built-in bottom row. It accepts `true` or `false`, and defaults to `true`. If your custom layout defines the bottom row, then specify `bottom_row="false"` to disable the built-in bottom row.
+  + We recommend your layout use the built-in bottom row, because it is still evolving and your layout will incorporate innovations in future versions. However, to define your own, the current definition of the bottom row is in [bottom_row.xml](https://github.com/Julow/Unexpected-Keyboard/res/xml/bottom_row.xml). You can copypaste this XML into your custom layout as a starting point.
+  + Likewise, the current definition of the top (number) row is in [number_row.xml](https://github.com/Julow/Unexpected-Keyboard/res/xml/number_row.xml).
+
+* `embedded_number_row`: Whether the layout has an embedded number row, and thus the "Show number row" setting shouldn't add another one. It accepts `true` or `false`, and defaults to `false`.
+
+* `locale_extra_keys`: Whether Unexpected should add language-dependent extra keys from [method.xml](../res/xml/method.xml) to this layout. It accepts `true` or `false`, and defaults to `true`. To disable these automatic additions, specify `locale_extra_keys="false"`.
+
+## Row
+The `<row>`...`</row>` pair encloses one row on the keyboard. It has only one optional property:
+* `height`: The height of the row: a positive floating-point value.
+
+A row's default height is 1.0 (one quarter of the keyboard height specified on the Settings menu). The `height` property makes the row taller or shorter than this. For example, if you define a 5-row keyboard but one row has `height="0.7"`, then the keyboard's total height is 4.7 units. If the total is different from 4.0, the keyboard will be taller or shorter than that specified in Settings.
+
+## Key
+The `<key />` tag defines a key on the keyboard. Its position in the sequence of keys inside `<row>`...`</row>` indicates its position in the row from left to right. What the key does is defined by optional properties.
+
+### Taps
+What the key does when tapped is defined by the optional `c` property. For example, `<key c="a" />` defines the "a" key. Unexpected Keyboard provides a legend in the middle of the key.
+
+When the Shift modifier is tapped, the "a" key becomes the "A" key and the legend temporarily changes. The Fn modifier makes a different change. You can override this behavior with a modmap (see below).
+
+### Swipes
+The following optional properties define the effects of swipes:
+* `n`, `ne`, `e`, `se`, `s`, `sw`, `w`, `nw`: What the key should do when it is swiped in the direction of that compass point. ("North" means upward and "East" is to the right.)
+<TABLE ALIGN=CENTER>
+  <TR>
+    <TD STYLE="width: 6em;">nw</TD><TD>n</TD><TD>ne</TD>
+  </TR>
+  <TR ALIGN=CENTER>
+    <TD>w</TD><TD>c</TD><TD>e</TD>
+  </TR>
+  <TR>
+    <TD>sw</TD><TD>s</TD><TD>se</TD>
+  </TR>
+</TABLE>
+
+* `key1` through `key8` is an older way to achieve the same effects. The directions are ordered as follows:
+<TABLE ALIGN=CENTER>
+  <TR>
+    <TD>key1</TD><TD>key7</TD><TD>key2</TD>
+  </TR>
+  <TR>
+    <TD>key5</TD><TD>key0</TD><TD>key6</TD>
+  </TR>
+  <TR>
+    <TD>key3</TD><TD>key8</TD><TD>key4</TD>
+  </TR>
+</TABLE>
+
+You can define a swipe only once with either compass-point or numeric notation. Unexpected Keyboard automatically puts a small legend in that direction from the center of the key.
+
+* `anticircle`: The key value to send when doing an anti-clockwise gesture on the key.
+
+### Layout
+A key may have the following properties to control the row's layout:
+* `width`: The width of the key, a positive floating-point value. It defaults to 1.0
+* `shift`: How much empty space to add to the left of this key, a non-negative floating-point value. It defaults to 0.0
+
+Normally, a key's width is 1.0 unit. Unexpected Keyboard occupies the full width of the screen, and the row defining the highest number of units (in widths plus shifts) is as wide as the screen. A row whose width is a smaller number of units has empty space on the right.
+
+### Extra legend
+* `indication`: An optional extra legend to show under the main label. For example, `<key c="2" indication="ABC" />` displays ABC at the bottom of the 2 key, as on a pinpad or some telephones. If the key also defines a downward swipe with `s` or `key8`, the legends overlap.
+
+### Possible key values
+Built-in strings that assign a special function to a key are described in [this page](Possible-key-values.md). For example, `se="copy"` means a southeasterly swipe produces the Copy key. If a key value does not match any of the built-in strings, it outputs that text _verbatim_. For example, `c="a"` simply outputs the letter a.
+
+In a layout, a key value can also start with the `loc` prefix. These are place-holders; the tap or swipe does nothing unless enabled through the "Add keys to keyboard" option in the Settings menu, or implicitly enabled by the language the device is set to use. For example, `ne="loc accent_aigu"` says that a northeast swipe produces the acute accent combinatorial key—if enabled.
+
+## Modmap
+The `<modmap>`...`</modmap>` pair encloses custom mappings for modifier keys. The modmap is placed inside the `<keyboard>`...`</keyboard>` pair, but outside any row. A layout can have at most one modmap. It can contain any number of mappings. Each mapping has an `a` property and a `b` property and maps the `a` key to the `b` key. Valid values are listed in [Possible key values](Possible-key-values.md).
+
+The following mappings are supported:
+
+```xml
+  <shift a="before" b="after" />
+```
+This means that when the Shift modifier is on, the key `before` is changed into `after`.
+
+```xml
+  <fn a="before" b="after" />
+```
+This means that when the Fn modifier is on, the key `before` is changed into `after`.
+
+```xml
+  <ctrl a="before" b="after" />
+```
+This means that when the Ctrl modifier is on, the key `before` is changed into `after`. The `<ctrl />` mapping is special in that the Ctrl modifier is applied to `after` after the mapping.
+
+The clockwise circle and the round-trip gestures are affected by both `<shift />` and `<fn />` mappings. The Shift mappings are used first and if that did not modify the key, the Fn mappings are used instead.
+
+### Examples
+① Turkish keyboards use the Latin alphabet, but when "i" is shifted, it should produce "İ". This is achieved with the following mapping: 
+
+```xml
+    <shift a="i" b="İ" />
+```
+② Cyrillic layouts have no V key. A layout can define Ctrl-V with the following mapping:
+
+```xml
+    <ctrl a="в" b="v" />
+```
+This maps Ctrl+в to Ctrl+V—not to v.
+
+## Portrait vs. landscape
+Unexpected Keyboard remembers *separately* which layout has last been used in portrait and landscape orientation. So you may have one custom layout for portrait orientation, but another custom layout for landscape orientation, and Unexpected Keyboard will switch between them without your intervention.
+
+## Contributing your layout
+The Unexpected Keyboard project enthusiastically accepts user contributions, including custom layouts. (See the guidance for layouts at [CONTRIBUTING.md](https://github.com/Julow/Unexpected-Keyboard/blob/master/CONTRIBUTING.md#Adding-a-layout)).
+* Submit a layout that has innovations of possible interest to other users at [Unexpected-Keyboard-layouts](https://github.com/Julow/Unexpected-Keyboard-layouts).
+* Propose that your layout be included in the set of built-in layouts by making a Pull Request for an addition to [srcs/layouts](https://github.com/Julow/Unexpected-Keyboard/tree/master/srcs/layouts). Please show that such a layout is standard in your locale or has a substantial number of users.

doc/Possible-key-values.md

@@ -0,0 +1,188 @@
+# Key values
+
+A key value defines what a key on the keyboard does when pressed or swiped.
+
+Key values appear in the following places:
+
+- In custom layouts, they are the value of: the `c` attribute, the compass-point attributes `nw` ... `se`, and the old-style `key0` ... `key8` attributes.
+- Internally, they are used in the definition of the "Add keys to the keyboard" setting.
+
+Key values can be any of the following:
+
+- The name of a special key. A complete list of valid special keys follows.
+
+- An arbitrary sequence of characters not containing `:`.
+  This results in a key that writes the specified characters.
+
+- The syntax `legend:key_def`.
+  `legend` is the visible legend on the keyboard. It cannot contain `:`.
+  `key_def` can be:
+  + The name of a special key, as listed below.
+  + `'string'` An arbitrary string that can contain `:`. `'` can be added to the string as `` \' ``.
+  + `keyevent:keycode` An Android keycode. They are listed as `KEYCODE_...` in [KeyEvent](https://developer.android.com/reference/android/view/KeyEvent#summary).
+
+  Examples:
+  + `⏯:keyevent:85` A play/pause key (which has no effect in most apps).
+  + `my@:'my.email@domain.com'` A key that sends an arbitrary string
+
+- A macro, `symbol:key_def1,key_def2,...`.
+  This results in a key that behaves as if the sequence of `key_def` had been pressed in order.
+
+  Examples:
+  + `CA:ctrl,a,ctrl,c` A key with legend CA that sends the sequence `ctrl+a`, `ctrl+c`.
+  + `Cd:ctrl,backspace` A key with legend Cd that sends the shortcut `ctrl+backspace`.
+
+## Escape codes
+Value | Escape code for
+:---- | :------
+`\?`  | `?`
+`\#`  | `#`
+`\@`  | `@`
+`\n`  | Literal newline character. This is different from `enter` and `action` in certain apps.
+`\t`  | Literal tab character. This is different from `tab` in certain apps.
+`\\`  | `\`
+
+XML escape codes also work, including:
+
+Value    | Escape code for
+:------- | :------
+`&`  | `&`
+`&lt;`   | `<`
+`&gt;`   | `>`
+`&quot;` | `"`
+
+## Modifiers
+System modifiers are sent to the app, which can take app-specific action.
+
+Value       | Meaning
+:---------- | :------
+`shift`     | System modifier.
+`ctrl`      | System modifier.
+`alt`       | System modifier.
+`meta`      | System modifier. Equivalent to the Windows key.
+
+The other modifiers take effect only within the keyboard.
+
+Value       | Meaning
+:---------- | :------
+`fn`        | Activates Fn mode, which assigns letters and symbols to special characters. Example: `fn` `!` = `¡`
+`compose`   | Compose key. Enables composing characters using Linux-like shortcuts. Example: `Compose` `A` `'` types `Á` (A with acute accent).
+`capslock`  | Activates and locks Shift.
+
+## App function keys
+These keys are sent to apps, which are free to ignore them. The keyboard does not perform editing in response to these keys.
+
+`esc`, `enter`,
+`up`, `right`,
+`down`, `left`,
+`page_up`, `page_down`,
+`home`, `end`,
+`backspace`, `delete`,
+`insert`, `scroll_lock`,
+`f1`-`f12`,
+`tab`, `copy`,
+`paste`, `cut`,
+`selectAll`, `pasteAsPlainText`,
+`undo`, `redo`
+
+## Keyboard editing actions
+In contrast, these keys perform editing on the text without sending anything to the app.
+Value                 | Meaning
+:-------------------- | :------
+`cursor_left`         | Moves the cursor to the left with the slider gesture.
+`cursor_right`        | Moves the cursor to the right with the slider gesture.
+`cursor_up`           | Moves the cursor up with the slider gesture. Warning: this might make the cursor leave the text box.
+`cursor_down`         | Moves the cursor down with the slider gesture. Warning: this might make the cursor leave the text box.
+`delete_word`         | Delete the word to the left of the cursor.
+`forward_delete_word` | Delete the word to the right of the cursor.
+
+## Whitespace
+Value   | Meaning
+:------ | :------
+`space` | Space bar.
+`nbsp`  | Non-breaking space.
+`nnbsp` | Narrow non-breaking space.
+`zwj`   | Zero-width joiner.
+`zwnj`  | Zero-width non-joiner.
+
+## Other modifiers and diacritics
+Value                | Meaning
+:------------------- | :------
+`accent_aigu`        | Acute accent. `á`
+`accent_caron`       | Háček. `č`
+`accent_cedille`     | Cedilla. `ç`
+`accent_circonflexe` | Circumflex. `â`
+`accent_grave`       | Grave accent. `à`
+`accent_macron`      | Macron. `ā`
+`accent_ring`        | Ring accent. `å`
+`accent_tilde`       | Tilde. `ã`
+`accent_trema`       | Dieresis/umlaut. `ä`
+`accent_ogonek`      | Ogonek. `ą`
+`accent_dot_above`   | Dot accent. `ż` If applied to the lowercase `i`, removes the dot instead for Turkish. `ı`
+`accent_double_aigu` | Double acute accent. `ő`
+`accent_slash`       | Slash through. `ø`
+`accent_arrow_right` | Right arrow above, used to denote a vector. `a⃗`
+`accent_breve`       | Breve. `ă`
+`accent_bar`         | Bar/strikethrough. `ɨ`
+`accent_dot_below`   | Dot below. `ạ`
+`accent_horn`        | Horn accent. `ơ`
+`accent_hook_above`  | Hook accent. `ả`
+`accent_double_grave`  | Double grave accent. `ȁ`
+`superscript`        | Superscript. `ᵃ`
+`subscript`          | Subscript. `ₐ`
+`ordinal`            | Turns `a` and `o` into `ª` and `º`.
+`arrows`             | Turns `1`-`4` and `6`-`9` into arrows.
+`box`                | Turns `1`-`9`, `0`, and `.` into single-line, thin box-drawing characters.
+
+## Bidirectional
+Value   | Meaning
+:------ | :------
+`lrm`   | Left-to-right mark.
+`rlm`   | Right-to-left mark.
+`b(`, `b)`, `b[`, `b]`, `b{`, `b}`, `blt`, `bgt` | Sends the bracket characters, but with mirrored key legends for right-to-left languages. (`blt` and `bgt` print `<` and `>` respectively.)
+
+## Hebrew
+Keys ending in `_placeholder` are normally hidden unless the Fn key is pressed.
+
+`qamats`, `patah`,
+`sheva`, `dagesh`,
+`hiriq`, `segol`,
+`tsere`, `holam`,
+`qubuts`, `hataf_patah`,
+`hataf_qamats`, `hataf_segol`,
+`shindot`, `shindot_placeholder`,
+`sindot`, `sindot_placeholder`,
+`geresh`, `gershayim`,
+`maqaf`, `rafe`,
+`ole`, `ole_placeholder`,
+`meteg`, `meteg_placeholder`
+
+## Keyboard behavior keys
+Value                  | Meaning
+:--------------------- | :------
+`config`               | Gear icon; opens Unexpected Keyboard settings.
+`switch_text`          | Switch to the text layer (main layer).
+`switch_numeric`       | Switch to the numeric layer.
+`switch_emoji`         | Switch to the emoji layer.
+`switch_back_emoji`    | Switch to the text layer from the emoji layer.
+`switch_forward`       | Change the keyboard layout, as long as Unexpected Keyboard has multiple keyboard layouts enabled in the settings.
+`switch_backward`      | Change the keyboard layout to the previous one in the list.
+`switch_greekmath`     | Switch to the Greek & Math Symbols layer.
+`switch_clipboard`     | Switch to the clipboard pane.
+`change_method`        | Open the input method picker dialog.
+`change_method_prev`   | Switch to the previously used input method.
+`action`               | Performs a special context-sensitive operation related to the Enter key. For example, in the Twitter (X) app, `enter` adds a new line, while `action` posts.
+`voice_typing`         | Begin voice typing.
+`voice_typing_chooser` | Shows a menu where you can choose which voice typing provider to use, then begins voice typing when you make a selection.
+`shareText`            | Emit a share Intent for the selected text. **Oddity:** This is in CamelCase.
+
+## Unused
+These keys are known to do nothing.
+
+`replaceText`, `textAssist`,
+`autofill`, `removed`
+
+## Placeholders
+These keys are normally hidden unless the Fn modifier is activated.
+
+`f11_placeholder` | `f12_placeholder`

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -0,0 +1,6 @@
+Hlavní funkcí je možnost psát více znaků posunutím kláves směrem k rohům.
+
+Tato aplikace byla původně navržena pro programátory používající Termux.
+Nyní je ideální pro každodenní použití.
+
+Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je Open Source.

fastlane/metadata/android/en-US/changelogs/40.txt

@@ -0,0 +1,11 @@
+MessagEase and Thumb-Key inspired gestures with the anti-clockwise circle being
+completely configurable.
+
+Updated emojis.
+Improved Hangul (Korean) support.
+Added Danish support.
+Improved spacebar slider.
+Updated translations.
+Various improvements and fixes to the app and layouts.
+
+Many thanks to the contributors: @alotbsol555 @bkmgit @Cheesebaron @CloneWith @eandersons @JapanYoshi @Julow @la-ninpre @m15a @marciozomb13 @polyctena @solokot @Spike-from-NH @tmqCypher @Validbit

fastlane/metadata/android/en-US/changelogs/41.txt

@@ -0,0 +1,8 @@
+Clipboard pane
+
+New Monet theme
+Improvements to custom layouts
+Options to disable key repeat and the circle gesture
+Options to disable the Tab and Esc keys
+
+Many thanks to the contributors: @alotbsol555 @ChasmSolacer @eandersons @polyctena @Sestowner @solokot @Spike-from-NH @TadaCZE @V6lhost @Validbit

fastlane/metadata/android/en-US/changelogs/42.txt

@@ -0,0 +1,6 @@
+Fix crash on Android 6.
+Fix scaling issues for layouts with few columns.
+Added Serbian layouts.
+Layout and compose key tweaks. Improvements to custom layouts. Added Menu key.
+
+Many thanks to the contributors: @adrian4096 @asivery @bokidori @dingodoppelt @RZHSSNZDH

fastlane/metadata/android/en-US/changelogs/43.txt

@@ -0,0 +1,14 @@
+New supported languages: Albanian, Belgian, Estonian, Georgian, Hawaiian,
+Irish, Kannada, Kazakh, Old Church Slavonic, Serbian, Tajiki, Tamil, Welsh
+
+Added WORKMAN (US) layout.
+Improved layouts for modern Hindi and Sanskrit, Greek, Kurdish, Persian, Czech.
+
+New compose sequences and added combining diacritic keys.
+New and improved themes.
+Many bug fixes and improvements.
+
+Many thanks to the contributors: @anaskaejdar @bokidori @cknight828 @cuhsy
+@Danger-Mkh @DocJr90 @IYO-OYI @kalankaboom @Kxeo @marciozomb13 @ms-jagadeeshan
+@npnpatidar @ptitgnu @quantenzitrone @Sestowner @solokot @Spike-from-NH
+@tenextractor

fastlane/metadata/android/en-US/changelogs/44.txt

@@ -0,0 +1 @@
+Bug fixes

fastlane/metadata/android/en-US/changelogs/45.txt

@@ -0,0 +1 @@
+Bug fixes

fastlane/metadata/android/en-US/changelogs/46.txt

@@ -0,0 +1 @@
+Bug fixes

fastlane/metadata/android/ja-JP/full_description.txt

@@ -0,0 +1,7 @@
+このキーボードは、キーの角をスワイプすることで様々なキーを入力できます。
+
+このアプリは元々はTermuxでのプログラミング用に設計されました。
+しかし、今では普段の入力にも適しています。
+PCキーボードでの半角入力を再現しています。日本語入力、変換は出来ません。
+
+このアプリは広告を含まず、インターネットに接続せず、そしてオープンソースです。

fastlane/metadata/android/ja-JP/short_description.txt

@@ -0,0 +1 @@
+軽量でプライバシーに配慮したAndroid用仮想キーボード

fastlane/metadata/android/ko-KR/full_description.txt

@@ -0,0 +1,6 @@
+주요 기능은 모서리 방향으로 키를 스와이프하여 더 많은 문자를 입력할 수 있다는 것입니다.
+
+이 앱은 처음에는 Termux를 사용하는 프로그래머들을 위한 것으로 개발되었습니다.
+지금은 일상적인 용도로도 완벽합니다.
+
+이 응용 프로그램에는 광고가 없으며 네트워크 요청을 하지 않고 오픈 소스입니다.

fastlane/metadata/android/pt-BR/full_description.txt

@@ -0,0 +1,6 @@
+A principal característica é que você pode digitar mais caracteres deslizando as teclas para os cantos.
+
+O app foi criado originalmente para desenvolvedores que usam Termux.
+Agora aperfeiçoado para o uso diário.
+
+Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e é Open Source.

fastlane/metadata/android/ru-RU/full_description.txt

@@ -0,0 +1,6 @@
+Главная особенность клавиатуры — это возможность легко напечатать любой ASCII-символ жестами в углы клавиш.
+
+Приложение изначально было разработано для использования с Termux.
+На данный момент оно также удобно в повседневном использовании.
+
+Приложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код.