Merge: gauge low-usage fill uses the space bar button colour

Harley wanted a pink/violet keyboard. The alternates use the exact violet sampled
from his own UI accent (#c67dff); letters are pink (#ff8ad8), activated keys
(shift/Esc/123+) are filled violet (#a855f7) with dark glyphs, caps-lock is
periwinkle blue (#9db8ff), background is violet-black (#100a1c). Contrast checked:
9.13 / 7.19 / 9.92 / 4.9 :1. Five edits: themes.xml style, arrays.xml entries+values
(kept index-aligned), strings.xml label, Config.java case.

.github/workflows/check-generated.yml

@@ -0,0 +1,39 @@
+name: Check generated files
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  gen-layouts:
+    name: Layout list
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - run: python3 gen_layouts.py
+    - name: "Run 'python3 gen_layouts.py' to update the generated files."
+      run: git diff --exit-code
+
+  check-layouts:
+    name: Layout warnings
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - 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
+
+  check-compose:
+    name: Compose key data
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - run: python3 srcs/compose/compile.py srcs/compose/{*.json,compose} > srcs/juloo.keyboard2/ComposeKeyData.java
+    - name: "Run 'gradle test' to update the generated files."
+      run: git diff --exit-code

.github/workflows/check-layouts.yml

@@ -1,26 +0,0 @@
-name: Check layouts
-
-on:
-  workflow_dispatch:
-  push:
-  pull_request:
-
-jobs:
-  gen-layouts:
-    name: Generated files
-    runs-on: ubuntu-latest
-    steps:
-    - 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'"
-      run: git diff --exit-code
-  check-layouts:
-    name: check_layout.output
-    runs-on: ubuntu-latest
-    steps:
-    - 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'"
-      run: git diff --exit-code

.github/workflows/check-translations.yml

@@ -1,16 +0,0 @@
-name: Check translations
-
-on:
-  workflow_dispatch:
-  push:
-  pull_request:
-
-jobs:
-  check-translations:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repo
-      uses: actions/checkout@v4
-    - run: python3 sync_translations.py
-    - name: "Check that strings files are uptodate, otherwise run 'python3 sync_translations.py'"
-      run: git add -N . && git diff --exit-code

.github/workflows/make-apk.yml

@@ -3,18 +3,19 @@ name: Make Apk CI
 on:
   workflow_dispatch:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:
   Build-Apk:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-java@v4
-      with:
-        distribution: 'zulu' # See 'Supported distributions' for available options
-        java-version: '17'
     - name: Checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        submodules: true
+
     - name: Restore debug keystore from GitHub Secrets
       run: |
         # Check if exist and use the secret named DEBUG_KEYSTORE
@@ -28,15 +29,32 @@ jobs:
                 gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
             fi
         fi
+
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        gradle-version: 8.14.4
+
+    - name: Run tests
+      run: |
+        gradle test
+        # Warn about outdated generated files.
+        if ! git diff --name-only; then
+          echo "Warning: Generated files are not uptodate. Run 'gradle test'."
+        fi
+
     - name: Build debug APK
-      uses: gradle/gradle-build-action@v3
+      run: ./gradlew assembleDebug
       env:
         DEBUG_KEYSTORE: "debug.keystore"
         DEBUG_KEYSTORE_PASSWORD: debug0
         DEBUG_KEY_ALIAS: debug
         DEBUG_KEY_PASSWORD: debug0
-      with:
-        arguments: assembleDebug
+
     - name: Artifact naming
       run: |
         artifact="${{github.repository_owner}} ${{github.ref_name}}"

.gitignore

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/cdict"]
+	path = vendor/cdict
+	url = https://github.com/Julow/cdict

AGENTS.md

@@ -0,0 +1,46 @@
+# Harley's Keyboard - agent notes
+
+Fork of Julow/Unexpected-Keyboard (Unexpected Keyboard). Android IME, Java, Gradle Kotlin DSL.
+
+## Build & test (exact)
+
+```bash
+./gradlew testDebugUnitTest assembleDebug    # full verification: unit tests THEN the APK
+./gradlew clean assembleDebug                # when a generated file may be stale
+```
+
+- SDK: `local.properties` -> `sdk.dir=/home/nyra/android-sdk` (present, gitignored, do not commit).
+- JDK 21, build-tools 34.0.0/36.0.0, AGP 8.8.2, compileSdk 36, minSdk 21.
+- APK: `build/outputs/apk/debug/Unexpected-Keyboard-debug.apk`, package id `harley.keyboard`.
+
+## Layout & generated code
+
+- Layout rows live in `srcs/layouts/*.xml`. A layout edit needs a **full build**, not just compile:
+  `gen_layouts.py` regenerates `res/values/layouts.xml`, `res/raw/*.xml` and
+  `srcs/juloo.keyboard2/ComposeKeyData.java`. Unit tests run before regeneration report
+  stale-generated-state failures that are not real bugs.
+- Never hand-edit generated files (`res/values/layouts.xml`, `res/raw/*`, `ComposeKeyData.java`,
+  `res/xml/method.xml`).
+
+## Always do
+
+- Run `./gradlew testDebugUnitTest assembleDebug` before reporting done.
+- Keep user-visible text in `res/values/strings.xml`.
+- Keep all network access off the UI thread.
+
+## Ask first
+
+- Adding any dependency (prefer the framework: `org.json`, `HttpURLConnection`).
+- Changing the package id, signing config or versionCode.
+
+## Never do
+
+- Commit or print secrets/tokens; no credentials in code, XML, tests or logs.
+- Touch `.git` internals, force-push, or edit CI workflows.
+- Enable cleartext HTTP globally (only a per-host network security config).
+- Change the space-bar peak-colour behaviour (a separate, deliberate feature).
+
+## Definition of done
+
+`./gradlew testDebugUnitTest assembleDebug` exits 0, new behaviour is covered by unit tests,
+and the tree has no generated-file diffs beyond what a normal build produces.

AndroidManifest.xml

@@ -2,25 +2,35 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:hardwareAccelerated="false">
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:hardwareAccelerated="false">
+  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:hardwareAccelerated="false" android:networkSecurityConfig="@xml/network_security_config">
     <service android:name="juloo.keyboard2.Keyboard2" android:label="@string/app_name" android:permission="android.permission.BIND_INPUT_METHOD" android:exported="true" android:directBootAware="true">
       <intent-filter>
         <action android:name="android.view.InputMethod"/>
       </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: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"/>
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
+
+    <activity android:name="juloo.keyboard2.dict.DictionariesActivity" android:icon="@mipmap/ic_launcher" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+      </intent-filter>
+    </activity>
   </application>
 
   <!-- To query enabled input methods for voice IME detection -->

CONTRIBUTING.md

@@ -7,10 +7,16 @@ Thanks for contributing :)
 The application uses Gradle and can be used with Android Studio, but using
 Android Studio is not required. The build dependencies are:
 - OpenJDK 17
-- Android SDK: build tools (minimum `28.0.1`), platform `30`
+- Android SDK: build tools, platform `36`
 
 Python 3 is required to update generated files but not to build the app.
 
+Make sure the Git submodules are initialized and point to the right revision:
+
+```sh
+git submodule update --init
+```
+
 For Android Studio users, no more setup is needed.
 
 For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
@@ -173,13 +179,13 @@ Remove the `<!--` and `-->` parts and change the text.
 
 ### Adding a translation
 
+The preferred method for translating the app is to use Weblate:
+https://hosted.weblate.org/engage/unexpected-keyboard/
+
 The `res/values-<language_tag>/strings.xml` file must be created by copying the
 default translation in `res/values/strings.xml`, which contain the structure of
 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 `fastlane/metadata/android/` are updated automatically.
 Translating changelogs is not useful.
 
@@ -190,18 +196,46 @@ 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
+### Adding symbols to Shift, Fn, Compose and other modifiers
 
-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.
+New key combinations can be added to builtin modifiers in the following files:
 
-### Adding key combinations
+- Shift in `srcs/compose/shift.json`.
+- Fn in `srcs/compose/fn.json`.
+- Compose in `srcs/compose/compose/extra.json`.
+- Other modifiers are defined in the `accent_*.json` files in `srcs/compose`.
 
-Key combinations are defined in `srcs/juloo.keyboard2/KeyModifier.java`.
-For example, keys modified by the `Fn` key are defined in method
-`apply_fn_char`.
+Generated code must then be updated by running:
 
-Keys with special meaning are defined in `KeyValue.java` in method
-`getKeyByName`. Their special action are defined in `KeyEventHandler.java` in
-method `key_up`
+```
+./gradlew compileComposeSequences
+```
+
+These files describe each symbols that get transformed when a given modifier is
+activated, in JSON format. For example:
+
+Example from `fn.json`, when `Fn` is activated, `<` becomes `«`:
+```json
+{
+  "<": "«",
+}
+```
+
+The result of a sequence can be a key name. See the list of key names in
+[doc/Possible-key-values.md](doc/Possible-key-values.md). For example from
+`fn.json`, when `Fn` is activated, space becomes `nbsp`:
+```json
+{
+  " ": "nbsp",
+}
+```
+
+Compose sequences are made of several steps. For example, the sequence
+`Compose V s = Š` is defined as:
+```json
+{
+  "V": {
+    "s": "Š"
+  }
+}
+```

README.md

@@ -1,4 +1,12 @@
-# Unexpected Keyboard
+# Unexpected Keyboard [<img src="https://hosted.weblate.org/widget/unexpected-keyboard/svg-badge.svg" alt="État de la traduction" />](https://hosted.weblate.org/engage/unexpected-keyboard/)
+
+---
+
+⚠️ Google wants to kill the open-source Android community.
+
+See [keepandroidopen.org](https://keepandroidopen.org/) and the [F-Droid blog](https://f-droid.org/en/2025/09/29/google-developer-registration-decree.html).
+
+---
 
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
@@ -16,7 +24,7 @@ The main feature is that you can type more characters by swiping the keys toward
 This application was originally designed for programmers using Termux.
 Now perfect for everyday use.
 
-This application contains no ads, doesn't make any network requests and is Open Source.
+This application contains no ads and is open source.
 
 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.
 
@@ -24,10 +32,17 @@ Usage: to apply the symbols located in the corners of each key, slide your finge
 | --- | --- | --- |
 | <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://git.bubu1.eu/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators.
+## Help translate the application
+
+Improve the application translations [using Weblate](https://hosted.weblate.org/engage/unexpected-keyboard/).
+
+[<img src="https://hosted.weblate.org/widget/unexpected-keyboard/multi-auto.svg" alt="État de la traduction" />](https://hosted.weblate.org/engage/unexpected-keyboard/)
 
 ## Contributing
 
 For instructions on building the application, see
 [Contributing](CONTRIBUTING.md).
+
+## Acknowledgement
+
+The [NLnet foundation](https://nlnet.nl/) funded the work on the spell checking feature.

build.gradle

@@ -1,199 +0,0 @@
-plugins {
-  id 'com.android.application' version '8.1.1'
-}
-
-dependencies {
-  testImplementation "junit:junit:4.13.2"
-}
-
-android {
-  namespace 'juloo.keyboard2'
-  compileSdk 34
-
-  defaultConfig {
-    applicationId "juloo.keyboard2"
-    minSdk 11
-    targetSdkVersion 35
-    versionCode 43
-    versionName "1.30.0"
-  }
-
-  sourceSets {
-    main {
-      manifest.srcFile 'AndroidManifest.xml'
-      java.srcDirs = ['srcs/juloo.keyboard2']
-      res.srcDirs = ['res', 'build/generated-resources']
-      assets.srcDirs = ['assets']
-    }
-
-    test {
-      java.srcDirs = ['test']
-    }
-  }
-
-  signingConfigs {
-    // Debug builds will always be signed. If no environment variables are set, a default
-    // keystore will be initialized by the task initDebugKeystore and used. This keystore
-    // can be uploaded to GitHub secrets by following instructions in CONTRIBUTING.md
-    // in order to always receive correctly signed debug APKs from the CI.
-    debug {
-      storeFile(System.env.DEBUG_KEYSTORE ? file(System.env.DEBUG_KEYSTORE) : file("debug.keystore"))
-      storePassword(System.env.DEBUG_KEYSTORE_PASSWORD ? "$System.env.DEBUG_KEYSTORE_PASSWORD" : "debug0")
-      keyAlias(System.env.DEBUG_KEY_ALIAS ? "$System.env.DEBUG_KEY_ALIAS" : "debug")
-      keyPassword(System.env.DEBUG_KEY_PASSWORD ? "$System.env.DEBUG_KEY_PASSWORD" : "debug0")
-    }
-
-    release {
-      if (System.env.RELEASE_KEYSTORE) {
-        storeFile file(System.env.RELEASE_KEYSTORE)
-        storePassword "$System.env.RELEASE_KEYSTORE_PASSWORD"
-        keyAlias "$System.env.RELEASE_KEY_ALIAS"
-        keyPassword "$System.env.RELEASE_KEY_PASSWORD"
-      }
-    }
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled true
-      shrinkResources true
-      debuggable false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
-      resValue "string", "app_name", "@string/app_name_release"
-      signingConfig signingConfigs.release
-    }
-
-    debug {
-      minifyEnabled false
-      shrinkResources false
-      debuggable true
-      applicationIdSuffix ".debug"
-      resValue "string", "app_name", "@string/app_name_debug"
-      resValue "bool", "debug_logs", "true"
-      signingConfig signingConfigs.debug
-    }
-  }
-
-  // Name outputs after the application ID.
-  android.applicationVariants.all { variant ->
-    variant.outputs.all {
-      outputFileName = "${applicationId}.apk"
-    }
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
-  }
-
-  lintOptions {
-    // Translation are already checked by 'syncTranslations'
-    disable 'MissingTranslation'
-  }
-}
-
-tasks.register('buildKeyboardFont') {
-  println "\nBuilding assets/special_font.ttf"
-  mkdir "$buildDir"
-  exec {
-    workingDir "$projectDir/srcs/special_font"
-    def svgFiles = workingDir.listFiles().findAll {
-      it.isFile() && it.name.endsWith(".svg")
-    }
-    commandLine("fontforge", "-lang=ff", "-script", "build.pe", "$buildDir/special_font.ttf", *svgFiles)
-  }
-  copy {
-    from "$buildDir/special_font.ttf"
-    into "assets"
-  }
-}
-
-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'
-  dependsOn 'syncTranslations'
-  dependsOn 'compileComposeSequences'
-}
-
-tasks.register('genLayoutsList') {
-  println "\nGenerating res/values/layouts.xml"
-  exec {
-    workingDir = projectDir
-    commandLine "python", "gen_layouts.py"
-  }
-}
-
-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")
-  }
-}
-
-tasks.register('syncTranslations') {
-  println "\nUpdating translations"
-  exec {
-    workingDir = projectDir
-    commandLine "python", "sync_translations.py"
-  }
-}
-
-tasks.register('compileComposeSequences') {
-  def out = "srcs/juloo.keyboard2/ComposeKeyData.java"
-  println "\nGenerating ${out}"
-  exec {
-    def sequences = new File(projectDir, "srcs/compose").listFiles().findAll {
-      !it.name.endsWith(".py") && !it.name.endsWith(".md")
-    }
-    workingDir = projectDir
-    commandLine("python", "srcs/compose/compile.py", *sequences)
-    standardOutput = new FileOutputStream("${projectDir}/${out}")
-  }
-}
-
-tasks.named("preBuild") {
-  dependsOn += "initDebugKeystore"
-  dependsOn += "copyRawQwertyUS"
-  dependsOn += "copyLayoutDefinitions"
-}
-
-tasks.register('initDebugKeystore') {
-  if (!file("debug.keystore").exists()) {
-    println "Initializing default debug keystore"
-    exec {
-      // A shell script might be needed if this line requires input from the user
-      commandLine "keytool", "-genkeypair", "-dname", "cn=d, ou=e, o=b, c=ug", "-alias", "debug", "-keypass", "debug0", "-keystore", "debug.keystore", "-keyalg", "rsa", "-storepass", "debug0", "-validity", "10000"
-    }
-  }
-}
-
-// latn_qwerty_us is used as a raw resource by the custom layout option.
-tasks.register('copyRawQwertyUS')
-{
-  copy {
-    from "srcs/layouts/latn_qwerty_us.xml"
-    into "build/generated-resources/raw"
-  }
-}
-
-tasks.register('copyLayoutDefinitions')
-{
-  copy {
-    from "srcs/layouts"
-    include "*.xml"
-    into "build/generated-resources/xml"
-  }
-}

build.gradle.kts

@@ -0,0 +1,196 @@
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
+import java.io.FileOutputStream
+
+plugins {
+  id("com.android.application") version "8.13.2"
+}
+
+dependencies {
+  // Following versions of androidx.window require sdk version 23
+  implementation("androidx.window:window-java:1.4.0")
+  implementation("androidx.core:core:1.16.0") // Version 1.17.0 available with sdk 36
+  testImplementation("junit:junit:4.13.2")
+}
+
+android {
+  namespace = "juloo.keyboard2"
+  compileSdkVersion = "android-36"
+
+  defaultConfig {
+    applicationId = "harley.keyboard"
+    minSdk = 21
+    targetSdk { version = release(36) }
+    versionCode = 55
+    versionName = "2.0.4"
+  }
+
+  sourceSets {
+    named("main") {
+      manifest.srcFile("AndroidManifest.xml")
+      java.srcDirs("srcs/juloo.keyboard2", "vendor/cdict/java/juloo.cdict")
+      res.srcDirs("res", "build/generated-resources")
+      assets.srcDirs("assets")
+    }
+
+    named("test") {
+      java.srcDirs("test")
+    }
+  }
+
+  externalNativeBuild {
+    ndkBuild {
+      path = file("vendor/Android.mk")
+    }
+  }
+
+  signingConfigs {
+    // Debug builds will always be signed. If no environment variables are set, a default
+    // keystore will be initialized by the task initDebugKeystore and used. This keystore
+    // can be uploaded to GitHub secrets by following instructions in CONTRIBUTING.md
+    // in order to always receive correctly signed debug APKs from the CI.
+    named("debug") {
+      storeFile = file(System.getenv("DEBUG_KEYSTORE") ?: "debug.keystore")
+      storePassword = System.getenv("DEBUG_KEYSTORE_PASSWORD") ?: "debug0"
+      keyAlias = System.getenv("DEBUG_KEY_ALIAS") ?: "debug"
+      keyPassword = System.getenv("DEBUG_KEY_PASSWORD") ?: "debug0"
+    }
+
+    create("release") {
+      val ks = System.getenv("RELEASE_KEYSTORE")
+      if (ks != null) {
+        storeFile = file(ks)
+        storePassword = System.getenv("RELEASE_KEYSTORE_PASSWORD")
+        keyAlias = System.getenv("RELEASE_KEY_ALIAS")
+        keyPassword = System.getenv("RELEASE_KEY_PASSWORD")
+      }
+    }
+  }
+
+  buildTypes {
+    named("release") {
+      isMinifyEnabled = true
+      proguardFiles(
+        getDefaultProguardFile("proguard-android-optimize.txt"),
+        "proguard-rules.pro")
+      isShrinkResources = true
+      isDebuggable = false
+      resValue("string", "app_name", "@string/app_name_release")
+      signingConfig = signingConfigs["release"]
+    }
+
+    named("debug") {
+      isMinifyEnabled = false
+      isShrinkResources = false
+      isDebuggable = true
+      resValue("string", "app_name", "@string/app_name_debug")
+      resValue("bool", "debug_logs", "true")
+      signingConfig = signingConfigs["debug"]
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
+}
+
+
+// This raises an error with an informative message instead of the confusing
+// ndk-build errors that occur when submodules are not initialized.
+gradle.projectsEvaluated {
+  if (!file("vendor/cdict/java").exists())
+    throw GradleException("Git submodules not initialized. Run 'git submodule update --init'")
+}
+
+val buildKeyboardFont by tasks.registering(Exec::class) {
+  val `in` = projectDir.resolve("srcs/special_font")
+  val out = layout.projectDirectory.file("assets/special_font.ttf")
+  inputs.dir(`in`)
+  outputs.file(out)
+  doFirst { println("\nBuilding assets/special_font.ttf") }
+  workingDir = `in`
+  val svgFiles = `in`.listFiles()!!.filter {
+    it.isFile && it.name.endsWith(".svg")
+  }.toTypedArray()
+  commandLine("fontforge", "-lang=ff", "-script", "build.pe", out.asFile.absolutePath, *svgFiles)
+}
+
+val genEmojis by tasks.registering(Exec::class) {
+  doFirst { println("\nGenerating res/raw/emojis.txt") }
+  workingDir = projectDir
+  commandLine("python", "gen_emoji.py")
+}
+
+val genLayoutsList by tasks.registering(Exec::class) {
+  inputs.dir(projectDir.resolve("srcs/layouts"))
+  outputs.file(projectDir.resolve("res/values/layouts.xml"))
+  doFirst { println("\nGenerating res/values/layouts.xml") }
+  workingDir = projectDir
+  commandLine("python", "gen_layouts.py")
+}
+
+val genMethodXml by tasks.registering(Exec::class) {
+  val out = projectDir.resolve("res/xml/method.xml")
+  inputs.file(projectDir.resolve("gen_method_xml.py"))
+  inputs.file(projectDir.resolve("res/values/dictionaries.xml"))
+  outputs.file(out)
+  doFirst { println("\nGenerating res/xml/method.xml") }
+  doFirst { standardOutput = FileOutputStream(out) }
+  workingDir = projectDir
+  commandLine("python", "gen_method_xml.py")
+}
+
+val checkKeyboardLayouts by tasks.registering(Exec::class) {
+  inputs.dir(projectDir.resolve("srcs/layouts"))
+  inputs.file(projectDir.resolve("srcs/juloo.keyboard2/KeyValue.java"))
+  outputs.file(projectDir.resolve("check_layout.output"))
+  doFirst { println("\nChecking layouts") }
+  workingDir = projectDir
+  commandLine("python", "check_layout.py")
+}
+
+val compileComposeSequences by tasks.registering(Exec::class) {
+  val `in` = projectDir.resolve("srcs/compose")
+  val out = projectDir.resolve("srcs/juloo.keyboard2/ComposeKeyData.java")
+  inputs.dir(`in`)
+  outputs.file(out)
+  doFirst { println("\nGenerating $out") }
+  val sequences = `in`.listFiles { it: File ->
+    !it.name.endsWith(".py") && !it.name.endsWith(".md")
+  }!!.map { it.absolutePath }.toTypedArray()
+  workingDir = projectDir
+  commandLine("python", `in`.resolve("compile.py").absolutePath, *sequences)
+  doFirst { standardOutput = FileOutputStream(out) }
+}
+
+tasks.withType(Test::class).configureEach {
+  dependsOn(genLayoutsList, checkKeyboardLayouts, compileComposeSequences, genMethodXml)
+}
+
+val initDebugKeystore by tasks.registering(Exec::class) {
+  doFirst { println("Initializing default debug keystore") }
+  isEnabled = !file("debug.keystore").exists()
+  // A shell script might be needed if this line requires input from the user
+  commandLine("keytool", "-genkeypair", "-dname", "cn=d, ou=e, o=b, c=ug", "-alias", "debug", "-keypass", "debug0", "-keystore", "debug.keystore", "-keyalg", "rsa", "-storepass", "debug0", "-validity", "10000")
+}
+
+// latn_qwerty_us is used as a raw resource by the custom layout option.
+val copyRawQwertyUS by tasks.registering(Copy::class) {
+  from("srcs/layouts/latn_qwerty_us.xml")
+  into("build/generated-resources/raw")
+}
+
+val copyLayoutDefinitions by tasks.registering(Copy::class) {
+  from("srcs/layouts")
+  include("*.xml")
+  into("build/generated-resources/xml")
+}
+
+tasks.named("preBuild") {
+  dependsOn(initDebugKeystore, copyRawQwertyUS, copyLayoutDefinitions)
+  // 'mustRunAfter' defines ordering between tasks (which is required by
+  // Gradle) but doesn't create a dependency. These rules update files that are
+  // checked in the repository that don't need to be updated during regular
+  // builds.
+  mustRunAfter(genEmojis, genLayoutsList, compileComposeSequences, genMethodXml)
+}

check_layout.output

@@ -1,185 +1,32 @@
-# arab_alt
-Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
-1 warnings
-# arab_hamvaj_tly
-Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], _, `, {, |, }
-Layout doesn't define some important keys, missing: loc esc
-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_ckb_fa
-Layout includes some ASCII punctuation but not all, missing: ", #, $, %, &, ', ,, /, ;, ?, @, \, ^, `, |, ~
-Layout doesn't define some important keys, missing: loc esc, loc tab
-2 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
-0 warnings
-# beng_national
-Layout includes some ASCII punctuation but not all, missing: $
-1 warnings
-# beng_provat
-Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
-1 warnings
-# cyrl_jcuken_kk
-0 warnings
-# cyrl_jcuken_ru
-0 warnings
-# cyrl_jcuken_uk
-0 warnings
-# cyrl_lynyertz_sr
-0 warnings
-# cyrl_ueishsht
-0 warnings
-# cyrl_yaverti
-Layout includes some ASCII punctuation but not all, missing: ~
-1 warnings
-# cyrl_yqukeng_tj
-Layout doesn't define some important keys, missing: loc esc, loc tab
-These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
-2 warnings
-# cyrl_yxukeng_os
-Layout includes some ASCII punctuation but not all, missing: ", #, $, &, ', @, [, ], ~
-Layout doesn't define some important keys, missing: loc esc, loc tab
-These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
-3 warnings
-# deva_alt
-Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't define some important keys, missing: loc esc, loc tab
-2 warnings
-# deva_inscript
-Duplicate keys: ।
-Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
-2 warnings
-# deva_phonetic_in
-Duplicate keys: ट
-1 warnings
-# georgian_mes
-0 warnings
-# georgian_qwerty
-0 warnings
-# grek_qwerty
-Duplicate keys: ;
-1 warnings
-# guj_phonetic_in
-Duplicate keys: ટ, ડ
-1 warnings
-# hang_dubeolsik_kr
-Layout doesn't define some important keys, missing: loc esc, loc tab
-1 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
-# kann_kannada
-Layout includes some ASCII punctuation but not all, missing: #, $, %, (, ), *, +, /, <, =, >, [, \, ], ^, `, {, |, }, ~
-Layout doesn't define some important keys, missing: loc esc, loc tab
-2 warnings
-# latn_azerty_be
-0 warnings
-# latn_azerty_fr
-0 warnings
-# latn_bepo_fr
-0 warnings
-# latn_bone
-Layout doesn't define some important keys, missing: loc esc, loc tab
-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_clipboard, 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
-Layout redefines the bottom row but some important keys are missing, missing: loc switch_clipboard
-1 warnings
-# latn_qwerty_br
-0 warnings
-# latn_qwerty_cy
-0 warnings
-# latn_qwerty_cz
-0 warnings
-# latn_qwerty_da
-0 warnings
-# latn_qwerty_es
-0 warnings
-# latn_qwerty_et
-0 warnings
-# latn_qwerty_ga
-0 warnings
-# latn_qwerty_gb
-0 warnings
-# latn_qwerty_haw
-0 warnings
-# latn_qwerty_hu
-0 warnings
-# latn_qwerty_jp
-0 warnings
-# latn_qwerty_kk
-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
-0 warnings
-# latn_qwerty_sr
-0 warnings
-# latn_qwerty_tly
-Duplicate keys: a, c, j, q
-Layout doesn't define some important keys, missing: loc esc, loc tab
-2 warnings
-# latn_qwerty_tr
-0 warnings
-# latn_qwerty_us
-0 warnings
-# latn_qwerty_vi
-0 warnings
-# latn_qwertz
-0 warnings
-# latn_qwertz_cz
-0 warnings
-# latn_qwertz_cz_diacritics
-0 warnings
-# latn_qwertz_cz_multifunctional
-Layout includes some ASCII punctuation but not all, missing: `
-1 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: `
-1 warnings
-# latn_qwertz_sq
-0 warnings
-# latn_workman_us
-0 warnings
-# shaw_imperial_en
-0 warnings
-# tamil_default
-0 warnings
-# urdu_phonetic_ur
-Duplicate keys:  
-Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~
-Some keys contain whitespaces, unexpected:  
-3 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: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
+armn_cpbsmo: Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', *, +, <, =, >, ?, @, [, ], ^, `, {, }, ~
+armn_kvertc: Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', *, +, <, =, >, ?, @, [, ], ^, `, {, }, ~
+beng_assamese: 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_jiuken: Layout includes some ASCII punctuation but not all, missing: #, $, &, ', *, +, <, =, >, @, [, ], ^, _, `, {, }, ~
+cyrl_lynyertdz_mk: Layout includes some ASCII punctuation but not all, missing: "
+cyrl_yaverti: Layout includes some ASCII punctuation but not all, missing: ~
+cyrl_yawerty: Layout includes some ASCII punctuation but not all, missing: #, $, &, ', *, <, >, @, [, ], ^, `, {, }, ~
+cyrl_yxukeng_os: Layout includes some ASCII punctuation but not all, missing: ", #, $, &, ', @, [, ], ~
+deva_alt: Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
+deva_inscript: Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+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: #, $, %, (, ), *, +, /, <, =, >, [, \, ], ^, `, {, |, }, ~
+latin_kbdtuf_tr: Layout includes some ASCII punctuation but not all, missing: $
+latin_kbdtuf_tr: These keys are now added automatically, unexpected: f11_placeholder, f12_placeholder
+latin_kbdtuf_tr: Missing programming keys, missing: loc esc, loc tab
+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: alt, loc switch_clipboard, meta, pgdn, pgup, switch_fn
+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: `
+latn_qzerty_it: Layout includes some ASCII punctuation but not all, missing: #, $, \, `, ~
+urdu_phonetic_ur: Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~

check_layout.py

@@ -1,7 +1,8 @@
 import xml.etree.ElementTree as ET
-import sys, os
+import sys, os, glob, re
 
-warning_count = 0
+layout_file_name = 0
+warnings = []
 
 KNOWN_NOT_LAYOUT = set([
     "number_row", "numpad", "pin",
@@ -14,10 +15,12 @@ KEY_ATTRIBUTES = set([
     "c", "nw", "ne", "sw", "se", "w", "e", "n", "s"
     ])
 
+# Keys defined in KeyValue.java
+known_keys = set()
+
 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)))
@@ -40,42 +43,53 @@ def unexpected_keys(keys, symbols, msg):
     if len(unexpected) > 0:
         warn("%s, unexpected: %s" % (msg, key_list_str(unexpected)))
 
-# Write to [keys] and [dup].
-def parse_row_from_et(row, keys, dup):
-    for key in row:
-        for attr in key.keys():
+def duplicates(keys):
+    dup = [ k for k, key_elts in keys.items() if len(key_elts) >= 2 ]
+    if len(dup) > 0:
+        warn("Duplicate keys: " + key_list_str(dup))
+
+def should_have_role(keys_map, role, keys):
+    def is_center_key(key):
+        def center(key_elt): return key_elt.get("key0", key_elt.get("c"))
+        return any(( center(key_elt) == key for key_elt in keys_map.get(key, []) ))
+    def key_roles(key):
+        return ( key_elt.get("role", "normal") for key_elt in keys_map[key] )
+    for key in keys:
+        if is_center_key(key) and role not in key_roles(key):
+            warn("Key '%s' is not on a key with role=\"%s\"" % (key, role))
+
+# Write to [keys], dict of keyvalue to the key elements they appear in
+def parse_row_from_et(row, keys):
+    for key_elt in row:
+        for attr in key_elt.keys():
             if attr in KEY_ATTRIBUTES:
-                k = key.get(attr).removeprefix("\\")
-                if k in keys: dup.add(k)
-                keys.add(k)
+                k = key_elt.get(attr).removeprefix("\\")
+                keys.setdefault(k, []).append(key_elt)
 
 def parse_layout(fname):
-    keys = set()
-    dup = set()
+    keys = {}
     root = ET.parse(fname).getroot()
     if root.tag != "keyboard":
         return None
     for row in root:
-        parse_row_from_et(row, keys, dup)
-    return root, keys, dup
+        parse_row_from_et(row, keys)
+    return root, keys
 
 def parse_row(fname):
-    keys = set()
-    dup = set()
+    keys = {}
     root = ET.parse(fname).getroot()
     if root.tag != "row":
         return None
-    parse_row_from_et(root, keys, dup)
-    return root, keys, dup
+    parse_row_from_et(root, keys)
+    return root, keys
 
 def check_layout(layout):
-    root, keys, dup = layout
-    if len(dup) > 0: warn("Duplicate keys: " + key_list_str(dup))
+    root, keys_map = layout
+    keys = set(keys_map.keys())
+    duplicates(keys_map)
     missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
     missing_some_of(keys, "0123456789", "digits")
-    missing_required(keys,
-                     ["loc esc", "loc tab", "backspace", "delete"],
-                     "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" ],
@@ -89,8 +103,12 @@ def check_layout(layout):
     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")
 
-    _, bottom_row_keys, _ = parse_row("res/xml/bottom_row.xml")
+    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_map = parse_row("res/xml/bottom_row.xml")
+    bottom_row_keys = set(bottom_row_keys_map.keys())
     if root.get("bottom_row") == "false":
         missing_required(keys, bottom_row_keys,
                          "Layout redefines the bottom row but some important keys are missing")
@@ -101,15 +119,38 @@ def check_layout(layout):
     if root.get("script") == None:
         warn("Layout doesn't specify a script.")
 
-for fname in sorted(sys.argv[1:]):
+    should_have_role(keys_map, "action",
+                     [ "shift", "ctrl", "fn", "backspace", "enter" ])
+    should_have_role(keys_map, "space_bar", [ "space" ])
+
+    keys_without_loc = set(( k.removeprefix("loc ") for k in keys ))
+    # Keys with a len under 3 are often composed characters
+    special_keys = set(( k for k in keys_without_loc if len(k) > 3 and ":" not in k ))
+    unknown = special_keys.difference(known_keys)
+    if len(unknown) > 0:
+        warn("Layout contains unknown keys: %s" % key_list_str(unknown))
+
+# Fill 'known_keys', which is used for some checks
+def parse_known_keys():
+    global known_keys
+    with open("srcs/juloo.keyboard2/KeyValue.java", "r", encoding="utf-8") as f:
+        known_keys = set(
+                ( m.group(1) for m in re.finditer('case "([^"]+)":', f.read()) )
+                )
+
+parse_known_keys()
+
+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", encoding="utf-8") as out:
+    for w in warnings:
+        print(w, file=out)

doc/Custom-layouts.md

@@ -6,7 +6,7 @@ We recommend you keep your work in a file outside Unexpected Keyboard (named som
 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.
+* Use the [web-based editor](https://domportera.github.io/app-unexpected-keyboard-layout-editor/). 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.
 
@@ -44,17 +44,23 @@ The `<keyboard>`...`</keyboard>` pair follows the declaration tag and encloses t
 * `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).
+  + 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/blob/master/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/blob/master/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:
+The `<row>`...`</row>` pair encloses one row on the keyboard. It has the following optional property:
 * `height`: The height of the row: a positive floating-point value.
 
+* `scale`: A positive floating-point value. If present, scale the width of each key so that the total is equal to the specified value, in key width unit.
+
 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.
 
+(A row of keys is drawn with a minimum height of 0.5 even if you specify a smaller value for `height`. There is no such minimum for a row without keys, such as a spacer row.)
+
 ## 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.
 
@@ -93,7 +99,6 @@ The following optional properties define the effects of swipes:
 
 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.
 
-* `slider`: If `slider="true"`, and the key also has `w` and `e` properties, then the key tracks horizontal finger motion precisely and sends the `w` and `e` keystrokes repeatedly. In built-in layouts, this makes the space bar send left and right characters as the user slides on the space bar.
 * `anticircle`: The key value to send when doing an anti-clockwise gesture on the key.
 
 ### Layout
@@ -131,7 +136,7 @@ This means that when the Fn modifier is on, the key `before` is changed into `af
 ```
 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.
+The clockwise circle and the round-trip gestures are affected by the `<fn />` mappings. Otherwise, they are defined by the Shift mappings (including the `<shift />` mappings), then, if that did not modify the key, the builtin 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: 
@@ -146,6 +151,9 @@ The clockwise circle and the round-trip gestures are affected by both `<shift />
 ```
 This maps Ctrl+в to Ctrl+V—not to v.
 
+### Default mappings
+Unexpected Keyboard's built-in mappings are not expressed as a modmap but by a series of .json files in `https://github.com/Julow/Unexpected-Keyboard/tree/master/srcs/compose`. For example, the mappings for `fn` are in [`fn.json`](https://github.com/Julow/Unexpected-Keyboard/blob/master/srcs/compose/fn.json). These built-in mappings are common to every language.
+
 ## 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.
 

doc/Possible-key-values.md

@@ -1,43 +1,73 @@
 # Key values
 
-This is an exhaustive list of special values accepted for the `key0` through `key8` or `nw` through `se` attributes on a key.
+A key value defines what a key on the keyboard does when pressed or swiped.
 
-Any string that does not exactly match these will be printed verbatim.
-A key can output multiple characters, but cannot combine multiple built-in key values.
+Key values appear in the following places:
 
-## Escape codes
-Value | Escape code for
+- 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, `legend:key_def1,key_def2,...`.
+  This results in a key with legend `legend` 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
+
+When defining a key value, several characters have special effects. If you want a character not to have its usual effect but to be taken literally, you should "escape" it in the usual way for XML:
+
+To get this character... | ...you can type
 :---- | :------
-`\?`  | `?`
-`\#`  | `#`
-`\@`  | `@`
-`\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.
-`\\`  | `\`
+A literal newline character, which is different from `enter` and `action` in certain apps. | `\n`
+A literal tab character, which is different from `tab` in certain apps. | `\t`
+`&` | `&`
+`<` | `&lt;`
+`>` | `&gt;`
+`"` | `&quot;`
 
-XML escape codes also work, including:
+The characters `\` (unless followed by n or t), `?`, `#`, and `@` do not need to be escaped when writing custom layouts. When writing a layout to be included in the app (in [srcs/layouts](https://github.com/Julow/Unexpected-Keyboard/tree/master/srcs/layouts)), they are represented by typing `\\`, `\?`, `\#`, and `\@`.
 
-Value    | Escape code for
-:------- | :------
-`&amp;`  | `&`
-`&lt;`   | `<`
-`&gt;`   | `>`
-`&quot;` | `"`
+The characters `,` and `:` can be escaped in a key value, using single quotes. For example, this macro defines a key with legend `http` that sends a string containing `:`: `<key c="http:home,'https://'" />` For simplicity, `,` and `:` cannot be escaped in the key legend.
 
 ## Modifiers
-System modifiers are sent to the app, which is free to do whatever they want in response.
-The other modifiers only exist within the keyboard.
+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.
-`fn`        | Activates Fn mode, which assigns letters and symbols to special characters. e.g. `fn` `!` = `¡`
-`compose`   | Compose key. Enables composing characters using Linux-like shortcuts; e.g. `Compose` `A` `single quote` types `Á` (A with acute accent).
-`capslock`  | Actives and locks Shift
 
-## Special keys
+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`,
@@ -53,6 +83,19 @@ These keys are sent to apps, which are free to ignore them. The keyboard does no
 `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.
+
+The values with `cursor_` are new in v1.31.0. Previous custom layouts specified the slider with `slider="true"`, which should be removed.
+
 ## Whitespace
 Value   | Meaning
 :------ | :------
@@ -62,13 +105,6 @@ Value   | Meaning
 `zwj`   | Zero-width joiner.
 `zwnj`  | Zero-width non-joiner.
 
-## Keyboard editing actions
-These keys perform editing on the text without sending keys that the app can interpret differently or ignore.
-Value              | Meaning
-:----------------- | :------
-`cursor_left`      | Moves the cursor position to the left directly, without sending a `left` key event.
-`cursor_right`     | Moves the cursor position to the right directly, without sending a `right` key event.
-
 ## Other modifiers and diacritics
 Value                | Meaning
 :------------------- | :------
@@ -92,6 +128,7 @@ Value                | Meaning
 `accent_horn`        | Horn accent. `ơ`
 `accent_hook_above`  | Hook accent. `ả`
 `accent_double_grave`  | Double grave accent. `ȁ`
+`accent_small_caps`  | Small capital letters. `ᴀ`
 `superscript`        | Superscript. `ᵃ`
 `subscript`          | Subscript. `ₐ`
 `ordinal`            | Turns `a` and `o` into `ª` and `º`.
@@ -105,6 +142,20 @@ Value   | Meaning
 `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.)
 
+## Arabic
+These are the diacritics for Arabic
+
+Value | Meaning
+:------ | :------
+`combining_fatha` | َ
+`combining_dammah` | ُ
+`combining_kasra` | ِ
+`combining_sukun` | ْ
+`combining_shaddah` | ّ
+`combining_hamza_above` | ٔ
+`combining_hamza_below` | ٕ
+
+
 ## Hebrew
 Keys ending in `_placeholder` are normally hidden unless the Fn key is pressed.
 
@@ -139,6 +190,16 @@ Value                  | Meaning
 `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.
+`hide_self`            | Hide the keyboard.
+
+## Suggestions
+
+Value           | Meaning
+:----           | :------
+`complete_first`  | Enter the best suggestion (the one in the middle)
+`complete_second` | Enter the second best suggestion (the right one)
+`complete_third`  | Enter the third best suggestion (the left one)
+`complete_emoji`  | Enter the emoji suggestion
 
 ## Unused
 These keys are known to do nothing.
@@ -150,50 +211,3 @@ These keys are known to do nothing.
 These keys are normally hidden unless the Fn modifier is activated.
 
 `f11_placeholder` | `f12_placeholder`
-
-## Complex keys
-
-More complex keys are of this form:
-
-```
-:<kind> <attributes>:<payload>
-```
-
-Where `<kind>` is one of the kinds documented below and `<attributes>` is a
-space separated list of attributes. `<payload>` depends on the `<kind>`.
-
-Attributes are:
-- `symbol='Sym'` specifies the symbol to be shown on the keyboard.
-- `flags='<flags>'` changes the behavior of the key.
-  `<flags>` is a coma separated list of:
-  + `dim`: Make the symbol dimmer.
-  + `small`: Make the symbol smaller.
-
-### Kind `str`
-
-Defines a key that outputs an arbitrary string. `<payload>` is a string wrapped
-in single-quotes (`'`), escaping of other single quotes is allowed with `\'`.
-
-For example:
-- `:str:'Arbitrary string with a \' inside'`
-- `:str symbol='Symbol':'Output string'`
-
-### Kind `char`
-
-Defines a key that outputs a single character. `<payload>` is the character to
-output, unquoted.
-This kind of key can be used to define a character key with a different symbol
-on it. `char` keys can be modified by `ctrl` and other modifiers, unlike `str`
-keys.
-
-For example:
-- `:char symbol='љ':q`, which is used to implement `ctrl` shortcuts in cyrillic
-  layouts.
-
-### Kind `keyevent`
-
-Defines a key that sends an Android [key event](https://developer.android.com/reference/android/view/KeyEvent).
-`<payload>` is the key event number.
-
-For example:
-- `:keyevent symbol='⏯' flags='small':85`

fastlane/metadata/android/ar/full_description.txt

@@ -0,0 +1,5 @@
+الميزة الرئيسة هي إمكانية كتابة المزيد من الأحرف عن طريق تمرير المفاتيح نحو الزوايا.
+
+صُمم هذا التطبيق في الأصل للمبرمجين الذين يستخدمون Termux.
+
+أصبح الآن مثاليًا للاستخدام اليومي.

fastlane/metadata/android/ar/short_description.txt

@@ -0,0 +1 @@
+لوحة مفاتيح افتراضية خفيفة الوزن ومراعية للخصوصية لنظام أندرويد.

fastlane/metadata/android/ar/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

fastlane/metadata/android/ca/full_description.txt

@@ -0,0 +1,6 @@
+La característica principal és que pots escriure més caràcters arrossegant les tecles cap a les cantonades.
+
+Aquesta aplicació va ser dissenyada originalment per als programadors que usen Termux.
+Ara és perfecta per a un ús quotidià.
+
+Aquesta aplicació no conté anuncis i és de codi obert.

fastlane/metadata/android/ca/short_description.txt

@@ -0,0 +1 @@
+Un teclat virtual lleuger per a Android que és conscient de la teva privacitat.

fastlane/metadata/android/ca/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

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

@@ -3,4 +3,4 @@ Hlavní funkcí je možnost psát více znaků posunutím kláves směrem k roh
 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.
+Tato aplikace neobsahuje žádné reklamy a je Open Source.

fastlane/metadata/android/de-DE/full_description.txt

@@ -3,4 +3,4 @@ Diese Tastatur zeichnet sich dadurch aus, dass man zusätzliche Zeichen durch Wi
 Die Anwendung wurde ursprünglich für das Programmieren in Termux entwickelt.
 Mittlerweile ist sie auch für den täglichen Gebrauch perfekt geeignet.
 
-Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quelloffen.
+Diese App enthält keine Werbung und ist quelloffen.

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/en-US/changelogs/47.txt

@@ -0,0 +1,8 @@
+Delete a word with a circle gesture on the delete key.
+Compose key can be unselected.
+Improved space bar slider and added selection mode.
+Lock shift with a circle gesture.
+Improvements to layouts.
+Various bug fixes and improvements to themes.
+
+Huge thanks to the contributors: @0skar2 @chuckwagoncomputing @dzaima @eandersons Lokesh Kumar @lrvideckis @ms-jagadeeshan @quantenzitrone @Sestowner @solokot @Spike-from-NH @srikanban @tenextractor

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

@@ -0,0 +1,9 @@
+Bug fixes
+
+Delete a word with a circle gesture on the delete key.
+Compose key can be unselected.
+Improved space bar slider and added selection mode.
+Lock shift with a circle gesture.
+Various bug fixes and improvements to themes and layouts.
+
+Many thanks to the contributors: @HaleyHalcyon @Jaoheah @Spike-from-NH

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

@@ -0,0 +1,6 @@
+Better support for foldable devices
+Added layouts
+Improved selection mode
+Bug fixes and many other improvements
+
+Huge thanks to the contributors: @alotbsol555, @bergentroll, @dacc9, @HaleyHalcyon, @Jaoheah, @jorexdeveloper, @malbajun, @matejdro, @Spike-from-NH, @tenextractor

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

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

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

@@ -0,0 +1,6 @@
+Spell checking and autocorrect are here !
+
+This releases comes with a very large number of improvements,
+support for more languages and new themes!
+
+Huge thanks to the contributors: @10Develops @anaskaejdar @andyca111100 @Autissima @bqv @cillyvms @domportera @dzaima @exzombie @Harry-Ais0 @Houfalafel @JeelsBoobz @JFronny @Julow @lan700ng @malbajun @matejdro @n-ce @skynetcat @sperareine @Spike-from-NH @xxcavemanxx

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

@@ -0,0 +1,6 @@
+Spell checking and autocorrect are here !
+
+This releases comes with a very large number of improvements,
+support for many languages and new themes!
+
+Huge thanks to the contributors: @10Develops @anaskaejdar @andyca111100 @Autissima @bqv @cillyvms @domportera @dzaima @exzombie @Harry-Ais0 @Houfalafel @JeelsBoobz @JFronny @Julow @lan700ng @malbajun @matejdro @n-ce @skynetcat @sperareine @Spike-from-NH @xxcavemanxx

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

@@ -0,0 +1,3 @@
+Bug fixes
+
+Huge thanks to the contributors: @alotbsol555 @FlippingBinary

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

@@ -0,0 +1,6 @@
+Spell checking and autocorrect are here !
+
+This releases comes with a very large number of improvements,
+support for many languages and new themes!
+
+Huge thanks to the contributors: @10Develops @alotbsol555 @anaskaejdar @andyca111100 @Autissima @bqv @cillyvms @domportera @dzaima @exzombie @FlippingBinary @Harry-Ais0 @Houfalafel @JeelsBoobz @JFronny @Julow @lan700ng @malbajun @matejdro @n-ce @skynetcat @sperareine @Spike-from-NH @xxcavemanxx

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

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

fastlane/metadata/android/en-US/full_description.txt

@@ -3,4 +3,4 @@ The main feature is that you can type more characters by swiping the keys toward
 This application was originally designed for programmers using Termux.
 Now perfect for everyday use.
 
-This application contains no ads, doesn't make any network requests and is Open Source.
+This application contains no ads and is Open Source.

fastlane/metadata/android/es-ES/full_description.txt

@@ -3,4 +3,4 @@ La característica principal es que hay acceso a más caractéres deslizando hac
 Esta aplicación fue originalmente diseñada para programadores que usaran Termux.
 Ahora es perfecta para uso cotidiano.
 
-La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y es de Fuente Abierta.
+La misma no contiene ningún anuncio/publicidad y es de Fuente Abierta.

fastlane/metadata/android/et/full_description.txt

@@ -0,0 +1,6 @@
+Peamine omadus on see, et saad sisestada rohkem märke, viibates klahve nurkade suunas.
+
+See rakendus loodi algselt Termuxit kasutavatele programmeerijatele.
+Nüüd sobib see ideaalselt igapäevaseks kasutamiseks.
+
+Rakendus ei sisalda reklaame ja on avatud lähtekoodiga.

fastlane/metadata/android/et/short_description.txt

@@ -0,0 +1 @@
+Väike ja privaatsusteadlik klahvistik Androidile.

fastlane/metadata/android/et/title.txt

@@ -0,0 +1 @@
+Ootamatu klahvistik

fastlane/metadata/android/fil/full_description.txt

@@ -0,0 +1,6 @@
+Ang pangunahing feature ay maaari kang mag-type ng mas marami pang karakter sa pag-swipe sa gilid ng mga key.
+
+Noong simula, ginawa itong application para sa mga programmer sa na nagte-Termux.
+Ngayo'y perpekto na sa pang-araw-araw.
+
+Walang ads at Open Source ang application na ito.

fastlane/metadata/android/fil/short_description.txt

@@ -0,0 +1 @@
+Magaan at privacy-conscious na virtual keyboard sa Android.

fastlane/metadata/android/fil/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

fastlane/metadata/android/fr-FR/full_description.txt

@@ -3,4 +3,4 @@ La fonctionnalité principale est l'accès rapide à plus de caractères en bala
 Cette application a été conçue à l'origine pour les programmeurs utilisant Termux.
 Elle est maintenant parfaite pour une utilisation quotidienne.
 
-Cette application ne contient pas de publicité, n'accède pas au réseau et est Open Source.
+Cette application ne contient pas de publicité et est Open Source.

fastlane/metadata/android/id/full_description.txt

@@ -0,0 +1,6 @@
+Fitur utamanya adalah Anda dapat mengetik lebih banyak karakter dengan menggeser tombol ke arah sudut.
+
+Aplikasi ini awalnya dirancang untuk programmer yang menggunakan Termux.
+Sekarang sempurna untuk penggunaan sehari-hari.
+
+Aplikasi ini tidak berisi iklan dan Open Source.

fastlane/metadata/android/id/short_description.txt

@@ -0,0 +1 @@
+Keyboard virtual yang ringan dan sadar privasi untuk Android.

fastlane/metadata/android/id/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

fastlane/metadata/android/it-IT/full_description.txt

@@ -0,0 +1,6 @@
+La caratteristica principale è quella di poter digitare altri caratteri scorrendo verso i bordi dei tasti.
+
+L'applicazione era originariamente pensata per l'utilizzo di Termux da parte di programmatori.
+Ora è perfetta anche per l'uso quotidiano.
+
+L'applicazione non contiene pubblicità ed è Open Source.

fastlane/metadata/android/it-IT/short_description.txt

@@ -1 +1 @@
-Una Tastiera Virtuale Leggera Per La Programmazione
+Una tastiera virtuale leggera ed attenta alla privacy per Android.

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

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

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

@@ -2,5 +2,3 @@
 
 이 앱은 처음에는 Termux를 사용하는 프로그래머들을 위한 것으로 개발되었습니다.
 지금은 일상적인 용도로도 완벽합니다.
-
-이 응용 프로그램에는 광고가 없으며 네트워크 요청을 하지 않고 오픈 소스입니다.

fastlane/metadata/android/lv/full_description.txt

@@ -1,6 +1,6 @@
-Galvenā iezīme ir iespēja ievadīt vairāk rakstzīmju ar pavilkšanu uz taustiņu stūriem.
+Tastatūras galvenā iespēja — viegli ievadīt jebkuru ASCII rakstzīmi ar pavilkšanu uz taustiņu stūriem.
 
-Šī lietotne sākotnēji tika izstrādāta programmētājiem, kas izmanto Termux.
-Tagad lieliski piemērota izmantošanai ikdienā.
+Sākotnēji šī lietotne tika izstrādāta programmētājiem, kas izmanto Termux.
+Tagad tā lieliski piemērota arī ikdienas lietošanai.
 
-Šī lietotne nesatur reklāmas, neveic nekādus tīkla pieprasījumus, un tās pirmkods ir pieejams visiem.
+Lietotne nesatur reklāmas, un tās pirmkods ir pieejams visiem.

fastlane/metadata/android/lv/short_description.txt

@@ -1 +1 @@
-Mazizmēra un privātumu ievērojoša virtuālā Android tastatūra.
+Mazizmēra virtuālā Android tastatūra, kurai rūp privātums.

fastlane/metadata/android/nl-NL/full_description.txt

@@ -0,0 +1,6 @@
+De belangrijkste functie is dat je meer tekens kunt typen door de toetsen naar de hoeken te vegen.
+
+Deze applicatie is oorspronkelijk ontworpen voor programmeurs die Termux gebruiken.
+Nu perfect voor dagelijks gebruik.
+
+Deze applicatie bevat geen advertenties en is Open Source.

fastlane/metadata/android/nl-NL/short_description.txt

@@ -0,0 +1 @@
+Lichtgewicht en privacy-bewust virtueel toetsenbord voor Android.

fastlane/metadata/android/nl-NL/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

fastlane/metadata/android/pl-PL/full_description.txt

@@ -3,4 +3,4 @@ Główną cechą tej klawiatury jest możliwość wprowadzania więcej znaków p
 Ta aplikacja została pierwotnie zaprojektowana z myślą o programistach używających Termuxa.
 Obecnie nadaje się doskonale do codziennego użytku.
 
-Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źródłowy jest dostępny publicznie.
+Aplikacja nie zawiera reklam, a jej kod źródłowy jest dostępny publicznie.

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

@@ -3,4 +3,4 @@ A principal característica é que você pode digitar mais caracteres deslizando
 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.
+Este aplicativo não contém anúncios e é Open Source.

fastlane/metadata/android/ro/full_description.txt

@@ -3,4 +3,4 @@ Funcționalitatea principală este accesul rapid la o mulțime de caractere ASCI
 Această aplicație a fost concepută inițial pentru programatori care folosec Termux.
 Este perfectă pentru uzul cotidian.
 
-Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e Open Source.
+Această aplicație nu conține publicitate și e Open Source.

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

@@ -3,4 +3,4 @@
 Приложение изначально было разработано для использования с Termux.
 На данный момент оно также удобно в повседневном использовании.
 
-Приложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код.
+Приложение не содержит рекламы и имеет открытый исходный код.

fastlane/metadata/android/th/full_description.txt

@@ -0,0 +1,4 @@
+คีย์บอร์ดนี้สามารถเขียนตัวอักษรได้หลายตัวมากขึ้นโดยใช้การปัดคีย์ไปที่มุมต่างๆ
+
+คีย์บอร์ดนี้ถูกออกแบบมาเพื่อนักเขียนโปรแกรมที่ใช้เทอร์มักซ์ (Termux) 
+แต่ตอนนี้เพอร์เฟ็กต์สำหรับคนทั่วไป

fastlane/metadata/android/th/short_description.txt

@@ -0,0 +1 @@
+คีย์บอร์ดสำหรับแอนดรอยด์ที่กินทรัพยากรน้อยและโฟกัสที่ความเป็นส่วนตัว

fastlane/metadata/android/th/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

fastlane/metadata/android/tr-TR/full_description.txt

@@ -3,4 +3,4 @@ Bu uygulama özünde tuşların kenarlarından kaydırarak daha fazla karakter y
 Bu uygulama aslında Termux kullanıcıları için geliştirildi.
 Artık gündelik kullanım için de uygun.
 
-Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz.
+Bu uygulama açık kaynaklıdır. Reklam içermez.

fastlane/metadata/android/uk/full_description.txt

@@ -3,4 +3,4 @@
 Ця програма спочатку була розроблена для програмістів, які використовують Termux.
 Тепер ідеально підходить для щоденного використання.
 
-Ця програма не містить реклами, не надсилає жодних мережевих запитів і має відкритий код.
+Ця програма не містить реклами і має відкритий код.

fastlane/metadata/android/vi/full_description.txt

@@ -3,4 +3,4 @@ Chức năng chính là dễ dàng gõ nhiều ký tự bằng cách kéo phím
 Ứng dụng này ban đầu được thiết kế cho các lập trình viên dùng Termux.
 Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
 
-Ứng dụng này không chứa quảng cáo, không cần đến mạng, và có mã nguồn mở.
+Ứng dụng này không chứa quảng cáo, có mã nguồn mở.

fastlane/metadata/android/zh-CN/full_description.txt

@@ -2,5 +2,3 @@
 
 此应用最初是为使用 Termux 的程序员而设计的。
 现在对于日常使用来说也很完美。
-
-此应用没有广告，不会发送任何网络请求，而且是开源的。

fastlane/metadata/android/zh-TW/full_description.txt

@@ -0,0 +1,6 @@
+你能透過往按鍵角落滑動來輸入更多字元。
+
+該軟體原先被設計給Termux使用者使用。
+現在已完善並可日用。
+
+此應用程式無任何廣告並且是開源的。

fastlane/metadata/android/zh-TW/short_description.txt

@@ -0,0 +1 @@
+為Android打造的輕量、注重隱私的虛擬鍵盤。

fastlane/metadata/android/zh-TW/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

funding.json

@@ -0,0 +1,91 @@
+{
+  "version": "v1.0.0",
+  "entity": {
+    "type": "individual",
+    "role": "owner",
+    "name": "Julow",
+    "email": "jules@j3s.fr",
+    "description": "Open source developer and maintainer of Unexpected Keyboard.",
+    "webpageUrl": {
+      "url": "https://github.com/Julow"
+    }
+  },
+  "projects": [
+    {
+      "guid": "unexpected-keyboard",
+      "name": "Unexpected Keyboard",
+      "description": "Lightweight and privacy-conscious virtual keyboard for Android.",
+      "webpageUrl": {
+        "url": "https://github.com/Julow/Unexpected-Keyboard/"
+      },
+      "repositoryUrl": {
+        "url": "https://github.com/Julow/Unexpected-Keyboard/"
+      },
+      "licenses": [
+        "spdx:GPL-3.0",
+        "spdx:CC0-1.0"
+      ],
+      "tags": [
+        "android",
+        "mobile",
+        "privacy",
+        "productivity",
+        "programming",
+        "user-experience"
+      ]
+    }
+  ],
+  "funding": {
+    "channels": [
+      {
+        "guid": "liberapay",
+        "type": "other",
+        "address": "https://liberapay.com/Julow/",
+        "description": "Recurring donations for funding Unexpected Keyboard."
+      },
+      {
+        "guid": "github-sponsors",
+        "type": "other",
+        "address": "https://github.com/sponsors/Julow",
+        "description": "Recurring donations for funding Unexpected Keyboard."
+      },
+      {
+        "guid": "paypal",
+        "type": "other",
+        "address": "https://paypal.me/JulesAguillon",
+        "description": "One-time donations for funding Unexpected-keyboard."
+      }
+    ],
+    "plans": [
+      {
+        "guid": "fund-maintenance",
+        "status": "active",
+        "name": "Fund developer time",
+        "description": "Help the maintainers spend time on Unexpected Keyboard",
+        "amount": 0,
+        "currency": "EUR",
+        "frequency": "monthly",
+        "channels": [
+          "liberapay",
+          "github-sponsors",
+          "paypal"
+        ]
+      },
+      {
+        "guid": "one-time-contribution",
+        "status": "active",
+        "name": "Fund developer time",
+        "description": "Help the maintainers spend time on Unexpected Keyboard",
+        "amount": 0,
+        "currency": "EUR",
+        "frequency": "one-time",
+        "channels": [
+          "liberapay",
+          "github-sponsors",
+          "paypal"
+        ]
+      }
+    ],
+    "history": []
+  }
+}

gen_layouts.py

@@ -57,8 +57,8 @@ def generate_arrays(out, layouts):
     root.append(mk_array("string-array", "pref_layout_entries", entries_items))
     root.append(mk_array("integer-array", "layout_ids", ids_items))
     XML.indent(root)
-    XML.ElementTree(element=root).write(out, encoding="unicode", xml_declaration=True)
+    XML.ElementTree(element=root).write(out, encoding="utf-8", xml_declaration=True)
 
 layouts = sort_layouts(read_layouts(glob.glob("srcs/layouts/*.xml")))
-with open("res/values/layouts.xml", "w") as out:
-    generate_arrays(out, layouts)
+with open("res/values/layouts.xml", "wb") as out:
+    generate_arrays(out, layouts)

gen_method_xml.py

@@ -0,0 +1,189 @@
+import xml.etree.ElementTree as ET
+import itertools as it
+import sys
+
+# This script generates res/xml/method.xml.
+
+def warn(msg):
+    print("Warning: " + msg, file=sys.stderr)
+
+def loc(loc_name, script, default_layout, **kwargs):
+    return { "name": loc_name, "script": script,
+             "default_layout": default_layout, **kwargs }
+
+# The locales are defined here. To add support for a language, add it to the
+# following block:
+
+LOCALES = [
+  loc("ar", "arabic", "arab_pc_hindu"),
+  loc("ar_TN", "arabic", "arab_pc"),
+  loc("as", "beng", "beng_assamese"),
+  loc("az_AZ", "latin", "latn_qwerty_az", extra_keys="accent_trema:ü:ö@w|accent_cedille:ç:ş@s|ğ@g|ı@k|ə@l"),
+  loc("be_BY", "cyrillic", "cyrl_jcuken_ru", extra_keys="ґ|є|і|ї|ў"),
+  loc("bg_BG", "cyrillic", "cyrl_ueishsht", extra_keys="€"),
+  loc("bn_BD", "latin", "latn_qwerty_us", extra_keys="৳"),
+  loc("bs", "latin", "latn_qwerty_us", extra_keys="đ|ž|lj|nj|ć|č|dž|š"),
+  loc("ca", "latin", "latn_qwerty_us", extra_keys="accent_grave:à:ò:è|accent_cedille:ç@c|accent_aigu:é:í:ú:ó|accent_trema:ï:ü|ŀl|€"),
+  loc("cs_CZ", "latin", "latn_qwertz_cz", extra_keys="accent_aigu:á:é:í:ó:ú:ý@d|accent_ring:ů@s|accent_caron:č:ě:ň:ř:š:ž:ď:ť@f"),
+  loc("cy_GB", "latin", "latn_qwerty_cy"),
+  loc("da_DK", "latin", "latn_qwerty_da", extra_keys="€|æ|å|ø"),
+  loc("de_BE", "latin", "latn_azerty_be", extra_keys="accent_grave:è@f|accent_aigu:á:é:í:ó:ú:ý:j́@d|accent_circonflexe:ê@f|accent_cedille:ç@c|accent_trema@u|€"),
+  loc("de_CH", "latin", "latn_qwertz_de", extra_keys="accent_trema:ä:ö:ü@u|ß"),
+  loc("de_DE", "latin", "latn_qwertz_de", extra_keys="accent_trema:ä:ö:ü@u|ß|€"),
+  loc("el", "latin", "grek_qwerty", extra_keys="£@l|€"),
+  loc("en", "latin", "latn_qwerty_us", dictionary="en_GB"),
+  loc("en_AU", "latin", "latn_qwerty_us"),
+  loc("en_CA", "latin", "latn_qwerty_us", dictionary="en_US"),
+  loc("en_GB", "latin", "latn_qwerty_gb", extra_keys="£@l"),
+  loc("en_IN", "latin", "latn_qwerty_us"),
+  loc("en_NG", "latin", "latn_qwerty_us", extra_keys="₦"),
+  loc("en_US", "latin", "latn_qwerty_us"),
+  loc("es_ES", "latin", "latn_qwerty_es", extra_keys="accent_aigu:á:é:í:ó:ú@d|accent_tilde:ñ@n|accent_grave@f|accent_trema@u|€"),
+  loc("et_EE", "latin", "latn_qwerty_et", extra_keys="accent_trema:ä:ö:ü@u|accent_tilde:õ@o|accent_caron:š:ž@s|€"),
+  loc("eu", "latin", "latn_qwerty_us", extra_keys="ñ|ç|ü|dd|ll|rr|ts|tt|tx|tz"),
+  loc("fa_IR", "persian", "arab_pc_ir"),
+  loc("fi", "latin", "latn_qwerty_fi", extra_keys="å|accent_ring|accent_aigu|accent_trema|ö|ä|€"),
+  loc("fr_BE", "latin", "latn_azerty_be", extra_keys="accent_grave:à:è:ù@f|accent_aigu:é@d|accent_circonflexe:ê:û@f|accent_cedille:ç@c|accent_trema@u|€"),
+  loc("fr_CA", "latin", "latn_azerty_fr", extra_keys="accent_grave:à:è:ù@f|accent_aigu:é@d|accent_circonflexe:â:ê:ô:û@f|accent_cedille:ç@c|accent_trema:ë:ï:ü:ÿ@u"),
+  loc("fr_CH", "latin", "latn_qwertz_fr_ch", extra_keys="accent_grave:à:è:ù@f|accent_aigu:é@d|accent_circonflexe:â:ê:ô:û@o|accent_cedille:ç@c|accent_trema:ë:ï:ü:ÿ@u|€"),
+  loc("fr_FR", "latin", "latn_azerty_fr", extra_keys="accent_grave:à:è:ù@d|accent_aigu:é@d|accent_circonflexe:â:ê:ô:û@o|accent_cedille:ç@c|accent_trema:ë:ï:ü@l|€"),
+  loc("ga_IE", "latin", "latn_qwerty_ga", extra_keys="accent_aigu:á:é:í:ó:ú@k|accent_dot_above@l"),
+  loc("gl", "latin", "latn_qwerty_us"),
+  loc("ha_NG", "latin", "latn_qwerty_us", extra_keys="₦|ɓ|ɗ|ƙ|’|ƴ|r̃"),
+  loc("haw_US", "latin", "latn_qwerty_haw", extra_keys="ʻ@l|accent_macron:ā:ē:ī:ō:ū@m"),
+  loc("he_IL", "hebrew", "hebr_1_il", extra_keys="₪@r"),
+  loc("hi_IN", "devanagari", "deva_inscript", extra_keys="₹"),
+  loc("hr", "latin", "latn_qwerty_us", extra_keys="č|ć|dž|đ|lj|nj|š|ž"),
+  loc("hu_HU", "latin", "latn_qwertz_hu", extra_keys="accent_aigu:á:é:í:ó:ú@d|accent_trema:ö:ü@u|accent_ogonek@s|accent_double_aigu:ő:ű@k|€"),
+  loc("hy", "armenian", "armenian_ph_am"),
+  loc("ig_NG", "latin", "latn_qwerty_us", extra_keys="₦|ṅ|ọ|ụ"),
+  loc("is_IS", "latin", "latn_qwerty_is", extra_keys="ð|þ|æ|accent_trema:ö@o|accent_aigu:á:é:í:ó:ú:ý@d|accent_circonflexe|accent_ring|accent_grave"),
+  loc("it_IT", "latin", "latn_qwerty_us", extra_keys="accent_grave:à:è:ì:ò:ù@f|accent_aigu:é:ó@d|accent_circonflexe:î@f|€|ə"),
+  loc("ka_GE", "latin", "georgian_mes"),
+  loc("kk_KZ", "latin", "cyrl_jcuken_kk"),
+  loc("kn_IN", "kannada", "kann_kannada"),
+  loc("ko_KR", "hangul", "hang_dubeolsik_kr"),
+  loc("lb", "latin", "latn_qwerty_us", extra_keys="é|ä|ë|accent_grave|accent_cedille@c|accent_aigu|accent_trema|€"),
+  loc("lt_LT", "latin", "latn_qwerty_lt", extra_keys="accent_ogonek:ą:ę:į:ų@s|accent_caron:č:š:ž@f|accent_dot_above:ė@s|accent_macron:ū@o|€"),
+  loc("lv_LV", "latin", "latn_qwerty_lv", extra_keys="accent_macron:ā:ē:ī:ū@o|accent_caron:č:š:ž@f|accent_ogonek:ķ:ļ:ņ@s|accent_cedille:ģ@c|€"),
+  loc("mk", "cyrillic", "cyrl_lynyertdz_mk", extra_keys="ѕ|ѓ|ќ|ѝ|ѐ|љ|њ|џ|„|“|€"),
+  loc("mn_MN", "cyrillic", "cyrl_fcuzhen_mn", extra_keys="ү|ө"),
+  loc("mr_IN", "devanagari", "deva_inscript", extra_keys="₹"),
+  loc("mt_MT", "latin", "latn_qwerty_mt", extra_keys="accent_grave:à:è:ì:ò:ù|accent_dot_above:ċ:ż:ġ|ħ"),
+  loc("nb", "latin", "latn_qwerty_us", extra_keys="€|æ@a|å@a|ø@o|accent_aigu:é:ó@d|accent_grave:è:ò:ù@f|accent_circonflexe:ê:ô@f"),
+  loc("ne_NE", "devanagari", "deva_inscript", extra_keys="₹"),
+  loc("nl_BE", "latin", "latn_azerty_be", extra_keys="accent_grave:è@f|accent_aigu:á:é:í:ó:ú:ý:j́@d|accent_circonflexe:ê@f|accent_cedille:ç@c|accent_trema@u|€"),
+  loc("no_NO", "latin", "latn_qwerty_us", extra_keys="€|æ@a|å@a|ø@o|accent_aigu:é:ó@d|accent_grave:è:ò:ù@f|accent_circonflexe:ê:ô@f"),
+  loc("pl_PL", "latin", "latn_qwerty_pl"),
+  loc("pt_BR", "latin", "latn_qwerty_pt", extra_keys="accent_aigu:á:é:í:ó:ú@d|accent_cedille:ç@c|accent_circonflexe:â:ê:ô@f|accent_grave:à:ò@f|accent_tilde:ã:õ@n|€|ª|º"),
+  loc("pt_PT", "latin", "latn_qwerty_pt", extra_keys="accent_aigu:á:é:í:ó:ú@d|accent_cedille:ç@c|accent_circonflexe:â:ê:ô@f|accent_grave:à:ò@f|accent_tilde:ã:õ@n|€|ª|º"),
+  loc("ro_RO", "latin", "latn_qwerty_ro", extra_keys="ă|â|î|ș|ț|€|$"),
+  loc("ru_RU", "latin", "cyrl_jcuken_ru"),
+  loc("si_LK", "sinhala", "sinhala_phonetic", extra_keys="₨"),
+  loc("sk_SK", "latin", "latn_qwertz_sk", extra_keys="accent_caron:ě:ř:ž:š:č:ň:ď:ľ:ť@f|accent_ring:ů@s|accent_circonflexe:ô@f|accent_trema:ä:ü:ö@u|accent_aigu:á:é:í:ó:ú:ŕ:ś:ĺ:ý@d"),
+  loc("sl", "latin", "latn_qwerty_us", extra_keys="accent_caron:Č:Š:Ž|€"),
+  loc("sq_AL", "latin", "latn_qwertz_sq"),
+  loc("sr_", "latin", "cyrl_lynyertz_sr"),
+  loc("sv_SE", "latin", "latn_qwerty_se", extra_keys="accent_aigu:á@d|accent_trema:ä:ö@o|accent_ring:å@s|€"),
+  loc("ta_IN", "tamil", "tamil_default"),
+  loc("tly_AZ", "latin", "latn_qwerty_tly", extra_keys="á|ú|â|ê|ı|š|ž"),
+  loc("tly_IR", "persian", "arab_hamvaj_tly"),
+  loc("tr_TR", "latin", "latn_qwerty_tr", extra_keys="accent_cedille:ç:ş@c|accent_trema:ö:ü@u|accent_circonflexe:â:î:û@f|₺|ı|ğ"),
+  loc("uk_UA", "cyrillic", "cyrl_jcuken_uk", extra_keys="ґ|є|і|ї|₴"),
+  loc("ur", "persian", "arab_pc_ir"),
+  loc("uz_UZ", "latin", "latn_qwerty_uz", extra_keys="ʻ|ʼ"),
+  loc("vi_VN", "latin", "latn_qwerty_vi"),
+  loc("yo_NG", "latin", "latn_qwerty_us", extra_keys="₦|ẹ|ọ|ṣ")
+]
+
+# The locale that is at the beginning of the list.
+DEFAULT_LOCALE = "en_GB"
+
+def parse_dictionaries():
+    tree = ET.parse("res/values/dictionaries.xml")
+    root = tree.getroot()
+    return set(( it.text for it in root.findall('*[@name="dictionaries_locale"]/item') ))
+
+# Available dictionares of the form "de" or "de_CH".
+available_dictionaries = parse_dictionaries()
+
+# Warn when a dictionary is attached to no locale
+def check_locales_for_dictionaries(locales):
+    used = { l["dictionary"] for l in locales if "dictionary" in l }
+    for d in available_dictionaries:
+        if d not in used:
+            warn("Dictionary '%s' is attached to no locale" % d)
+
+def subtype_elem(root, loc):
+    tag = loc["tag"].replace("_", "-")
+    extra_keys = ",extra_keys=" + loc["extra_keys"] if "extra_keys" in loc else ""
+    dictionaries = ",dictionary=" + loc["dictionary"] if loc["dictionary"] != None else ""
+    extra_value = f'script={loc["script"]},default_layout={loc["default_layout"]}{dictionaries}{extra_keys}'
+    ET.SubElement(root, "subtype", attrib={
+        "android:label": "%s",
+        "android:languageTag": tag,
+        "android:imeSubtypeLocale": loc["name"],
+        "android:imeSubtypeMode": "keyboard",
+        "android:isAsciiCapable": "true",
+        "android:imeSubtypeExtraValue": extra_value
+        })
+
+# Return locales with the "tag" and "dictionary" attributes added.
+def compute_attrs():
+    locales_grouped = {} # Locales grouped by language tag
+    def lang(loc):
+        return loc["name"].split("_")[0]
+    def find_locale(name):
+        l = name.split("_")[0]
+        return next(( loc for loc in locales_grouped[l] if loc["name"] == name ), None)
+    for loc in LOCALES:
+        locales_grouped.setdefault(lang(loc), []).append(loc)
+    def tag(loc):
+        l = lang(loc)
+        if loc["name"] == l: return l # Locales like "en"
+        if loc["name"] == f"{l}_{l.upper()}": return l # Locales like "fr_FR"
+        # Return a short tag when it's not shared between several locales
+        return l if len(locales_grouped[l]) == 1 else loc["name"]
+    def dictionary(loc):
+        if loc is None: return None
+        if "dictionary" in loc: return loc["dictionary"]
+        if loc["name"] in available_dictionaries: return loc["name"]
+        l = lang(loc)
+        if l in available_dictionaries: return l
+        if l != loc["name"]: return dictionary(find_locale(l))
+        return None
+    def add_attrs(loc):
+        loc = dict(**loc)
+        loc["tag"] = tag(loc)
+        loc["dictionary"] = dictionary(loc)
+        return loc
+    return map(add_attrs, LOCALES)
+
+def sort_locales(locales):
+    # The default locale for a language (eg. "en") might shadow the exact
+    # locale (eg. "en_US"). Makes sure the default locale sorts after the exact
+    # ones.
+    def key(l):
+        s = l["name"].split("_")
+        return (l["name"] != DEFAULT_LOCALE), s[0], (len(s) == 1), s[1:]
+    return sorted(locales, key=key)
+
+def gen():
+    locales = sort_locales(compute_attrs())
+    check_locales_for_dictionaries(locales)
+    root = ET.Element("input-method", attrib={
+        "xmlns:android": "http://schemas.android.com/apk/res/android",
+        "android:settingsActivity": "juloo.keyboard2.SettingsActivity",
+        "android:supportsSwitchingToNextInputMethod": "true",
+        })
+    root.append(ET.Comment(text=""" This file is automatically generated. DO NOT EDIT.
+       Locales definitions should go into 'gen_method_xml.py'.
+       Update this file with 'gradle test'.
+
+  """))
+    for loc in locales:
+        subtype_elem(root, loc)
+    ET.indent(root)
+    print(ET.tostring(root, encoding="utf-8", xml_declaration=True).decode("UTF-8"))
+
+gen()

gen_sinhala_phonetic_layout.py

@@ -0,0 +1,524 @@
+#! /bin/env python3
+
+"""
+Script to generate a layout based on an existing.
+
+Tuned to create Sinhala phonetic layout based on qwerty (US), but may be adoped
+for other scripts. Look at dicts before the LayoutBuilder code.
+
+Usage:
+    python3 gen_sinhala_phonetic_layout [-h|--help] [-v|--verbose] [-o|--output]
+
+By default with no args will write to corresponding file in `srcs/layouts/`.
+
+Script uses central symbol (in direction "c") to identify a key, which may not
+be appropriate for base (reference) layouts other, than qwerty (US).
+
+Warning will be printed to stderr if new symbol overrides some symbol of the
+reference layout in directions other, than "c".
+
+Exception will be rised on other
+conflicts e. g. when trying to move a symbol into occupied position.
+
+  - Made with latn_qwerty_us.xml from commit `6b1551d`
+  - Made with Python 3.13
+  - Requires Python >= 3.11
+"""
+
+import argparse
+import logging
+
+from enum import StrEnum
+from pathlib import Path
+from xml.etree import ElementTree
+
+
+class Placement(StrEnum):
+    C = 'c'
+    NW = 'nw'
+    N = 'n'
+    NE = 'ne'
+    E = 'e'
+    SE = 'se'
+    S = 's'
+    SW = 'sw'
+    W = 'w'
+
+
+# Based on XKB Sinhala (phonetic)
+KEYS_MAP: dict[str, tuple[str, str, str, str]] = {
+    # Row 1 ###########################################
+    'q': ('ඍ', 'ඎ', '\u0DD8', '\u0DF2'),
+    'w': ('ඇ', 'ඈ', '\u0DD0', '\u0DD1'),
+    'e': ('එ', 'ඒ', '\u0DD9', '\u0DDA'),
+    'r': ('ර', '', '', ''),  # In XKB virama is on layer 2
+    't': ('ත', 'ථ', 'ට', 'ඨ'),
+    'y': ('ය', '', '', ''),  # In XKB virama is on layer 2
+    'u': ('උ', 'ඌ', '\u0DD4', '\u0DD6'),
+    'i': ('ඉ', 'ඊ', '\u0DD2', '\u0DD3'),
+    'o': ('ඔ', 'ඕ', '\u0DDC', '\u0DDD'),
+    'p': ('ප', 'ඵ', '', ''),
+    # Row 2 ###########################################
+    'a': ('අ', 'ආ', '\u0DCA', '\u0DCF'),
+    's': ('ස', 'ශ', 'ෂ', ''),
+    'd': ('ද', 'ධ', 'ඩ', 'ඪ'),
+    'f': ('ෆ', '\u0D93', '', '\u0DDB'),  # In XKB aiyanna placed otherwise
+    'g': ('ග', 'ඝ', 'ඟ', ''),
+    'h': ('හ', '\u0D83', '\u0DDE', 'ඖ'),
+    'j': ('ජ', 'ඣ', 'ඦ', ''),
+    'k': ('ක', 'ඛ', 'ඦ', 'ඐ'),
+    'l': ('ල', 'ළ', '\u0DDF', '\u0DF3'),
+    # Row 3 ###########################################
+    'z': ('ඤ', 'ඥ', '', ''),  # In XKB contains bar, broken bar
+    'x': ('ඳ', 'ඬ', '', ''),
+    'c': ('ච', 'ඡ', '', ''),
+    'v': ('ව', '', '', ''),
+    'b': ('බ', 'භ', '', ''),
+    'n': ('න', 'ණ', '\u0D82', 'ඞ'),
+    'm': ('ම', 'ඹ', '', ''),
+}
+
+# How to place four levels of Key.
+# Syntax: LEVEL: PLACEMENT | 'FROM_LEVEL+MODIFIER'
+# The last means symbol on level FROM_LEVEL with modifier key MODIFIER gives
+# key on level LEVEL
+#
+LEVELS_MAP = {
+    0: Placement.C,
+    1: Placement.NE,
+    2: '0+shift',
+    3: '1+shift',
+}
+
+# Additional modify keys combinations.
+# Syntax:
+#   MODKEY: { A: B }
+#
+MODMAP_EXTRA: dict[str, dict[str, str]] = {
+    'shift': {
+        # Astrological numbers
+        '1': '෧',
+        '2': '෨',
+        '3': '෩',
+        '4': '෪',
+        '5': '෫',
+        '6': '෬',
+        '7': '෭',
+        '8': '෮',
+        '9': '෯',
+        '0': '෦',
+        # Kunddaliya
+        '.': '෴',
+        # Extra broken bar intead z key in XKB
+        '\u007C': '\u00A6',
+        # Special whitespaces
+        'zwj': 'zwnj',
+    },
+    'fn': {
+        # Sinhala archaic digits
+        'ඍ': '𑇡',  # 1
+        'ඇ': '𑇢',  # 2
+        'එ': '𑇣',  # 3
+        'ර': '𑇤',  # 4
+        'ත': '𑇥',  # 5
+        'ය': '𑇦',  # 6
+        'උ': '𑇧',  # 7
+        'ඉ': '𑇨',  # 8
+        'ඔ': '𑇩',  # 9
+        'ප': '𑇪',  # 10
+        'අ': '𑇫',  # 20
+        'ස': '𑇬',  # 30
+        'ද': '𑇭',  # 40
+        'ෆ': '𑇮',  # 50
+        'ග': '𑇯',  # 60
+        'හ': '𑇰',  # 70
+        'ජ': '𑇱',  # 80
+        'ක': '𑇲',  # 90
+        'ල': '𑇳',  # 100
+        'ළ': '𑇴',  # 1000
+        # Sinhala candrabindu for Sanskrit
+        'ණ': '\u0D81',
+    },
+}
+
+# Table to move additional characters in reference layout.
+# Format is (CENTRAL_CHAR, PLACEMENT): (CENTRAL_CHAR, PLACEMENT). E. g. to move
+# char from key with central character "q", direction "se" to key with central
+# character "w", direction "sw", add line:
+#   ('q', Placement.SE): ('w', Placement.SW),
+#
+# To delete a char, use None as destination placement. E.g.:
+#   ('q', Placment.SE): ('q', None)
+#
+# Moving of main char in central placement is not supported.
+#
+TRANSITIONS_MAP: dict[tuple[str, Placement], tuple[str, Placement | None]] = {
+    ('q', Placement.SE): ('q', Placement.SW),  # loc esc
+    ('q', Placement.NE): ('q', Placement.SE),  # 1
+
+    ('w', Placement.NE): ('w', Placement.SE),  # 2
+
+    ('e', Placement.SE): ('r', Placement.NW),  # loc €
+    ('e', Placement.NE): ('e', Placement.SE),  # 3
+
+    ('r', Placement.NE): ('r', Placement.SE),  # 4
+    ('t', Placement.NE): ('t', Placement.SE),  # 5
+    ('y', Placement.NE): ('y', Placement.SE),  # 6
+    ('u', Placement.NE): ('u', Placement.SE),  # 7
+    ('i', Placement.NE): ('i', Placement.SE),  # 8
+
+    ('o', Placement.SE): ('p', Placement.SW),  # )
+    ('o', Placement.NE): ('o', Placement.SE),  # 9
+
+    ('p', Placement.NE): ('p', Placement.SE),  # 0
+
+    ('a', Placement.NE): ('a', Placement.NW),  # `
+    ('a', Placement.NW): ('a', Placement.SW),  # loc tab
+
+    ('s', Placement.NE): ('s', Placement.NW),  # loc §
+
+    ('g', Placement.SW): ('g', Placement.NW),  # _
+    ('g', Placement.NE): ('g', Placement.SW),  # -
+
+    ('h', Placement.SW): ('h', Placement.NW),  # +
+    ('h', Placement.NE): ('h', Placement.SW),  # =
+
+    ('l', Placement.NE): ('l', Placement.NW),  # |
+
+    ('x', Placement.NE): ('x', Placement.NW),  # loc †
+    ('c', Placement.NE): ('c', Placement.NW),  # <
+    ('b', Placement.NE): ('b', Placement.NW),  # ?
+    ('n', Placement.NE): ('n', Placement.NW),  # :
+    ('m', Placement.NE): ('m', Placement.NW),  # "
+}
+
+# Add additional characters to arbitrary places.
+# Syntax is CHAR: POSITION, where POSITION is a pari as in TRANSITIONS_MAP.
+#
+CHARS_EXTRA = {
+    # In XKB ZWJ is on `/` key, and ZWNJ is on spacebar
+    'zwj': ('m', Placement.SE),
+}
+
+
+# List of char unicode numbers and inclusive ranges of numbers to encode as XML
+# numeric character references.
+# Good for combining signs to not mess with quotes.
+# Characters in line of the keyboard tag will not be escaped.
+#
+ESCAPE_LIST: list[int | tuple[int, int]] = [
+    # Sinhalese diacritics
+    (0xD81, 0xD83),
+    (0xDCA, 0xDDF),
+]
+
+# Default filename. Output path can be overrided with `-o` flag also.
+LAYOUT_FILENAME = 'sinhala_phonetic.xml'
+
+# Will be placed after XML declaration. Need to have proper <!-- --> tags.
+COMMENT = '''
+<!-- This file defines Sinhala layout.
+
+Based on XKB Sinhala (phonetic) layout.
+-->
+'''
+
+BASE_DIR = Path(__file__).parent
+REFERENCE_LAYOUT_FILE = BASE_DIR / 'srcs/layouts/latn_qwerty_us.xml'
+
+LOGGER = logging.getLogger(__name__)
+KeysMapType = list[list[ElementTree.Element]]
+
+
+class LayoutGenError(RuntimeError):
+    ...
+
+
+def xml_elem_to_str(element: ElementTree.Element) -> str:
+    return ElementTree.tostring(
+        element,
+        xml_declaration=False,
+        encoding='unicode').strip()
+
+
+def keys_map_to_str(keys_map: KeysMapType) -> str:
+    """ Make laout rows map printable for debug purposes """
+    result = '[\n'
+    for row in keys_map:
+        result += ' ' * 4
+        for key in row:
+            result += str(key.attrib) + ', '
+        result += '\n'
+    result += ']'
+    return result
+
+
+def is_in_escape_list(char: str | int) -> bool:
+    if isinstance(char, str):
+        char = ord(char)
+    for item in ESCAPE_LIST:
+        if isinstance(item, tuple) and char >= item[0] and char <= item[1]:
+            return True
+        elif isinstance(item, int):
+            if char == item:
+                return True
+        else:
+            TypeError(f'Unexpected item {item} of ESCAPE_LIST')
+    return False
+
+
+def xml_encode_char(ch: str | int) -> str:
+    if isinstance(ch, str):
+        ch = ord(ch)
+    hex_val = hex(ch).split('x')[-1]
+    return f'&#x{hex_val.upper().zfill(4)};'
+
+
+class LayoutBuilder:
+    XML_DECLARATION = "<?xml version='1.0' encoding='utf-8'?>"
+
+    def __init__(
+        self,
+        name: str = '',
+        script: str = '',
+        numpad_script: str = '',
+        comment: str = '',
+    ) -> None:
+        """
+        :param comment: MUST be a valid XML comment wrapped in <!-- tags -->
+        """
+        attrs = {}
+        if name:
+            attrs['name'] = name
+        if script:
+            attrs['script'] = script
+        if numpad_script:
+            attrs['numpad_script'] = numpad_script
+        self._comment = None
+        if comment:
+            self._comment = comment.strip() or None
+        self._xml_keyboard = ElementTree.Element('keyboard', attrib=attrs)
+        self._modmap = ElementTree.Element('modmap')
+
+    @staticmethod
+    def _parse_reference_layout() -> list[ElementTree.Element]:
+        return ElementTree.parse(REFERENCE_LAYOUT_FILE).findall('row')
+
+    @staticmethod
+    def _move_untransited_to_new_map(
+        ref_map: KeysMapType,
+        new_map: KeysMapType
+    ) -> None:
+        coordinates = [
+            (row_num, key_num)
+            for row_num in range(len(ref_map))
+            for key_num in range(len(ref_map[row_num]))
+        ]
+
+        for row_num, key_num in coordinates:
+            old_key = ref_map[row_num][key_num]
+            new_key = new_map[row_num][key_num]
+            for k, val in old_key.attrib.items():
+                if (transited := new_key.attrib.get(k)) is not None:
+                    msg = (
+                        f'Transition of {transited} to'
+                        f' {new_key.get(Placement.C)}:{k} conflictls with'
+                        f' existing value "{val}"')
+                    raise LayoutGenError(msg)
+                new_key.set(k, val)
+
+    @staticmethod
+    def _add_extra_chars_to_ref_map(
+        coord_map: dict[str, tuple[int, int]],
+        new_map: KeysMapType
+    ) -> None:
+        for char, (to_key_name, to_plc) in CHARS_EXTRA.items():
+            if not (to_coord := coord_map.get(to_key_name)):
+                msg = f'Trying to add "{char}" to missing key "{to_key_name}"'
+                raise LayoutGenError(msg)
+            row_num, key_num = to_coord
+            key = new_map[row_num][key_num]
+            if (existing := key.get(to_plc)) is not None:
+                msg = f'Trying to add char to <{to_key_name}:{to_plc}>, but already contains "{existing}"'
+                raise LayoutGenError(msg)
+            key.set(to_plc, char)
+            LOGGER.info(
+                'Added "%s" to <%s:%s>',
+                char, to_key_name, to_plc)
+
+    @classmethod
+    def _apply_transitions(cls, ref_map: list) -> list:
+        coord_map: dict[str, tuple[int, int]] = {}
+
+        coordinates = [
+            (row_num, key_num)
+            for row_num in range(len(ref_map))
+            for key_num in range(len(ref_map[row_num]))
+        ]
+
+        for row_num, key_num in coordinates:
+            row = ref_map[row_num]
+            key = row[key_num]
+            key_name = key.get(Placement.C)
+            if key_name in coord_map:
+                msg = f'Duplicated value "{key_name}" in central position'
+                raise LayoutGenError(msg)
+            coord_map[key_name] = (row_num, key_num)
+
+        # Make new map with empty keys
+        result_map = [[ElementTree.Element('key') for key in row] for row in ref_map]
+
+        # Place by transitions map on new places
+        for (from_key_name, from_plc), (to_key_name, to_plc) in TRANSITIONS_MAP.items():
+            if Placement.C in (from_plc, to_plc):
+                raise NotImplementedError('Transition from or to placment "c"')
+            if not (from_coord := coord_map.get(from_key_name)):
+                raise LayoutGenError(f'Transition from missing key {from_key_name}')
+            if not (to_coord := coord_map.get(to_key_name)):
+                raise LayoutGenError(f'Transition to missing key {to_key_name}')
+            from_key = ref_map[from_coord[0]][from_coord[1]]
+            to_key = result_map[to_coord[0]][to_coord[1]]
+            try:
+                val = from_key.attrib.pop(from_plc)
+            except KeyError:
+                msg = f'No value in key {from_key_name}, placement {from_plc} to move'
+                raise LayoutGenError(msg)
+            if to_plc is not None:
+                if to_key.get(to_plc):
+                    msg = f'Second transition to key {to_key_name}, placement {to_plc}'
+                    raise LayoutGenError(msg)
+                to_key.set(to_plc, val)
+                LOGGER.info(
+                    'Moved "%s" from <%s:%s> to <%s:%s>',
+                    val, from_key_name, from_plc, to_key_name, to_plc)
+            else:
+                LOGGER.info(
+                    'Deleted "%s" from <%s:%s>',
+                    val, from_key_name, from_plc)
+
+        # Fill new map with other values
+        cls._move_untransited_to_new_map(ref_map, new_map=result_map)
+
+        # Add additional characters
+        cls._add_extra_chars_to_ref_map(coord_map, new_map=result_map)
+
+        return result_map
+
+    @staticmethod
+    def _resolve_placement(
+        key: ElementTree.Element,
+        placement: Placement,
+        new_char: str
+    ) -> None:
+        if placement != Placement.C:
+            central_char = key.get(Placement.C)
+            existing = key.get(placement)
+            if existing:
+                LOGGER.warning(
+                    'Placement %s of key %s already occupied with %s',
+                    placement, central_char, existing)
+        key.set(placement, new_char)
+
+    def _process_key(self, key: ElementTree.Element) -> ElementTree.Element:
+        central_char = key.get(Placement.C)
+        if not central_char:
+            return key
+        new_key_entry = KEYS_MAP.get(central_char)
+        if new_key_entry is None:
+            return key
+
+        for level, placement_spec in LEVELS_MAP.items():
+            if not (new_char := new_key_entry[level]):
+                continue
+            if '+' in placement_spec:
+                pair = placement_spec.split('+')
+                from_level, modkey = int(pair[0]), pair[1]
+                key_a = new_key_entry[from_level]
+                key_b = new_char
+                if key_a is None:
+                    raise LayoutGenError(f'Tried to modife {key_a} to {key_b}')
+                ElementTree.SubElement(self._modmap, modkey, a=key_a, b=key_b)
+            else:
+                placement = Placement(placement_spec)
+                self._resolve_placement(key, placement=placement, new_char=new_char)
+        return key
+
+    @staticmethod
+    def _make_extra_modmap(modmap: ElementTree.Element) -> ElementTree.Element:
+        for modkey, ab_map in MODMAP_EXTRA.items():
+            for a, b in ab_map.items():
+                LOGGER.info('Adding modmap %s "%s" -> "%s"', modkey, a, b)
+                ElementTree.SubElement(modmap, modkey, a=a, b=b)
+        return modmap
+
+    @staticmethod
+    def _post_escape(data: str) -> str:
+        buf = ''
+        lines = data.splitlines(keepends=True)
+        for line in lines:
+            # Skip keyboard tag line to keep attributes
+            if '<keyboard ' in line:
+                buf += line
+                continue
+            for ch in line:
+                if is_in_escape_list(ch):
+                    ch = xml_encode_char(ch)
+                buf += ch
+        return buf
+
+    def build(self) -> None:
+        raw_ref_rows = self._parse_reference_layout()
+        ref_rows = self._apply_transitions(raw_ref_rows)
+        for row in ref_rows:
+            new_row = ElementTree.SubElement(self._xml_keyboard, 'row')
+            for key in row:
+                LOGGER.debug(
+                    'Processing reference entry %s',
+                    xml_elem_to_str(key))
+                new_row.append(self._process_key(key))
+        self._modmap = self._make_extra_modmap(self._modmap)
+        self._xml_keyboard.append(self._modmap)
+
+    def get_xml(self) -> str:
+        ElementTree.indent(self._xml_keyboard)
+        body_raw = xml_elem_to_str(self._xml_keyboard)
+        body = self._post_escape(body_raw)
+
+        result = self.XML_DECLARATION + '\n'
+        if self._comment:
+            result += self._comment + '\n'
+        result += body + '\n'
+
+        return result
+
+
+def get_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        prog='gen_sinhala_phonetic_layout',
+        description='Generate XKB-based Sinhala layout',)
+    parser.add_argument(
+        '-o',
+        '--output',
+        default=BASE_DIR / f'srcs/layouts/{LAYOUT_FILENAME}',
+        help='File to write result, `-` for stdout')
+    parser.add_argument(
+        '-v',
+        '--verbose',
+        help='More verbose logging',
+        action='store_true')
+    return parser.parse_args()
+
+
+if __name__ == '__main__':
+    args = get_args()
+    logging.basicConfig(
+        level=logging.DEBUG if args.verbose else logging.WARNING,
+        format='%(levelname)s: %(message)s')
+    builder = LayoutBuilder(name='සිංහල', script='sinhala', comment=COMMENT)
+    builder.build()
+    content = builder.get_xml()
+    if args.output == '-':
+        print(content)
+    else:
+        with open(args.output, 'w') as file:
+            file.write(content)

gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
-android.useAndroidX=false
-android.nonTransitiveRClass=true
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Aug 21 18:13:41 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,81 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

proguard-rules.pro

@@ -0,0 +1,3 @@
+-keep public class juloo.cdict.* {
+  public protected private *;
+}

res/drawable/doc_anim_circle.xml

@@ -3,28 +3,15 @@
   <aapt:attr name="android:drawable">
     <vector android:name="vector" android:width="35dp" android:height="40dp" android:viewportWidth="35" android:viewportHeight="40">
       <path android:name="trace" android:pathData="M 17.5 20 C 20 3 26 7 27.5 10" android:strokeColor="#09b3f1" android:strokeWidth="2" android:strokeLineCap="round"/>
-      <group android:name="pointer_g">
-        <path android:name="pointer" android:pathData="m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2" android:fillAlpha="0" android:strokeAlpha="0"/>
+      <group android:name="pointer_g" android:translateX="27" android:translateY="10">
+        <path android:name="pointer" android:pathData="m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2"/>
       </group>
     </vector>
   </aapt:attr>
   <target android:name="trace">
     <aapt:attr name="android:animation">
       <set>
-        <objectAnimator android:propertyName="strokeAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
         <objectAnimator android:propertyName="trimPathEnd" android:duration="700" android:valueFrom="0" android:valueTo="1" android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
-      </set>
-    </aapt:attr>
-  </target>
-  <target android:name="pointer">
-    <aapt:attr name="android:animation">
-      <set>
-        <objectAnimator android:propertyName="fillAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator android:propertyName="fillAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
       </set>
     </aapt:attr>
   </target>

res/drawable/doc_anim_round_trip.xml

@@ -2,31 +2,14 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
   <aapt:attr name="android:drawable">
     <vector android:name="vector" android:width="35dp" android:height="40dp" android:viewportWidth="35" android:viewportHeight="40">
-      <path android:name="trace" android:pathData="M 0 0" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2" android:strokeLineCap="round"/>
+      <path android:name="trace" android:pathData="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2" android:strokeLineCap="round"/>
     </vector>
   </aapt:attr>
   <target android:name="trace">
     <aapt:attr name="android:animation">
       <set>
-        <objectAnimator android:propertyName="fillAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator
-          android:propertyName="pathData"
-          android:duration="350"
-          android:valueFrom="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 17.5,20.0"
-          android:valueTo="M 31 4 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4"
-          android:valueType="pathType"
-          android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator
-          android:propertyName="pathData"
-          android:startOffset="400"
-          android:duration="800"
-          android:valueFrom="M 31 4 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4"
-          android:valueTo="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4"
-          android:valueType="pathType"
-          android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="fillAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
+        <objectAnimator android:propertyName="pathData" android:duration="350" android:valueFrom="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 17.5,20.0" android:valueTo="M 31 4 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4" android:valueType="pathType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
+        <objectAnimator android:propertyName="pathData" android:startOffset="400" android:duration="800" android:valueFrom="M 31 4 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4" android:valueTo="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31,4" android:valueType="pathType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
       </set>
     </aapt:attr>
   </target>

res/drawable/doc_anim_swipe.xml

@@ -2,23 +2,13 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
   <aapt:attr name="android:drawable">
     <vector android:name="vector" android:width="35dp" android:height="40dp" android:viewportWidth="35" android:viewportHeight="40">
-      <path android:name="trace" android:pathData="M 0 0" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2" android:strokeLineCap="round"/>
+      <path android:name="trace" android:pathData="  M 31 4      m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31  ,4" android:fillColor="#09b3f1" android:strokeColor="#09b3f1" android:strokeWidth="2" android:strokeLineCap="round"/>
     </vector>
   </aapt:attr>
   <target android:name="trace">
     <aapt:attr name="android:animation">
       <set>
-        <objectAnimator android:propertyName="fillAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:duration="100" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        <objectAnimator
-          android:propertyName="pathData"
-          android:duration="700"
-          android:valueFrom="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 17.5,20.0"
-          android:valueTo="  M 31 4      m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31  ,4"
-          android:valueType="pathType"
-          android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="fillAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        <objectAnimator android:propertyName="strokeAlpha" android:startOffset="900" android:duration="400" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
+        <objectAnimator android:propertyName="pathData" android:duration="700" android:valueFrom="M 17.5 20.0 m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 17.5,20.0" android:valueTo="  M 31 4      m 2,0 a 2,2 0 1,1 -4,0 a 2,2 0 1,1 4,0 M 17.5 20.0 L 31  ,4" android:valueType="pathType" android:interpolator="@android:interpolator/linear_out_slow_in"/>
       </set>
     </aapt:attr>
   </target>

res/drawable/ic_delete.xml

@@ -1 +1 @@
-<!-- drawable/delete.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" /></vector>
+<!-- drawable/delete.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" /></vector>

res/drawable/ic_download.xml

@@ -0,0 +1,2 @@
+<!-- From https://pictogrammers.com/library/mdi/icon/download/ -->
+<!-- drawable/download.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z" /></vector>

res/drawable/suggestions_item_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+  <solid android:color="?attr/suggestions_background"/>
+  <corners android:radius="?attr/suggestions_border_radius"/>
+</shape>

res/layout/candidates_status_no_dict.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/candidates_status">
+  <TextView android:id="@android:id/text1" style="@style/candidates_item" android:onClick="launch_dictionaries_activity"/>
+</LinearLayout>

res/layout/dialog_edit_text.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content">
-  <EditText android:id="@+id/text" android:inputType="text" android:importantForAutofill="no" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
+  <EditText android:id="@+id/text" android:hint="@string/pref_dialog_edit_text" android:inputType="text" android:importantForAutofill="no" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
 </LinearLayout>

res/layout/dictionaries_activity.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:fitsSystemWindows="true">
+  <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
+    <TextView style="@style/paragraph" android:text="@string/dictionaries_from_internet"/>
+    <juloo.keyboard2.dict.DictionaryListView style="@style/dictionary_list_view"/>
+  </LinearLayout>
+</ScrollView>

res/layout/dictionary_download_item.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/dictionary_download_item">
+  <TextView android:id="@+id/dictionary_download_locale" style="@style/dictionary_download_locale"/>
+  <TextView android:id="@+id/dictionary_download_size" style="@style/dictionary_download_size"/>
+  <View android:id="@+id/dictionary_download_button" style="@style/dictionary_download_button" android:background="@drawable/ic_download"/>
+</LinearLayout>

res/layout/dictionary_status_not_enabled.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/paragraph" android:paddingHorizontal="24dp" android:gravity="center" android:text="@string/dictionaries_activity_not_enabled"/>