Remove the old implementation of the Caps lock button

The previous implementation has unintended interactions with
auto-capitalisation.

Caps lock can now be locked twice at the same time, independently:
- Long press on shift
- Tap on Caps lock

Both have to be disabled independently. This might seem weird.

.github/workflows/check-layouts.yml

@@ -0,0 +1,19 @@
+name: Check layouts
+
+# Runs 'gen_layouts.py' and checks that the generated file were uptodate.
+# This doesn't run 'check_layout.py'.
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+jobs:
+  check-layouts:
+    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, run python3 gen_layouts.py otherwise
+      run: git diff --exit-code

.github/workflows/check-translations.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - run: python3 sync_translations.py
     - name: Check that strings files are uptodate, run python3 sync_translations.py otherwise
       run: git diff --exit-code

.github/workflows/make-apk.yml

@@ -9,39 +9,41 @@ jobs:
   Build-Apk:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'zulu' # See 'Supported distributions' for available options
-        java-version: '11'
+        java-version: '17'
     - name: Checkout repo
-      uses: actions/checkout@v3
-    - name: Cache debug certificate
-      uses: actions/cache@v3
-      with:
-        path: _build/debug.keystore
-        key: debug-keystore
-    - name: Restore debug keystore from github Secrets 
+      uses: actions/checkout@v4
+    - name: Restore debug keystore from GitHub Secrets
       run: |
-        mkdir -p _build
-        cd "_build"
         # Check if exist and use the secret named DEBUG_KEYSTORE
         # The contents of the secret can be obtained -
-        #    from the debug.keystore.asc from you local _build folder
+        #  from the debug.keystore.asc from you local folder 
+        #  (refer to CONTRIBUTING.md Using the local debug.keystore on the Github CI actions)
         if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
             echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
             if [[ -s "debug.keystore.asc" ]]; then
+                echo "Restoring debug keystore from GitHub secrets"
                 gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
             fi
         fi
-    - name: Build
-      run: make
+    - name: Build debug APK
+      uses: gradle/gradle-build-action@v3
+      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}}"
         artifact="${artifact//\//-}" # replace slashes
         echo "artifact=${artifact}" >> $GITHUB_ENV
-    - name: Save debug apk
-      uses: actions/upload-artifact@v3
+    - name: Upload debug APK
+      uses: actions/upload-artifact@v4
       with:
         name: "${{env.artifact}} debug_apk"
-        path: _build/*.apk
+        path: build/outputs/apk/debug/*.apk

.gitignore

@@ -1,4 +1,12 @@
 *.keystore
 *.keystore.asc
-_build
 /*-keystore.conf
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/captures
+/build
+# Directory _build is not used anymore
+/_build

AndroidManifest.xml

@@ -1,25 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="34" android:versionName="1.22.1" android:hardwareAccelerated="false">
-  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="33"/>
-  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:hardwareAccelerated="false">
+<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"/>
+
+  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:hardwareAccelerated="false">
     <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="@drawable/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true">
+    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/appTheme" 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="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true">
+    <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>
   </application>
-  <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+  <!-- To query enabled input methods for voice IME detection -->
+  <queries>
+    <intent>
+      <action android:name="android.view.InputMethod" />
+    </intent>
+  </queries>
 </manifest>

CONTRIBUTING.md

@@ -4,67 +4,60 @@ Thanks for contributing :)
 
 ## Building the app
 
-The application doesn't use Gradle and it might be hard to use some features of
-Android Studio.
-
-Fortunately, there's not many dependencies:
-- OpenJDK 8
+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`
-- Make sure to have the `$ANDROID_HOME` environment variable set.
+
+Python 3 is required to update generated files but not to build the app.
+
+For Android Studio users, no more setup is needed.
 
 For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
 Instructions to install Nix are [here](https://nixos.wiki/wiki/Nix_Installation_Guide).
 
+If you don't use Android Studio or Nix, you have to inform Gradle about the
+location of your Android SDK by either:
+- Setting the `ANDROID_HOME` environment variable to point to the android sdk or
+- Creating the file `local.properties` and writing
+  `sdk.dir=<location_of_android_home>` into it.
+
 Building the debug apk:
 
 ```sh
-make
+./gradlew assembleDebug
 ```
 
-If the build succeed, the debug apk is located in `_build/juloo.keyboard2.debug.apk`.
+Nix users can call gradle directly: `gradle assembleDebug`.
 
-## Using the local debug.keystore on the Github CI actions
-
-It's possible to save the local debug.keystore into a github secret, so the same keystore is utilized to build the debug apk in the CI github actions.
-Doing this, they wil have the same signature, thus the debug apk can be updated without having to uninstall it first.
-
-After you sucessfully run `make`, (thus a debug.keystore exists) you can use this second command to generate a base64 stringified version of it
-
-```sh
-cd _build
-gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystore"
-```
-
-A file will be generated inside the local `_build/` folder, called `debug.keystore.asc`
-
-You can copy the content of this file, and with that, paste it into a new github secret in your repo settings. 
-
-The secret must be named `DEBUG_KEYSTORE`
+If the build succeeds, the debug apk is located in `build/outputs/apk/debug/app-debug.apk`.
 
 ## Debugging on your phone
 
 First [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb#Enabling).
-Then connect your phone to your computer using an USB cable or wireless
+Then connect your phone to your computer using an USB cable or via wireless
 debugging.
 
+If you use Android Studio, this process will be automatic and you don't have to
+follow this guide anymore.
+
 And finally, install the application with:
 ```sh
-make installd
+./gradlew installDebug
 ```
 
-The debug version of the application won't be removed, both versions will stay
-installed at the same time.
-
-The application must be enabled in the settings:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
+The released version of the application won't be removed, both versions will
+be installed at the same time.
 
 ## Debugging the application: INSTALL_FAILED_UPDATE_INCOMPATIBLE
 
-`make installd` can fail with the following error message:
+`./gradlew installDebug` can fail with the following error message:
 
 ```
-adb: failed to install _build/juloo.keyboard2.debug.apk: Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Package juloo.keyboard2.debug signatures do not match previously installed version; ignoring!]
-make: *** [Makefile:20: installd] Error 1
+FAILURE: Build failed with an exception.
+* What went wrong:
+Execution failed for task ':installDebug'.
+> java.util.concurrent.ExecutionException: com.android.builder.testing.api.DeviceException: com.android.ddmlib.InstallException: INSTALL_FAILED_UPDATE_INCOMPATIBLE: Existing package juloo.keyboard2.debug signatures do not match newer version; ignoring!
 ```
 
 The application can't be "updated" because the temporary certificate has been
@@ -73,30 +66,63 @@ The application must be enabled again in the settings.
 
 ```sh
 adb uninstall juloo.keyboard2.debug
-make installd
+./gradlew installDebug
 ```
 
+## Specifying a debug signing certificate on Github Actions
+
+It's possible to specify the signing certificate that the automated build
+should use.
+After you successfully run `./gradlew asssembleDebug`, (thus a debug.keystore
+exists) you can use this second command to generate a base64 stringified
+version of it:
+
+```sh
+gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystore"
+```
+
+This will create the file `debug.keystore.asc`, paste its content into a new
+Github secret named `DEBUG_KEYSTORE`.
+
 ## Guidelines
 
 ### Adding a layout
 
-Layouts are defined in XML, see `res/xml/qwerty.xml`.
+Layouts are defined in XML, see `srcs/layouts/latn_qwerty_us.xml`.
+An online tool for editing layout files written by @Lixquid is available
+[here](https://unexpected-keyboard-layout-editor.lixquid.com/).
 
-An entry must be added to the layout option in `res/values/arrays.xml`, to both
-`pref_layout_values` (correspond to the file name) and `pref_layout_entries`
-(display name).
+Makes sure to specify the `name` attribute like in `latn_qwerty_us.xml`,
+otherwise the layout won't be added to the app.
 
-The layout must also be referenced in `srcs/juloo.keyboard2/Config.java` in
-`layoutId_of_string`.
+The layout file must be placed in the `srcs/layouts` directory and named
+according to:
+- script (`latn` for latin, etc..)
+- layout name (eg. the name of a standard)
+- country code (or language code if more adequate)
+
+Then, run `./gradlew genLayoutsList` to add the layout to the app.
+
+The last step will update the file `res/values/layouts.xml`, that you should
+not edit directly.
+
+Run `./gradlew checkKeyboardLayouts` to check some properties about your
+layout. This will change the file `check_layout.output`, which you should
+commit.
 
 #### Adding a programming layout
 
-A programming layout must contains every ASCII characters.
+A programming layout must contain all ASCII characters.
 The current programming layouts are: QWERTY, Dvorak and Colemak.
 
-Keys with a name starting in `loc ` are hidden unless they are configured for
-the user's installed languages in `res/xml/method.xml`. These keys are optional
-and will be added automatically when necessary.
+See for example, Dvorak, added in https://github.com/Julow/Unexpected-Keyboard/pull/16
+
+It's best to leave free spots on the layout for language-specific symbols that
+are added automatically when necessary.
+These symbols are defined in `res/xml/method.xml` (`extra_keys`).
+
+It's possible to place extra keys with the `loc` prefix. These keys are
+normally hidden unless they are needed.
 
 Some users cannot easily type the characters close the the edges of the screen
 due to a bulky phone case. It is best to avoid placing important characters
@@ -116,21 +142,56 @@ Supported locales are defined in `res/xml/method.xml`.
 
 The attributes `languageTag` and `imeSubtypeLocale` define a locale, the
 attribute `imeSubtypeExtraValue` defines the default layout and the dead-keys
-and other extra keys to show. 
+and other extra keys to show.
 
-### Translations
+The list of language tags (generally two letters)
+and locales (generally of the form `xx_XX`)
+can be found in this [stackoverflow answer](https://stackoverflow.com/a/7989085)
 
-Translations are always welcome !
+### Updating translations
 
-See for example: 1723288 (Latvian), baf867a (French).
-The app can be translated by writing `res/values-<language code>/strings.xml`
-(for example `values-fr`, `values-lv`), based on the default:
-`res/values/strings.xml` (English).
+The text used in the app is written in `res/values-<language_tag>/strings.xml`.
 
-The store description is found in `metadata/android/<locale>/`,
-`short_description.txt` and `full_description.txt`.
-Translating changelogs is not useful. Changelogs are written quickly just
-before a release and older ones are never shown to anyone currently.
+The list of language tags can be found in this
+[stackoverflow answer](https://stackoverflow.com/a/7989085)
 
-The app name might be partially translated, the "unexpected" word should remain
-untranslated.
+The first part before the `_` is used, for example,
+`res/values-fr/strings.xml` for French,
+`res/values-lv/strings.xml` for Latvian.
+
+Commented-out lines indicate missing translations:
+
+```xml
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+```
+
+Remove the `<!--` and `-->` parts and change the text.
+
+### Adding a translation
+
+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 `metadata/` are updated automatically.
+Translating changelogs is not useful.
+
+The app name might be partially translated, the "Unexpected" word should remain
+untranslated if possible.
+
+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 key combinations
+
+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`.
+
+Keys with special meaning are defined in `KeyValue.java` in method
+`getKeyByName`. Their special action are defined in `KeyEventHandler.java` in
+method `key_up`

Makefile

@@ -1,119 +0,0 @@
-# Configuration
-
-PACKAGE_NAME = juloo.keyboard2
-
-ANDROID_PLATFORM_VERSION = android-30
-JAVA_VERSION = 1.7
-
-SRC_DIR = srcs
-RES_DIR = res
-
-EXTRA_JARS =
-
-# /
-
-debug: _build/$(PACKAGE_NAME).debug.apk
-release: _build/$(PACKAGE_NAME).apk
-
-installd: _build/$(PACKAGE_NAME).debug.apk
-	adb install -r "$<"
-
-clean:
-	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \
-		_build/*.idsig _build/assets
-
-rebuild_special_font:
-	cd srcs/special_font && fontforge -lang=ff -script build.pe *.svg
-
-.PHONY: release debug installd clean rebuild_special_font
-
-$(shell mkdir -p _build)
-
-ifndef ANDROID_HOME
-$(error ANDROID_HOME not set)
-endif
-
-ANDROID_BUILD_TOOLS = $(lastword $(sort $(wildcard $(ANDROID_HOME)/build-tools/*)))
-ANDROID_PLATFORM = $(ANDROID_HOME)/platforms/$(ANDROID_PLATFORM_VERSION)
-
-ifeq ($(shell [ -d "$(ANDROID_PLATFORM)" ] && echo ok),)
-$(error Android platform not found. Want $(ANDROID_PLATFORM_VERSION), \
-	found $(notdir $(wildcard $(ANDROID_HOME)/platforms/*)))
-endif
-
-JAVAC_FLAGS = -source $(JAVA_VERSION) -target $(JAVA_VERSION) -encoding utf8
-
-# Source files
-
-MANIFEST_FILE = AndroidManifest.xml
-JAVA_FILES = $(shell find $(SRC_DIR) -name '*.java')
-RES_FILES = $(shell find $(RES_DIR) -type f)
-
-# Debug signing
-
-DEBUG_KEYSTORE = _build/debug.keystore
-DEBUG_PASSWD = debug0
-
-$(DEBUG_KEYSTORE):
-	echo y | keytool -genkeypair -dname "cn=d, ou=e, o=b, c=ug" \
-		-alias debug -keypass $(DEBUG_PASSWD) -keystore "$@" \
-		-keyalg rsa -storepass $(DEBUG_PASSWD) -validity 10000
-
-_build/%.debug.apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
-	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
-		--ks $(DEBUG_KEYSTORE) --ks-key-alias debug --ks-pass "pass:$(DEBUG_PASSWD)"
-
-# Debug apk
-
-_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug --product debug
-
-# Release signing
-
-# %-keystore.conf should declare KEYSTORE, KEYNAME and KEYSTOREPASS
-#  it is interpreted as a shell script
-_build/%.apk: _build/%.unsigned-apk %-keystore.conf
-	eval `cat $(word 2,$^)` && \
-	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
-		--ks "$$KEYSTORE" --ks-key-alias "$$KEYNAME" --ks-pass "pass:$$KEYSTOREPASS"
-
-# Package
-
-_build/%.unsigned-apk: _build/%.unaligned-apk
-	$(ANDROID_BUILD_TOOLS)/zipalign -fp 4 "$<" "$@"
-
-APK_EXTRA_FILES = classes.dex assets/special_font.ttf
-
-_build/%.unaligned-apk: $(addprefix _build/,$(APK_EXTRA_FILES)) $(MANIFEST_FILE)
-	$(ANDROID_BUILD_TOOLS)/aapt package -f -M $(MANIFEST_FILE) -S $(RES_DIR) \
-		-I $(ANDROID_PLATFORM)/android.jar -F "$@" $(AAPT_PACKAGE_FLAGS)
-	cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) $(APK_EXTRA_FILES)
-
-# Copy the special font file into _build because aapt requires relative paths
-_build/assets/special_font.ttf: srcs/special_font/result.ttf
-	mkdir -p $(@D)
-	cp "$<" "$@"
-
-# R.java
-
-GEN_DIR = _build/gen
-R_FILE = $(GEN_DIR)/$(subst .,/,$(PACKAGE_NAME))/R.java
-
-$(R_FILE): $(RES_FILES) $(MANIFEST_FILE)
-	mkdir -p "$(@D)"
-	$(ANDROID_BUILD_TOOLS)/aapt package -f -m -S $(RES_DIR) -J $(GEN_DIR) \
-		-M $(MANIFEST_FILE) -I $(ANDROID_PLATFORM)/android.jar
-
-# Compile java classes and build classes.dex
-
-OBJ_DIR = _build/class
-# A$B.class files are ignored
-# CLASS_FILES = $(JAVA_FILES:$(SRC_DIR)/%.java=$(OBJ_DIR)/%.class) \
-# 	$(R_FILE:$(GEN_DIR)/%.java=$(OBJ_DIR)/%.class)
-
-_build/classes.dex: $(JAVA_FILES) $(R_FILE)
-	mkdir -p $(OBJ_DIR)
-	javac -d $(OBJ_DIR) $(JAVAC_FLAGS) \
-		-classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \
-		-sourcepath $(SRC_DIR):$(GEN_DIR) \
-		$^
-	$(ANDROID_BUILD_TOOLS)/d8 --output $(@D) $(OBJ_DIR)/*/*/* $(subst :, ,$(EXTRA_JARS))

README.md

@@ -1,27 +1,5 @@
 # Unexpected Keyboard
 
-A lightweight virtual keyboard for developers.
-| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
-| --- | --- | --- |
-| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
-
-The main feature is easy typing of more characters by swiping the keys toward the corners.
-
-Highlight of some of the features:
-
-- Every character and special keys of a PC keyboard. This is perfect for using applications like Termux.
-
-- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt.
-
-- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
-
-- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
-
-- Personalizable with many options, layouts and themes.
-
-Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
-
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/juloo.keyboard2/)
@@ -29,6 +7,26 @@ System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=juloo.keyboard2)
 
+Lightweight and privacy-conscious virtual keyboard for Android.
+
+https://github.com/Julow/Unexpected-Keyboard/assets/2310568/28f8f6fe-ac13-46f3-8c5e-d62443e16d0d
+
+The main feature is that you can type more characters by swiping the keys towards the corners.
+
+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.
+
+Usage: to apply the symbols located in the corners of each key, slide your finger in the direction of the symbols. For example, the Settings are opened by sliding in the left down corner.
+
+| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
+| --- | --- | --- |
+| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
+
+## Similar apps
+* [Calculator++](https://github.com/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators. Works up to Android 13 but maybe unmaintained.
+
 ## Contributing
 
 For instructions on building the application, see

build.gradle

@@ -0,0 +1,172 @@
+plugins {
+  id 'com.android.application' version '8.1.1'
+}
+
+android {
+  namespace 'juloo.keyboard2'
+  compileSdk 33
+
+  defaultConfig {
+    applicationId "juloo.keyboard2"
+    minSdk 11
+    targetSdkVersion 33
+    versionCode 38
+    versionName "1.26.0"
+  }
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      java.srcDirs = ['srcs']
+      res.srcDirs = ['res', 'build/generated-resources']
+      assets.srcDirs = ['assets']
+    }
+  }
+
+  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'
+  }
+}
+
+dependencies {
+
+}
+
+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.withType(Test).configureEach {
+  dependsOn 'genLayoutsList'
+  dependsOn 'checkKeyboardLayouts'
+  dependsOn 'syncTranslations'
+}
+
+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.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"
+    into "build/generated-resources/xml"
+  }
+}

check_layout.output

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

check_layout.py

@@ -0,0 +1,109 @@
+import xml.etree.ElementTree as ET
+import sys, os
+
+warning_count = 0
+
+KNOWN_NOT_LAYOUT = set([
+    "number_row", "numpad", "pin",
+    "bottom_row", "settings", "method",
+    "greekmath", "numeric", "emoji_bottom_row" ])
+
+def warn(msg):
+    global warning_count
+    print(msg)
+    warning_count += 1
+
+def key_list_str(keys):
+    return ", ".join(sorted(list(keys)))
+
+def missing_some_of(keys, symbols, class_name=None):
+    if class_name is None:
+        class_name = "of [" + ", ".join(symbols) + "]"
+    missing = set(symbols).difference(keys)
+    if len(missing) > 0 and len(missing) != len(symbols):
+        warn("Layout includes some %s but not all, missing: %s" % (
+            class_name, key_list_str(missing)))
+
+def missing_required(keys, symbols, msg):
+    missing = set(symbols).difference(keys)
+    if len(missing) > 0:
+        warn("%s, missing: %s" % (msg, key_list_str(missing)))
+
+def unexpected_keys(keys, symbols, msg):
+    unexpected = set(symbols).intersection(keys)
+    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():
+            if attr.startswith("key"):
+                k = key.get(attr).removeprefix("\\")
+                if k in keys: dup.add(k)
+                keys.add(k)
+
+def parse_layout(fname):
+    keys = set()
+    dup = set()
+    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
+
+def parse_row(fname):
+    keys = set()
+    dup = set()
+    root = ET.parse(fname).getroot()
+    if root.tag != "row":
+        return None
+    parse_row_from_et(root, keys, dup)
+    return root, keys, dup
+
+def check_layout(layout):
+    root, keys, dup = layout
+    if len(dup) > 0: warn("Duplicate keys: " + key_list_str(dup))
+    missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
+    missing_some_of(keys, "0123456789", "digits")
+    missing_required(keys,
+                     ["esc", "tab", "backspace", "delete",
+                      "f11_placeholder", "f12_placeholder"],
+                     "Layout doesn't define some important keys")
+    unexpected_keys(keys,
+                    ["copy", "paste", "cut", "selectAll", "shareText",
+                     "pasteAsPlainText", "undo", "redo" ],
+                    "Layout contains editing keys")
+    unexpected_keys(keys,
+                    [ "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
+                     "f10", "f11", "f12" ],
+                    "Layout contains function keys")
+    unexpected_keys(keys, [""], "Layout contains empty strings")
+    unexpected_keys(keys, ["loc"], "Special keyword cannot be a symbol")
+    unexpected_keys(keys, filter(lambda k: k.strip()!=k, keys), "Some keys contain whitespaces")
+
+    _, bottom_row_keys, _ = parse_row("res/xml/bottom_row.xml")
+
+    if root.get("bottom_row") == "false":
+        missing_required(keys, bottom_row_keys,
+                         "Layout redefines the bottom row but some important keys are missing")
+    else:
+        unexpected_keys(keys, bottom_row_keys,
+                        "Layout contains keys present in the bottom row")
+
+    if root.get("script") == None:
+        warn("Layout doesn't specify a script.")
+
+for fname in sorted(sys.argv[1:]):
+    layout_id, _ = os.path.splitext(os.path.basename(fname))
+    if layout_id in KNOWN_NOT_LAYOUT:
+        continue
+    layout = parse_layout(fname)
+    if layout == None:
+        print("Not a layout file: %s" % layout_id)
+    else:
+        print("# %s" % layout_id)
+        warning_count = 0
+        check_layout(layout)
+        print("%d warnings" % warning_count)

gen_layouts.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+# Generates the list of layouts in res/values/layouts.xml from the layout files
+# in srcs/layouts. Every layouts must have a 'name' attribute to be listed.
+
+import itertools as it
+import sys, os, glob
+import xml.etree.ElementTree as XML
+
+# Layouts first in the list (these are the programming layouts). Other layouts
+# are sorted alphabetically.
+FIRST_LAYOUTS = [ "latn_qwerty_us", "latn_colemak", "latn_dvorak" ]
+
+# Read a layout from a file. Returns [None] if [fname] is not a layout.
+def read_layout(fname):
+    root = XML.parse(fname).getroot()
+    if root.tag != "keyboard":
+        return None
+    return { "name": root.get("name") }
+
+# Yields the id (based on the file name) and the display name for every layouts
+def read_layouts(files):
+    for layout_file in files:
+        layout_id, _ = os.path.splitext(os.path.basename(layout_file))
+        layout = read_layout(layout_file)
+        if layout == None:
+            print("Not a layout file: %s" % layout_file)
+        elif layout["name"] == None:
+            print("Layout doesn't have a name: %s" % layout_id)
+        else:
+            yield (layout_id, layout["name"])
+
+# Sort layouts alphabetically, except for layouts in FIRST_LAYOUTS, which are
+# placed at the top.
+# Returns a list. 'layouts' can be an iterator.
+def sort_layouts(layouts):
+    layouts = dict(layouts)
+    head = [ (lid, layouts.pop(lid)) for lid in FIRST_LAYOUTS ]
+    return head + sorted(layouts.items())
+
+# Write the XML arrays used in the preferences.
+def generate_arrays(out, layouts):
+    def mk_array(tag, name, strings_items):
+        elem = XML.Element(tag, name=name)
+        for s in strings_items:
+            item = XML.Element("item")
+            item.text = s
+            elem.append(item)
+        return elem
+    system_item = [ ("system", "@string/pref_layout_e_system") ]
+    custom_item = [ ("custom", "@string/pref_layout_e_custom") ]
+    values_items, entries_items = zip(*(system_item + layouts + custom_item)) # unzip
+    ids_items = map(lambda s: "@xml/%s" % s if s not in ["system", "custom"] else "-1", values_items)
+    root = XML.Element("resources")
+    root.append(XML.Comment(text="DO NOT EDIT. This file is generated, see gen_layouts.py."))
+    root.append(mk_array("string-array", "pref_layout_values", values_items))
+    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)
+
+layouts = sort_layouts(read_layouts(glob.glob("srcs/layouts/*.xml")))
+with open("res/values/layouts.xml", "w") as out:
+    generate_arrays(out, layouts)

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#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
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# 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
+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"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# 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"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+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" ;;
+    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, 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"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "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.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+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.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

metadata/android/de-DE/full_description.txt

@@ -1,18 +0,0 @@
-Diese App ist eine virtuelle Tastatur für Android. Hauptfunktionen sind das einfache Tippen eines jeden ASCII-Zeichens durch Wischgesten, Hilfstasten, Tottasten für Akzente, sowie das Vorhandensein spezieller Tasten (Tabulator, Esc, Pfeiltasten etc.). 
-
-Die Tastatur hat bis zu vier Extrazeichen in den Ecken jeder Taste. Diese Extrazeichen werden durch das Wischen mit dem Finger auf der Taste ausgewählt.
-
-Highlights mancher Funktionen:
-
-- Jedes Zeichen und jede spezielle Taste gibt es auch auf einer PC-Tastatur. Das ist perfekt für die Nutzung von Anwendungen wie Termux.
-
-- Dies schließt auch Tab, Esc und die Pfeil- und Funktionstasten sowie Strg und Alt mit ein!
-
-- Akzenttasten sind über Tottasten verfügbar. Nach Aktivieren des Akzents kan der akzentuierte Buchstabe getippt werden. 
-
-- Sehr schlank und schnell. Braucht 500x weniger Speicherplatz als Googles Tastatur und 15x weniger als die Standardtastatur. Keine Werbung, kein Tracking.
-
-- Verschiedene Layouts: QWERTY, QWERTZ, AZERTY. Themes: Weiß, Dunkel, OLED Schwarz. Und viele weitere Optionen.
-
-Wie jede andere virtuelle Tastatur muss diese Tastatur in den Systemeinstellungen aktiviert werden. Dazu Systemeinstellungen öffnen und wie folgt vorgehen: 
-System > Sprachen und Eingabe > Bildschirmtastatur > Bildschirmtastaturen verwalten. 

metadata/android/de-DE/short_description.txt

@@ -1 +0,0 @@
-Eine schlanke Bildschirmtastatur für Entwickler

metadata/android/de/full_description.txt

@@ -0,0 +1,6 @@
+Diese Tastatur zeichnet sich dadurch aus, dass man zusätzliche Zeichen durch Wischgesten in Richtung der Tastenecken eingeben kann.
+
+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.

metadata/android/de/short_description.txt

@@ -0,0 +1 @@
+Eine schlanke, datenschutzfreundliche Bildschirmtastatur für Android.

metadata/android/en-US/full_description.txt

@@ -1,16 +0,0 @@
-The main feature is easy typing of more characters by swiping the keys toward the corners.
-
-Highlight of some of the features:
-
-- Every character and special keys of a PC keyboard. This is perfect for using applications like Termux.
-
-- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt.
-
-- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
-
-- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
-
-- Multiple layouts: QWERTY, QWERTZ, AZERTY. Themes: White, Dark, OLED Black. And many other options.
-
-Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.

metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-A lightweight virtual keyboard for developers.

metadata/android/en/changelogs/35.txt

@@ -0,0 +1,9 @@
+New layouts: Persian, Kurdish, Bengali Provat, Romanian, Czech
+New languages support: Icelandic
+Updated translations: Polish, Latvian, Russian, German, Vietnamese, Farsi, Brazilian, French, Simplified Chinese, Romanian
+
+Voice typing shortcut (can be disabled in settings).
+Improved vibration settings.
+Many bug fixes and improvements.
+
+Thanks to the contributors: @ChasmSolacer, @eandersons, @MAKI1LOVE, @Moini, @polyctena, @rVnPower, @RZHSSNZDH, @vladgba, @marciozomb13, @GoRaN909, @9-2-1, @shmVirus, @GrimPixel, @frimdo

metadata/android/en/changelogs/36.txt

@@ -0,0 +1,9 @@
+Allow selecting any number of standard and custom layouts.
+Allow adding custom keys to the keyboard.
+Changed behavior of auto-added keys (often dead-keys).
+New layouts.
+Improved layouts and language support.
+Improved the space bar slider, and many more.
+Updated translations.
+
+Thanks to the contributors: @ChasmSolacer, @ElucGeek, @GoRaN909, @RZHSSNZDH, @Shareef101, @Validbit, @eandersons, @nitsvga, @polyctena, @sdrapha, @syskill

metadata/android/en/changelogs/37.txt

@@ -0,0 +1,8 @@
+Improved custom layout option.
+Allow selecting voice typing app with a long press.
+The numpad can work with other numeral systems.
+New and updated layouts.
+New themes.
+Many small improvements.
+
+Thanks to the contributors: @pharook, @syskill, @ojas-bhagavath, @lrvideckis, @lyubomirv, @matthiakl, @deftkHD, @V6lhost, @RZHSSNZDH, @RetrogisusDEV, @rafasaurus, @krtsgnr7230, @eandersons, @ChasmSolacer, @Validbit, @polyctena

metadata/android/en/changelogs/38.txt

@@ -0,0 +1,7 @@
+The custom vibration setting is back.
+Allow to hide the keyboard switching key.
+Fixed modifier keys in some development apps.
+Updated translations.
+Bug fixes and general improvements.
+
+Many thanks to the contributors: @abb128, @marciozomb13, @RetrogisusDEV, @Sestowner, @vedamanavi, @krtsgnr7230

metadata/android/en/full_description.txt

@@ -0,0 +1,6 @@
+The main feature is that you can type more characters by swiping the keys towards the corners.
+
+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.

metadata/android/en/short_description.txt

@@ -0,0 +1 @@
+Lightweight and privacy-conscious virtual keyboard for Android.

metadata/android/en/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=rwGvWesPFX8

metadata/android/es-ES/short_description.txt

@@ -1 +0,0 @@
-Un teclado virtual ligero para desarrolladores.

metadata/android/es/full_description.txt

@@ -0,0 +1,6 @@
+La característica principal es que hay acceso a más caractéres deslizando hacia las esquinas de las teclas.
+
+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.

metadata/android/es/short_description.txt

@@ -0,0 +1 @@
+Un teclado virtual ligero para Android consciente de su privacidad.

metadata/android/fa/title.txt

@@ -0,0 +1 @@
+صفحه کلید غیرمنتظره

metadata/android/fr-FR/full_description.txt

@@ -1,16 +0,0 @@
-La fonctionnalité principale est l'accès rapide à plus de caractères en balayant les touches vers les coins.
-
-Quelques fonctionnalités:
-
-- Tous les caractères et toutes les touches spéciales d'un clavier PC. Idéal pour utiliser une application comme Termux.
-
-- Cela comprend les touches Tab, Esc, les flèches et les touches fonctions mais aussi Ctrl et Alt.
-
-- Les accents sont des touches mortes. Activez d'abord l'accent et tapez ensuite la lettre accentuée.
-
-- Léger et rapide. Utilise 500x fois moins d'espace que le clavier de Google et 15x fois moins que le clavier de base. Pas de pub, pas de traqueur.
-
-- Plusieurs configurations: QWERTY, QWERTZ, AZERTY. Thèmes: Clair, Sombre, Noir OLED. Et beaucoup d'autres options.
-
-Comme tous les claviers virtuels, il doit être activé dans les paramètres systèmes. Ouvrez les paramètres et allez dans:
-Système > Langue & saisie > Clavier à l'écran > Gérer les claviers à l'écran.

metadata/android/fr-FR/short_description.txt

@@ -1 +0,0 @@
-Le meilleur clavier pour les développeurs.

metadata/android/fr/full_description.txt

@@ -0,0 +1,6 @@
+La fonctionnalité principale est l'accès rapide à plus de caractères en balayant les touches vers les coins.
+
+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.

metadata/android/fr/short_description.txt

@@ -0,0 +1 @@
+Clavier virtuel léger et respectueux de la vie privée pour Android.

metadata/android/ko/full_description.txt

@@ -15,4 +15,4 @@
 - 다중 레이아웃: QWERTY, QWERTZ, AZERTY. 다양한 테마: White, Dark, OLED Black. 또한 다른 많은 옵션들.
 
 다른 가상 키보드와 마찬가지로 시스템 설정에서 활성화해야 합니다. 시스템 설정을 열고 다음으로 이동합니다.
-시스템 > 언어 및 입력 > 키보드 > 키보드 관리.
+시스템 > 언어 및 입력 > 키보드 > 키보드 관리.

metadata/android/lv-LV/full_description.txt

@@ -1,18 +0,0 @@
-Šī lietotne ir tastatūra Android tālruņiem. Galvenās iespējas ir ērta ASCII rakstzīmju ievadīšana ar pavilkšanas kustību, taustiņi piekļūšanai uzsvara zīmēm un pārveidošanas taustiņiem un īpašo taustiņu esamība (Tab, Esc, bultas utt.).
-
-Tastatūrā ir redzamas līdz 4 papildus rakstzīmēm katra taustiņa stūros. Tām var piekļūt ar pirksta pavilkšanu uz taustiņa attiecīgajā virzienā.
-
-Izceltās iespējas:
-
-- Visas rakstzīmes un īpašie taustiņi, kas ir atrodami arī datora tastatūrā. Tas lieliski noder tādās lietotnēs kā, piemēram, Termux.
-
-- Ir iekļauti Tab, Esc, bultas un darbību taustiņi, kā arī Ctrl un Alt.
-
-- Uzsvara zīmju taustiņi ir pieejami ar īpašām pogām. Vispirms jāizvēlas uzsvara zīmes veids, tad jāievada vēlamais burts.
-
-- Ļoti viegla un ātra. Izmanto 500 reižu mazāk vietas kā Google tastatūra un 15 reižu mazāk kā noklusējuma tastatūra. Bez reklāmām un izsekošanas.
-
-- Dažādi izkārtojumi: QWERTY, QWERTZ, AZERTY. Izskats: Gaišs, Tumšs, OLED melns. Kā arī daudzas citas papildiespējas.
-
-Kā jebkura cita tālruņa tastatūra, tā ir jāiespējo ierīces iestatījumos. Jāatver Iestatījumi un tad:
-Sistēma > Valodas un ievade > Virtuālā tastatūra > Pārvaldīt tastatūras.

metadata/android/lv-LV/short_description.txt

@@ -1 +0,0 @@
-Viegla un ātra tālruņa tastatūra izstrādātājiem.

metadata/android/lv/full_description.txt

@@ -0,0 +1,6 @@
+Galvenā iezīme ir iespēja ievadīt vairāk rakstzīmju 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ā.
+
+Šī lietotne nesatur reklāmas, neveic nekādus tīkla pieprasījumus, un tās pirmkods ir pieejams visiem.

metadata/android/lv/short_description.txt

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

metadata/android/pl-PL/full_description.txt

@@ -1,16 +0,0 @@
-Jej główną cechą jest łatwość wprowadzania wielu znaków poprzez przesuwanie po klawiszu do rogu.
-
-Wyróźnione funkcjonalności:
-
-- Wszystkie znaki i klawisze specjalne dostępne na klawiaturze komputerowej. Doskonałe do korzystania z aplikacji takich jak Termux.
-
-- Obejmują one Tab, Esc, strzałki, klawisze funkcyjne, a także Ctrl i Alt.
-
-- Znaki akcentowane uzyskuje się za pomocą martwych klawiszy. Najpierw naciśnij akcent, a następnie wpisz akcentowaną literę.
-
-- Bardzo lekka i szybka. Zajmuje 500x mniej miejsca niż klawiatura Google i 15x mniej niż klawiatura domyślna. Bez reklam, bez śledzenia.
-
-- Wiele układów: QWERTY, QWERTZ, AZERTY. Motywy: Biały, Ciemny, Czarny (OLED). Oraz wiele innych ustawień.
-
-Tak jak każda inna klawiatura ekranowa, należy ją włączyć w ustawieniach systemowych. Otwórz Ustawienia i przejdź kolejno do:
-System > Języki i metody wprowadzania > Klawiatura ekranowa > Zarządzaj klawiaturami ekranowymi.

metadata/android/pl-PL/short_description.txt

@@ -1 +0,0 @@
-Lekka klawiatura wirtualna dla programistów.

metadata/android/pl/full_description.txt

@@ -0,0 +1,6 @@
+Główną cechą tej klawiatury jest możliwość wprowadzania więcej znaków poprzez przesuwanie po klawiszach do ich rogów.
+
+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.

metadata/android/pl/short_description.txt

@@ -0,0 +1 @@
+Lekka i dbająca o prywatność klawiatura wirtualna dla Androida.

metadata/android/pt/title.txt

@@ -0,0 +1 @@
+Teclado Unexpected

metadata/android/ro/full_description.txt

@@ -0,0 +1,6 @@
+Funcționalitatea principală este accesul rapid la o mulțime de caractere ASCII prin glisarea către colțurile tastelor.
+
+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.

metadata/android/ro/short_description.txt

@@ -0,0 +1 @@
+Tastatură virtuală pentru Android, ușoară și respectuoasă cu viața privată.

metadata/android/ro/title.txt

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

metadata/android/ru-RU/full_description.txt

@@ -1,16 +0,0 @@
-Главная особенность клавиатуры - это возможность легко напечатать любой ASCII символ за счет свайпов в углы клавиш.
-
-Основные особенности:
-
-- Есть все символы и специальные клавиши компьютерной клавиатуры. Идеально подходит для таких приложений, как Termux.
-
-- Включены клавиши Tab, Esc, стрелки, функциональные клавиши, Ctrl и Alt.
-
-- Клавиши с акцентами доступны с помощью мёртвых клавиш. Сначала нажмите на акцент, затем нажмите на букву с акцентом.
-
-- Очень легкая и быстрая. Использует в 500 раз меньше места, чем Google клавиатура и в 15 раз меньше дефолтной клавиатуры. Никакой рекламы, никаких трекеров.
-
-- Множество раскладок: QWERTY, QWERTZ, AZERTY и т.д. Темы: белая, темная. Множество других опций.
-
-Клавиатура, как и все виртуальные клавиатуры, должна быть активирована в настройках. Откройте Настройки и перейдите:
-Язык и ввод > Блок "Клавиатура" или "Способ ввода" > поставить галочку напротив Unexpected Keyboard