Release v0.4.2

* Hide sensitive clip data in clipboard history

* Add is remoteDevice flag

* Do not link password length to displayed characters

* Add backspace in clipboard history (#2615)

* Use ClipboardItem level function for the obfuscation of the text

* Move the backspace button to the header bar

* Adjust innerHeight to match the full layout

* Use KeyboardLikeButton instead of FlorisIconButtonWithInnerPadding

.editorconfig

@@ -9,7 +9,7 @@ insert_final_newline = true
 max_line_length = 120
 trim_trailing_whitespace = true
 
-[{*.har,*.json,*yml}]
+[{*.har,*.json,*yml,*.sh}]
 indent_size = 2
 
 [*.kt]

.envrc

@@ -0,0 +1 @@
+use_flake

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: [patrickgold]
+liberapay: patrickgold
 custom: ["https://paypal.me/devpatrickgold"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,34 +0,0 @@
----
-name: Bug report
-about: Create a report to help FlorisBoard improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--
-Thank you for your help in making FlorisBoard better!
-
-Guide to a good bug-report:
-• Please search existing bug/crash reports reports to avoid creating duplicates.
-• Give your bug report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
-• Describe the bug in a short but concise way.
-• If you have a screenshot or screen recording of the bug, link them at the end of this issue.
-• Also make sure to fill out the environment information. This info is valuable when trying to fix your described bug.
--->
-
-#### Short description
-Describe the bug in a short but concise way.
-
-#### Steps to reproduce
-1. Go to '…'
-2. Click on '…'
-3. Scroll down to '…'
-4. See error
-
-#### Environment information
-- FlorisBoard Version: <!-- e.g. 0.X.X -->
-- Install Source: <!-- Google PlayStore/F-Droid/GitHub/? -->
-- Device: <!-- e.g. OnePlus 7T -->
-- Android: <!-- e.g. 10, Stock -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug Report
+description: Create a report to help FlorisBoard improve
+labels:
+  - "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your help in making FlorisBoard better!
+        Guide to a good bug-report:
+        • Please search existing bug/crash reports reports to avoid creating duplicates.
+        • Give your bug report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
+        • Describe the bug in a short but concise way.
+        • If you have a screenshot or screen recording of the bug, link them at the end of this issue.
+        • Also make sure to fill out the environment information. This info is valuable when trying to fix your described bug.
+  - type: textarea
+    id: description
+    attributes:
+      label: Short description
+      description: Describe the bug in a short but concise way.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      value: |
+        1. Go to '…'
+        2. Click on '…'
+        3. Scroll down to '…'
+        4. See error
+    validations:
+      required: true
+  - type: input
+    id: florisversion
+    attributes:
+      label: FlorisBoard Version
+      placeholder: e.g. 0.X.X
+    validations:
+      required: true
+  - type: dropdown
+    id: installsource
+    attributes:
+      label: Install Source
+      options:
+        - Google PlayStore
+        - F-Droid
+        - GitHub
+    validations:
+      required: true
+  - type: input
+    id: device
+    attributes:
+      label: Device
+      placeholder: e.g. OnePlus 7T
+    validations:
+      required: true
+  - type: input
+    id: androidversion
+    attributes:
+      label: Android
+      placeholder: e.g. 10, Stock
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/crash_report.md

@@ -1,28 +0,0 @@
----
-name: Crash report
-about: Create a report with a generated crash log attached to help FlorisBoard improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--
-Thank you for your help in making FlorisBoard better!
-
-Guide to a good crash-report:
-• Please search existing bug/crash reports to avoid creating duplicates.
-• Give your crash report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
-• Describe what you were doing what could've led to the crash and whether the crash is random or reproducible.
--->
-
-#### Short description
-Describe what you were doing that could've led to the crash.
-
-#### Steps to reproduce
-1. Go to '…'
-2. Click on '…'
-3. Scroll down to '…'
-4. See crash
-
-<!-- Paste the generated crash log below -->

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -0,0 +1,38 @@
+name: Crash report
+description: Create a report with a generated crash log attached to help FlorisBoard improve
+labels:
+  - "bug"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your help in making FlorisBoard better!
+        Guide to a good crash-report:
+        • Please search existing bug/crash reports to avoid creating duplicates.
+        • Give your crash report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
+        • Describe what you were doing what could've led to the crash and whether the crash is random or reproducible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Short description
+      description: Describe the bug in a short but concise way.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      value: |
+        1. Go to '…'
+        2. Click on '…'
+        3. Scroll down to '…'
+        4. See crash
+    validations:
+      required: true
+  - type: textarea
+    id: crashlog
+    attributes:
+      label: Crash log
+      description: Paste the generated crash log below
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: Feature request / Suggestion
-about: Suggest an idea for this project
-title: ''
-labels: proposal
-assignees: ''
-
----
-
-<!--
-Thank you for your help in making FlorisBoard better!
-
-Guide to a good feature-request:
-• Please search existing proposals to avoid creating duplicates.
-• If you have multiple ideas which are not directly connected to other, file a new issue for each idea. This makes it easier to implement your proposals.
-• Describe your idea in a short but concise way.
-• If you have any examples, e.g. screenshots or other keyboards have the proposed feature implemented, feel free to post them after your description.
--->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,22 @@
+name: Feature request / Suggestion
+description: Suggest an idea for this project
+labels:
+  - "proposal"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your help in making FlorisBoard better!
+
+        Guide to a good feature-request:
+        • Please search existing proposals to avoid creating duplicates.
+        • If you have multiple ideas which are not directly connected to other, file a new issue for each idea. This makes it easier to implement your proposals.
+        • Describe your idea in a short but concise way.
+        • If you have any examples, e.g. screenshots or other keyboards have the proposed feature implemented, feel free to post them after your description.
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature idea
+      description: Please explain your idea in a precise way.
+    validations:
+      required: true

.github/workflows/android.yml

@@ -2,38 +2,40 @@ name: FlorisBoard CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths-ignore:
       - ".github/ISSUE_TEMPLATE/**"
       - ".github/FUNDING.yml"
       - ".editorconfig"
       - "fastlane/**"
       - "CONTRIBUTING.md"
+      - "CODE_OF_CONDUCT.md"
       - "LICENSE"
       - "README.md"
       - "ROADMAP.md"
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
         with:
-          java-version: 11
-      - name: Setup CMake and Ninja
-        uses: lukka/get-cmake@v3.20.1
+          submodules: recursive
+
+      - uses: gradle/actions/wrapper-validation@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: Set up CMake and Ninja
+        uses: lukka/get-cmake@latest
       - name: Build with Gradle
-        # MUST call gradlew separately because of an OSS license plugin issue.
-        # See https://github.com/google/play-services-plugins/issues/199
-        run: ./gradlew clean && ./gradlew assembleDebug
-      - uses: actions/upload-artifact@v2
+        run: ./gradlew clean assembleDebug
+      - uses: actions/upload-artifact@v4
         with:
           name: app-debug.apk
           path: app/build/outputs/apk/debug/app-debug.apk

.github/workflows/crowdin-upload.yml

@@ -2,7 +2,7 @@ name: Crowdin Upload Sources
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
       - "app/src/main/res/values/strings.xml"
       - ".github/workflows/crowdin-upload.yml"
@@ -13,9 +13,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Upload
-        uses: crowdin/github-action@1.4.0
+        uses: crowdin/github-action@v2
         with:
           config: "crowdin.yml"
           upload_sources: true

.github/workflows/validate-strings-no-translations.yml

@@ -0,0 +1,61 @@
+name: Validate no translated strings.xml included
+
+on:
+  pull_request_target:
+    branches: [ main ]
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Precheck if validation is required
+        id: precheck
+        run: |
+          pr_author="${{ github.event.pull_request.user.login }}"
+          if [[ "$pr_author" == "florisboard-bot" ]]; then
+            echo "PR is by florisboard-bot, skipping validation!"
+            echo "require_validation=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "PR is not by florisboard-bot, requiring validation!"
+            echo "require_validation=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Fetch PR changed files manually
+        id: fetch_changed_files
+        if: steps.precheck.outputs.require_validation == 'true'
+        run: |
+          pr_files="$(curl -sSf https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files?per_page=1000)" || exit 11
+          changed_files="$(jq -r '.[].filename' <<< "$pr_files")" || exit 12
+          illegal_changes_list="$(grep -E '^app/src/main/res/values-.+/strings.xml$' <<< "$changed_files")" || true
+          if [ -n "$illegal_changes_list" ]; then
+            echo -e "Illegal changes detected:\n$illegal_changes_list"
+          else
+            echo "No illegal changes detected"
+          fi
+          echo "illegal_changes_list<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$illegal_changes_list" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+      - name: Create comment if illegal files detected
+        uses: peter-evans/create-or-update-comment@v4
+        if: steps.precheck.outputs.require_validation == 'true' && steps.fetch_changed_files.outputs.illegal_changes_list != ''
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ⚠️ Illegal changes detected
+
+            Hey there!
+
+            We detected illegal changes that disobey the [contribution guidelines](https://github.com/florisboard/florisboard/blob/main/CONTRIBUTING.md#translation). This is a kind reminder that pull requests must not contain translated `strings.xml` files, as those are exclusively managed from Crowdin.
+
+            Please remove changes to the following files:
+            ```
+            ${{ steps.fetch_changed_files.outputs.illegal_changes_list }}
+            ```
+
+      - name: Fail workflow if illegal files detected
+        if: steps.precheck.outputs.require_validation == 'true' && steps.fetch_changed_files.outputs.illegal_changes_list != ''
+        run: echo -e "Illegal changes detected:\n${{ steps.fetch_changed_files.outputs.illegal_changes_list }}" && exit 1

.gitignore

@@ -1,7 +1,11 @@
 # Built application files
 *.apk
+*.aab
 *.ap_
 
+# dotenv
+.env
+
 # Files for the ART/Dalvik VM
 *.dex
 
@@ -43,3 +47,16 @@ crowdin.properties
 
 # C++
 .cxx/
+
+# Nix stuff
+.direnv/
+result
+
+# VSCode
+.vscode/
+
+# Rust
+debug/
+target/
+**/*.rs.bk
+*.pdb

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "app/src/main/icu4c"]
-	path = app/src/main/icu4c
-	url = https://github.com/florisboard/icu4c

.idea/icon.svg

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="vector"
+   width="108"
+   height="108"
+   viewBox="0 0 108 108"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10">
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="20.594"
+       cx="54.141998"
+       cy="48.769001"
+       id="gradient_0"
+       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
+      <stop
+         offset="0"
+         stop-color="#55E032FF"
+         id="stop1" />
+      <stop
+         offset="1"
+         stop-color="#227C53FF"
+         id="stop2" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="20.594"
+       cx="54.141998"
+       cy="48.769001"
+       id="gradient_1"
+       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
+      <stop
+         offset="0"
+         stop-color="#55E032FF"
+         id="stop3" />
+      <stop
+         offset="1"
+         stop-color="#227C53FF"
+         id="stop4" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="12.849"
+       cx="54.029999"
+       cy="39.144001"
+       id="gradient_2"
+       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
+      <stop
+         offset="0"
+         stop-color="#FE7901FF"
+         id="stop5" />
+      <stop
+         offset="1"
+         stop-color="#FEBE01FF"
+         id="stop6" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="20.594"
+       cx="54.141998"
+       cy="48.769001"
+       id="gradient_3"
+       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
+      <stop
+         offset="0"
+         stop-color="#55E032FF"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#227C53FF"
+         id="stop8" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="17.913"
+       cx="54.131001"
+       cy="49.819"
+       id="gradient_4"
+       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
+      <stop
+         offset="0"
+         stop-color="#FE7901FF"
+         id="stop9" />
+      <stop
+         offset="1"
+         stop-color="#FEBE01FF"
+         id="stop10" />
+    </radialGradient>
+  </defs>
+  <path
+     fill="url(#gradient_0)"
+     d="m 12.291915,34.438502 0.434238,0.0066 c 20.014377,0.256595 36.184221,16.58873 36.184221,36.666707 v 6.504782 C 46.434346,77.090222 43.999987,76.362108 41.642388,75.436613 27.045007,69.710386 16.044337,56.538532 13.081437,41.131892 12.655973,38.923423 12.392799,36.686445 12.289722,34.440694 Z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_0"
+     style="fill:url(#gradient_0);stroke-width:2.19311" />
+  <path
+     fill="url(#gradient_1)"
+     d="m 41.438428,33.83978 c 1.451843,-7.875479 5.219616,-15.404446 11.305513,-21.490344 0.497838,-0.497837 1.004447,-0.980322 1.524216,-1.449649 0.517575,0.469327 1.026378,0.951812 1.526409,1.449649 6.074931,6.077125 9.842705,13.595127 11.29674,21.459641 -5.296375,4.153762 -9.689186,9.412854 -12.829729,15.428571 -3.136156,-5.974047 -7.53774,-11.23314 -12.823149,-15.395674 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_1"
+     style="fill:url(#gradient_1);stroke-width:2.19311" />
+  <path
+     fill="url(#gradient_2)"
+     d="M 33.758135,28.900884 C 35.892037,20.613098 40.199317,12.774901 46.684361,6.2876637 48.478331,4.4936948 50.377569,2.8642095 52.362338,1.4035943 L 54.268157,0 56.176168,1.4035943 c 1.984769,1.4628084 3.884009,3.0901005 5.677977,4.8840694 6.480658,6.4806583 10.790132,14.3210483 12.924033,22.6022543 -2.015473,1.030764 -3.949802,2.199695 -5.783247,3.49802 C 67.332549,24.486141 63.437574,16.961559 57.307815,10.833993 56.548998,10.072982 55.768249,9.3492537 54.965567,8.6584222 L 54.265964,8.0553153 53.56636,8.6584222 C 52.765872,9.3492537 51.985123,10.072982 51.226304,10.833993 45.089966,16.970332 41.190606,24.503686 39.53261,32.414255 37.694779,31.111545 35.764837,29.933841 33.753749,28.900884 Z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_2"
+     style="fill:url(#gradient_2);stroke-width:2.19311" />
+  <path
+     fill="url(#gradient_3)"
+     d="m 96.244398,34.438502 -0.434237,0.0066 c -20.01657,0.256595 -36.186415,16.58873 -36.186415,36.666707 v 6.506976 C 79.890332,73.322449 95.279427,55.74901 96.244398,34.440694 Z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_3"
+     style="fill:url(#gradient_3);stroke-width:2.19311" />
+  <path
+     fill="url(#gradient_4)"
+     d="m 12.68887,25.874383 0.149132,0.0022 c 4.506853,0.05702 8.996162,0.787328 13.290282,2.168991 11.959063,3.851112 21.891685,12.759549 27.168322,24.058483 l 0.973744,2.083461 0.969357,-2.085654 C 62.347596,36.789522 77.776168,26.104661 95.702698,25.876577 l 0.149133,-0.0022 c 0.291684,2.098811 0.443009,4.241486 0.445201,6.421443 l -0.510995,0.0066 C 74.600536,32.576546 57.485458,49.860493 57.485458,71.111788 v 6.917088 c -1.048309,0.155711 -2.046178,0.188608 -3.079135,0.192995 h -0.13378 c -1.068047,0 -2.144867,-0.07238 -3.212915,-0.219313 v -6.89077 c 0,-21.251295 -17.117271,-38.535242 -38.300578,-38.809382 l -0.510997,-0.0066 c 0,-2.147061 0.149133,-4.296315 0.445203,-6.421443 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_4"
+     style="fill:url(#gradient_4);stroke-width:2.19311" />
+  <path
+     fill="#53cd53"
+     d="m 101.9772,99.716601 c 0,-2.46287 -1.997925,-4.462992 -4.460795,-4.462992 H 85.243728 c -2.460676,0 -4.460798,1.997929 -4.460798,4.462992 v 3.822599 c 0,2.46068 1.997928,4.4608 4.460798,4.4608 h 12.272677 c 2.460676,0 4.460795,-1.99793 4.460795,-4.4608 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_5"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 78.620517,84.818763 c 0,-2.460676 -1.997928,-4.460798 -4.460797,-4.460798 h -6.096864 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.096864 c 2.460676,0 4.460797,-1.997929 4.460797,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_6"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 61.450612,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_7"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 27.11738,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.096863 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.096863 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_8"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 95.78823,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.462869,0 -4.462991,1.997929 -4.462991,4.460798 v 3.824795 c 0,2.460676 1.997928,4.460798 4.462991,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_9"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 21.038062,69.923119 c 0,-2.46287 -1.997928,-4.462991 -4.460797,-4.462991 h -6.09467 c -2.4606765,0 -4.4607984,1.997929 -4.4607984,4.462991 v 3.822601 c 0,2.460676 1.9979288,4.460798 4.4607984,4.460798 h 6.09467 c 2.460676,0 4.460797,-1.997928 4.460797,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_10"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 101.9772,69.923119 c 0,-2.46287 -1.997925,-4.462991 -4.460795,-4.462991 h -6.09467 c -2.460676,0 -4.460797,1.997929 -4.460797,4.462991 v 3.822601 c 0,2.460676 1.997928,4.460798 4.460797,4.460798 h 6.09467 c 2.460676,0 4.460795,-1.997928 4.460795,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_11"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 44.282899,84.818763 c 0,-2.460676 -1.997928,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.462869,0 -4.462991,1.997929 -4.462991,4.460798 v 3.824795 c 0,2.460676 1.99793,4.460798 4.462991,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_12"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#fe9801"
+     d="m 27.21607,99.716601 c 0,-2.46287 -1.997928,-4.462992 -4.460798,-4.462992 H 10.482595 c -2.4606765,0 -4.4607984,1.997929 -4.4607984,4.462992 v 3.822599 c 0,2.46068 1.9979288,4.4608 4.4607984,4.4608 h 12.272677 c 2.460676,0 4.460798,-1.99793 4.460798,-4.4608 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_13"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 83.756795,67.041365 c 0.655742,0.776363 1.054889,1.783003 1.054889,2.881754 v 3.822601 c 0,2.460676 -1.997928,4.460798 -4.460798,4.460798 h -6.096863 c -1.557112,0 -2.927809,-0.798293 -3.723911,-2.006701 4.91258,-2.307158 9.377765,-5.414803 13.226683,-9.158452 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_14"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 24.529503,66.738714 c 3.796284,3.76558 8.20664,6.919282 13.066585,9.263722 -0.774169,1.320257 -2.210661,2.204082 -3.848919,2.204082 h -6.096862 c -2.460676,0 -4.460798,-1.997928 -4.460798,-4.460798 v -3.822601 c 0,-1.247883 0.510996,-2.375144 1.337801,-3.186598 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_15"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 14.015705,51.362778 c 1.868535,4.322632 4.359915,8.346999 7.366677,11.950289 h -4.822663 c -2.460676,0 -4.460798,-1.997928 -4.460798,-4.460797 v -3.824795 c 0,-1.517637 0.758819,-2.85763 1.916784,-3.664697 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_16"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 94.369284,51.764118 c 0.87286,0.813646 1.418946,1.975997 1.418946,3.263357 v 3.824795 c 0,2.460676 -1.997929,4.460797 -4.460798,4.460797 h -4.116479 c 2.897106,-3.471703 5.313921,-7.355711 7.156137,-11.548949 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_17"
+     style="stroke-width:2.19311" />
+  <path
+     fill="#ffffff"
+     d="m 78.782808,99.819677 c 0,-2.432165 -1.971611,-4.40597 -4.403777,-4.40597 H 33.738397 c -2.432166,0 -4.405969,1.973805 -4.405969,4.40597 v 3.774353 c 0,2.43217 1.973803,4.40378 4.405969,4.40378 h 40.640634 c 2.432166,0 4.403777,-1.97161 4.403777,-4.40378 z"
+     stroke-linejoin="round"
+     fill-rule="evenodd"
+     id="path_18"
+     style="stroke-width:2.19311" />
+</svg>

CODE_OF_CONDUCT.md

@@ -0,0 +1,133 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
+

CONTRIBUTING.md

@@ -1,105 +1,97 @@
-# Contributing
+# Contribution guidelines
 
-First off, thanks for considering contributing to FlorisBoard!
+Thanks for considering contributing to FlorisBoard!
 
-There are several ways to contribute to FlorisBoard. This document provides some general guidelines for each type of
-contribution.
+There are several ways to contribute to FlorisBoard. This document provides some general guidelines for each type of contribution.
 
-## Giving general feedback
+## General contributions
 
-NEW! You can now [give general feedback](https://github.com/florisboard/florisboard/discussions/new?category=feedback)
-directly here on GitHub. This is the preferred way to give feedback, as it allows not only for me to read and respond to
-feedback, but for everyone in this community.
+### Translation
 
-Optionally you can also use the review function within Google Play or email me
-at [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev). I love to hear from you! Note, that the amount of
-feedback emails I get is overwhelmingly high - so if I don't answer or answer really late, I apologize - I guarantee
-though that I read through every email and that I will use every feedback to improve FlorisBoard :)
+To make FlorisBoard accessible in as many languages as possible, the platform [Crowdin](https://crowdin.florisboard.patrickgold.dev) is used to crowdsource and manage translations.  The list of languages in Crowdin covers a good range of languages, but feel free to send an email to [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev) to request a new language.
 
-## Translations
+> [!IMPORTANT]
+> This is the only source of translations - **PRs that add/update translations are not accepted.**
 
-To make FlorisBoard accessible in as many languages as possible, the
-platform [Crowdin](https://crowdin.florisboard.patrickgold.dev) is used to crowdsource and manage translations. This is
-the only source of translations from now on - **PRs that add/update translations are no longer accepted.** The list of
-languages in Crowdin covers the top 20 languages, but feel free to email me at
-[florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev) to request a language and I'll add it.
+### Feedback
 
-## Adding a new feature or making large changes
+You can [give general feedback](https://github.com/florisboard/florisboard/discussions/new?category=feedback) directly here on GitHub. This is the preferred way to give feedback, as it allows not only for me to read and respond to feedback, but for everyone in this community.
 
-If you intend to add a new feature or to make large changes, please discuss this first through a proposal on GitHub.
-Discussing your idea enables both you and the dev team that we are on the same page before you start on working on your
-change. If you have any questions, feel free to ask for help at any time!
+### Bug reporting
 
-## Adding a new keyboard layout
+This kind of contribution is the most important, as it tells where FlorisBoard has flaws and thus should be improved to maximize stability and user experience. To make this process as smooth as possible, please use the pre-made [issue template](.github/ISSUE_TEMPLATE/bug_report.md) for bug reporting. This makes it easy for us to understand what the bug is and how to solve it.
 
-Adding a layout to FlorisBoard is very simple and does not require any coding skills, although you should understand the
-basics of the JSON syntax (it is very easy though by just looking at some other layout files). Most of the time is
-enough to look at the existing layout files, but the following attempts to help you in creating layouts from scratch.
+#### Capturing error logs
 
-### Adding the layout
+Logs are captured by FlorisBoard's crash handler, which gives you the ability to copy it to the clipboard and paste it in GitHub. This is the preferred way to capture logs.
 
-Since v0.3.14-beta06 it is possible to add custom layouts for all types using the new extension format, Flex.
+Alternatively, you can also use ADB (Android Debug Bridge) to capture the error log. This is recommended for experienced users only.
 
-Keyboard layout assets are grouped in [`app/src/main/assets/ime/keyboard`](app/src/main/assets/ime/keyboard) and are
-further sub-grouped into the following:
+### Feature proposals
 
-- `org.florisboard.composers`: Defines standard composers for interpreting input, currently supports basic typing and
-  Korean input. Most of the time you won't need to add new composers, so if you don't know what they are always
-  assume `appender` (the default composer which does not alter input in any way) is in use.
-- `org.florisboard.currencysets`: Lists all currency sets, which can be chosen for each subtype. If you consider adding
-  a new one, make sure that the first currency symbol matches the name of the currency set and also ensure that you have
-  exactly 6 currency symbols. This is important as the symbol layouts have exactly 6 slots available to fill these
-  defined currency symbols in.
-- `org.florisboard.layouts`: Contains the actual layout files for all layout types.
-- `org.florisboard.localization`: Contains all popup mappings and subtype presets (formally the `config.json` file). The
-  subtype presets are a list of all pre-made subtypes. Each time the user selects a language in the `Subtype Add`
-  -dialog, all options configured here will get selected if found in the presets. The language tag must adhere to the
-  IETF BCP 47 code ([ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
-  and [ISO 3166-1 region code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements)). For
-  example, Dutch as spoken in Belgium is `nl-be`.
+Use the feature proposal issue template to suggest a new idea or improvement for this project.
 
-To add a new layout, head to above directory and add the necessary files to each extension group.
+## Code contributions
 
-For the `code` field of each key, make sure to use the UTF-8 code. An useful tool for finding the correct code
-is [unicode-table.com](https://unicode-table.com/en/). From there, you search for your letter and then use the HTML
-code, but without the `&#;`
-For internal codes of functional or UI keys, see
-[`app/src/main/kotlin/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt`](app/src/main/kotlin/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt)
-.
+You are always welcome to contribute new features or work on existing issues, there are a lot to choose from :) It is always best to quickly ask if someone is already working on this issue to avoid duplicate issues.
 
-The label is equally important and should always match up with the defined code. If `code` and `label` don't match up,
-FlorisBoard won't crash but it will most likely lead to confusion in the key processing logic.
+> [!NOTE]
+> If you intend to implement a bigger feature please coordinate with us so we can prevent that there's a major difference in expected implementation.
 
-Any accents or diacritics that should be exposed via long press can be added
-at [`app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/<languageTag>.json`](app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings)
-. For each key, you can add 1 main and several relevant accents. The main accent should be used for accents which are
-important for the language you add. The main field is used for determining if a hint or an accent should take priority,
-so please make sure to leave main empty and just use relevant for accents which are not-so important.
+If you are overwhelmed by the code don't hesistate to ask for help in the [dev chat](https://matrix.to/#/#florisboard-dev:matrix.org) or the discussions tab! Some issues are also marked as good first issue, which are easy to do tasks.
 
-For popups of non-`characters` layout, simply add the popup directly to each key via the `popup` field.
+### System requirements for development
 
-## Adding a new dictionary for a language
+- Desktop PC with Linux or WSL2 (Windows)
+  - MacOS and Windows without WSL2 probably works too however there's no official support
+- At least 16GB of RAM (because of Android Studio)
+- The following tools must be installed:
+  - Android Studio (bundles SDK and NDK)
+  - Java 17
+  - CMake 3.22+
+  - Clang 15+
+  - Git
+  - [Rust](https://www.rust-lang.org/tools/install)
+- Utilities (optional)
+  - Python 3.10+
+  - Bash, realpath, grep, ...
 
-Currently the suggestions implementation is highly experimental and not available until 0.4.0, so dictionaries are
-currently not accepted.
+### Manual build without Android Studio
 
-## Bug reporting
+If you want to manually build the project without Android Studio you must ensure that the Android SDK and NDK are properly installed on your system. Then issue
 
-This kind of contribution is the most important, as it tells where FlorisBoard has flaws and thus should be improved to
-maximize stability and user experience. To make this process as smooth as possible, please use the
-pre-made [issue template](.github/ISSUE_TEMPLATE/bug_report.md)
-for bug reporting. This makes it easy for us to understand what the bug is and how to solve it.
+```./gradlew clean && ./gradlew assembleDebug```
 
-### Capturing error logs
+and Gradle should take care of every build task.
 
-Logs are captured by FlorisBoard's crash handler, which gives you the ability to copy it to the clipboard and paste it
-in GitHub. This is the preferred way to capture logs.
+## Joining the team
 
-Alternatively, you can also use ADB (Android Debug Bridge) to capture the error log. This is recommended for experienced
-users only.
+If you want to join the core maintainer/moderator team on a volunteer basis and be part of this project's journey that's great to hear!
+
+### Basic Requirements
+
+- A passion for seeing FlorisBoard flourish
+- Good English skills for team and public communication
+- A GitHub account and a Matrix handle
+
+### Why Join
+
+You'll have the chance to work directly with me and other team members. While the general idea is for us to work on all kinds of different aspects of the project as a team, if you're particularly interested in a specific area (e.g., UI, extensions, text processing), that's totally okay too!
+
+### Available Roles
+
+Currently the following roles are available and need help:
+
+Role Description | Required Dev Experience
+---|---
+Software Developer (Kotlin) for Core App | Java/Kotlin development experience (on Android)
+Software Developer (Rust) for Native Core | Some Rust development experience
+GitHub Issues/Discussions Moderator | None
+Crowdin Translation Verifier | Language proficiency for the language you want to verify
+
+Interested? Feel free to dm me ([@patrickgold](https://matrix.to/#/@patrickgold:matrix.org)) on Matrix or send an email to [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev).
 
 ## Donating
 
-If none of the above options are feasible for you but you still want to show your support, you can also buy me a coffee,
-so I can stay up all night and chase away bugs or add new cool stuff :)
+Alternatively you can also show your support by buying me a coffee, so I can stay up all night and chase away bugs or add new cool stuff :)
 See the `Sponsors` button for available options!

LANGUAGEPACKS-CHINESE.md

@@ -0,0 +1,143 @@
+# Chinese language pack
+
+[简体中文翻译点这里](#简体中文翻译)
+
+[繁体中文翻譯點這裡](#繁体中文翻譯)
+
+
+## Default barebones Chinese shape-based pack
+
+Default barebones Chinese shape-based language pack which are always available.
+
+Please download the [full Chinese language pack](#full-chinese-shape-based-pack) to access input methods such as wubi, quick cangjie, and other versions of these input methods.
+
+This pack is released under the same license as Florisboard.
+
+
+## Full Chinese shape-based pack
+
+Chinese shape-based language pack based on fcitx5-table-extra.
+
+This pack is released under a separate license. Please visit to download: [TODO: add link to release page](https://)
+
+:no_entry: :no_entry: **WARNING** :no_entry: :no_entry:
+
+- **Input methods that include pinyin, jyutping, zhuyin as (auxiliary) functions are only provided for convenience. Currently, FlorisBoard lacks phonetic input algorithms. These functions currently have poor user experience and are not recommended for daily use.**
+
+The following input methods are included in this language pack:
+
+- 中文 (中国) [T9笔画] / Chinese (China) [T9]
+- 中文 (中国) [五笔98] / Chinese (China) [WUBI98]
+- ~中文 (中国) [五笔98-拼音混打] / Chinese (China) [WUBI98PINYIN]~
+- 中文 (中国) [五笔98-单字] / Chinese (China) [WUBI98SINGLE]
+- 中文 (中国) [五笔-大字库] / Chinese (China) [WUBILARGE]
+- 中文 (中国) [郑码] / Chinese (China) [ZHENGMA]
+- 中文 (中国) [郑码-大字库] / Chinese (China) [ZHENGMALARGE]
+- ~中文 (中国) [郑码-拼音混打] / Chinese (China) [ZHENGMAPINYIN]~
+- ~中文 (香港) [廣東拼音] / Chinese (Hong Kong) [CANTONESE]~
+- ~中文 (香港) [港式廣東話] / Chinese (Hong Kong) [CANTONHK]~
+- 中文 (香港) [輕鬆-大字庫] / Chinese (Hong Kong) [EASYLARGE]
+- ~中文 (香港) [粤語拼音-表格] / Chinese (Hong Kong) [JYUTPINGTABLE]~
+- 中文 (香港) [速成三代] / Chinese (Hong Kong) [QUICK3]
+- 中文 (香港) [經典速成] / Chinese (Hong Kong) [QUICKCLASSIC]
+- 中文 (香港) [筆順五碼] / Chinese (Hong Kong) [STROKE5]
+- 中文 (台灣) [行列] / Chinese (Taiwan) [ARRAY30]
+- 中文 (台灣) [行列-大字库] / Chinese (Taiwan) [ARRAY30LARGE]
+- 中文 (台灣) [嘸蝦米] / Chinese (Taiwan) [BOSHIAMY]
+- 中文 (台灣) [倉頡三代] / Chinese (Taiwan) [CANGJIE3]
+- 中文 (台灣) [倉頡五代] / Chinese (Taiwan) [CANGJIE5]
+- 中文 (台灣) [倉頡-大字庫] / Chinese (Taiwan) [CANGJIELARGE]
+- 中文 (台灣) [速成五代] / Chinese (Taiwan) [QUICK5]
+- 中文 (台灣) [快倉六] / Chinese (Taiwan) [SCJ6]
+- ~中文 (台灣) [吳語注音] / Chinese (Taiwan) [WU]~
+
+Third-party license: [https://github.com/fcitx/fcitx5-table-extra/blob/master/LICENSES/GPL-3.0-or-later.txt]
+
+# 简体中文翻译
+## 默认中文形码语言包
+
+请下载[完整中文语言包](#fcitx5-中文形码语言包)来获得五笔、快速仓颉等输入法，及这些输入法的其他版本。
+
+这一语言包的使用许可与FlorisBoard相同。
+
+## Fcitx5 中文形码语言包
+
+这一语言包由另一使用许可提供。下载请访问：[TODO: add link to release page](https://)
+
+:no_entry: :no_entry: **注意** :no_entry: :no_entry:
+
+- **含拼音、粤拼、注音等功能的输入法，仅为便利提供。目前，FlorisBoard缺乏音码输入算法，这些功能目前使用体验不佳，暂不推荐日常使用。**
+
+语言包内含以下输入法：
+
+- 中文 (中国) [T9笔画] / Chinese (China) [T9]
+- 中文 (中国) [五笔98] / Chinese (China) [WUBI98]
+- ~中文 (中国) [五笔98-拼音混打] / Chinese (China) [WUBI98PINYIN]~
+- 中文 (中国) [五笔98-单字] / Chinese (China) [WUBI98SINGLE]
+- 中文 (中国) [五笔-大字库] / Chinese (China) [WUBILARGE]
+- 中文 (中国) [郑码] / Chinese (China) [ZHENGMA]
+- 中文 (中国) [郑码-大字库] / Chinese (China) [ZHENGMALARGE]
+- ~中文 (中国) [郑码-拼音混打] / Chinese (China) [ZHENGMAPINYIN]~
+- ~中文 (香港) [廣東拼音] / Chinese (Hong Kong) [CANTONESE]~
+- ~中文 (香港) [港式廣東話] / Chinese (Hong Kong) [CANTONHK]~
+- 中文 (香港) [輕鬆-大字庫] / Chinese (Hong Kong) [EASYLARGE]
+- ~中文 (香港) [粤語拼音-表格] / Chinese (Hong Kong) [JYUTPINGTABLE]~
+- 中文 (香港) [速成三代] / Chinese (Hong Kong) [QUICK3]
+- 中文 (香港) [經典速成] / Chinese (Hong Kong) [QUICKCLASSIC]
+- 中文 (香港) [筆順五碼] / Chinese (Hong Kong) [STROKE5]
+- 中文 (台灣) [行列] / Chinese (Taiwan) [ARRAY30]
+- 中文 (台灣) [行列-大字库] / Chinese (Taiwan) [ARRAY30LARGE]
+- 中文 (台灣) [嘸蝦米] / Chinese (Taiwan) [BOSHIAMY]
+- 中文 (台灣) [倉頡三代] / Chinese (Taiwan) [CANGJIE3]
+- 中文 (台灣) [倉頡五代] / Chinese (Taiwan) [CANGJIE5]
+- 中文 (台灣) [倉頡-大字庫] / Chinese (Taiwan) [CANGJIELARGE]
+- 中文 (台灣) [速成五代] / Chinese (Taiwan) [QUICK5]
+- 中文 (台灣) [快倉六] / Chinese (Taiwan) [SCJ6]
+- ~中文 (台灣) [吳語注音] / Chinese (Taiwan) [WU]~
+
+第三方许可证: [https://github.com/fcitx/fcitx5-table-extra/blob/master/LICENSES/GPL-3.0-or-later.txt]
+
+
+# 繁体中文翻譯
+## 預設中文形碼語言包
+
+請下載[完整中文語言包](#fcitx5-中文形碼語言包)來獲得五筆、快速倉頡等輸入法，及這些輸入法的其他版本。
+
+這一語言包的使用許可與FlorisBoard相同。
+
+## Fcitx5 中文形碼語言包
+
+這一語言包由另一使用許可提供。下載請訪問：[TODO: add link to release page](https://)
+
+:no_entry: :no_entry: **注意** :no_entry: :no_entry:
+
+- **含拼音、粵拼、注音等功能的輸入法，僅為便利提供。目前，FlorisBoard缺乏音碼輸入算法，這些功能目前使用體驗不佳，暫不推薦日常使用。**
+
+語言包內含以下輸入法：
+
+- 中文 (中国) [T9笔画] / Chinese (China) [T9]
+- 中文 (中国) [五笔98] / Chinese (China) [WUBI98]
+- ~中文 (中国) [五笔98-拼音混打] / Chinese (China) [WUBI98PINYIN]~
+- 中文 (中国) [五笔98-单字] / Chinese (China) [WUBI98SINGLE]
+- 中文 (中国) [五笔-大字库] / Chinese (China) [WUBILARGE]
+- 中文 (中国) [郑码] / Chinese (China) [ZHENGMA]
+- 中文 (中国) [郑码-大字库] / Chinese (China) [ZHENGMALARGE]
+- ~中文 (中国) [郑码-拼音混打] / Chinese (China) [ZHENGMAPINYIN]~
+- ~中文 (香港) [廣東拼音] / Chinese (Hong Kong) [CANTONESE]~
+- ~中文 (香港) [港式廣東話] / Chinese (Hong Kong) [CANTONHK]~
+- 中文 (香港) [輕鬆-大字庫] / Chinese (Hong Kong) [EASYLARGE]
+- ~中文 (香港) [粤語拼音-表格] / Chinese (Hong Kong) [JYUTPINGTABLE]~
+- 中文 (香港) [速成三代] / Chinese (Hong Kong) [QUICK3]
+- 中文 (香港) [經典速成] / Chinese (Hong Kong) [QUICKCLASSIC]
+- 中文 (香港) [筆順五碼] / Chinese (Hong Kong) [STROKE5]
+- 中文 (台灣) [行列] / Chinese (Taiwan) [ARRAY30]
+- 中文 (台灣) [行列-大字库] / Chinese (Taiwan) [ARRAY30LARGE]
+- 中文 (台灣) [嘸蝦米] / Chinese (Taiwan) [BOSHIAMY]
+- 中文 (台灣) [倉頡三代] / Chinese (Taiwan) [CANGJIE3]
+- 中文 (台灣) [倉頡五代] / Chinese (Taiwan) [CANGJIE5]
+- 中文 (台灣) [倉頡-大字庫] / Chinese (Taiwan) [CANGJIELARGE]
+- 中文 (台灣) [速成五代] / Chinese (Taiwan) [QUICK5]
+- 中文 (台灣) [快倉六] / Chinese (Taiwan) [SCJ6]
+- ~中文 (台灣) [吳語注音] / Chinese (Taiwan) [WU]~
+
+第三方許可證: [https://github.com/fcitx/fcitx5-table-extra/blob/master/LICENSES/GPL-3.0-or-later.txt]

LANGUAGEPACKS.md

@@ -0,0 +1,16 @@
+# Language Packs
+
+## Languages
+
+- [Summary](#summary)
+- [Chinese / 中文](LANGUAGEPACKS-CHINESE.md)
+
+## Summary
+
+Stub.
+
+This page should describe how language packs work, how to import them, and point to the location of downloadable
+language packs.
+
+The homepage of default language packs included in FlorisBoard should link to this page.
+

README.md

@@ -1,7 +1,7 @@
 <img align="left" width="80" height="80"
 src=".github/repo_icon.png" alt="App icon">
 
-# FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) [![Matrix badge](https://img.shields.io/badge/chat-%23florisboard%3amatrix.org-blue)](https://matrix.to/#/#florisboard:matrix.org) ![FlorisBoard CI](https://github.com/florisboard/florisboard/workflows/FlorisBoard%20CI/badge.svg?event=push)
+# FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) [![Matrix badge](https://img.shields.io/badge/chat-%23florisboard%3amatrix.org-blue)](https://matrix.to/#/#florisboard:matrix.org) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) [![FlorisBoard CI](https://github.com/florisboard/florisboard/actions/workflows/android.yml/badge.svg?event=push)](https://github.com/florisboard/florisboard/actions/workflows/android.yml)
 
 **FlorisBoard** is a free and open-source keyboard for Android 7.0+
 devices. It aims at being modern, user-friendly and customizable while
@@ -10,18 +10,18 @@ fully respecting your privacy. Currently in early-beta state.
 <table>
 <tr>
 <th align="center" width="50%">
-<h3>Stable <a href="https://github.com/florisboard/florisboard/releases/latest"><img alt="Latest stable release" src="https://img.shields.io/github/v/release/florisboard/florisboard"></a></h3>
+<h3>Stable <a href="https://github.com/florisboard/florisboard/releases/latest"><img alt="Latest stable release" src="https://img.shields.io/github/v/release/florisboard/florisboard?sort=semver&display_name=tag&color=28a745"></a></h3>
 </th>
 <th align="center" width="50%">
-<h3>Beta <a href="https://github.com/florisboard/florisboard/releases"><img alt="Latest beta release" src="https://img.shields.io/github/v/release/florisboard/florisboard?include_prereleases"></a></h3>
+<h3>Preview <a href="https://github.com/florisboard/florisboard/releases"><img alt="Latest preview release" src="https://img.shields.io/github/v/release/florisboard/florisboard?include_prereleases&sort=semver&display_name=tag&color=fd7e14"></a></h3>
 </th>
 </tr>
 <tr>
 <td valign="top">
-<p><i>Major versions only, 1 release per 1-5 months</i><br><br>Updates are more polished, new features are matured and tested through to ensure a stable experience.</p>
+<p><i>Major versions only</i><br><br>Updates are more polished, new features are matured and tested through to ensure a stable experience.</p>
 </td>
 <td valign="top">
-<p><i>Beta versions, up to 1-2 releases per week</i><br><br>Updates contain new features that may not be fully matured yet and bugs are more likely to occur. Allows you to give early feedback.</p>
+<p><i>Major + Alpha/Beta/Rc versions</i><br><br>Updates contain new features that may not be fully matured yet and bugs are more likely to occur. Allows you to give early feedback.</p>
 </td>
 </tr>
 <tr>
@@ -34,6 +34,11 @@ fully respecting your privacy. Currently in early-beta state.
 </p>
 <p>
 
+**Obtainium**: [Auto-import stable config][obtainium_stable]
+
+</p>
+<p>
+
 **Manual**: Download and install the APK from the release page.
 
 </p>
@@ -42,7 +47,12 @@ fully respecting your privacy. Currently in early-beta state.
 <p><a href="https://apt.izzysoft.de/fdroid/index/apk/dev.patrickgold.florisboard.beta"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="64" alt="IzzySoft repo badge"></a></p>
 <p>
 
-**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-public-alpha-test), then visit the [beta testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard.beta). Once joined and installed, updates will be delivered like for any other app. ([Store entry](https://play.google.com/store/apps/details?id=dev.patrickgold.florisboard.beta))
+**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-public-alpha-test), then visit the [preview testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard.beta). Once joined and installed, updates will be delivered like for any other app. ([Store entry](https://play.google.com/store/apps/details?id=dev.patrickgold.florisboard.beta))
+
+</p>
+<p>
+
+**Obtainium**: [Auto-import preview config][obtainium_preview]
 
 </p>
 <p>
@@ -54,26 +64,33 @@ fully respecting your privacy. Currently in early-beta state.
 </tr>
 </table>
 
-Beginning with v0.4.0 FlorisBoard will follow [SemVer](https://semver.org/#summary) versioning scheme and enter the public beta on Google Play.
+Beginning with v0.6.0 FlorisBoard will enter the public beta on Google Play.
 
 ## Highlighted features
 - Integrated clipboard manager / history
 - Advanced theming support and customization
 - Integrated extension support (still evolving)
-- Emoji keyboard
-- Spell checking service
-- Glide typing (currently English only)
+- Emoji keyboard / history / suggestions
 
-Word suggestions are not included in the current releases and are a major goal for the v0.4.0 milestone.
+> [!IMPORTANT]
+> Word suggestions/spell checking are not included in the current releases
+> and are a major goal for the v0.5 milestone.
 
 Feature roadmap: See [ROADMAP.md](ROADMAP.md)
 
 ## Contributing
-Wanna contribute to FlorisBoard? That's great to hear! There are lots of
-different ways to help out. Bug reporting, making pull requests,
-translating FlorisBoard to make it more accessible, etc. For more
-information see the [contributing guidelines](CONTRIBUTING.md). Thank
-you for your help!
+Want to contribute to FlorisBoard? That's great to hear! There are lots of
+different ways to help out, please see the [contribution guidelines](CONTRIBUTING.md) for more info.
+
+## Addons Store
+The official [Addons Store](https://beta.addons.florisboard.org) offers the possibility for the community to share and download FlorisBoard extensions.
+Instructions on how to publish addons can be found [here](https://github.com/florisboard/florisboard/wiki/How-to-publish-on-FlorisBoard-Addons).
+
+Many thanks to Ali ([@4H1R](https://github.com/4H1R)) for implementing the store!
+
+> [!NOTE]
+> During the initial beta release phase, the Addons Store _will_ only accept theme extensions.
+> Later on we plan to add support for language packs and keyboard extensions.
 
 ## List of permissions FlorisBoard requests
 Please refer to this [page](https://github.com/florisboard/florisboard/wiki/List-of-permissions-FlorisBoard-requests)
@@ -82,8 +99,6 @@ to get more information on this topic.
 ## Used libraries, components and icons
 * [AndroidX libraries](https://github.com/androidx/androidx) by
   [Android Jetpack](https://github.com/androidx)
-* [Accompanist Compose UI libraries](https://github.com/google/accompanist/) by
-  [Google](https://github.com/google)
 * [AboutLibraries](https://github.com/mikepenz/AboutLibraries) by
   [mikepenz](https://github.com/mikepenz)
 * [Google Material icons](https://github.com/google/material-design-icons) by
@@ -94,16 +109,12 @@ to get more information on this topic.
   [Kotlin](https://github.com/Kotlin)
 * [KotlinX serialization library](https://github.com/Kotlin/kotlinx.serialization) by
   [Kotlin](https://github.com/Kotlin)
-* [ICU4C](https://github.com/unicode-org/icu) by
-  [The Unicode Consortium](https://github.com/unicode-org)
-* [Nuspell](https://github.com/nuspell/nuspell) by
-  [Nuspell](https://github.com/nuspell)
 
 Many thanks to [Nikolay Anzarov](https://www.behance.net/nikolayanzarov) ([@BloodRaven0](https://github.com/BloodRaven0)) for designing and providing the main app icons to this project!
 
 ## License
 ```
-Copyright 2020-2022 Patrick Goldinger
+Copyright 2020-2024 Patrick Goldinger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -117,3 +128,10 @@ 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.
 ```
+
+<!-- BEGIN SECTION: obtainium_links -->
+<!-- auto-generated link templates, do NOT edit by hand -->
+<!-- see fastlane/update-readme.sh -->
+[obtainium_preview]: https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://app/%7B%22id%22%3A%22dev.patrickgold.florisboard.beta%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fflorisboard%2Fflorisboard%22%2C%22author%22%3A%22florisboard%22%2C%22name%22%3A%22FlorisBoard%20Preview%22%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22preview%5C%22%7D%22%7D%0A
+[obtainium_stable]: https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://app/%7B%22id%22%3A%22dev.patrickgold.florisboard%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fflorisboard%2Fflorisboard%22%2C%22author%22%3A%22florisboard%22%2C%22name%22%3A%22FlorisBoard%20Stable%22%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22stable%5C%22%7D%22%7D%0A
+<!-- END SECTION: obtainium_links -->

ROADMAP.md

@@ -1,75 +1,68 @@
+# Roadmap
 
-# FlorisBoard's feature roadmap & milestones
+This feature roadmap intents to provide transparency to what is planned to be added to FlorisBoard in the foreseeable future. Note that there are no ETAs for any version milestones down below, experience has shown these won't hold anyways.
 
-This feature roadmap intents to provide transparency to what I want to add to FlorisBoard in the foreseeable future.
-Note that there are no ETAs for any version milestones down below, experience says these won't hold anyways.
+Each major milestone has associated alpha/beta releases, so if you are interested in previewing features quicker, keep an eye out! Each major 0.x release has also patch releases after the initial major release, which will be published on both the stable and beta tracks.
 
-I try my best to release regularly, though some features take a lot longer than others and thus releases can be spaced
-out a bit on the stable track. If you are interested in following the development more closely, make sure to follow
-along the beta track releases! These are generally more unstable but you get new stuff faster and can provide early
-feedback, which helps a lot!
+## 0.4
 
-## 0.3.x
+**Main focus**: Getting the project back on track, see [this announcement](https://github.com/florisboard/florisboard/discussions/2314) for details. Note that this has also replaced the previous roadmap, however this step is necessary for getting the project back on track again.
 
-Releases in this section still follow the old versioning scheme, meaning the patch number is a feature upgrade. As this
-naming convention is more confusing than useful, beginning with v0.4.0 development a new release/development cycle will
-be introduced.
+This includes, but is not exclusive to:
+- Fixing the most reported bugs/issues
+- Merging in the Material You theme PR -> Adds Material You support (v0.4.0-alpha05)
+- Merging in other external PRs as best as possible
+- Reworking the Settings UI warning boxes and hiding any UI for features related to word suggestions until they are ready
+- Remove existing glide/swipe typing (see 0.5 milestone)
+- Improvements in clipboard / emoji functionality (v0.4.0-beta01/beta02)
+- Prepare project to have native code implemented in [Rust](https://www.rust-lang.org/) (v0.4.0-beta02)
+- - Upgrade Settings UI to Material 3 (v0.4.0-beta03)
+- Add support for importing extensions via system file handler APIs (relevant for Addons store) (v0.4.0-beta03)
 
-### 0.3.15 & 0.3.16 (currently 0.3.15 done, 0.3.16 in work)
+Note that the previous versioning scheme has been dropped in favor of using a major.minor.patch versioning scheme, so versions like `0.3.16` are a thing of the past :)
 
-- Hotfix releases for possible bugs in the preference rework (in work)
-- Lots and lots of bug fixing in general (in work)
-- Preparation work for 0.4.0, fixing text state logic and use break iterator (done)
-- Reducing or getting rid of input lag some devices experience (done)
-- Clean up of project structure for better future development (done)
+## 0.5
 
-## 0.4.0
+- Implement predictive text support / spell checking
+  - Consider adding proximity-based key typo detection
+- Add new extension type: Language Pack
+  - Basically groups all locale-relevant data (predictive base model, emoji suggestion data, ...)
+    in a dynamically importable extension file
+- New keyboard layout engine + file syntax based on the upcoming Unicode Keyboard v3 standard
+  - RFC document with technical details will be released later
+- New text processing logic (maybe moved back to 0.6)
+  - RFC document with technical details will be released later
+- Add Tablet mode / Optimizations for landscape input based on new keyboard layout engine
+- Reimplementation of glide typing with the new layout engine and predictive text core
+- Add support for any remaining new features introduced with Android 13
 
-- Re-adding word suggestions (at least for Latin-based languages at first)
-    - Importing the dictionaries as well as management relies on the Flex extension core and UI in Kotlin
-    - Actually parsing and generating suggestions happens in C++ to avoid another OOM catastrophe like in 0.3.9/10
-    - The actual format of the dictionary and word list source is not decided yet
-- Community repository on GitHub for theme sharing across users (may be 0.5.0)
-
-With this release the versioning scheme changes: the second number now indicates new features, changes in the third "
-patch" number now indicates bug fixes and minor feature additions for the stable track. The development cycle for each
-0.x release will have `-alphaXX` (optional and only for large releases), `-betaXX` and `-rcXX` (release candidate)
-releases on the beta track for interested people to follow along the development. The first release to follow the new
-scheme will be `0.4.0-alpha01` on the beta track.
-
-## 0.5.0
+## 0.6
 
 - Complete rework of the Emoji panel
-    - Recently used / Emoji history (already implemented with 0.3.14)
-    - Emoji search
-    - Emoji suggestions when using :emoji_name: syntax
-    - Kaomoji panel implementation (the third tab which currently has "not yet implemented")
-- Smartbar customization improvements
-    - Quick actions customization (order and which buttons to show)
-- Prepare FlorisBoard repository and app store presence for public beta release on Google Play (will go live with stable
-  0.5.0!!)
+  - Recently used / Emoji history (already implemented with 0.3.14)
+  - Emoji search
+  - Emoji suggestions when using :emoji_name: syntax (already implemented with v0.4.0-beta02)
+  - Maybe: consider upgrading to emoji2 for better unified system-wide emoji styles
+- Prepare FlorisBoard repository and app store presence for public beta release on Google Play (will go live with stable 0.6)
 - Rework branding images and texts of FlorisBoard for the app stores
 - Focus on stability and experience improvements of the app and keyboard
+- Add support for new features introduced with Android 14
+- Not finalized, but planned: raise minimum required Android version from Android 7 (SDK level 24) to Android 8 (SDK level 26)
 
-## 0.6.0
+## Backlog / Planned (unassigned)
+
+**Features that MAY be added (even in versions mentioned above) or dismissed**
 
 - Full on-board layout editor which allows users to create their own layouts without writing a JSON file
-- Import/Export of custom layout files packed in Flex extensions
-
-## Backlog / Features that MAY be added, even in versions not mentioned above if the feature implementation fits perfectly with another feature
-
 - Theme rework part II
 - Adaptive themes v2
-- Voice-to-text with Mozilla's open-source voice service
+- Voice-to-text with Mozilla's open-source voice service (or any other oss voice provider)
 - Text translation
-- Glide typing better word detection
-- Proximity-based key typo detection
 - Floating keyboard
-- Tablet mode / Optimizations for landscape input
 - Stickers/GIFs
+- Kaomoji panel implementation
 - FlorisBoard landing web page for presentation
 - Implementing additional layouts
 - Support for Tasker/Automate/MacroDroid plugins
 - Support for WearOS/Smartwatches
 - Handwriting
-- ...

app/.gitignore

@@ -0,0 +1,2 @@
+# Exclude auto-generated icu4c assets
+src/main/assets/icu4c/

app/build.gradle.kts

@@ -14,26 +14,33 @@
  * limitations under the License.
  */
 
-// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import java.io.ByteArrayOutputStream
-import java.io.File
 
 plugins {
     alias(libs.plugins.agp.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.plugin.compose)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.mannodermaus.android.junit5)
     alias(libs.plugins.mikepenz.aboutlibraries)
 }
 
+val projectMinSdk: String by project
+val projectTargetSdk: String by project
+val projectCompileSdk: String by project
+val projectBuildToolsVersion: String by project
+val projectNdkVersion: String by project
+val projectVersionCode: String by project
+val projectVersionName: String by project
+val projectVersionNameSuffix = projectVersionName.substringAfter("-", "")
+
 android {
     namespace = "dev.patrickgold.florisboard"
-    compileSdk = 31
-    buildToolsVersion = "31.0.0"
-    ndkVersion = "22.1.7171670"
+    compileSdk = projectCompileSdk.toInt()
+    buildToolsVersion = projectBuildToolsVersion
+    ndkVersion = projectNdkVersion
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -43,23 +50,23 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs = listOf(
-            "-Xallow-result-return-type",
-            "-Xopt-in=kotlin.RequiresOptIn",
-            "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-            "-Xjvm-default=compatibility",
+            "-opt-in=kotlin.contracts.ExperimentalContracts",
+            "-Xjvm-default=all-compatibility",
         )
     }
 
     defaultConfig {
         applicationId = "dev.patrickgold.florisboard"
-        minSdk = 24
-        targetSdk = 31
-        versionCode = 86
-        versionName = "0.3.16"
+        minSdk = projectMinSdk.toInt()
+        targetSdk = projectTargetSdk.toInt()
+        versionCode = projectVersionCode.toInt()
+        versionName = projectVersionName.substringBefore("-")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "BUILD_COMMIT_HASH", "\"${getGitCommitHash()}\"")
+        buildConfigField("String", "FLADDONS_API_VERSION", "\"v~draft2\"")
+        buildConfigField("String", "FLADDONS_STORE_URL", "\"beta.addons.florisboard.org\"")
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
@@ -67,25 +74,10 @@ android {
             arg("room.expandProjection", "true")
         }
 
-        externalNativeBuild {
-            cmake {
-                cFlags("-fvisibility=hidden", "-DU_STATIC_IMPLEMENTATION=1")
-                cppFlags("-fvisibility=hidden", "-std=c++17", "-fexceptions", "-ffunction-sections", "-fdata-sections", "-DU_DISABLE_RENAMING=1", "-DU_STATIC_IMPLEMENTATION=1")
-                arguments("-DANDROID_STL=c++_static")
-            }
-        }
-
-        ndk {
-            abiFilters += listOf("armeabi-v7a", "arm64-v8a")
-        }
-
         sourceSets {
             maybeCreate("main").apply {
                 assets {
-                    srcDirs("src/main/assets", "src/main/icu4c/prebuilt/assets")
-                }
-                jniLibs {
-                    srcDirs("src/main/icu4c/prebuilt/jniLibs")
+                    srcDirs("src/main/assets")
                 }
                 java {
                     srcDirs("src/main/kotlin")
@@ -104,32 +96,18 @@ android {
     }
 
     buildFeatures {
+        buildConfig = true
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.get()
-    }
-
-    externalNativeBuild {
-        cmake {
-            path("src/main/cpp/CMakeLists.txt")
-        }
-    }
-
     buildTypes {
         named("debug") {
             applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug-${getGitCommitHash(short = true)}"
+            versionNameSuffix = "-debug+${getGitCommitHash(short = true)}"
 
             isDebuggable = true
             isJniDebuggable = false
 
-            ndk {
-                // For running FlorisBoard on the emulator
-                abiFilters += listOf("x86", "x86_64")
-            }
-
             resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_debug")
             resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_debug_round")
             resValue("drawable", "floris_app_icon_foreground", "@drawable/ic_app_icon_debug_foreground")
@@ -138,7 +116,7 @@ android {
 
         create("beta") {
             applicationIdSuffix = ".beta"
-            versionNameSuffix = ""
+            versionNameSuffix = projectVersionNameSuffix
 
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             isMinifyEnabled = true
@@ -151,6 +129,8 @@ android {
         }
 
         named("release") {
+            versionNameSuffix = projectVersionNameSuffix
+
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             isMinifyEnabled = true
             isShrinkResources = true
@@ -165,11 +145,6 @@ android {
             initWith(getByName("release"))
             signingConfig = signingConfigs.getByName("debug")
             matchingFallbacks += listOf("release")
-
-            ndk {
-                // For running FlorisBoard on the emulator
-                abiFilters += listOf("x86", "x86_64")
-            }
         }
     }
 
@@ -187,19 +162,22 @@ android {
     }
 }
 
+composeCompiler {
+    // DO NOT ENABLE STRONG SKIPPING! This project currently relies on
+    // recomposition on parent state change to update the UI correctly.
+    featureFlags.add(ComposeFeatureFlag.StrongSkipping.disabled())
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }
 
 dependencies {
-    implementation(libs.accompanist.flowlayout)
-    implementation(libs.accompanist.insets)
-    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.autofill)
     implementation(libs.androidx.collection.ktx)
-    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.runtime.livedata)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling.preview)
@@ -207,18 +185,26 @@ dependencies {
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.emoji2)
     implementation(libs.androidx.emoji2.views)
+    implementation(libs.androidx.exifinterface)
+    implementation(libs.androidx.material.icons)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.runtime)
     implementation(libs.cache4k)
-    implementation(libs.jetpref.datastore.model)
-    implementation(libs.jetpref.datastore.ui)
-    implementation(libs.jetpref.material.ui)
     implementation(libs.kotlinx.coroutines)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.mikepenz.aboutlibraries.core)
     implementation(libs.mikepenz.aboutlibraries.compose)
+    implementation(libs.patrickgold.compose.tooltip)
+    implementation(libs.patrickgold.jetpref.datastore.model)
+    implementation(libs.patrickgold.jetpref.datastore.ui)
+    implementation(libs.patrickgold.jetpref.material.ui)
+
+    implementation(project(":lib:android"))
+    implementation(project(":lib:kotlin"))
+    implementation(project(":lib:native"))
+    implementation(project(":lib:snygg"))
 
     testImplementation(libs.equalsverifier)
     testImplementation(libs.kotest.assertions.core)

app/lint.xml

@@ -0,0 +1,3 @@
+<lint>
+    <issue id="UsingMaterialAndMaterial3Libraries" severity="ignore" />
+</lint>

app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardFilesDatabase/2.json

@@ -0,0 +1,68 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "dc886df9792fe6b6ad532cc7aa7c4a84",
+    "entities": [
+      {
+        "tableName": "clipboard_files",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `_display_name` TEXT NOT NULL, `_size` INTEGER NOT NULL, `orientation` INTEGER NOT NULL, `mimeTypes` TEXT NOT NULL, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "_display_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "_size",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "orientation",
+            "columnName": "orientation",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeTypes",
+            "columnName": "mimeTypes",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_clipboard_files__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_clipboard_files__id` ON `${TABLE_NAME}` (`_id`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'dc886df9792fe6b6ad532cc7aa7c4a84')"
+    ]
+  }
+}

app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase/3.json

@@ -0,0 +1,92 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "282a1b421e498fd0e21c055b6a4315e0",
+    "entities": [
+      {
+        "tableName": "clipboard_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` INTEGER NOT NULL, `text` TEXT, `uri` TEXT, `creationTimestampMs` INTEGER NOT NULL, `isPinned` INTEGER NOT NULL, `mimeTypes` TEXT NOT NULL, `isSensitive` INTEGER NOT NULL, `isRemoteDevice` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uri",
+            "columnName": "uri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "creationTimestampMs",
+            "columnName": "creationTimestampMs",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPinned",
+            "columnName": "isPinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mimeTypes",
+            "columnName": "mimeTypes",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSensitive",
+            "columnName": "isSensitive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRemoteDevice",
+            "columnName": "isRemoteDevice",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_clipboard_history__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_clipboard_history__id` ON `${TABLE_NAME}` (`_id`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '282a1b421e498fd0e21c055b6a4315e0')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -19,6 +19,9 @@
     <!-- Permission needed to vibrate if the user has key press vibration enabled -->
     <uses-permission android:name="android.permission.VIBRATE"/>
 
+    <!-- Permission needed to create notifications on devices running Android 13+ -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <!-- Android 11+ only: Define that FlorisBoard requests to see all apps that
           ship with an IME or Spell Check service. This is used to guide the user
           in the Settings Ui why FlorisBoard may not be working.
@@ -39,10 +42,11 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/floris_app_icon"
         android:label="@string/floris_app_name"
+        android:enableOnBackInvokedCallback="true"
         android:roundIcon="@mipmap/floris_app_icon_round"
         android:supportsRtl="true"
         android:theme="@style/FlorisAppTheme"
-        tools:targetApi="s">
+        tools:targetApi="tiramisu">
 
         <!-- Allow app to be profiled for benchmarking and baseline profile generation -->
         <profileable android:shell="true"/>
@@ -80,10 +84,26 @@
             android:launchMode="singleTask"
             android:roundIcon="@mipmap/floris_app_icon_round"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/FlorisAppTheme"
-            android:exported="false">
+            android:theme="@style/FlorisAppTheme.Splash"
+            android:exported="true">
             <intent-filter>
-                <data android:scheme="florisboard" android:host="app-ui"/>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="ui" android:host="florisboard" android:pathPrefix="/" />
+            </intent-filter>
+            <intent-filter android:label="Import Extension">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="content"/>
+                <data android:mimeType="application/vnd.florisboard.extension+zip"/>
+                <data android:mimeType="application/octet-stream"/><!-- Firefox looking at you :eyes: -->
+            </intent-filter>
+            <intent-filter android:label="Import Extension">
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="application/vnd.florisboard.extension+zip"/>
+                <data android:mimeType="application/octet-stream"/><!-- Firefox looking at you :eyes: -->
             </intent-filter>
         </activity>
 
@@ -95,7 +115,7 @@
             android:launchMode="singleTask"
             android:roundIcon="@mipmap/floris_app_icon_round"
             android:targetActivity="dev.patrickgold.florisboard.app.FlorisAppActivity"
-            android:theme="@style/FlorisAppTheme"
+            android:theme="@style/FlorisAppTheme.Splash"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -103,24 +123,6 @@
             </intent-filter>
         </activity-alias>
 
-        <!-- Import File Bridging Activity -->
-        <activity
-            android:name="dev.patrickgold.florisboard.app.ext.ImportFileActivity"
-            android:icon="@mipmap/floris_app_icon"
-            android:label="@string/settings__title"
-            android:launchMode="singleTask"
-            android:roundIcon="@mipmap/floris_app_icon_round"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/FlorisAppTheme"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="*" android:host="*" android:pathPattern=".*\\.flex"/>
-                <data android:scheme="*" android:host="*" android:pathPattern=".*\\.xpi"/>
-            </intent-filter>
-        </activity>
-
         <!-- Crash Dialog Activity -->
         <activity
             android:name="dev.patrickgold.florisboard.lib.crashutility.CrashDialogActivity"
@@ -128,6 +130,18 @@
             android:label="@string/crash_dialog__title"
             android:theme="@style/CrashDialogTheme"/>
 
+        <!-- Copy to Clipboard Activity -->
+        <activity
+            android:name="dev.patrickgold.florisboard.ime.clipboard.FlorisCopyToClipboardActivity"
+            android:theme="@style/FlorisAppTheme.Transparent"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+        </activity>
+
         <!-- Clipboard Media File Provider -->
         <provider
             android:name="dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardMediaProvider"

app/src/main/assets/ime/keyboard/org.florisboard.composers/extension.json

@@ -57,12 +57,89 @@
         "ừz": "ư", "ửz": "ư", "ữz": "ư", "ứz": "ư", "ựz": "ư",
         "ỳz": "y", "ỷz": "y", "ỹz": "y", "ýz": "y", "ỵz": "y",
 
+        "áf": "à", "ár": "ả", "áx": "ã", "áj": "ạ", 
+        "às": "á", "àr": "ả", "àx": "ã", "àj": "ạ", 
+        "ảs": "á", "ảf": "à", "ảx": "ã", "ảj": "ạ", 
+        "ãs": "á", "ãf": "à", "ãr": "ả", "ãj": "ạ", 
+        "ạs": "á", "ạf": "à", "ạr": "ả", "ạx": "ã", 
+        "ấf": "ầ", "ấr": "ẩ", "ấx": "ẫ", "ấj": "ậ", 
+        "ầs": "ấ", "ầr": "ẩ", "ầx": "ẫ", "ầj": "ậ", 
+        "ẩs": "ấ", "ẩf": "ầ", "ẩx": "ẫ", "ẩj": "ậ", 
+        "ẫs": "ấ", "ẫf": "ầ", "ẫr": "ẩ", "ẫj": "ậ", 
+        "ậs": "ấ", "ậf": "ầ", "ậr": "ẩ", "ậx": "ẫ", 
+        "ắf": "ằ", "ắr": "ẳ", "ắx": "ẵ", "ắj": "ặ", 
+        "ằs": "ắ", "ằr": "ẳ", "ằx": "ẵ", "ằj": "ặ", 
+        "ẳs": "ắ", "ẳf": "ằ", "ẳx": "ẵ", "ẳj": "ặ", 
+        "ẵs": "ắ", "ẵf": "ằ", "ẵr": "ẳ", "ẵj": "ặ", 
+        "ặs": "ắ", "ặf": "ằ", "ặr": "ẳ", "ặx": "ẵ",
+        "éf": "è", "ér": "ẻ", "éx": "ẽ", "éj": "ẹ", 
+        "ès": "é", "èr": "ẻ", "èx": "ẽ", "èj": "ẹ", 
+        "ẻs": "é", "ẻf": "è", "ẻx": "ẽ", "ẻj": "ẹ", 
+        "ẽs": "é", "ẽf": "è", "ẽr": "ẻ", "ẽj": "ẹ", 
+        "ẹs": "é", "ẹf": "è", "ẹr": "ẻ", "ẹx": "ẽ",
+        "ếf": "ề", "ếr": "ể", "ếx": "ễ", "ếj": "ệ", 
+        "ềs": "ế", "ềr": "ể", "ềx": "ễ", "ềj": "ệ", 
+        "ểs": "ế", "ểf": "ề", "ểx": "ễ", "ểj": "ệ", 
+        "ễs": "ế", "ễf": "ề", "ễr": "ể", "ễj": "ệ", 
+        "ệs": "ế", "ệf": "ề", "ệr": "ể", "ệx": "ễ",
+        "íf": "ì", "ír": "ỉ", "íx": "ĩ", "íj": "ị", 
+        "ìs": "í", "ìr": "ỉ", "ìx": "ĩ", "ìj": "ị", 
+        "ỉs": "í", "ỉf": "ì", "ỉx": "ĩ", "ỉj": "ị", 
+        "ĩs": "í", "ĩf": "ì", "ĩr": "ỉ", "ĩj": "ị", 
+        "ịs": "í", "ịf": "ì", "ịr": "ỉ", "ịx": "ĩ", 
+        "óf": "ò", "ór": "ỏ", "óx": "õ", "ój": "ọ", 
+        "òs": "ó", "òr": "ỏ", "òx": "õ", "òj": "ọ", 
+        "ỏs": "ó", "ỏf": "ò", "ỏx": "õ", "ỏj": "ọ", 
+        "õs": "ó", "õf": "ò", "õr": "ỏ", "õj": "ọ", 
+        "ọs": "ó", "ọf": "ò", "ọr": "ỏ", "ọx": "õ", 
+        "ốf": "ồ", "ốr": "ổ", "ốx": "ỗ", "ốj": "ộ", 
+        "ồs": "ố", "ồr": "ổ", "ồx": "ỗ", "ồj": "ộ", 
+        "ổs": "ố", "ổf": "ồ", "ổx": "ỗ", "ổj": "ộ", 
+        "ỗs": "ố", "ỗf": "ồ", "ỗr": "ổ", "ỗj": "ộ", 
+        "ộs": "ố", "ộf": "ồ", "ộr": "ổ", "ộx": "ỗ", 
+        "ớf": "ờ", "ớr": "ở", "ớx": "ỡ", "ớj": "ợ", 
+        "ờs": "ớ", "ờr": "ở", "ờx": "ỡ", "ờj": "ợ", 
+        "ởs": "ớ", "ởf": "ờ", "ởx": "ỡ", "ởj": "ợ", 
+        "ỡs": "ớ", "ỡf": "ờ", "ỡr": "ở", "ỡj": "ợ", 
+        "ợs": "ớ", "ợf": "ờ", "ợr": "ở", "ợx": "ỡ", 
+        "úf": "ù", "úr": "ủ", "úx": "ũ", "új": "ụ", 
+        "ùs": "ú", "ùr": "ủ", "ùx": "ũ", "ùj": "ụ", 
+        "ủs": "ú", "ủf": "ù", "ủx": "ũ", "ủj": "ụ", 
+        "ũs": "ú", "ũf": "ù", "ũr": "ủ", "ũj": "ụ", 
+        "ụs": "ú", "ụf": "ù", "ụr": "ủ", "ụx": "ũ", 
+        "ứf": "ừ", "ứr": "ử", "ứx": "ữ", "ứj": "ự", 
+        "ừs": "ứ", "ừr": "ử", "ừx": "ữ", "ừj": "ự", 
+        "ửs": "ứ", "ửf": "ừ", "ửx": "ữ", "ửj": "ự", 
+        "ữs": "ứ", "ữf": "ừ", "ữr": "ử", "ữj": "ự", 
+        "ựs": "ứ", "ựf": "ừ", "ựr": "ử", "ựx": "ữ", 
+        "ýf": "ỳ", "ýr": "ỷ", "ýx": "ỹ", "ýj": "ỵ", 
+        "ỳs": "ý", "ỳr": "ỷ", "ỳx": "ỹ", "ỳj": "ỵ", 
+        "ỷs": "ý", "ỷf": "ỳ", "ỷx": "ỹ", "ỷj": "ỵ", 
+        "ỹs": "ý", "ỹf": "ỳ", "ỹr": "ỷ", "ỹj": "ỵ", 
+        "ỵs": "ý", "ỵf": "ỳ", "ỵr": "ỷ", "ỵx": "ỹ", 
+
+        "gias": "giá", "giaf": "già", "giar": "giả", "giax": "giã", "giaj": "giạ",
+        "gía": "giá", "gìa": "già", "gỉa": "giả", "gĩa": "giã", "gịa": "giạ",
+        "gíă": "giắ", "gìă": "giằ", "gỉă": "giẳ", "gĩă": "giẵ", "gịă": "giặ",
+        "gíâ": "giấ", "gìâ": "giầ", "gỉâ": "giẩ", "gĩẫ": "giẫ", "gịâ": "giậ",
+        "gíe": "gié", "gìe": "giè", "gỉe": "giẻ", "gĩe": "giẽ", "gịe": "giẹ",
+        "gíê": "giế", "gìê": "giề", "gỉê": "giể", "gĩê": "giễ", "gịê": "giệ",
+        "gío": "gió", "gìo": "giò", "gỉo": "giỏ", "gĩo": "giõ", "gịo": "giọ",
+        "gíô": "giố", "gìô": "giồ", "gỉô": "giổ", "gĩô": "giỗ", "gịô": "giộ",
+        "gíơ": "giớ", "gìơ": "giờ", "gỉơ": "giở", "gĩơ": "giỡ", "gịơ": "giợ",
+        "gius": "giú", "giuf": "giù", "giur": "giủ", "giux": "giũ", "giuj": "giụ",
+        "gíu": "giú", "gìu": "giù", "gỉu": "giủ", "gĩu": "giũ", "gịu": "giụ",
+        "gíư": "giứ", "gìư": "giừ", "gỉư": "giử", "gĩư": "giữ", "gịư": "giự",
+
+        "ghíê": "ghiế", "ghìê": "ghiề", "ghỉê": "ghiể", "ghĩê": "ghiễ", "ghịê": "ghiệ",
+
+
         "acw": "ăc", "amw": "ăm", "anw": "ăn", "apw": "ăp", "atw": "ăt", "angw": "ăng",
         "aca": "âc", "ama": "âm", "ana": "ân", "apa": "âp", "ata": "ât", "aua": "âu", "aya": "ây", "anga": "âng",
         "eme": "êm", "ene": "ên", "epe": "êp", "ete": "êt", "enhe": "ênh",
         "oio": "ôi","omo": "ôm", "ono": "ôn", "opo": "ôp", "oto": "ôt", "ongo": "ông",
         "oiw": "ơi", "omw": "ơm", "onw": "ơn", "opw": "ơp", "otw": "ơt",
-        "uaw": "ưa", "uiw": "ưi", "umw": "ưm", "unw": "ưn", "utw": "ưt", "uuw": "ưu", "ungw": "ưng",
+        "uaw": "ưa", "ucw": "ưc", "uiw": "ưi", "umw": "ưm", "unw": "ưn", "utw": "ưt", "uuw": "ưu", "ungw": "ưng",
         "ieme": "iêm", "iene": "iên", "iepe": "iêp", "iete": "iêt", "ieue": "iêu", "ienge": "iêng", 
         "uocw": "ươc", "uoiw": "ươi", "uomw": "ươm", "uonw": "ươn", "uotw": "ươt", "uongw": "ương",
         "uoco": "uôc", "uoio": "uôi", "uomo": "uôm", "uono": "uôn", "uoto": "uôt", "uongo": "uông",
@@ -79,7 +156,7 @@
         "ême": "eme", "êne": "ene", "êpe": "epe", "ête": "ete",
         "ôio": "oio", "ômo": "omo", "ôno": "ono", "ôpo": "opo", "ôto": "oto", "ôngo": "ongo",
         "ơmw": "omw", "ơnw": "onw", "ơpw": "opw", "ơtw": "otw",
-        "ưaw": "uaw", "ưiw": "uiw", "ưmw": "umw", "ưnw": "unw" , "ưtw": "utw", "ưuw": "uuw", "ưngw": "ungw",
+        "ưaw": "uaw", "ưcw": "ucw", "ưiw": "uiw", "ưmw": "umw", "ưnw": "unw" , "ưtw": "utw", "ưuw": "uuw", "ưngw": "ungw",
         "iême": "ieme", "iêne": "iene", "iêpe": "iepe", "iête": "iete", "iêue": "ieue", "iênge": "ienge",
         "ươcw": "uocw", "ươiw": "uoiw", "ươmw": "uomw", "ươnw": "uonw", "ươtw": "uotw", "ươngw": "uongw",
         "uyêne": "uyene", "uyêt": "uyete",
@@ -138,6 +215,7 @@
         "inhs": "ính", "inhf": "ình", "inhr": "ỉnh", "inhx": "ĩnh", "inhj": "ịnh",
 
         "ías": "ias", "ìaf": "iaf", "ỉar": "iar", "ĩax": "iax", "ịaj": "iaj",
+        "iás": "ias", "iàf": "iaf", "iảr": "iar", "iãx": "iax", "iạj": "iaj",
         "ícs": "ics", "ịcj": "icj",
         "íms": "ims", "ìmf": "imf", "ỉmr": "imr", "ĩmx": "imx", "ịmj": "imj",
         "íns": "ins", "ìnf": "inf", "ỉnr": "inr", "ĩnx": "inx", "ịnj": "inj",
@@ -385,6 +463,8 @@
 
         "ưas": "ứa", "ưaf": "ừa", "ưar": "ửa", "ưax": "ữa", "ưaj": "ựa",
         "úaw": "ứa", "ùaw": "ừa", "ủaw": "ửa", "ũaw": "ữa", "ụaw": "ựa",
+        "ưcs": "ức", "ưcj": "ực",
+        "úcw": "ức", "ụcw": "ực",
         "ưis": "ứi", "ưif": "ừi", "ưir": "ửi", "ưix": "ữi", "ưij": "ựi",
         "úiw": "ứi", "ùiw": "ừi", "ủiw": "ửi", "ũiw": "ữi", "ụiw": "ựi",
         "ưms": "ứm", "ưmf": "ừm", "ưmr": "ửm", "ưmx": "ữm", "ưmj": "ựm",
@@ -403,6 +483,8 @@
         "ửar": "ưar", "ửaw": "ủaw", "ưarw": "uarw", "ủawr": "uawr",
         "ữax": "ưax", "ữaw": "ũaw", "ưaxw": "uaxw", "ũawx": "uawx",
         "ựaj": "ưaj", "ựaw": "ụaw", "ưajw": "uajw", "ụawj": "uawj",
+        "ứcs": "ưcs", "ứcw": "úcw", "ưcsw": "ucsw", "úcws": "ucws",        
+        "ựcj": "ưcj", "ựcw": "ụcw", "ưcjw": "ucjw", "ụcwj": "ucwj",
         "ứis": "ưis", "ứiw": "úiw", "ưisw": "uisw", "úiws": "uiws",
         "ừif": "ưif", "ừiw": "ùiw", "ưifw": "uifw", "ùiwf": "uiwf",
         "ửir": "ưir", "ửiw": "ủiw", "ưirw": "uirw", "ủiwr": "uiwr",
@@ -450,6 +532,11 @@
         "iénge": "iếng", "iènge": "iềng", "iẻnge": "iểng", "iẽnge": "iễng", "iẹnge": "iệng",
         "iêngs": "iếng", "iêngf": "iềng", "iêngr": "iểng", "iêngx": "iễng", "iêngj": "iệng",
 
+        "iếs": "iês", "iếe": "iée", "iêse": "iese", "iées": "iees",
+        "iềf": "iêf", "iềe": "ièe", "iêfe": "iefe", "ièef": "ieef",
+        "iểr": "iêr", "iểe": "iẻe", "iêre": "iere", "iẻer": "ieer",
+        "iễx": "iêx", "iễe": "iẽe", "iêxe": "iexe", "iẽex": "ieex",
+        "iệj": "iêj", "iệe": "iẹe", "iêje": "ieje", "iẹej": "ieej",
         "iếms": "iêms", "iếme": "iéme", "iêmse": "iemse", "iémes": "iemes",
         "iềmf": "iêmf", "iềme": "ième", "iêmfe": "iemfe", "ièmef": "iemef",
         "iểmr": "iêmr", "iểme": "iẻme", "iêmre": "iemre", "iẻmer": "iemer",

app/src/main/assets/ime/keyboard/org.florisboard.currencysets/extension.json

@@ -32,6 +32,18 @@
         { "code":  163, "label": "£" },
         { "code":  165, "label": "¥" }
       ]
+    },
+	{
+      "id": "bangladeshi_taka",
+      "label": "Bangladeshi taka (৳)",
+      "slots": [
+        { "code": 2547, "label": "৳" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
     },
     {
       "id": "bitcoin",
@@ -45,6 +57,18 @@
         { "code":  165, "label": "¥" }
       ]
     },
+    {
+      "id": "costa_rican_colon",
+      "label": "Costa Rican colón (₡)",
+      "slots": [
+        { "code": 8353, "label": "₡" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
     {
       "id": "dollar",
       "label": "Dollar ($)",

app/src/main/assets/ime/keyboard/org.florisboard.layouts/extension.json

@@ -42,6 +42,12 @@
         "label": "AZERTY",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
+      },
+	  {
+        "id": "bengali_bd",
+        "label": "বাংলা",
+        "authors": [ "iamrasel" ],
+        "direction": "ltr"
       },
       {
         "id": "bepo",
@@ -98,12 +104,25 @@
         "authors": [ "blucin" ],
         "direction": "ltr"
       },
+      {
+        "id": "colemak_dhm",
+        "label": "ColemakDHm",
+        "authors": [ "SteveP", "oneilljp" ],
+        "direction": "ltr"
+      },
       {
         "id": "danish",
         "label": "Danish (QWERTY)",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "diktor",
+        "label": "Diktor",
+        "authors": [ "kuroya2mouse" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:diktor"
+      },
       {
         "id": "dvorak",
         "label": "Dvorak",
@@ -111,6 +130,13 @@
         "direction": "ltr",
         "modifier": "org.florisboard.layouts:dvorak"
       },
+      {
+        "id": "dvorak_de",
+        "label": "Dvorak (DE)",
+        "authors": [ "msrd0" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:dvorak_de"
+      },
       {
         "id": "dvorak_es",
         "label": "Dvorak (ÑÇ)",
@@ -130,6 +156,12 @@
         "authors": [ "jeremiah-miller", "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "estonian",
+        "label": "Estonian",
+        "authors": [ "OneSheepy" ],
+        "direction": "ltr"
+      },
       {
         "id": "faroese",
         "label": "Faroese (QWERTY)",
@@ -199,13 +231,13 @@
       },
       {
         "id": "jcuken_russian",
-        "label": "Russian (JCUKEN)",
+        "label": "Russian (ЙЦУКЕН)",
         "authors": [ "williamtheaker" ],
         "direction": "ltr"
       },
       {
         "id": "jcuken_ukrainian",
-        "label": "Ukrainian (JCUKEN)",
+        "label": "Ukrainian (ЙЦУКЕН)",
         "authors": [ "williamtheaker", "33kk" ],
         "direction": "ltr"
       },
@@ -324,6 +356,12 @@
         "authors": ["GrbavaCigla"],
         "direction": "ltr"
       },
+      {
+        "id": "slovenian",
+        "label": "Slovenian (QWERTZ)",
+        "authors": ["samo_lego"],
+        "direction": "ltr"
+      },
       {
         "id": "spanish",
         "label": "Spanish (QWERTY)",
@@ -354,6 +392,12 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "tamil",
+        "label": "Tamil",
+        "authors": [ "Clem0908" ],
+        "direction": "ltr"
+      },
       {
         "id": "thai_kedmanee",
         "label": "Thai Kedmanee",
@@ -378,6 +422,18 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "udmurt_compact",
+        "label": "Udmurt (3 чур)",
+        "authors": [ "vorgoron" ],
+        "direction": "ltr"
+      },
+      {
+        "id": "udmurt_extended",
+        "label": "Udmurt (4 чур)",
+        "authors": [ "vorgoron" ],
+        "direction": "ltr"
+      },
       {
         "id": "urdu_phonetic",
         "label": "Urdu Phonetic",
@@ -396,6 +452,12 @@
         "label": "Workman",
         "authors": [ "icyphox" ],
         "direction": "ltr"
+      },
+      {
+        "id": "jcuken_interslavic",
+        "label": "Interslavic (ЈЦУКЕН)",
+        "authors": [ "victorbnl" ],
+        "direction": "ltr"
       }
     ],
     "charactersMod": [
@@ -417,12 +479,24 @@
         "authors": [ "HeiWiper" ],
         "direction": "rtl"
       },
+      {
+        "id": "diktor",
+        "label": "Diktor",
+        "authors": [ "kuroya2mouse" ],
+        "direction": "ltr"
+      },
       {
         "id": "dvorak",
         "label": "Dvorak",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "dvorak_de",
+        "label": "Dvorak (DE)",
+        "authors": [ "msrd0" ],
+        "direction": "ltr"
+      },
       {
         "id": "hebrew",
         "label": "עברית",
@@ -500,6 +574,12 @@
         "label": "Western Arabic (PC)",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
+      },
+	  {
+        "id": "bengali",
+        "label": "Bengali",
+        "authors": [ "iamrasel" ],
+        "direction": "ltr"
       }
     ],
     "numericRow": [
@@ -572,7 +652,7 @@
       {
         "id": "tamil",
         "label": "Tamil",
-        "authors": [ "yashpalgoyal1304" ],
+        "authors": [ "Clem0908" ],
         "direction": "ltr"
       },
       {
@@ -667,6 +747,12 @@
         "label": "Western (Additional symbols)",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
+      },
+      {
+        "id": "western_samsung",
+        "label": "Western (Samsung)",
+        "authors": [ "nettnikl" ],
+        "direction": "ltr"
       }
     ],
     "symbolsMod": [
@@ -726,6 +812,12 @@
         "label": "Western",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
+      },
+      {
+        "id": "western_samsung",
+        "label": "Western (Samsung)",
+        "authors": [ "nettnikl" ],
+        "direction": "ltr"
       }
     ],
     "symbols2Mod": [

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/armenian_alt_phonetic.json

@@ -0,0 +1,49 @@
+[
+    [
+      { "$": "auto_text_key", "code": 1383, "label": "է" },
+      { "$": "auto_text_key", "code": 1385, "label": "թ" },
+      { "$": "auto_text_key", "code": 1411, "label": "փ" },
+      { "$": "auto_text_key", "code": 1393, "label": "ձ" },
+      { "$": "auto_text_key", "code": 1403, "label": "ջ" },
+      { "$": "auto_text_key", "code": 1408, "label": "ր" },
+      { "$": "auto_text_key", "code": 1401, "label": "չ" },
+      { "$": "auto_text_key", "code": 1395, "label": "ճ" },
+      { "$": "auto_text_key", "code": 1386, "label": "ժ" },
+      { "$": "auto_text_key", "code": 1390, "label": "ծ" }
+    ],
+    [
+      { "$": "auto_text_key", "code": 1412, "label": "ք" },
+      { "$": "auto_text_key", "code": 1400, "label": "ո" },
+      { "$": "auto_text_key", "code": 1381, "label": "ե" },
+      { "$": "auto_text_key", "code": 1404, "label": "ռ" },
+      { "$": "auto_text_key", "code": 1407, "label": "տ" },
+      { "$": "auto_text_key", "code": 1384, "label": "ը" },
+      { "$": "auto_text_key", "code": 1410, "label": "ւ" },
+      { "$": "auto_text_key", "code": 1387, "label": "ի" },
+      { "$": "auto_text_key", "code": 1413, "label": "օ" },
+      { "$": "auto_text_key", "code": 1402, "label": "պ" }
+    ],
+    [
+      { "$": "auto_text_key", "code": 1377, "label": "ա" },
+      { "$": "auto_text_key", "code": 1405, "label": "ս" },
+      { "$": "auto_text_key", "code": 1380, "label": "դ" },
+      { "$": "auto_text_key", "code": 1414, "label": "ֆ" },
+      { "$": "auto_text_key", "code": 1379, "label": "գ" },
+      { "$": "auto_text_key", "code": 1392, "label": "հ" },
+      { "$": "auto_text_key", "code": 1397, "label": "յ" },
+      { "$": "auto_text_key", "code": 1391, "label": "կ" },
+      { "$": "auto_text_key", "code": 1388, "label": "լ" },
+      { "$": "auto_text_key", "code": 1389, "label": "խ" }
+    ],
+    [
+      { "$": "auto_text_key", "code": 1382, "label": "զ" },
+      { "$": "auto_text_key", "code": 1394, "label": "ղ" },
+      { "$": "auto_text_key", "code": 1409, "label": "ց" },
+      { "$": "auto_text_key", "code": 1406, "label": "վ" },
+      { "$": "auto_text_key", "code": 1378, "label": "բ" },
+      { "$": "auto_text_key", "code": 1398, "label": "ն" },
+      { "$": "auto_text_key", "code": 1396, "label": "մ" },
+      { "$": "auto_text_key", "code": 1399, "label": "շ" }
+    ]
+  ]
+  

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/bengali_bd.json

@@ -0,0 +1,112 @@
+[
+  [
+    { "$": "case_selector",
+      "lower": { "code": 2457, "label": "ঙ" },
+      "upper": { "code": 2434, "label": "ং" }
+    },
+	{ "$": "case_selector",
+	  "lower": { "code": 2479, "label": "য" },
+	  "upper": { "code": 2527, "label": "য়" }
+	},
+    { "$": "case_selector",
+	  "lower": { "code": 2465, "label": "ড" },
+	  "upper": { "code": 2466, "label": "ঢ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2474, "label": "প" },
+	  "upper": { "code": 2475, "label": "ফ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2463, "label": "ট" },
+	  "upper": { "code": 2464, "label": "ঠ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2458, "label": "চ" },
+	  "upper": { "code": 2459, "label": "ছ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2460, "label": "জ" },
+	  "upper": { "code": 2461, "label": "ঝ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2489, "label": "হ" },
+	  "upper": { "code": 2462, "label": "ঞ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2455, "label": "গ" },
+	  "upper": { "code": 2456, "label": "ঘ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2524, "label": "ড়" },
+	  "upper": { "code": 2525, "label": "ঢ়" }
+	}
+  ],
+  [
+  { "$": "case_selector",
+	  "lower": { "code": 2499, "label": "ৃ" },
+    "upper": { "code": 2435, "label": "ঃ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2497, "label": "ু" },
+	  "upper": { "code": 2498, "label": "ূ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2495, "label": "ি" },
+	  "upper": { "code": 2496, "label": "ী" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2494, "label": "া" },
+	  "upper": { "code": 2437, "label": "অ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2509, "label": "্" },
+	  "upper": { "code": 2433, "label": "ঁ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2476, "label": "ব" },
+	  "upper": { "code": 2477, "label": "ভ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2453, "label": "ক" },
+	  "upper": { "code": 2454, "label": "খ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2468, "label": "ত" },
+	  "upper": { "code": 2469, "label": "থ" }
+	},
+	{ "$": "case_selector",
+	  "lower": { "code": 2470, "label": "দ" },
+	  "upper": { "code": 2471, "label": "ধ" }
+	}
+  ],
+  [
+    { "$": "case_selector",
+      "lower": { "$": "multi_text_key", "codePoints": [2509, 2480], "label": "্র" },
+      "upper": { "$": "multi_text_key", "codePoints": [2509, 2479], "label": "্য" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2507, "label": "ো" },
+      "upper": { "code": 2508, "label": "ৌ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2503, "label": "ে" },
+      "upper": { "code": 2504, "label": "ৈ" }
+    },
+	{ "$": "case_selector",
+      "lower": { "code": 2480, "label": "র" },
+      "upper": { "code": 2482, "label": "ল" }
+    },
+	{ "$": "case_selector",
+      "lower": { "code": 2472, "label": "ন" },
+      "upper": { "code": 2467, "label": "ণ" }
+    },
+	{ "$": "case_selector",
+      "lower": { "code": 2488, "label": "স" },
+      "upper": { "code": 2487, "label": "ষ" }
+    },
+	{ "$": "case_selector",
+      "lower": { "code": 2478, "label": "ম" },
+      "upper": { "code": 2486, "label": "শ" }
+    }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/colemak_dhm.json

@@ -0,0 +1,46 @@
+[
+  [
+    { "$": "auto_text_key", "code":  113, "label": "q" },
+    { "$": "auto_text_key", "code":  119, "label": "w" },
+    { "$": "auto_text_key", "code":  102, "label": "f" },
+    { "$": "auto_text_key", "code":  112, "label": "p" },
+    { "$": "auto_text_key", "code":   98, "label": "b" },
+    { "$": "auto_text_key", "code":  106, "label": "j" },
+    { "$": "auto_text_key", "code":  108, "label": "l" },
+    { "$": "auto_text_key", "code":  117, "label": "u" },
+    { "$": "auto_text_key", "code":  121, "label": "y" },
+    { "$": "case_selector",
+      "lower": { "code":   59, "label": ";", "popup": {
+        "relevant": [
+          { "code":   58, "label": ":" }
+        ]
+      } },
+      "upper": { "code":   58, "label": ":", "popup": {
+        "relevant": [
+          { "code":   59, "label": ";" }
+        ]
+      } }
+    }
+  ],
+  [
+    { "$": "auto_text_key", "code":   97, "label": "a" },
+    { "$": "auto_text_key", "code":  114, "label": "r" },
+    { "$": "auto_text_key", "code":  115, "label": "s" },
+    { "$": "auto_text_key", "code":  116, "label": "t" },
+    { "$": "auto_text_key", "code":  103, "label": "g" },
+    { "$": "auto_text_key", "code":  109, "label": "m" },
+    { "$": "auto_text_key", "code":  110, "label": "n" },
+    { "$": "auto_text_key", "code":  101, "label": "e" },
+    { "$": "auto_text_key", "code":  105, "label": "i" },
+    { "$": "auto_text_key", "code":  111, "label": "o" }
+  ],
+  [
+    { "$": "auto_text_key", "code":  122, "label": "z" },
+    { "$": "auto_text_key", "code":  120, "label": "x" },
+    { "$": "auto_text_key", "code":   99, "label": "c" },
+    { "$": "auto_text_key", "code":  100, "label": "d" },
+    { "$": "auto_text_key", "code":  118, "label": "v" },
+    { "$": "auto_text_key", "code":  107, "label": "k" },
+    { "$": "auto_text_key", "code":  104, "label": "h" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/diktor.json

@@ -0,0 +1,49 @@
+[
+  [
+    { "$": "auto_text_key", "code":  1094, "label": "ц" },
+    { "$": "auto_text_key", "code":  1100, "label": "ь" },
+    { "$": "auto_text_key", "code":  1103, "label": "я" },
+    { "$": "case_selector",
+      "lower": { "code":   44, "label": ",", "popup": {
+        "relevant": [
+          { "code":   46, "label": "." }
+        ]
+      } },
+      "upper": { "code":   46, "label": ".", "popup": {
+        "relevant": [
+          { "code":   44, "label": "," }
+        ]
+      } }
+    },
+    { "$": "auto_text_key", "code":  1079, "label": "з" },
+    { "$": "auto_text_key", "code":  1074, "label": "в" },
+    { "$": "auto_text_key", "code":  1082, "label": "к" },
+    { "$": "auto_text_key", "code":  1076, "label": "д" },
+    { "$": "auto_text_key", "code":  1095, "label": "ч" },
+    { "$": "auto_text_key", "code":  1096, "label": "ш" },
+    { "$": "auto_text_key", "code":  1097, "label": "щ" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1091 , "label": "у" },
+    { "$": "auto_text_key", "code": 1080 , "label": "и" },
+    { "$": "auto_text_key", "code": 1077 , "label": "е" },
+    { "$": "auto_text_key", "code": 1086 , "label": "о" },
+    { "$": "auto_text_key", "code": 1072 , "label": "а" },
+    { "$": "auto_text_key", "code": 1083 , "label": "л" },
+    { "$": "auto_text_key", "code": 1085 , "label": "н" },
+    { "$": "auto_text_key", "code": 1090 , "label": "т" },
+    { "$": "auto_text_key", "code": 1089 , "label": "с" },
+    { "$": "auto_text_key", "code": 1088 , "label": "р" },
+    { "$": "auto_text_key", "code": 1081 , "label": "й" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1101 , "label": "э" },
+    { "$": "auto_text_key", "code": 1093 , "label": "х" },
+    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
+    { "$": "auto_text_key", "code": 1102 , "label": "ю" },
+    { "$": "auto_text_key", "code": 1073 , "label": "б" },
+    { "$": "auto_text_key", "code": 1084 , "label": "м" },
+    { "$": "auto_text_key", "code": 1087 , "label": "п" },
+    { "$": "auto_text_key", "code": 1075 , "label": "г" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/dvorak_de.json

@@ -0,0 +1,71 @@
+[
+  [
+    { "$": "auto_text_key", "code":  252, "label": "ü" },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   59, "label": ";", "popup": {
+        "relevant": [
+          { "code":   44, "label": "," }
+        ]
+      } },
+      "default": { "code":   44, "label": ",", "popup": {
+        "relevant": [
+          { "code":   59, "label": ";" }
+        ]
+      } }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   58, "label": ":", "popup": {
+        "relevant": [
+          { "code":   46, "label": "." }
+        ]
+      } },
+      "default": { "code":   46, "label": ".", "popup": {
+        "relevant": [
+          { "code":   58, "label": ":" }
+        ]
+      } }
+    },
+    { "$": "auto_text_key", "code":  112, "label": "p" },
+    { "$": "auto_text_key", "code":  121, "label": "y" },
+    { "$": "auto_text_key", "code":  102, "label": "f" },
+    { "$": "auto_text_key", "code":  103, "label": "g" },
+    { "$": "auto_text_key", "code":   99, "label": "c" },
+    { "$": "auto_text_key", "code":  116, "label": "t" },
+    { "$": "auto_text_key", "code":  122, "label": "z" },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":  223, "label": "ß", "popup": {
+        "relevant": [
+          { "code":   63, "label": "?" }
+        ]
+      } },
+      "default": { "code":   63, "label": "?", "popup": {
+        "relevant": [
+          { "code":  223, "label": "ß" }
+        ]
+      } }
+    }
+  ],
+  [
+    { "$": "auto_text_key", "code":   97, "label": "a" },
+    { "$": "auto_text_key", "code":  111, "label": "o" },
+    { "$": "auto_text_key", "code":  101, "label": "e" },
+    { "$": "auto_text_key", "code":  105, "label": "i" },
+    { "$": "auto_text_key", "code":  117, "label": "u" },
+    { "$": "auto_text_key", "code":  104, "label": "h" },
+    { "$": "auto_text_key", "code":  100, "label": "d" },
+    { "$": "auto_text_key", "code":  114, "label": "r" },
+    { "$": "auto_text_key", "code":  110, "label": "n" },
+    { "$": "auto_text_key", "code":  115, "label": "s" },
+    { "$": "auto_text_key", "code":  108, "label": "l" }
+  ],
+  [
+    { "$": "auto_text_key", "code":  113, "label": "q" },
+    { "$": "auto_text_key", "code":  106, "label": "j" },
+    { "$": "auto_text_key", "code":  107, "label": "k" },
+    { "$": "auto_text_key", "code":  120, "label": "x" },
+    { "$": "auto_text_key", "code":   98, "label": "b" },
+    { "$": "auto_text_key", "code":  109, "label": "m" },
+    { "$": "auto_text_key", "code":  119, "label": "w" },
+    { "$": "auto_text_key", "code":  118, "label": "v" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/estonian.json

@@ -0,0 +1,38 @@
+[
+  [
+    { "$": "auto_text_key", "code":  113, "label": "q" },
+    { "$": "auto_text_key", "code":  119, "label": "w" },
+    { "$": "auto_text_key", "code":  101, "label": "e" },
+    { "$": "auto_text_key", "code":  114, "label": "r" },
+    { "$": "auto_text_key", "code":  116, "label": "t" },
+    { "$": "auto_text_key", "code":  121, "label": "y" },
+    { "$": "auto_text_key", "code":  117, "label": "u" },
+    { "$": "auto_text_key", "code":  105, "label": "i" },
+    { "$": "auto_text_key", "code":  111, "label": "o" },
+    { "$": "auto_text_key", "code":  112, "label": "p" },
+    { "$": "auto_text_key", "code":  252, "label": "ü" }
+  ],
+  [
+    { "$": "auto_text_key", "code":   97, "label": "a" },
+    { "$": "auto_text_key", "code":  115, "label": "s" },
+    { "$": "auto_text_key", "code":  100, "label": "d" },
+    { "$": "auto_text_key", "code":  102, "label": "f" },
+    { "$": "auto_text_key", "code":  103, "label": "g" },
+    { "$": "auto_text_key", "code":  104, "label": "h" },
+    { "$": "auto_text_key", "code":  106, "label": "j" },
+    { "$": "auto_text_key", "code":  107, "label": "k" },
+    { "$": "auto_text_key", "code":  108, "label": "l" },
+    { "$": "auto_text_key", "code":  246, "label": "ö" },
+    { "$": "auto_text_key", "code":  228, "label": "ä" }
+  ],
+  [
+    { "$": "auto_text_key", "code":  122, "label": "z" },
+    { "$": "auto_text_key", "code":  120, "label": "x" },
+    { "$": "auto_text_key", "code":   99, "label": "c" },
+    { "$": "auto_text_key", "code":  118, "label": "v" },
+    { "$": "auto_text_key", "code":   98, "label": "b" },
+    { "$": "auto_text_key", "code":  110, "label": "n" },
+    { "$": "auto_text_key", "code":  109, "label": "m" },
+    { "$": "auto_text_key", "code":  245, "label": "õ" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/jcuken_interslavic.json

@@ -0,0 +1,36 @@
+[
+  [
+    { "$": "auto_text_key", "code":  1112, "label": "ј" },
+    { "$": "auto_text_key", "code":  1094, "label": "ц" },
+    { "$": "auto_text_key", "code":  1091, "label": "у" },
+    { "$": "auto_text_key", "code":  1082, "label": "к" },
+    { "$": "auto_text_key", "code":  1077, "label": "е" },
+    { "$": "auto_text_key", "code":  1085, "label": "н" },
+    { "$": "auto_text_key", "code":  1114, "label": "њ" },
+    { "$": "auto_text_key", "code":  1075, "label": "г" },
+    { "$": "auto_text_key", "code":  1096, "label": "ш" },
+    { "$": "auto_text_key", "code":  1079, "label": "з" },
+    { "$": "auto_text_key", "code":  1093, "label": "х" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
+    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
+    { "$": "auto_text_key", "code": 1074 , "label": "в" },
+    { "$": "auto_text_key", "code": 1072 , "label": "а" },
+    { "$": "auto_text_key", "code": 1087 , "label": "п" },
+    { "$": "auto_text_key", "code": 1088 , "label": "р" },
+    { "$": "auto_text_key", "code": 1086 , "label": "о" },
+    { "$": "auto_text_key", "code": 1083 , "label": "л" },
+    { "$": "auto_text_key", "code": 1113 , "label": "љ" },
+    { "$": "auto_text_key", "code": 1078 , "label": "ж" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1108 , "label": "є" },
+    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
+    { "$": "auto_text_key", "code": 1089 , "label": "с" },
+    { "$": "auto_text_key", "code": 1084 , "label": "м" },
+    { "$": "auto_text_key", "code": 1080 , "label": "и" },
+    { "$": "auto_text_key", "code": 1090 , "label": "т" },
+    { "$": "auto_text_key", "code": 1073 , "label": "б" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/slovenian.json

@@ -0,0 +1,37 @@
+[
+  [
+    { "$": "auto_text_key", "code": 113, "label": "q" },
+    { "$": "auto_text_key", "code": 119, "label": "w" },
+    { "$": "auto_text_key", "code": 101, "label": "e" },
+    { "$": "auto_text_key", "code": 114, "label": "r" },
+    { "$": "auto_text_key", "code": 116, "label": "t" },
+    { "$": "auto_text_key", "code": 122, "label": "z" },
+    { "$": "auto_text_key", "code": 117, "label": "u" },
+    { "$": "auto_text_key", "code": 105, "label": "i" },
+    { "$": "auto_text_key", "code": 111, "label": "o" },
+    { "$": "auto_text_key", "code": 112, "label": "p" },
+    { "$": "auto_text_key", "code": 353, "label": "š" }
+  ],
+  [
+    { "$": "auto_text_key", "code":  97, "label": "a" },
+    { "$": "auto_text_key", "code": 115, "label": "s" },
+    { "$": "auto_text_key", "code": 100, "label": "d" },
+    { "$": "auto_text_key", "code": 102, "label": "f" },
+    { "$": "auto_text_key", "code": 103, "label": "g" },
+    { "$": "auto_text_key", "code": 104, "label": "h" },
+    { "$": "auto_text_key", "code": 106, "label": "j" },
+    { "$": "auto_text_key", "code": 107, "label": "k" },
+    { "$": "auto_text_key", "code": 108, "label": "l" },
+    { "$": "auto_text_key", "code": 269, "label": "č" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 121, "label": "y" },
+    { "$": "auto_text_key", "code": 120, "label": "x" },
+    { "$": "auto_text_key", "code":  99, "label": "c" },
+    { "$": "auto_text_key", "code": 118, "label": "v" },
+    { "$": "auto_text_key", "code":  98, "label": "b" },
+    { "$": "auto_text_key", "code": 110, "label": "n" },
+    { "$": "auto_text_key", "code": 109, "label": "m" },
+    { "$": "auto_text_key", "code": 382, "label": "ž" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/tamil.json

@@ -0,0 +1,98 @@
+[
+  [
+    { "$": "case_selector",
+      "lower": { "code": 2974, "label": "ஞ" },
+      "upper": { "code": 2998, "label": "ஶ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2993, "label": "ற" },
+      "upper": { "code": 2999, "label": "ஷ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2984, "label": "ந" },
+      "upper": { "code": 3000, "label": "ஸ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2970, "label": "ச" },
+      "upper": { "code": 3001, "label": "ஹ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2997, "label": "வ" },
+      "upper": { "code": 2972, "label": "ஜ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2992, "label": "ர" },
+      "upper": { "code": 2994, "label": "ல" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3016, "label": "ை" },
+      "upper": { "code": 2960, "label": "ஐ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3018, "label": "ொ"  },
+      "upper": { "code": 3019, "label": "ோ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3007, "label": "ி" },
+      "upper": { "code": 3008, "label": "ீ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3009, "label": "ு" },
+      "upper": { "code": 3010, "label": "ூ" }
+    }
+  ],
+  [
+    { "$": "auto_text_key", "code": 2991, "label": "ய" },
+    { "$": "auto_text_key", "code": 2995, "label": "ள" },
+    { "$": "auto_text_key", "code": 2985, "label": "ன" },
+    { "$": "auto_text_key", "code": 2965, "label": "க" },
+    { "$": "auto_text_key", "code": 2986, "label": "ப" },
+    { "$": "case_selector",
+      "lower": { "code": 3006, "label": "ா" },
+      "upper": { "code": 2996, "label": "ழ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2980, "label": "த" },
+      "upper": { "code": 2990, "label": "ம" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2975, "label": "ட" },
+      "upper": { "code": 2969, "label": "ங" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3021, "label": "்" },
+      "upper": { "code": 2947, "label": "ஃ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2951, "label": "இ" },
+      "upper": { "code": 2952, "label": "ஈ" }
+    }
+  ],
+  [
+    { "$": "auto_text_key", "code": 2979, "label": "ண" },
+    { "$": "case_selector",
+      "lower": { "code": 2962, "label": "ஒ" },
+      "upper": { "code": 2963, "label": "ஓ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2953, "label": "உ" },
+      "upper": { "code": 2954, "label": "ஊ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2958, "label": "எ" },
+      "upper": { "code": 2959, "label": "ஏ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 3014, "label": "ெ" },
+      "upper": { "code": 3015, "label": "ே" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2964, "label": "ஔ" },
+      "upper": { "code": 3020, "label": "ௌ" }
+    },
+    { "$": "case_selector",
+      "lower": { "code": 2949, "label": "அ" },
+      "upper": { "code": 2950, "label": "ஆ" }
+    }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/udmurt_compact.json

@@ -0,0 +1,39 @@
+[
+  [
+    { "$": "auto_text_key", "code":  1081, "label": "й" },
+    { "$": "auto_text_key", "code":  1094, "label": "ц" },
+    { "$": "auto_text_key", "code":  1091, "label": "у" },
+    { "$": "auto_text_key", "code":  1082, "label": "к" },
+    { "$": "auto_text_key", "code":  1077, "label": "е" },
+    { "$": "auto_text_key", "code":  1085, "label": "н" },
+    { "$": "auto_text_key", "code":  1075, "label": "г" },
+    { "$": "auto_text_key", "code":  1096, "label": "ш" },
+    { "$": "auto_text_key", "code":  1097, "label": "щ" },
+    { "$": "auto_text_key", "code":  1079, "label": "з" },
+    { "$": "auto_text_key", "code":  1093, "label": "х" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
+    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
+    { "$": "auto_text_key", "code": 1074 , "label": "в" },
+    { "$": "auto_text_key", "code": 1072 , "label": "а" },
+    { "$": "auto_text_key", "code": 1087 , "label": "п" },
+    { "$": "auto_text_key", "code": 1088 , "label": "р" },
+    { "$": "auto_text_key", "code": 1086 , "label": "о" },
+    { "$": "auto_text_key", "code": 1083 , "label": "л" },
+    { "$": "auto_text_key", "code": 1076 , "label": "д" },
+    { "$": "auto_text_key", "code": 1078 , "label": "ж" },
+    { "$": "auto_text_key", "code": 1101 , "label": "э" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1103 , "label": "я" },
+    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
+    { "$": "auto_text_key", "code": 1089 , "label": "с" },
+    { "$": "auto_text_key", "code": 1084 , "label": "м" },
+    { "$": "auto_text_key", "code": 1080 , "label": "и" },
+    { "$": "auto_text_key", "code": 1090 , "label": "т" },
+    { "$": "auto_text_key", "code": 1100 , "label": "ь" },
+    { "$": "auto_text_key", "code": 1073 , "label": "б" },
+    { "$": "auto_text_key", "code": 1102 , "label": "ю" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/udmurt_extended.json

@@ -0,0 +1,48 @@
+[
+  [
+    { "$": "auto_text_key", "code":  1081, "label": "ё" },
+    { "$": "auto_text_key", "code":  1245, "label": "ӝ" },
+    { "$": "auto_text_key", "code":  1255, "label": "ӧ" },
+    { "$": "auto_text_key", "code":  1269, "label": "ӵ" },
+    { "$": "auto_text_key", "code":  1253, "label": "ӥ" },
+    { "$": "auto_text_key", "code":  1247, "label": "ӟ" },
+    { "$": "auto_text_key", "code":  1100, "label": "ь" },
+    { "$": "auto_text_key", "code":  1098, "label": "ъ" },
+    { "$": "auto_text_key", "code":  1093, "label": "х" },
+    { "$": "auto_text_key", "code":  1101, "label": "э" }
+  ],
+  [
+    { "$": "auto_text_key", "code":  1081, "label": "й" },
+    { "$": "auto_text_key", "code":  1094, "label": "ц" },
+    { "$": "auto_text_key", "code":  1091, "label": "у" },
+    { "$": "auto_text_key", "code":  1082, "label": "к" },
+    { "$": "auto_text_key", "code":  1077, "label": "е" },
+    { "$": "auto_text_key", "code":  1085, "label": "н" },
+    { "$": "auto_text_key", "code":  1075, "label": "г" },
+    { "$": "auto_text_key", "code":  1096, "label": "ш" },
+    { "$": "auto_text_key", "code":  1097, "label": "щ" },
+    { "$": "auto_text_key", "code":  1079, "label": "з" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
+    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
+    { "$": "auto_text_key", "code": 1074 , "label": "в" },
+    { "$": "auto_text_key", "code": 1072 , "label": "а" },
+    { "$": "auto_text_key", "code": 1087 , "label": "п" },
+    { "$": "auto_text_key", "code": 1088 , "label": "р" },
+    { "$": "auto_text_key", "code": 1086 , "label": "о" },
+    { "$": "auto_text_key", "code": 1083 , "label": "л" },
+    { "$": "auto_text_key", "code": 1076 , "label": "д" },
+    { "$": "auto_text_key", "code": 1078 , "label": "ж" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1103 , "label": "я" },
+    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
+    { "$": "auto_text_key", "code": 1089 , "label": "с" },
+    { "$": "auto_text_key", "code": 1084 , "label": "м" },
+    { "$": "auto_text_key", "code": 1080 , "label": "и" },
+    { "$": "auto_text_key", "code": 1090 , "label": "т" },
+    { "$": "auto_text_key", "code": 1073 , "label": "б" },
+    { "$": "auto_text_key", "code": 1102 , "label": "ю" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/diktor.json

@@ -0,0 +1,16 @@
+[
+  [
+    { "code":  -11, "label": "shift", "type": "modifier" },
+    { "code":    0, "type": "placeholder" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -202, "label": "view_symbols", "type": "system_gui" },
+    { "$": "auto_text_key", "code":  1092, "label": "ф", "groupId": 1 },
+    { "code": -227, "label": "language_switch", "type": "system_gui" },
+    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
+    { "code":   32, "label": "space" },
+    { "$": "auto_text_key", "code":  1078, "label": "ж", "groupId": 2 },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/dvorak_de.json

@@ -0,0 +1,16 @@
+[
+  [
+    { "code":  -11, "label": "shift", "type": "modifier" },
+    { "code":    0, "type": "placeholder" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -202, "label": "view_symbols", "type": "system_gui" },
+    { "$": "auto_text_key", "code":  228, "label": "ä", "groupId": 1 },
+    { "code": -227, "label": "language_switch", "type": "system_gui" },
+    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
+    { "code":   32, "label": "space" },
+    { "$": "auto_text_key", "code":  246, "label": "ö", "groupId": 2 },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/persian.json

@@ -14,7 +14,6 @@
     { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
     { "code":   32, "label": "space" },
     { "code": 8204, "label": "half_space" },
-    { "code": 1600, "label": "kashida" },
     { "code":   46, "label": ".", "groupId": 2 },
     { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/extension/clipboard_cursor_row.json

@@ -1,12 +0,0 @@
-[
-  [
-    { "code":  -35, "label": "clipboard_select_all", "type": "enter_editing" },
-    { "code":  -31, "label": "clipboard_copy", "type": "enter_editing" },
-    { "code":  -32, "label": "clipboard_cut", "type": "enter_editing" },
-    { "code":  -21, "label": "arrow_left", "type": "navigation" },
-    { "code":  -22, "label": "arrow_right", "type": "navigation" },
-    { "code":  -33, "label": "clipboard_paste", "type": "enter_editing" },
-    { "code":  -38, "label": "clipboard_clear_primary_clip", "type":  "system_gui"},
-    { "code": -213, "label": "ime_ui_mode_clipboard", "type":  "system_gui"}
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericAdvanced/bengali.json

@@ -0,0 +1,48 @@
+[
+  [
+    { "code":   43, "label": "+", "popup": {
+      "relevant": [
+        { "code":   45, "label": "-" },
+        { "code":   215, "label": "×" },
+        { "code":   247, "label": "÷" }
+      ]
+    } },
+    { "code":   2535, "label": "১", "type": "numeric" },
+    { "code":   2536, "label": "২", "type": "numeric" },
+    { "code":   2537, "label": "৩", "type": "numeric" },
+    { "code":   37, "label": "%" }
+  ],
+  [
+    { "code":   40, "label": "(", "popup": {
+      "relevant": [
+        { "code":   91, "label": "[" },
+        { "code":  123, "label": "{" }
+      ]
+    } },
+    { "code":   2538, "label": "৪", "type": "numeric" },
+    { "code":   2539, "label": "৫", "type": "numeric" },
+    { "code":   2540, "label": "৬", "type": "numeric" },
+    { "code":   32, "label": "space" }
+  ],
+  [
+    { "code":   41, "label": ")", "popup": {
+      "relevant": [
+        { "code":   93, "label": "]" },
+        { "code":  125, "label": "}" }
+      ]
+    } },
+    { "code":   2541, "label": "৭", "type": "numeric" },
+    { "code":   2542, "label": "৮", "type": "numeric" },
+    { "code":   2543, "label": "৯", "type": "numeric" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -201, "label": "view_characters", "type": "system_gui" },
+    { "code":   44, "label": "," },
+    { "code": -202, "label": "view_symbols", "type": "system_gui" },
+    { "code":   2534, "label": "০", "type": "numeric" },
+    { "code":   61, "label": "=" },
+    { "code":   46, "label": "." },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/thai.json

@@ -54,7 +54,7 @@
     { "code":  3672, "label": "๘", "type": "numeric", "popup": {
       "main": { "code": 8312, "label": "⁸" }
     } },
-    { "code":  3672, "label": "๘", "type": "numeric", "popup": {
+    { "code":  3673, "label": "๙", "type": "numeric", "popup": {
       "main": { "code": 8313, "label": "⁹" }
     } },
     { "code":  3664, "label": "๐", "type": "numeric", "popup": {

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/western_arabic.json

@@ -1,68 +1,200 @@
 [
   [
-    { "code":   49, "label": "1", "type": "numeric", "popup": {
-      "main": { "code":  185, "label": "¹" },
-      "relevant": [
-        { "code": 8537, "label": "⅙" },
-        { "code": 8528, "label": "⅐" },
-        { "code": 8539, "label": "⅛" },
-        { "code": 8529, "label": "⅑" },
-        { "code": 8530, "label": "⅒" },
-        { "code":  189, "label": "½" },
-        { "code": 8531, "label": "⅓" },
-        { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" }
-      ]
-    } },
-    { "code":   50, "label": "2", "type": "numeric", "popup": {
-      "main": { "code":  178, "label": "²" },
-      "relevant": [
-        { "code": 8532, "label": "⅔" },
-        { "code": 8534, "label": "⅖" }
-      ]
-    } },
-    { "code":   51, "label": "3", "type": "numeric", "popup": {
-      "main": { "code":  179, "label": "³" },
-      "relevant": [
-        { "code": 8535, "label": "⅗" },
-        { "code":  190, "label": "¾" },
-        { "code": 8540, "label": "⅜" }
-      ]
-    } },
-    { "code":   52, "label": "4", "type": "numeric", "popup": {
-      "main": { "code": 8308, "label": "⁴" },
-      "relevant": [
-        { "code": 8536, "label": "⅘" }
-      ]
-    } },
-    { "code":   53, "label": "5", "type": "numeric", "popup": {
-      "main": { "code": 8309, "label": "⁵" },
-      "relevant": [
-        { "code": 8538, "label": "⅚" },
-        { "code": 8541, "label": "⅝" }
-      ]
-    } },
-    { "code":   54, "label": "6", "type": "numeric", "popup": {
-      "main": { "code": 8310, "label": "⁶" }
-    } },
-    { "code":   55, "label": "7", "type": "numeric", "popup": {
-      "main": { "code": 8311, "label": "⁷" },
-      "relevant": [
-        { "code": 8542, "label": "⅞" }
-      ]
-    } },
-    { "code":   56, "label": "8", "type": "numeric", "popup": {
-      "main": { "code": 8312, "label": "⁸" }
-    } },
-    { "code":   57, "label": "9", "type": "numeric", "popup": {
-      "main": { "code": 8313, "label": "⁹" }
-    } },
-    { "code":   48, "label": "0", "type": "numeric", "popup": {
-      "main": { "code": 8304, "label": "⁰" },
-      "relevant": [
-        { "code": 8709, "label": "∅" },
-        { "code": 8319, "label": "ⁿ" }
-      ]
-    } }
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": 33, "label": "!", "type": "numeric", "popup": {
+          "main": { "code": 161, "label": "¡" }
+        }
+      },
+      "default": {
+        "code": 49, "label": "1", "type": "numeric", "popup": {
+          "main": { "code": 185, "label": "¹" },
+          "relevant": [
+            { "code": 8537, "label": "⅙" },
+            { "code": 8528, "label": "⅐" },
+            { "code": 8539, "label": "⅛" },
+            { "code": 8529, "label": "⅑" },
+            { "code": 8530, "label": "⅒" },
+            { "code":  189, "label": "½" },
+            { "code": 8531, "label": "⅓" },
+            { "code":  188, "label": "¼" },
+            { "code": 8533, "label": "⅕" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code": 64, "label": "@", "type": "numeric" },
+      "default": {
+        "code": 50, "label": "2", "type": "numeric", "popup": {
+          "main": { "code": 178, "label": "²" },
+          "relevant": [
+            { "code": 8532, "label": "⅔" },
+            { "code": 8534, "label": "⅖" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": 35, "label": "#", "type": "numeric", "popup": {
+          "main": { "code": 8470, "label": "№" }
+        }
+      },
+      "default": {
+        "code": 51, "label": "3", "type": "numeric", "popup": {
+          "main": { "code": 179, "label": "³" },
+          "relevant": [
+            { "code": 8535, "label": "⅗" },
+            { "code":  190, "label": "¾" },
+            { "code": 8540, "label": "⅜" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": -801, "label": "currency_slot_1", "type": "numeric", "popup": {
+          "main": { "code": -802, "label": "currency_slot_2" },
+          "relevant": [
+            { "code": -806, "label": "currency_slot_6" },
+            { "code": -803, "label": "currency_slot_3" },
+            { "code": -804, "label": "currency_slot_4" },
+            { "code": -805, "label": "currency_slot_5" }
+          ]
+        }
+      },
+      "default": {
+        "code": 52, "label": "4", "type": "numeric", "popup": {
+          "main": { "code": 8308, "label": "⁴" },
+          "relevant": [
+            { "code": 8536, "label": "⅘" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": 37, "label": "%", "type": "numeric", "popup": {
+          "main": { "code": 8240, "label": "‰" },
+          "relevant": [
+            { "code": 8453, "label": "℅" }
+          ]
+        }
+      },
+      "default": {
+        "code": 53, "label": "5", "type": "numeric", "popup": {
+          "main": { "code": 8309, "label": "⁵" },
+          "relevant": [
+            { "code": 8538, "label": "⅚" },
+            { "code": 8541, "label": "⅝" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": 94, "label": "^", "type": "numeric", "popup": {
+          "main": { "code": 8593, "label": "↑" },
+          "relevant": [
+            { "code": 8592, "label": "←" },
+            { "code": 8595, "label": "↓" },
+            { "code": 8594, "label": "→" }
+          ]
+        }
+      },
+      "default": {
+        "code": 54, "label": "6", "type": "numeric", "popup": {
+          "main": { "code": 8310, "label": "⁶" }
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code": 38, "label": "&", "type": "numeric" },
+      "default": {
+        "code": 55, "label": "7", "type": "numeric", "popup": {
+          "main": { "code": 8311, "label": "⁷" },
+          "relevant": [
+            { "code": 8542, "label": "⅞" }
+          ]
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "code": 42, "label": "*", "type": "numeric", "popup": {
+          "main": { "code": 8224, "label": "†" },
+          "relevant": [
+            { "code": 9733, "label": "★" },
+            { "code": 8225, "label": "‡" }
+          ]
+        }
+      },
+      "default": {
+        "code": 56, "label": "8", "type": "numeric", "popup": {
+          "main": { "code": 8312, "label": "⁸" }
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "$": "layout_direction_selector",
+        "ltr": {
+          "code": 40, "label": "(", "type": "numeric", "popup": {
+            "main": { "code": 60, "label": "<" },
+            "relevant": [
+              { "code":  91, "label": "[" },
+              { "code": 123, "label": "{" }
+            ]
+          }
+        },
+        "rtl": {
+          "code": 41, "label": "(", "type": "numeric", "popup": {
+            "main": { "code": 62, "label": "<" },
+            "relevant": [
+              { "code":  93, "label": "[" },
+              { "code": 125, "label": "{" }
+            ]
+          }
+        }
+      },
+      "default": {
+        "code":   57, "label": "9", "type": "numeric", "popup": {
+          "main": { "code": 8313, "label": "⁹" }
+        }
+      }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": {
+        "$": "layout_direction_selector",
+        "ltr": {
+          "code":   41, "label": ")", "type": "numeric", "popup": {
+            "main": { "code":   62, "label": ">" },
+            "relevant": [
+              { "code":   93, "label": "]" },
+              { "code":  125, "label": "}" }
+            ]
+          }
+        },
+        "rtl": {
+          "code":   40, "label": ")", "type": "numeric", "popup": {
+            "main": { "code":   60, "label": ">" },
+            "relevant": [
+              { "code":   91, "label": "]" },
+              { "code":  123, "label": "}" }
+            ]
+          }
+        }
+      },
+      "default": {
+        "code": 48, "label": "0", "type": "numeric", "popup": {
+          "main": { "code": 8304, "label": "⁰" },
+          "relevant": [
+            { "code": 8709, "label": "∅" },
+            { "code": 8319, "label": "ⁿ" }
+          ]
+        }
+      }
+    }
   ]
 ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/cjk.json

@@ -8,15 +8,13 @@
       },
       "half": { "code": 64, "label": "@" }
     },
-    { "code": 12306, "label": "〒", "popup": {
-        "main": { "code": 12320, "label": "〠" }
-      }
-    },
     {
       "$": "char_width_selector",
       "full": { "code": 65283, "label": "＃", "popup": {
           "main": { "code": 35, "label": "#" },
           "relevant": [
+            { "code": 12306, "label": "〒"},
+            { "code": 12320, "label": "〠" },
             { "code": 8470, "label": "№" }
           ]
         }
@@ -24,6 +22,8 @@
       "half": { "code": 35, "label": "#", "popup": {
           "main": { "code": 65283, "label": "＃" },
           "relevant": [
+            { "code": 12306, "label": "〒"},
+            { "code": 12320, "label": "〠" },
             { "code": 8470, "label": "№" }
           ]
         }
@@ -99,14 +99,18 @@
       "full": { "code": 65291, "label": "＋", "popup": {
           "main": { "code": 43, "label": "+" },
           "relevant": [
-            { "code": 177, "label": "±" }
+            { "code":   177, "label": "±" },
+            { "code":    61, "label": "=" },
+            { "code": 65309, "label": "＝" }
           ]
         }
       },
       "half": { "code": 43, "label": "+", "popup": {
           "main": { "code": 65291, "label": "＋" },
           "relevant": [
-            { "code": 177, "label": "±" }
+            { "code":   177, "label": "±" },
+            { "code":    61, "label": "=" },
+            { "code": 65309, "label": "＝" }
           ]
         }
       }
@@ -117,16 +121,20 @@
           "main": { "code": 12302, "label": "『" },
           "relevant": [
             { "code": 12304, "label": "【" },
-            { "code": 12310, "label": "〖" }
+            { "code": 12310, "label": "〖" },
+            { "code": 65288, "label": "（" },
+            { "code": 65339, "label": "［" }
           ]
         }
       },
       "half": { "code": 65378, "label": "｢", "popup": {
-          "main": { "code": 12301, "label": "」" },
+          "main": { "code": 12300, "label": "「" },
           "relevant": [
-            { "code": 12303, "label": "』" },
+            { "code": 12302, "label": "『" },
             { "code": 12304, "label": "【" },
-            { "code": 12310, "label": "〖" }
+            { "code": 12310, "label": "〖" },
+            { "code":    40, "label": "(" },
+            { "code":    91, "label": "[" }
           ]
         }
       }
@@ -137,7 +145,9 @@
           "main": { "code": 12303, "label": "』" },
           "relevant": [
             { "code": 12305, "label": "】" },
-            { "code": 12311, "label": "〗" }
+            { "code": 12311, "label": "〗" },
+            { "code": 65289, "label": "）" },
+            { "code": 65341, "label": "］" }
           ]
         }
       },
@@ -146,7 +156,9 @@
           "relevant": [
             { "code": 12303, "label": "』" },
             { "code": 12305, "label": "】" },
-            { "code": 12311, "label": "〗" }
+            { "code": 12311, "label": "〗" },
+            { "code":    41, "label": ")" },
+            { "code":    93, "label": "]" }
           ]
         }
       }

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/western_samsung.json

@@ -0,0 +1,85 @@
+[
+  [
+    { "code":   43, "label": "+", "popup": {
+      "main": { "code":  177, "label": "±" }
+    } },
+    { "code":  215, "label": "×" },
+    { "code":  247, "label": "÷" },
+    { "code":   61, "label": "=", "popup": {
+      "main": { "code": 8776, "label": "≈" },
+      "relevant": [
+        { "code": 8800, "label": "≠" },
+        { "code": 8801, "label": "≡" }
+      ]
+    } },
+    { "code":   47, "label": "/" },
+    { "code":   95, "label": "_" },
+    { "code":   60, "label": "<" },
+    { "code":   62, "label": ">" },
+    { "code":   91, "label": "[", "popup": {
+      "main": { "code": 12302, "label": "『" },
+      "relevant": [
+        { "code": 12300, "label": "「" },
+        { "code": 12308, "label": "〔" },
+        { "code": 12304, "label": "【" }
+      ]
+    } },
+    { "code":   93, "label": "]", "popup": {
+      "main": { "code": 12303, "label": "』" },
+      "relevant": [
+        { "code": 12301, "label": "」" },
+        { "code": 12309, "label": "〕" },
+        { "code": 12305, "label": "】" }
+      ]
+    } }
+  ],
+  [
+    { "code":   33, "label": "!", "popup": {
+      "main": { "code":  161, "label": "¡" }
+    } },
+    { "code":   64, "label": "@" },
+    { "code":   35, "label": "#", "popup": {
+      "main": { "code": 8470, "label": "№" }
+    } },
+    { "code": -801, "label": "currency_slot_1", "popup": {
+      "main": { "code": -802, "label": "currency_slot_2" },
+      "relevant": [
+        { "code": -806, "label": "currency_slot_6" },
+        { "code": -803, "label": "currency_slot_3" },
+        { "code": -804, "label": "currency_slot_4" },
+        { "code": -805, "label": "currency_slot_5" }
+      ]
+    } },
+    { "code":   37, "label": "%", "popup": {
+      "main": { "code": 1642, "label": "٪" },
+      "relevant": [
+        { "code": 8240, "label": "‰" }
+      ]
+    } },
+    { "code":   94, "label": "^" },
+    { "code":   38, "label": "&" },
+    { "code":   42, "label": "*" },
+    { "code":   40, "label": "(" },
+    { "code":   41, "label": ")" }
+  ],
+  [
+    { "code":   45, "label": "-", "popup": {
+      "main": { "code": 8208, "label": "‐" },
+      "relevant": [
+        { "code": 8211, "label": "–" },
+        { "code": 8212, "label": "—" }
+      ]
+    } },
+    { "code":   39, "label": "'" },
+    { "code":   34, "label": "\"" },
+    { "code":   58, "label": ":" },
+    { "code":   59, "label": ";" },
+    { "code":   44, "label": "," },
+    { "code":   63, "label": "?", "popup": {
+      "main": { "code":  191, "label": "¿" },
+      "relevant": [
+        { "code": 8253, "label": "‽" }
+      ]
+    } }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols2/cjk.json

@@ -54,7 +54,9 @@
           ]
         } }
     },
-    { "code": 8730, "label": "√" },
+    { "code": 8730, "label": "√", "popup": {
+      "main": { "code": 10003, "label": "✓" }
+    } },
     { "code":  960, "label": "π", "popup": {
       "main": { "code":  928, "label": "Π" },
       "relevant": [
@@ -104,7 +106,7 @@
         { "code":   61, "label": "=", "popup": {
           "main": { "code": 8800, "label": "≠" },
           "relevant": [
-            { "code":   61, "label": "=" },
+            { "code": 65309, "label": "＝" },
             { "code": 8734, "label": "∞" },
             { "code": 8776, "label": "≈" }
           ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols2/western_samsung.json

@@ -0,0 +1,45 @@
+[
+  [
+    { "code":   96, "label": "`" },
+    { "code":  126, "label": "~" },
+    { "code":   92, "label": "\\" },
+    { "code":  124, "label": "|" },
+    { "code":  123, "label": "{" },
+    { "code":  125, "label": "}" },
+    { "code": -802, "label": "currency_slot_2" },
+    { "code": -804, "label": "currency_slot_4" },
+    { "code": -805, "label": "currency_slot_5" },
+    { "code": -806, "label": "currency_slot_6" }
+  ],
+  [
+    { "code":  176, "label": "°" },
+    { "code": 8226, "label": "•" },
+    { "code": 9675, "label": "○" },
+    { "code": 9679, "label": "●" },
+    { "code": 9633, "label": "□" },
+    { "code": 9632, "label": "■" },
+    { "code": 9828, "label": "♤", "popup": {
+      "main": { "code": 9824, "label": "♠️" }
+    } },
+    { "code": 9825, "label": "♡", "popup": {
+      "main": { "code": 9829, "label": "♥️" }
+    } },
+    { "code": 9671, "label": "◇", "popup": {
+      "main": { "code": 9670, "label": "◆" }
+    } },
+    { "code": 9831, "label": "♧", "popup": {
+      "main": { "code": 9827, "label": "♣️" }
+    } }
+  ],
+  [
+    { "code": 9734, "label": "☆", "popup": {
+      "main": { "code":  9733, "label": "★" }
+    } },
+    { "code": 9642, "label": "▪️" },
+    { "code":  164, "label": "¤" },
+    { "code":12298, "label": "《" },
+    { "code":12299, "label": "》" },
+    { "code":  161, "label": "¡" },
+    { "code":  191, "label": "¿" }
+  ]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols2Mod/cjk.json

@@ -6,15 +6,28 @@
   ],
   [
     { "code": -201, "label": "view_characters", "type": "system_gui" },
-    { "code": 12296, "label": "〈", "popup": {
-      "main": { "code": 12298, "label": "《" },
-      "relevant": [
-        { "code":  8804, "label": "≤" },
-        { "code":  8249, "label": "‹" },
-        { "code": 10216, "label": "⟨" },
-        { "code": 65308, "label": "＜" }
-      ]
-    } },
+    { "$": "char_width_selector",
+      "full": { "code": 12296, "label": "〈", "popup": {
+        "main": { "code": 12298, "label": "《" },
+        "relevant": [
+          { "code":    60, "label": "<" },
+          { "code":  8804, "label": "≤" },
+          { "code":  8249, "label": "‹" },
+          { "code": 10216, "label": "⟨" },
+          { "code": 65308, "label": "＜" }
+        ]
+      } },
+      "half": { "code":    60, "label": "<", "popup": {
+        "main": { "code": 12298, "label": "《" },
+        "relevant": [
+          { "code": 12296, "label": "〈" },
+          { "code":  8804, "label": "≤" },
+          { "code":  8249, "label": "‹" },
+          { "code": 10216, "label": "⟨" },
+          { "code": 65308, "label": "＜" }
+        ]
+      } }
+    },
     { "code": -205, "label": "view_numeric_advanced", "type": "system_gui" },
     { "code": 12288, "label": "空白" },
     { "code": -9701, "label": "char_width_switcher", "type": "system_gui", "popup": {
@@ -24,15 +37,28 @@
         ]
       }
     },
-    { "code": 12297, "label": "〉", "popup": {
-      "main": { "code": 12299, "label": "》" },
-      "relevant": [
-        { "code":    62, "label": ">" },
-        { "code":  8805, "label": "≥" },
-        { "code": 10217, "label": "⟩" },
-        { "code": 65310, "label": "＞" }
-      ]
-    } },
+    { "$": "char_width_selector",
+      "full": { "code": 12297, "label": "〉", "popup": {
+        "main": { "code": 12299, "label": "》" },
+        "relevant": [
+          { "code":    62, "label": ">" },
+          { "code":  8805, "label": "≥" },
+          { "code":  8250, "label": "›" },
+          { "code": 10217, "label": "⟩" },
+          { "code": 65310, "label": "＞" }
+        ]
+      } },
+      "half": { "code":    62, "label": ">", "popup": {
+        "main": { "code": 12299, "label": "》" },
+        "relevant": [
+          { "code": 12297, "label": "〉" },
+          { "code":  8805, "label": "≥" },
+          { "code":  8250, "label": "›" },
+          { "code": 10217, "label": "⟩" },
+          { "code": 65310, "label": "＞" }
+        ]
+      } }
+    },
     { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
   ]
 ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbolsMod/cjk.json

@@ -8,11 +8,17 @@
     { "code": -201, "label": "view_characters", "type": "system_gui" },
     { "$": "char_width_selector",
       "full": { "code": 12289, "label": "、", "popup": {
-          "main": { "code":   44, "label": "," }
+          "main": { "code":   65292, "label": "，" },
+          "relevant": [
+            { "code":   44, "label": "," }
+          ]
         }
       },
       "half": { "code": 65380, "label": "､", "popup": {
-          "main": { "code":   44, "label": "," }
+          "main": { "code":   44, "label": "," },
+          "relevant": [
+            { "code":   65292, "label": "，" }
+          ]
         }
       }
     },

app/src/main/assets/ime/keyboard/org.florisboard.localization/extension.json

@@ -17,15 +17,21 @@
     {
       "id": "default",
       "label": "Default",
-      "symbolsPrecedingSpace": ".*[.,;:!?‽&%)\\]}»©®™\\p{L}0-9]",
-      "symbolsFollowingSpace": "[\\p{L}0-9].*"
+      "symbolsPrecedingAutoSpace": ".,?‽!\"&%)]}»",
+      "symbolsFollowingAutoSpace": "",
+      "symbolsPrecedingPhantomSpace": ".,;:?‽!&%)]}»©®™",
+      "symbolsFollowingPhantomSpace": "¿⸘¡([{",
+      "symbolsTerminatingSentence": ".?‽!"
     }
   ],
   "popupMappings": [
     { "id": "default", "authors": [ "patrickgold" ] },
     { "id": "ar", "authors": [ "HeiWiper" ] },
+    { "id": "ast", "authors": [ "Softastur" ] },
     { "id": "bg", "authors": [ "iorvethe" ] },
+    { "id": "bn-BD", "authors": [ "iamrasel" ] },
     { "id": "ca", "authors": [ "mikelloc" ] },
+    { "id": "cjk", "authors": [ "moonbeamcelery" ] },
     { "id": "ckb", "authors": [ "GoRaN" ] },
     { "id": "cs", "authors": [ "stefan-misik" ] },
     { "id": "da", "authors": [ "patrickgold" ] },
@@ -35,6 +41,7 @@
     { "id": "en", "authors": [ "patrickgold" ] },
     { "id": "eo", "authors": [ "jeremiah-miller" ] },
     { "id": "es", "authors": [ "patrickgold" ] },
+    { "id": "et", "authors": [ "OneSheepy" ] },
     { "id": "fa", "authors": [ "PHELAT" ] },
     { "id": "fa2", "authors": [ "M-Koushan" ] },
     { "id": "fa3", "authors": [ "SaeID-Rz" ] },
@@ -49,6 +56,7 @@
     { "id": "it", "authors": [ "patrickgold" ] },
     { "id": "iw", "authors": [ "Antony" ] },
     { "id": "ja-JP-jis", "authors": [ "waelwindows" ] },
+    { "id": "kab", "authors": [ "yanis867" ] },
     { "id": "ko", "authors": [ "patrickgold", "Hayleia" ] },
     { "id": "ku", "authors": [ "GoRaN" ] },
     { "id": "lt", "authors": [ "patrickgold" ] },
@@ -65,6 +73,7 @@
     { "id": "sr", "authors": [ "hedidnothingwrong", "GrbavaCigla" ] },
     { "id": "sv", "authors": [ "patrickgold" ] },
     { "id": "tr", "authors": [ "kisekinopureya", "patrickgold", "dvrnynr" ] },
+    { "id": "udm", "authors": [ "vorgoron" ] },
     { "id": "uk", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
     { "id": "uk-cyr-ext", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
     { "id": "ur-PK", "authors": [ "mubashir-rehman", "mirfatif" ] },
@@ -513,6 +522,15 @@
         "characters": "org.florisboard.layouts:serbian_cyrillic"
       }
     },
+    {
+      "languageTag": "sl-SI",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:euro",
+      "popupMapping": "org.florisboard.localization:sl-SI",
+      "preferred": {
+        "characters": "org.florisboard.layouts:slovenian"
+      }
+    },
     {
       "languageTag": "lv-LV",
       "composer": "org.florisboard.composers:appender",
@@ -633,6 +651,15 @@
         "numericRow": "org.florisboard.layouts:warang_citi"
       }
     },
+    {
+      "languageTag": "udm",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:russian_ruble",
+      "popupMapping": "org.florisboard.localization:udm",
+      "preferred": {
+        "characters": "org.florisboard.layouts:udmurt_extended"
+      }
+    },
     {
       "languageTag": "ur-PK",
       "composer": "org.florisboard.composers:appender",
@@ -641,6 +668,58 @@
       "preferred": {
         "characters": "org.florisboard.layouts:urdu_phonetic"
       }
+    },
+    {
+      "languageTag": "zh-CN-zhengma",
+      "composer": "org.florisboard.composers:appender",
+      "nlpProviders": {
+        "spelling": "org.florisboard.nlp.providers.han.shape",
+        "suggestion": "org.florisboard.nlp.providers.han.shape"
+      },
+      "currencySet": "org.florisboard.currencysets:yen",
+      "popupMapping": "org.florisboard.localization:cjk",
+      "preferred": {
+        "characters": "org.florisboard.layouts:qwerty",
+        "symbols": "org.florisboard.layouts:cjk",
+        "symbols2": "org.florisboard.layouts:cjk"
+      }
+    },
+	  {
+      "languageTag": "bn-BD",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:bangladeshi_taka",
+      "popupMapping": "org.florisboard.localization:bn-BD",
+      "preferred": {
+        "characters": "org.florisboard.layouts:bengali_bd",
+        "numericRow": "org.florisboard.layouts:bengali",
+        "numericAdvanced": "org.florisboard.layouts:bengali"
+      }
+    },
+    {
+      "languageTag": "ast",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:euro",
+      "popupMapping": "org.florisboard.localization:ast",
+      "preferred": {
+        "characters": "org.florisboard.layouts:qwerty"
+      }
+    },
+    {
+      "languageTag": "ta-lk",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:indian_rupee",
+      "preferred": {
+        "characters": "org.florisboard.layouts:tamil"
+      }
+    },
+    {
+      "languageTag": "kab",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:euro",
+      "popupMapping": "org.florisboard.localization:kab",
+      "preferred": {
+        "characters": "org.florisboard.layouts:qwerty"
+      }
     }
   ]
 }

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/ast.json

@@ -0,0 +1,115 @@
+{
+    "all": {
+      "a": {
+        "main": { "$": "auto_text_key", "code":  225, "label": "á" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  261, "label": "ą" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" }
+        ]
+      },
+      "c": {
+        "main": { "$": "auto_text_key", "code":  231, "label": "ç" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
+        ]
+      },
+      "e": {
+        "main": { "$": "auto_text_key", "code":  233, "label": "é" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  7497, "label": "ᵉ" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
+        ]
+      },
+      "h": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  7717, "label": "ḥ" }
+        ]
+      },
+      "i": {
+        "main": { "$": "auto_text_key", "code":  237, "label": "í" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
+        ]
+      },
+      "l": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  7735, "label": "ḷ" }
+        ]
+      },
+      "n": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
+        ]
+      },
+      "o": {
+        "main": { "$": "auto_text_key", "code":  243, "label": "ó" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" }
+        ]
+      },
+      "r": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  691, "label": "ʳ" }
+        ]
+      },
+      "s": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  223, "label": "ß" }
+        ]
+      },
+      "u": {
+        "main": { "$": "auto_text_key", "code":  250, "label": "ú" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  7512, "label": "ᵘ" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
+        ]
+      },
+      "~right": {
+        "main": { "code":   58, "label": ":" },
+        "relevant": [
+          { "code":   59, "label": ";" },
+          { "code":   8230, "label": "…" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".es" },
+          { "code": -255, "label": ".com.es" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+  

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/bn-BD.json

@@ -0,0 +1,153 @@
+{
+  "all": {
+    "ঙ": {
+      "main": { "$": "auto_text_key", "code":  2434, "label": "ং" }
+    },
+    "য": {
+      "main": { "$": "auto_text_key", "code":  2527, "label": "য়" }
+    },
+    "ড": {
+      "main": { "$": "auto_text_key", "code":  2466, "label": "ঢ" }
+    },
+    "প": {
+      "main": { "$": "auto_text_key", "code":  2475, "label": "ফ" }
+    },
+    "ট": {
+      "main": { "$": "auto_text_key", "code":  2464, "label": "ঠ" }
+    },
+    "চ": {
+      "main": { "$": "auto_text_key", "code":  2459, "label": "ছ" }
+    },
+    "জ": {
+      "main": { "$": "auto_text_key", "code":  2461, "label": "ঝ" }
+    },
+    "হ": {
+      "main": { "$": "auto_text_key", "code":  2462, "label": "ঞ" }
+    },
+    "গ": {
+      "main": { "$": "auto_text_key", "code":  2456, "label": "ঘ" }
+    },
+    "ড়": {
+      "main": { "$": "auto_text_key", "code":  2525, "label": "ঢ়" }
+    },
+    "ৃ": {
+      "main": { "$": "auto_text_key", "code":  2443, "label": "ঋ" }
+    },
+    "ু": {
+      "main": { "$": "auto_text_key", "code":  2441, "label": "উ" }
+    },
+    "ি": {
+      "main": { "$": "auto_text_key", "code":  2439, "label": "ই" }
+    },
+    "া": {
+      "main": { "$": "auto_text_key", "code":  2438, "label": "আ" },
+      "relevant": [
+        { "$": "auto_text_key", "code":  2437, "label": "অ" }
+      ]
+    },
+    "্": {
+      "main": { "$": "auto_text_key", "code":  2433, "label": "ঁ" }
+    },
+    "ব": {
+      "main": { "$": "auto_text_key", "code":  2477, "label": "ভ" }
+    },
+    "ক": {
+      "main": { "$": "auto_text_key", "code":  2454, "label": "খ" }
+    },
+    "ত": {
+      "main": { "$": "auto_text_key", "code":  2469, "label": "থ" },
+      "relevant": [
+        { "$": "auto_text_key", "code":  2510, "label": "ৎ" }
+      ]
+    },
+    "দ": {
+      "main": { "$": "auto_text_key", "code":  2471, "label": "ধ" }
+    },
+    "ো": {
+      "main": { "$": "auto_text_key", "code":  2451, "label": "ও" }
+    },
+    "ে": {
+      "main": { "$": "auto_text_key", "code":  2447, "label": "এ" }
+    },
+    "র": {
+      "main": { "$": "auto_text_key", "code":  2482, "label": "ল" },
+      "relevant": [
+        { "code": -255, "label": "র‌্য" }
+      ]
+    },
+    "ন": {
+      "main": { "$": "auto_text_key", "code":  2467, "label": "ণ" }
+    },
+    "স": {
+      "main": { "$": "auto_text_key", "code":  2487, "label": "ষ" }
+    },
+    "ম": {
+      "main": { "$": "auto_text_key", "code":  2486, "label": "শ" }
+    },
+    "ূ": {
+      "main": { "$": "auto_text_key", "code":  2442, "label": "ঊ" }
+    },
+    "ী": {
+      "main": { "$": "auto_text_key", "code":  2440, "label": "ঈ" }
+    },
+    "ঁ": {
+      "main": { "$": "auto_text_key", "code":  2492, "label": "়" },
+      "relevant": [
+        { "$": "auto_text_key", "code":  2500, "label": "ৄ" },
+        { "$": "auto_text_key", "code":  2530, "label": "ৢ" },
+        { "$": "auto_text_key", "code":  2531, "label": "ৣ" },
+        { "$": "auto_text_key", "code":  2528, "label": "ৠ" },
+        { "$": "auto_text_key", "code":  2444, "label": "ঌ" },
+        { "$": "auto_text_key", "code":  2529, "label": "ৡ" },
+        { "$": "auto_text_key", "code":  2544, "label": "ৰ" },
+        { "$": "auto_text_key", "code":  2545, "label": "ৱ" },
+        { "$": "auto_text_key", "code":  2493, "label": "ঽ" },
+        { "$": "auto_text_key", "code":  2554, "label": "৺" },
+        { "$": "auto_text_key", "code":  2519, "label": "ৗ" }
+      ]
+    },
+    "ৌ": {
+      "main": { "$": "auto_text_key", "code":  2452, "label": "ঔ" }
+    },
+    "ৈ": {
+      "main": { "$": "auto_text_key", "code":  2448, "label": "ঐ" }
+    },
+    "~right": {
+      "main": { "code":   2404, "label": "।" },
+      "relevant": [
+      	{ "code":   37, "label": "%" },
+      	{ "code":   43, "label": "+" },
+      	{ "code":   45, "label": "-" },
+      	{ "code":   58, "label": ":" },
+      	{ "code":   59, "label": ";" },
+      	{ "code":   47, "label": "/" },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
+        },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
+        },
+        { "code":   64, "label": "@" },
+        { "code":   35, "label": "#" },
+        { "code":   8205, "label": ">⁞<" },
+        { "code":   8204, "label": "<⁞>" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" },
+        { "code":   2405, "label": "॥" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".com" },
+      "relevant": [
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".com.bd" },
+        { "code": -255, "label": ".bd" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/cjk.json

@@ -0,0 +1,117 @@
+{
+  "all": {
+    "a": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  257, "label": "ā" },
+        { "$": "auto_text_key", "code":  225, "label": "á" },
+        { "$": "auto_text_key", "code":  462, "label": "ǎ" },
+        { "$": "auto_text_key", "code":  224, "label": "à" },
+        { "$": "auto_text_key", "code":  230, "label": "æ" },
+        { "$": "auto_text_key", "code":  227, "label": "ã" },
+        { "$": "auto_text_key", "code":  229, "label": "å" },
+        { "$": "auto_text_key", "code":  226, "label": "â" },
+        { "$": "auto_text_key", "code":  228, "label": "ä" }
+      ]
+    },
+    "c": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  231, "label": "ç" }
+      ]
+    },
+    "e": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  275, "label": "ē" },
+        { "$": "auto_text_key", "code":  233, "label": "é" },
+        { "$": "auto_text_key", "code":  283, "label": "ě" },
+        { "$": "auto_text_key", "code":  232, "label": "è" },
+        { "$": "auto_text_key", "code":  234, "label": "ê" },
+        { "$": "auto_text_key", "code":  235, "label": "ë" }
+      ]
+    },
+    "i": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  299, "label": "ī" },
+        { "$": "auto_text_key", "code":  237, "label": "í" },
+        { "$": "auto_text_key", "code":  464, "label": "ǐ" },
+        { "$": "auto_text_key", "code":  236, "label": "ì" },
+        { "$": "auto_text_key", "code":  239, "label": "ï" },
+        { "$": "auto_text_key", "code":  238, "label": "î" }
+      ]
+    },
+    "n": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  241, "label": "ñ" },
+        { "$": "auto_text_key", "code":  324, "label": "ń" }
+      ]
+    },
+    "o": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  333, "label": "ō" },
+        { "$": "auto_text_key", "code":  243, "label": "ó" },
+        { "$": "auto_text_key", "code":  466, "label": "ǒ" },
+        { "$": "auto_text_key", "code":  242, "label": "ò" },
+        { "$": "auto_text_key", "code":  245, "label": "õ" },
+        { "$": "auto_text_key", "code":  339, "label": "œ" },
+        { "$": "auto_text_key", "code":  248, "label": "ø" },
+        { "$": "auto_text_key", "code":  246, "label": "ö" },
+        { "$": "auto_text_key", "code":  244, "label": "ô" }
+      ]
+    },
+    "s": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  223, "label": "ß" }
+      ]
+    },
+    "u": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  363, "label": "ū" },
+        { "$": "auto_text_key", "code":  250, "label": "ú" },
+        { "$": "auto_text_key", "code":  468, "label": "ǔ" },
+        { "$": "auto_text_key", "code":  249, "label": "ù" },
+        { "$": "auto_text_key", "code":  252, "label": "ü" },
+        { "$": "auto_text_key", "code":  470, "label": "ǖ" },
+        { "$": "auto_text_key", "code":  472, "label": "ǘ" },
+        { "$": "auto_text_key", "code":  474, "label": "ǚ" },
+        { "$": "auto_text_key", "code":  476, "label": "ǜ" },
+        { "$": "auto_text_key", "code":  251, "label": "û" }
+      ]
+    },
+    "~right": {
+      "main": { "code":   44, "label": "," },
+      "relevant": [
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   58, "label": ":" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "code":   59, "label": ";" },
+        { "code":   47, "label": "/" },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
+        },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
+        },
+        { "code":   35, "label": "#" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".com" },
+      "relevant": [
+        { "code": -255, "label": ".gov" },
+        { "code": -255, "label": ".edu" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/el.json

@@ -2,41 +2,74 @@
   "all": {
     "α": {
       "relevant": [
-        { "$": "auto_text_key", "code":  940, "label": "ά" }
+        { "$": "case_selector",
+          "lower": { "code":  940, "label": "ά" },
+          "upper": { "code":  902, "label": "Ά" }
+        }
       ]
     },
     "ε": {
       "relevant": [
-        { "$": "auto_text_key", "code":  941, "label": "έ" }
+        { "$": "case_selector",
+          "lower": { "code":  941, "label": "έ" },
+          "upper": { "code":  904, "label": "Έ" }
+        }
       ]
     },
     "η": {
       "relevant": [
-        { "$": "auto_text_key", "code":  942, "label": "ή" }
+        { "$": "case_selector",
+          "lower": { "code":  942, "label": "ή" },
+          "upper": { "code":  905, "label": "Ή" }
+        }
       ]
     },
     "ι": {
-      "main": { "$": "auto_text_key", "code":  943, "label": "ί" },
+      "main": { "$": "case_selector",
+        "lower": { "code":  943, "label": "ί" },
+        "upper": { "code":  906, "label": "Ί" }
+      },
       "relevant": [
-        { "$": "auto_text_key", "code":  912, "label": "ΐ" },
-        { "$": "auto_text_key", "code":  970, "label": "ϊ" }
+        { "$": "case_selector",
+          "lower": { "code":  912, "label": "ΐ" },
+          "upper": { "$": "multi_text_key", "codePoints":  [921, 776, 769], "label": "Ϊ́" }
+        },
+        { "$": "case_selector",
+          "lower": { "code":  970, "label": "ϊ" },
+          "upper": { "code":  938, "label": "Ϊ" }
+        }
       ]
     },
     "ο": {
       "relevant": [
-        { "$": "auto_text_key", "code":  972, "label": "ό" }
+        { "$": "case_selector",
+          "lower": { "code":  972, "label": "ό" },
+          "upper": { "code":  908, "label": "Ό" }
+        }
       ]
     },
     "υ": {
-      "main": { "$": "auto_text_key", "code":  973, "label": "ύ" },
+      "main": { "$": "case_selector",
+        "lower": { "code":  973, "label": "ύ" },
+        "upper": { "code":  910, "label": "Ύ" }
+      },
       "relevant": [
-        { "$": "auto_text_key", "code":  944, "label": "ΰ" },
-        { "$": "auto_text_key", "code":  971, "label": "ϋ" }
+        { "$": "case_selector",
+          "lower": { "code":  944, "label": "ΰ" },
+          "upper": { "$": "multi_text_key", "codePoints":  [933, 776, 769], "label": "Ϋ́" }
+        },
+        { "$": "case_selector",
+          "lower": { "code":  971, "label": "ϋ" },
+          "upper": { "code":  939, "label": "Ϋ" }
+        }
       ]
     },
     "ω": {
       "relevant": [
-        { "$": "auto_text_key", "code":  974, "label": "ώ" }
+        { "$": "case_selector",
+          "lower": { "code":  974, "label": "ώ" },
+          "upper": { "code":  911, "label": "Ώ" }
+        }
       ]
     },
     "~right": {

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/et.json

@@ -0,0 +1,120 @@
+{
+  "all": {
+    "a": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  228, "label": "ä" },
+        { "$": "auto_text_key", "code":  225, "label": "á" },
+        { "$": "auto_text_key", "code":  226, "label": "â" },
+        { "$": "auto_text_key", "code":  227, "label": "ã" },
+        { "$": "auto_text_key", "code":  257, "label": "ā" },
+        { "$": "auto_text_key", "code":  229, "label": "å" },
+        { "$": "auto_text_key", "code":  230, "label": "æ" },
+        { "$": "auto_text_key", "code":  224, "label": "à" }
+      ]
+    },
+    "e": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  233, "label": "é" },
+        { "$": "auto_text_key", "code":  275, "label": "ē" },
+        { "$": "auto_text_key", "code":  281, "label": "ę" },
+        { "$": "auto_text_key", "code":  279, "label": "ė" },
+        { "$": "auto_text_key", "code":  232, "label": "è" },
+        { "$": "auto_text_key", "code":  235, "label": "ë" },
+        { "$": "auto_text_key", "code":  234, "label": "ê" }
+      ]
+    },
+    "i": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  237, "label": "í" },
+        { "$": "auto_text_key", "code":  299, "label": "ī" },
+        { "$": "auto_text_key", "code":  236, "label": "ì" },
+        { "$": "auto_text_key", "code":  303, "label": "į" },
+        { "$": "auto_text_key", "code":  238, "label": "î" },
+        { "$": "auto_text_key", "code":  239, "label": "ï" }
+      ]
+    },
+    "o": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  246, "label": "ö" },
+        { "$": "auto_text_key", "code":  333, "label": "ō" },
+        { "$": "auto_text_key", "code":  339, "label": "œ" },
+        { "$": "auto_text_key", "code":  243, "label": "ó" },
+        { "$": "auto_text_key", "code":  245, "label": "õ" },
+        { "$": "auto_text_key", "code":  242, "label": "ò" },
+        { "$": "auto_text_key", "code":  244, "label": "ô" },
+        { "$": "auto_text_key", "code":  248, "label": "ø" }
+      ]
+    },
+    "s": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  353, "label": "š" },
+        { "$": "auto_text_key", "code":  223, "label": "ß" },
+        { "$": "auto_text_key", "code":  347, "label": "ś" }
+      ]
+    },
+    "u": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  252, "label": "ü" },
+        { "$": "auto_text_key", "code":  363, "label": "ū" },
+        { "$": "auto_text_key", "code":  251, "label": "û" },
+        { "$": "auto_text_key", "code":  250, "label": "ú" },
+        { "$": "auto_text_key", "code":  249, "label": "ù" }
+      ]
+    },
+    "z": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  382, "label": "ž" },
+        { "$": "auto_text_key", "code":  380, "label": "ż" },
+        { "$": "auto_text_key", "code":  378, "label": "ź" }
+      ]
+    },
+    "ä": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  230, "label": "æ" }
+      ]
+    },
+    "ö": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  248, "label": "ø" }
+      ]
+    },
+    "~right": {
+      "main": { "code":   44, "label": "," },
+      "relevant": [
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   58, "label": ":" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "code":   59, "label": ";" },
+        { "code":   47, "label": "/" },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
+        },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
+        },
+        { "code":   35, "label": "#" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".com" },
+      "relevant": [
+        { "code": -255, "label": ".gov" },
+        { "code": -255, "label": ".edu" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".net" },
+        { "code": -255, "label": ".ee" }
+      ]
+    }
+  }
+}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/fa.json

@@ -30,6 +30,7 @@
     },
     "ک": {
       "relevant": [
+        { "code": 1603, "label": "ك" },
         { "code": 1706, "label": "ڪ"}
       ]
     },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/hu.json

@@ -1,68 +1,62 @@
 {
   "all": {
     "a": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  225, "label": "á" }
-      ]
+      "main": { "$": "auto_text_key","code" : 225, "label": "á" }
     },
     "e": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  233, "label": "é" }
-      ]
+      "main": {"$": "auto_text_key", "code" : 233, "label": "é" }
     },
     "i": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  237, "label": "í" }
-      ]
+      "main": { "$": "auto_text_key" ,"code" : 237, "label": "í" }
     },
     "o": {
+      "main": { "$": "auto_text_key", "code" : 246, "label": "ö" },
       "relevant": [
-        { "$": "auto_text_key", "code":  243, "label": "ó" },
-        { "$": "auto_text_key", "code":  246, "label": "ö" },
-        { "$": "auto_text_key", "code":  337, "label": "ő" }
+        { "$": "auto_text_key", "code" : 243, "label": "ó" },
+        { "$": "auto_text_key", "code" : 337, "label": "ő" }
       ]
     },
     "ö": {
       "relevant": [
-        { "$": "auto_text_key", "code":  337, "label": "ő" }
+        { "$": "auto_text_key", "code" : 337, "label": "ő" }
       ]
     },
     "u": {
+      "main": { "$": "auto_text_key", "code" : 252, "label": "ü" },
       "relevant": [
-        { "$": "auto_text_key", "code":  250, "label": "ú" },
-        { "$": "auto_text_key", "code":  252, "label": "ü" },
-        { "$": "auto_text_key", "code":  369, "label": "ű" }
+        { "$": "auto_text_key", "code" : 250, "label": "ú" },
+        { "$": "auto_text_key", "code" : 369, "label": "ű" }
       ]
     },
     "ü": {
       "relevant": [
-        { "$": "auto_text_key", "code":  369, "label": "ű" }
+        { "$": "auto_text_key", "code" : 369, "label": "ű" }
       ]
-    },    
+    },
     "~right": {
-      "main": { "code":   44, "label": "," },
+      "main": { "code" : 44, "label": "," },
       "relevant": [
-        { "code":   38, "label": "&" },
-        { "code":   37, "label": "%" },
-        { "code":   43, "label": "+" },
-        { "code":   34, "label": "\"" },
-        { "code":   45, "label": "-" },
-        { "code":   58, "label": ":" },
-        { "code":   39, "label": "'" },
-        { "code":   64, "label": "@" },
-        { "code":   59, "label": ";" },
-        { "code":   47, "label": "/" },
+        { "code" : 37, "label": "%" },
+        { "code" : 38, "label": "&" },
+        { "code" : 43, "label": "+" },
+        { "code" : 34, "label": "\"" },
+        { "code" : 45, "label": "-" },
+        { "code" : 58, "label": ":" },
+        { "code" : 39, "label": "'" },
+        { "code" : 64, "label": "@" },
+        { "code" : 59, "label": ";" },
+        { "code" : 47, "label": "/" },
         { "$": "layout_direction_selector",
-          "ltr": { "code":   40, "label": "(" },
-          "rtl": { "code":   41, "label": "(" }
+          "ltr": { "code" : 40, "label": "(" },
+          "rtl": { "code" : 41, "label": "(" }
         },
         { "$": "layout_direction_selector",
-          "ltr": { "code":   41, "label": ")" },
-          "rtl": { "code":   40, "label": ")" }
+          "ltr": { "code" : 41, "label": ")" },
+          "rtl": { "code" : 40, "label": ")" }
         },
-        { "code":   35, "label": "#" },
-        { "code":   33, "label": "!" },
-        { "code":   63, "label": "?" }
+        { "code" : 35, "label": "#" },
+        { "code" : 33, "label": "!" },
+        { "code" : 63, "label": "?" }
       ]
     }
   },
@@ -74,7 +68,7 @@
         { "code": -255, "label": ".net" },
         { "code": -255, "label": ".org" },
         { "code": -255, "label": ".eu" },
-        { "code": -255, "label": ".gov.hu" }        
+        { "code": -255, "label": ".gov.hu" }
       ]
     }
   }

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/hy-am.json

@@ -0,0 +1,46 @@
+{
+    "all": {
+      "ե": {
+        "main": { "$": "auto_text_key", "code": 1415, "label": "և" }
+      },
+      "յ": {
+        "main": { "$": "auto_text_key", "code": 1416, "label": "ֈ" }
+      },
+      "ա": {
+        "main": { "$": "auto_text_key", "code": 1376, "label": "ՠ" }
+      },
+      "~right": {
+        "main": { "code":   44, "label": "," },
+        "relevant": [
+          { "code": 1417, "label": "։" },
+          { "code": 1418, "label": "֊" },
+          { "code": 1369, "label": "ՙ" },
+          { "code": 1370, "label": "՚" },
+          { "code": 1373, "label": "՝" },
+          { "code": 1371, "label": "՛" },
+          { "code": 1375, "label": "՟" },
+          { "code":   47, "label": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   46, "label": "." },
+          { "code": 1372, "label": "՜" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" },
+          { "code": 1374, "label": "՞" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".gov" },
+          { "code": -255, "label": ".edu" },
+          { "code": -255, "label": ".gr" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+  

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/kab.json

@@ -0,0 +1,131 @@
+{
+    "all": {
+        "w": {
+            "relevant": [
+                { "$": "auto_text_key", "code":  695, "label": "ʷ" }
+            ]
+        },
+        "e": {
+            "relevant": [
+                { "$": "auto_text_key", "code":  234, "label": "ê" },
+                { "$": "auto_text_key", "code":  578, "label": "ɂ" },
+                { "$": "auto_text_key", "code":  233, "label": "é" },
+                { "$": "auto_text_key", "code":  232, "label": "è" },
+                { "$": "auto_text_key", "code":  235, "label": "ë" },
+                { "$": "auto_text_key", "code":  477, "label": "ǝ" },
+                { "$": "auto_text_key", "code":  603, "label": "ɛ" }
+            ]
+        },
+        "r": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7771, "label": "ṛ" }
+            ]
+        },
+        "t": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7789, "label": "ṭ" }
+            ]
+        },
+        "y": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  255, "label": "ÿ" }
+            ]
+        },
+        "u": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  118, "label": "v" },
+                { "$": "auto_text_key", "code":  251, "label": "û" },
+                { "$": "auto_text_key", "code":  249, "label": "ù" },
+                { "$": "auto_text_key", "code":  252, "label": "ü" }
+            ]
+        },
+        "i": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  239, "label": "ï" },
+                { "$": "auto_text_key", "code":  238, "label": "î" }
+            ]
+        },
+        "o": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  339, "label": "œ" },
+                { "$": "auto_text_key", "code":  244, "label": "ô" }
+            ]
+        },
+        "a": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  259, "label": "ă" },
+                { "$": "auto_text_key", "code":  224, "label": "à" },
+                { "$": "auto_text_key", "code":  226, "label": "â" },
+                { "$": "auto_text_key", "code":  230, "label": "æ" }
+            ]
+        },
+        "s": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7779, "label": "ṣ" },
+                { "$": "auto_text_key", "code":  353, "label": "š" }
+            ]
+        },
+        "d": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7693, "label": "ḍ" }
+            ]
+        },
+        "g": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  487, "label": "ǧ" },
+                { "$": "auto_text_key", "code":  611, "label": "ɣ" }
+            ]
+        },
+        "h": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7717, "label": "ḥ" }
+            ]
+        },
+        "j": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  496, "label": "ǰ" }
+            ]
+        },
+        "l": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7735, "label": "ḷ" }
+            ]
+        },
+        "z": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7827, "label": "ẓ" },
+                { "$": "auto_text_key", "code":  382, "label": "ž" }
+            ]
+        },
+        "c": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  269, "label": "č" },
+                { "$": "auto_text_key", "code":  231, "label": "ç" }
+            ]
+        },
+        "b": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  7685, "label": "ḅ" },
+                { "$": "auto_text_key", "code":  112, "label": "p" }
+            ]
+        },
+        "n": {
+            "relevant":[
+                { "$": "auto_text_key", "code":  331, "label": "ŋ" }
+            ]
+        }
+    },
+    "uri": {
+        "~right": {
+          "main": { "code": -255, "label": ".com" },
+          "relevant": [
+            { "code": -255, "label": ".dz" },
+            { "code": -255, "label": ".fr" },
+            { "code": -255, "label": ".gov" },
+            { "code": -255, "label": ".edu" },
+            { "code": -255, "label": ".org" },
+            { "code": -255, "label": ".net" }
+          ]
+        }
+      }
+}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/pl.json

@@ -43,8 +43,8 @@
     },
     "z": {
       "relevant": [
-        { "$": "auto_text_key", "code":  378, "label": "ź" },
-        { "$": "auto_text_key", "code":  380, "label": "ż" }
+        { "$": "auto_text_key", "code":  380, "label": "ż" },
+        { "$": "auto_text_key", "code":  378, "label": "ź" }
       ]
     },
     "~right": {

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/sl-SI.json

@@ -0,0 +1,56 @@
+{
+  "all": {
+    "c": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  269, "label": "č" }
+      ]
+    },
+    "s": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  353, "label": "š" }
+      ]
+    },
+    "z": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  382, "label": "ž" }
+      ]
+    },
+    "~right": {
+      "main": { "code":   44, "label": "," },
+      "relevant": [
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   58, "label": ":" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "code":   59, "label": ";" },
+        { "code":   47, "label": "/" },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
+        },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
+        },
+        { "code":   35, "label": "#" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".com" },
+      "relevant": [
+        { "code": -255, "label": ".eu" },
+        { "code": -255, "label": ".si" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/tr.json

@@ -1,5 +1,8 @@
 {
   "all": {
+    "a": {
+      "main": { "$": "auto_text_key", "code":  226, "label": "â" }
+    },
     "c": {
       "main": { "$": "auto_text_key", "code":  231, "label": "ç" }
     },
@@ -10,13 +13,19 @@
       "main": { "$": "case_selector",
         "lower": { "code":  305, "label": "ı" },
         "upper": { "code":   73, "label": "I" }
-      }
+      },
+      "relevant": [
+        { "$": "auto_text_key", "code":  238, "label": "î" }
+      ]
     },
     "ı": {
       "main": { "$": "case_selector",
         "lower": { "code":  105, "label": "i" },
         "upper": { "code":  304, "label": "İ" }
-      }
+      },
+      "relevant": [
+        { "$": "auto_text_key", "code":  238, "label": "î" }
+      ]
     },
     "o": {
       "main": { "$": "auto_text_key", "code":  246, "label": "ö" }
@@ -25,7 +34,10 @@
       "main": { "$": "auto_text_key", "code":  351, "label": "ş" }
     },
     "u": {
-      "main": { "$": "auto_text_key", "code":  252, "label": "ü" }
+      "main": { "$": "auto_text_key", "code":  252, "label": "ü" },
+      "relevant": [
+        { "$": "auto_text_key", "code":  251, "label": "û" }
+      ]
     },
     "~right": {
       "main": { "code":   44, "label": "," },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/udm.json

@@ -0,0 +1,71 @@
+{
+  "all": {
+    "о": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1255, "label": "ӧ" }
+      ]
+    },
+    "з": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1247, "label": "ӟ" }
+      ]
+    },
+    "ж": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1245, "label": "ӝ" }
+      ]
+    },
+    "ч": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1269, "label": "ӵ" }
+      ]
+    },
+    "и": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1253, "label": "ӥ" }
+      ]
+    },
+    "е": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1105, "label": "ё" }
+      ]
+    },
+    "ь": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1098, "label": "ъ" }
+      ]
+    },
+    "~right": {
+      "main": { "code":   44, "label": "," },
+      "relevant": [
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   58, "label": ":" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
+        },
+        { "$": "layout_direction_selector",
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
+        },
+        { "code":   35, "label": "#" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".com" },
+      "relevant": [
+        { "code": -255, "label": ".ru" },
+        { "code": -255, "label": ".udm.ru" }
+      ]
+    }
+  }
+}

app/src/main/assets/ime/languagepack/org.florisboard.hanshapebasedbasicpack/extension.json

@@ -0,0 +1,32 @@
+{
+  "$": "ime.extension.languagepack",
+  "meta": {
+    "id": "org.florisboard.hanshapebasedbasicpack",
+    "version": "0.0.0",
+    "title": "Default barebones Chinese shape-based pack",
+    "description": "默认中文形码语言包 / 預設中文形碼語言包 / Default barebones Chinese shape-based language pack which are always available.\n请访问下面的主页链接下载更多输入法 / 請訪問下面的主頁鏈接下載更多輸入法 / Please visit the homepage linked below to download more input methods.",
+    "maintainers": [ "patrickgold <patrick@patrickgold.dev>", "waelwindows", "moonbeamcelery" ],
+    "homepage": "https://github.com/florisboard/florisboard/blob/master/LANGUAGEPACKS-CHINESE.md#default-barebones-chinese-shape-based-pack",
+    "license": "apache-2.0"
+  },
+  "items": [
+    {
+      "id": "zh_CN_zhengma",
+      "label": "中文 (中国) [郑码] / Chinese (China) [ZHENGMA]",
+      "authors": [ "waelwindows", "moonbeamcelery" ],
+      "hanShapeBasedKeyCode": "abcdefghijklmnopqrstuvwxyz"
+    },
+    {
+      "id": "zh_TW_boshiamy",
+      "label": "中文 (台灣) [嘸蝦米] / Chinese (Taiwan) [BOSHIAMY]",
+      "authors": [ "waelwindows", "moonbeamcelery" ],
+      "hanShapeBasedKeyCode": ",.'abcdefghijklmnopqrstuvwxyz[]"
+    },
+    {
+      "id": "zh_TW_cangjielarge",
+      "label": "中文 (台灣) [倉頡-大字庫] / Chinese (Taiwan) [CANGJIELARGE]",
+      "authors": [ "waelwindows", "moonbeamcelery" ],
+      "hanShapeBasedKeyCode": "abcdefghijklmnopqrstuvwxyz&"
+    }
+  ]
+}

app/src/main/assets/ime/languagepack/org.florisboard.languagepack/extension.json

@@ -0,0 +1,23 @@
+{
+  "$": "ime.extension.languagepack",
+  "meta": {
+    "id": "org.florisboard.languagepack",
+    "version": "0.0.0",
+    "title": "Default language pack",
+    "description": "Default language pack which are always available.",
+    "maintainers": [ "patrickgold <patrick@patrickgold.dev>" ],
+    "license": "apache-2.0"
+  },
+  "items": [
+    {
+      "id": "de_DE_neobone",
+      "label": "Deutsch (Deutschland) [NEOBONE] / German (Germany) [NEOBONE]",
+      "authors": [ "patrickgold" ]
+    },
+    {
+      "id": "ja_JP_jis",
+      "label": "日本語 (日本) [JIS] / Japanese (Japan) [JIS]",
+      "authors": [ "patrickgold" ]
+    }
+  ]
+}

app/src/main/assets/ime/media/emoji/root.txt

@@ -1,3 +1,6 @@
+# Auto-generated by emojicon.py using CLDR v45
+# DO NOT EDIT MANUALLY!
+
 [smileys_emotion]
 😀;;
 😃;;
@@ -48,6 +51,9 @@
 😬;;
 😮‍💨;;
 🤥;;
+🫨;;
+🙂‍↔️;;
+🙂‍↕️;;
 😌;;
 😔;;
 😪;;
@@ -125,7 +131,6 @@
 🙈;;
 🙉;;
 🙊;;
-💋;;
 💌;;
 💘;;
 💝;;
@@ -140,14 +145,18 @@
 ❤️‍🔥;;
 ❤️‍🩹;;
 ❤️;;
+🩷;;
 🧡;;
 💛;;
 💚;;
 💙;;
+🩵;;
 💜;;
 🤎;;
 🖤;;
+🩶;;
 🤍;;
+💋;;
 💯;;
 💢;;
 💥;;
@@ -155,7 +164,6 @@
 💦;;
 💨;;
 🕳️;;
-💣;;
 💬;;
 👁️‍🗨️;;
 🗨️;;
@@ -218,6 +226,18 @@
 	🫴🏽;;
 	🫴🏾;;
 	🫴🏿;;
+🫷;;
+	🫷🏻;;
+	🫷🏼;;
+	🫷🏽;;
+	🫷🏾;;
+	🫷🏿;;
+🫸;;
+	🫸🏻;;
+	🫸🏼;;
+	🫸🏽;;
+	🫸🏾;;
+	🫸🏿;;
 👌;;
 	👌🏻;;
 	👌🏼;;
@@ -1529,6 +1549,24 @@
 	🚶🏽‍♀️;;
 	🚶🏾‍♀️;;
 	🚶🏿‍♀️;;
+🚶‍➡️;;
+	🚶🏻‍➡️;;
+	🚶🏼‍➡️;;
+	🚶🏽‍➡️;;
+	🚶🏾‍➡️;;
+	🚶🏿‍➡️;;
+🚶‍♀️‍➡️;;
+	🚶🏻‍♀️‍➡️;;
+	🚶🏼‍♀️‍➡️;;
+	🚶🏽‍♀️‍➡️;;
+	🚶🏾‍♀️‍➡️;;
+	🚶🏿‍♀️‍➡️;;
+🚶‍♂️‍➡️;;
+	🚶🏻‍♂️‍➡️;;
+	🚶🏼‍♂️‍➡️;;
+	🚶🏽‍♂️‍➡️;;
+	🚶🏾‍♂️‍➡️;;
+	🚶🏿‍♂️‍➡️;;
 🧍;;
 	🧍🏻;;
 	🧍🏼;;
@@ -1565,60 +1603,132 @@
 	🧎🏽‍♀️;;
 	🧎🏾‍♀️;;
 	🧎🏿‍♀️;;
+🧎‍➡️;;
+	🧎🏻‍➡️;;
+	🧎🏼‍➡️;;
+	🧎🏽‍➡️;;
+	🧎🏾‍➡️;;
+	🧎🏿‍➡️;;
+🧎‍♀️‍➡️;;
+	🧎🏻‍♀️‍➡️;;
+	🧎🏼‍♀️‍➡️;;
+	🧎🏽‍♀️‍➡️;;
+	🧎🏾‍♀️‍➡️;;
+	🧎🏿‍♀️‍➡️;;
+🧎‍♂️‍➡️;;
+	🧎🏻‍♂️‍➡️;;
+	🧎🏼‍♂️‍➡️;;
+	🧎🏽‍♂️‍➡️;;
+	🧎🏾‍♂️‍➡️;;
+	🧎🏿‍♂️‍➡️;;
 🧑‍🦯;;
 	🧑🏻‍🦯;;
 	🧑🏼‍🦯;;
 	🧑🏽‍🦯;;
 	🧑🏾‍🦯;;
 	🧑🏿‍🦯;;
+🧑‍🦯‍➡️;;
+	🧑🏻‍🦯‍➡️;;
+	🧑🏼‍🦯‍➡️;;
+	🧑🏽‍🦯‍➡️;;
+	🧑🏾‍🦯‍➡️;;
+	🧑🏿‍🦯‍➡️;;
 👨‍🦯;;
 	👨🏻‍🦯;;
 	👨🏼‍🦯;;
 	👨🏽‍🦯;;
 	👨🏾‍🦯;;
 	👨🏿‍🦯;;
+👨‍🦯‍➡️;;
+	👨🏻‍🦯‍➡️;;
+	👨🏼‍🦯‍➡️;;
+	👨🏽‍🦯‍➡️;;
+	👨🏾‍🦯‍➡️;;
+	👨🏿‍🦯‍➡️;;
 👩‍🦯;;
 	👩🏻‍🦯;;
 	👩🏼‍🦯;;
 	👩🏽‍🦯;;
 	👩🏾‍🦯;;
 	👩🏿‍🦯;;
+👩‍🦯‍➡️;;
+	👩🏻‍🦯‍➡️;;
+	👩🏼‍🦯‍➡️;;
+	👩🏽‍🦯‍➡️;;
+	👩🏾‍🦯‍➡️;;
+	👩🏿‍🦯‍➡️;;
 🧑‍🦼;;
 	🧑🏻‍🦼;;
 	🧑🏼‍🦼;;
 	🧑🏽‍🦼;;
 	🧑🏾‍🦼;;
 	🧑🏿‍🦼;;
+🧑‍🦼‍➡️;;
+	🧑🏻‍🦼‍➡️;;
+	🧑🏼‍🦼‍➡️;;
+	🧑🏽‍🦼‍➡️;;
+	🧑🏾‍🦼‍➡️;;
+	🧑🏿‍🦼‍➡️;;
 👨‍🦼;;
 	👨🏻‍🦼;;
 	👨🏼‍🦼;;
 	👨🏽‍🦼;;
 	👨🏾‍🦼;;
 	👨🏿‍🦼;;
+👨‍🦼‍➡️;;
+	👨🏻‍🦼‍➡️;;
+	👨🏼‍🦼‍➡️;;
+	👨🏽‍🦼‍➡️;;
+	👨🏾‍🦼‍➡️;;
+	👨🏿‍🦼‍➡️;;
 👩‍🦼;;
 	👩🏻‍🦼;;
 	👩🏼‍🦼;;
 	👩🏽‍🦼;;
 	👩🏾‍🦼;;
 	👩🏿‍🦼;;
+👩‍🦼‍➡️;;
+	👩🏻‍🦼‍➡️;;
+	👩🏼‍🦼‍➡️;;
+	👩🏽‍🦼‍➡️;;
+	👩🏾‍🦼‍➡️;;
+	👩🏿‍🦼‍➡️;;
 🧑‍🦽;;
 	🧑🏻‍🦽;;
 	🧑🏼‍🦽;;
 	🧑🏽‍🦽;;
 	🧑🏾‍🦽;;
 	🧑🏿‍🦽;;
+🧑‍🦽‍➡️;;
+	🧑🏻‍🦽‍➡️;;
+	🧑🏼‍🦽‍➡️;;
+	🧑🏽‍🦽‍➡️;;
+	🧑🏾‍🦽‍➡️;;
+	🧑🏿‍🦽‍➡️;;
 👨‍🦽;;
 	👨🏻‍🦽;;
 	👨🏼‍🦽;;
 	👨🏽‍🦽;;
 	👨🏾‍🦽;;
 	👨🏿‍🦽;;
+👨‍🦽‍➡️;;
+	👨🏻‍🦽‍➡️;;
+	👨🏼‍🦽‍➡️;;
+	👨🏽‍🦽‍➡️;;
+	👨🏾‍🦽‍➡️;;
+	👨🏿‍🦽‍➡️;;
 👩‍🦽;;
 	👩🏻‍🦽;;
 	👩🏼‍🦽;;
 	👩🏽‍🦽;;
 	👩🏾‍🦽;;
 	👩🏿‍🦽;;
+👩‍🦽‍➡️;;
+	👩🏻‍🦽‍➡️;;
+	👩🏼‍🦽‍➡️;;
+	👩🏽‍🦽‍➡️;;
+	👩🏾‍🦽‍➡️;;
+	👩🏿‍🦽‍➡️;;
 🏃;;
 	🏃🏻;;
 	🏃🏼;;
@@ -1637,6 +1747,24 @@
 	🏃🏽‍♀️;;
 	🏃🏾‍♀️;;
 	🏃🏿‍♀️;;
+🏃‍➡️;;
+	🏃🏻‍➡️;;
+	🏃🏼‍➡️;;
+	🏃🏽‍➡️;;
+	🏃🏾‍➡️;;
+	🏃🏿‍➡️;;
+🏃‍♀️‍➡️;;
+	🏃🏻‍♀️‍➡️;;
+	🏃🏼‍♀️‍➡️;;
+	🏃🏽‍♀️‍➡️;;
+	🏃🏾‍♀️‍➡️;;
+	🏃🏿‍♀️‍➡️;;
+🏃‍♂️‍➡️;;
+	🏃🏻‍♂️‍➡️;;
+	🏃🏼‍♂️‍➡️;;
+	🏃🏽‍♂️‍➡️;;
+	🏃🏾‍♂️‍➡️;;
+	🏃🏿‍♂️‍➡️;;
 💃;;
 	💃🏻;;
 	💃🏼;;
@@ -2269,7 +2397,6 @@
 	👩🏿‍❤️‍👩🏽;;
 	👩🏿‍❤️‍👩🏾;;
 	👩🏿‍❤️‍👩🏿;;
-👪;;
 👨‍👩‍👦;;
 👨‍👩‍👧;;
 👨‍👩‍👧‍👦;;
@@ -2299,6 +2426,11 @@
 👤;;
 👥;;
 🫂;;
+👪;;
+🧑‍🧑‍🧒;;
+🧑‍🧑‍🧒‍🧒;;
+🧑‍🧒;;
+🧑‍🧒‍🧒;;
 👣;;
 
 [animals_nature]
@@ -2322,6 +2454,8 @@
 🐅;;
 🐆;;
 🐴;;
+🫎;;
+🫏;;
 🐎;;
 🦄;;
 🦓;;
@@ -2384,6 +2518,10 @@
 🦩;;
 🦚;;
 🦜;;
+🪽;;
+🐦‍⬛;;
+🪿;;
+🐦‍🔥;;
 🐸;;
 🐊;;
 🐢;;
@@ -2404,6 +2542,7 @@
 🐙;;
 🐚;;
 🪸;;
+🪼;;
 🐌;;
 🦋;;
 🐛;;
@@ -2431,6 +2570,7 @@
 🌻;;
 🌼;;
 🌷;;
+🪻;;
 🌱;;
 🪴;;
 🌲;;
@@ -2446,6 +2586,7 @@
 🍃;;
 🪹;;
 🪺;;
+🍄;;
 
 [food_drink]
 🍇;;
@@ -2453,6 +2594,7 @@
 🍉;;
 🍊;;
 🍋;;
+🍋‍🟩;;
 🍌;;
 🍍;;
 🥭;;
@@ -2479,10 +2621,12 @@
 🥦;;
 🧄;;
 🧅;;
-🍄;;
 🥜;;
 🫘;;
 🌰;;
+🫚;;
+🫛;;
+🍄‍🟫;;
 🍞;;
 🥐;;
 🥖;;
@@ -2859,11 +3003,10 @@
 🎯;;
 🪀;;
 🪁;;
+🔫;;
 🎱;;
 🔮;;
 🪄;;
-🧿;;
-🪬;;
 🎮;;
 🕹️;;
 🎰;;
@@ -2910,6 +3053,7 @@
 🩳;;
 👙;;
 👚;;
+🪭;;
 👛;;
 👜;;
 👝;;
@@ -2924,6 +3068,7 @@
 👡;;
 🩰;;
 👢;;
+🪮;;
 👑;;
 👒;;
 🎩;;
@@ -2962,6 +3107,8 @@
 🪕;;
 🥁;;
 🪘;;
+🪇;;
+🪈;;
 📱;;
 📲;;
 ☎️;;
@@ -3081,7 +3228,7 @@
 🛠️;;
 🗡️;;
 ⚔️;;
-🔫;;
+💣;;
 🪃;;
 🏹;;
 🛡️;;
@@ -3094,6 +3241,7 @@
 ⚖️;;
 🦯;;
 🔗;;
+⛓️‍💥;;
 ⛓️;;
 🪝;;
 🧰;;
@@ -3142,6 +3290,8 @@
 ⚰️;;
 🪦;;
 ⚱️;;
+🧿;;
+🪬;;
 🗿;;
 🪧;;
 🪪;;
@@ -3206,6 +3356,7 @@
 ☮️;;
 🕎;;
 🔯;;
+🪯;;
 ♈;;
 ♉;;
 ♊;;
@@ -3241,6 +3392,7 @@
 🔅;;
 🔆;;
 📶;;
+🛜;;
 📳;;
 📴;;
 ♀️;;

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_day.json

@@ -64,36 +64,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#12121248"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#12121248"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -183,6 +212,10 @@
     "foreground": "var(--primary)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#00000011"
+  },
+
   "one-handed-panel": {
     "background": "#e8f5e9",
     "foreground": "#424242"

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_day_borderless.json

@@ -63,35 +63,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "shape": "circle()"
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#12121248"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#12121248"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -181,6 +211,10 @@
     "foreground": "var(--primary)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#00000011"
+  },
+
   "one-handed-panel": {
     "background": "#e8f5e9",
     "foreground": "#424242"

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_night.json

@@ -64,36 +64,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#dcdcdc48"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -183,6 +212,10 @@
     "foreground": "var(--primary)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#ffffff11"
+  },
+
   "one-handed-panel": {
     "background": "#1b5e20",
     "foreground": "#eeeeee"

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_night_borderless.json

@@ -63,35 +63,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "shape": "circle()"
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#dcdcdc48"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -181,6 +211,10 @@
     "foreground": "var(--primary)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#ffffff11"
+  },
+
   "one-handed-panel": {
     "background": "#1b5e20",
     "foreground": "#eeeeee"

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_pure_night.json

@@ -64,36 +64,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#dcdcdc48"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -183,6 +212,10 @@
     "foreground": "var(--primary-variant)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#ffffff11"
+  },
+
   "one-handed-panel": {
     "background": "#000000",
     "foreground": "#eeeeee"

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_pure_night_borderless.json

@@ -63,36 +63,65 @@
     "foreground": "var(--on-surface)"
   },
 
-  "smartbar-primary-actions-toggle": {
+  "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
-  "smartbar-secondary-actions-toggle": {
+  "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-  "smartbar-quick-action": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "shape": "circle()"
-  },
-  "smartbar-key": {
+  "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "18sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "smartbar-action-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "smartbar-action-key:disabled": {
     "background": "transparent",
     "foreground": "#dcdcdc48"
   },
+  "smartbar-action-tile": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-action-tile:disabled": {
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
+  },
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
+  },
+  "smartbar-actions-editor": {
+    "background": "var(--background)",
+    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
+  },
+  "smartbar-actions-editor-header": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "smartbar-actions-editor-subheader": {
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
+  },
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
@@ -182,6 +211,10 @@
     "foreground": "var(--primary-variant)"
   },
 
+  "incognito-mode-indicator": {
+    "foreground": "#ffffff11"
+  },
+
   "one-handed-panel": {
     "background": "#000000",
     "foreground": "#eeeeee"

app/src/main/config/libraries/pictogrammers-material-icons.json

@@ -0,0 +1,14 @@
+{
+  "uniqueId": "pictogrammers-material-icons",
+  "name": "Pictogrammers Material Icons",
+  "developers": [
+    {
+      "name": "Pictogrammers Icon Group",
+      "organisationUrl": "https://pictogrammers.com"
+    }
+  ],
+  "website": "https://github.com/Templarian/MaterialDesign",
+  "licenses": [
+    "Apache-2.0"
+  ]
+}

app/src/main/cpp/CMakeLists.txt

@@ -1,48 +0,0 @@
-# For more information about using CMake with Android Studio, read the
-# documentation: https://d.android.com/studio/projects/add-native-code.html
-
-cmake_minimum_required(VERSION 3.10.2)
-
-project("florisboard")
-
-set(CMAKE_CXX_STANDARD 17)
-
-include_directories(.)
-
-### ICU4C ###
-include_directories(../icu4c/prebuilt/include)
-set(JNI_LIBS ${CMAKE_SOURCE_DIR}/../icu4c/prebuilt/jniLibs/${ANDROID_ABI})
-add_library(ICU::data STATIC IMPORTED)
-set_property(TARGET ICU::data PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicudata.a")
-add_library(ICU::uc STATIC IMPORTED)
-set_property(TARGET ICU::uc PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicuuc.a")
-
-### FlorisBoard ###
-add_subdirectory(nuspell)
-add_subdirectory(utils)
-add_subdirectory(ime/nlp)
-add_subdirectory(ime/spelling)
-
-add_library(
-        florisboard-native
-        SHARED
-        dev_patrickgold_florisboard_FlorisApplication.cpp
-        dev_patrickgold_florisboard_ime_nlp_SuggestionList.cpp
-        dev_patrickgold_florisboard_ime_spelling_SpellingDict.cpp
-)
-
-target_compile_options(florisboard-native PRIVATE -ffunction-sections -fdata-sections -fexceptions)
-target_link_libraries(
-        # Destination
-        florisboard-native
-
-        # Sources
-        android
-        log
-        ICU::uc
-        ICU::data
-        Nuspell::nuspell
-        utils
-        ime-nlp
-        ime-spelling
-)

app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include <fstream>
-#include <vector>
-#include <jni.h>
-#include <unicode/udata.h>
-#include "utils/jni_utils.h"
-
-#pragma ide diagnostic ignored "UnusedLocalVariable"
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_dev_patrickgold_florisboard_FlorisApplication_00024Companion_nativeInitICUData(
-        JNIEnv *env,
-        jobject thiz,
-        jobject path) {
-    auto path_str = utils::j2std_string(env, path);
-    std::ifstream in_file(path_str, std::ios::in | std::ios::binary);
-    if (!in_file) {
-        return U_FILE_ACCESS_ERROR;
-    }
-    in_file.seekg(0, std::ios::end);
-    size_t size = in_file.tellg();
-    if (size <= 0) {
-        return U_FILE_ACCESS_ERROR;
-    }
-    in_file.seekg(0, std::ios::beg);
-    char *icu_data = new char[size + 1];
-    in_file.read(icu_data, size);
-    if (!in_file) {
-        in_file.close();
-        return U_FILE_ACCESS_ERROR;
-    }
-    icu_data[size] = 0;
-    in_file.close();
-    UErrorCode status = U_ZERO_ERROR;
-    udata_setCommonData(reinterpret_cast<void *>(icu_data), &status);
-    return status;
-}

app/src/main/cpp/dev_patrickgold_florisboard_ime_nlp_SuggestionList.cpp

@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include <jni.h>
-#include "ime/nlp/suggestion_list.h"
-
-#pragma ide diagnostic ignored "UnusedLocalVariable"
-
-using namespace ime::nlp;
-
-extern "C"
-JNIEXPORT jlong JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeInitialize(
-        JNIEnv *env,
-        jobject thiz,
-        jint max_size) {
-    auto *suggestionList = new SuggestionList(max_size);
-    return reinterpret_cast<jlong>(suggestionList);
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeDispose(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    suggestionList->clear();
-    delete suggestionList;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeAdd(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr,
-        jstring word,
-        jint freq) {
-    const char *cWord = env->GetStringUTFChars(word, nullptr);
-    word_t stdWord = word_t(cWord);
-    env->ReleaseStringUTFChars(word, cWord);
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    return suggestionList->add(std::move(stdWord), freq);
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeClear(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    suggestionList->clear();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeContains(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr,
-        jstring element) {
-    const char *cWord = env->GetStringUTFChars(element, nullptr);
-    const word_t stdWord = word_t(cWord);
-    env->ReleaseStringUTFChars(element, cWord);
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    return suggestionList->containsWord(stdWord);
-}
-
-extern "C"
-JNIEXPORT jstring JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeGetOrNull(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr,
-        jint index) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    auto weightedToken = suggestionList->get(index);
-    if (weightedToken == nullptr) {
-        return nullptr;
-    }
-    return env->NewStringUTF(weightedToken->data.c_str());
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeSize(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    return suggestionList->size();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeGetIsPrimaryTokenAutoInsert(
-        JNIEnv *env, jobject thiz, jlong native_ptr) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    return suggestionList->isPrimaryTokenAutoInsert;
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_dev_patrickgold_florisboard_ime_nlp_SuggestionList_00024Companion_nativeSetIsPrimaryTokenAutoInsert(
-        JNIEnv *env, jobject thiz, jlong native_ptr, jboolean v) {
-    auto *suggestionList = reinterpret_cast<SuggestionList *>(native_ptr);
-    suggestionList->isPrimaryTokenAutoInsert = v;
-}

app/src/main/cpp/dev_patrickgold_florisboard_ime_spelling_SpellingDict.cpp

@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include <jni.h>
-#include <algorithm>
-#include "ime/spelling/spellingdict.h"
-#include "utils/jni_utils.h"
-
-#pragma ide diagnostic ignored "UnusedLocalVariable"
-
-using namespace ime::spellcheck;
-
-extern "C"
-JNIEXPORT jlong JNICALL
-Java_dev_patrickgold_florisboard_ime_spelling_SpellingDict_00024Companion_nativeInitialize(
-        JNIEnv *env,
-        jobject thiz,
-        jobject base_path) {
-    auto strBasePath = utils::j2std_string(env, base_path);
-
-    auto *spellingDict = SpellingDict::load(strBasePath);
-
-    if (spellingDict == nullptr) {
-        return 0L;
-    } else {
-        return reinterpret_cast<jlong>(spellingDict);
-    }
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_dev_patrickgold_florisboard_ime_spelling_SpellingDict_00024Companion_nativeDispose(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr) {
-    auto spellingDict = reinterpret_cast<SpellingDict *>(native_ptr);
-
-    delete spellingDict;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_dev_patrickgold_florisboard_ime_spelling_SpellingDict_00024Companion_nativeSpell(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr,
-        jobject word) {
-    auto strWord = utils::j2std_string(env, word);
-
-    auto spellingDict = reinterpret_cast<SpellingDict *>(native_ptr);
-    auto result = spellingDict->spell(strWord);
-
-    return result;
-}
-
-extern "C"
-JNIEXPORT jobjectArray JNICALL
-Java_dev_patrickgold_florisboard_ime_spelling_SpellingDict_00024Companion_nativeSuggest(
-        JNIEnv *env,
-        jobject thiz,
-        jlong native_ptr,
-        jobject word,
-        jint limit) {
-    auto strWord = utils::j2std_string(env, word);
-
-    auto spellingDict = reinterpret_cast<SpellingDict *>(native_ptr);
-    auto result = spellingDict->suggest(strWord);
-    auto retSize = std::min(result.size(), (size_t)std::max(0, limit));
-
-    jclass jByteArrayClass = env->FindClass("java/nio/ByteBuffer");
-    jobjectArray jSuggestions = env->NewObjectArray(retSize, jByteArrayClass, nullptr);
-    for (int n = 0; n < retSize; n++) {
-        env->SetObjectArrayElement(jSuggestions, n, utils::std2j_string(env, result[n]));
-    }
-
-    return jSuggestions;
-}

app/src/main/cpp/ime/nlp/CMakeLists.txt

@@ -1,13 +0,0 @@
-add_library(
-        # Name
-        ime-nlp
-
-        # Headers
-        nlp.h
-        token.h
-        suggestion_list.h
-
-        # Sources
-        token.cpp
-        suggestion_list.cpp
-)

app/src/main/cpp/ime/nlp/nlp.h

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#ifndef FLORISBOARD_NLP_H
-#define FLORISBOARD_NLP_H
-
-#include <string>
-
-namespace ime::nlp {
-
-typedef std::string word_t;
-typedef uint16_t freq_t;
-
-static const freq_t FREQ_VALUE_MASK =          0xFF;
-static const freq_t FREQ_POSSIBLY_OFFENSIVE =  0x01;
-
-} // namespace ime::nlp
-
-#endif // FLORISBOARD_NLP_H

app/src/main/cpp/ime/nlp/suggestion_list.cpp

@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include "suggestion_list.h"
-
-#include <utility>
-
-using namespace ime::nlp;
-
-SuggestionList::SuggestionList(size_t _maxSize) :
-    maxSize(_maxSize), internalSize(0), tokens(_maxSize), isPrimaryTokenAutoInsert(false)
-{ }
-
-SuggestionList::~SuggestionList() = default;
-
-bool SuggestionList::add(word_t &&word, freq_t &&freq) {
-    auto entryIndex = indexOfWord(word);
-    if (entryIndex.has_value()) {
-        // Word exists already
-        auto entry = tokens[entryIndex.value()];
-        if (entry.freq < freq) {
-            // Need to update freq
-            entry.freq = freq;
-        } else {
-            return false;
-        }
-    } else {
-        if (internalSize < maxSize) {
-            tokens[internalSize++] = WeightedToken(std::move(word), freq);
-        } else {
-            auto last = tokens[internalSize - 1];
-            if (last.freq < freq) {
-                tokens[internalSize - 1] = WeightedToken(std::move(word), freq);
-            } else {
-                return false;
-            }
-        }
-    }
-    std::sort(tokens.begin(), tokens.begin() + internalSize, std::greater<>());
-    return true;
-}
-
-void SuggestionList::clear() {
-    internalSize = 0;
-    isPrimaryTokenAutoInsert = false;
-}
-
-bool SuggestionList::contains(const WeightedToken &element) const {
-    return indexOf(element).has_value();
-}
-
-bool SuggestionList::containsWord(const word_t &word) const {
-    return indexOfWord(word).has_value();
-}
-
-const WeightedToken *SuggestionList::get(size_t index) const {
-    if (index < 0 || index >= internalSize) return nullptr;
-    return &tokens[index];
-}
-
-std::optional<size_t> SuggestionList::indexOf(const WeightedToken &element) const {
-    for (size_t n = 0; n < internalSize; n++) {
-        if (element == tokens[n]) {
-            return n;
-        }
-    }
-    return std::nullopt;
-}
-
-std::optional<size_t> SuggestionList::indexOfWord(const word_t &word) const {
-    for (size_t n = 0; n < internalSize; n++) {
-        if (word == tokens[n].data) {
-            return n;
-        }
-    }
-    return std::nullopt;
-}
-
-bool SuggestionList::isEmpty() const {
-    return internalSize == 0;
-}
-
-size_t SuggestionList::size() const {
-    return internalSize;
-}

app/src/main/cpp/ime/nlp/suggestion_list.h

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#ifndef FLORISBOARD_SUGGESTION_LIST_H
-#define FLORISBOARD_SUGGESTION_LIST_H
-
-#include <optional>
-#include <vector>
-#include "token.h"
-
-namespace ime::nlp {
-
-class SuggestionList {
-public:
-    SuggestionList(size_t _maxSize);
-    ~SuggestionList();
-
-    bool add(word_t &&word, freq_t &&freq);
-    void clear();
-    bool contains(const WeightedToken &element) const;
-    bool containsWord(const word_t &word) const;
-    const WeightedToken *get(size_t index) const;
-    std::optional<size_t> indexOf(const WeightedToken &element) const;
-    std::optional<size_t> indexOfWord(const word_t &word) const;
-    bool isEmpty() const;
-    size_t size() const;
-
-    bool isPrimaryTokenAutoInsert;
-
-private:
-    std::vector<WeightedToken> tokens;
-    size_t internalSize;
-    size_t maxSize;
-};
-
-} // namespace ime::nlp
-
-#endif // FLORISBOARD_SUGGESTION_LIST_H

app/src/main/cpp/ime/nlp/token.cpp

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include "token.h"
-
-#include <utility>
-
-namespace ime::nlp {
-
-Token::Token() : data() {}
-Token::Token(word_t &&_data) : data(std::move(_data)) {}
-
-bool operator==(const Token &t1, const Token &t2) {
-    return t1.data == t2.data;
-}
-
-bool operator!=(const Token &t1, const Token &t2) {
-    return !(t1 == t2);
-}
-
-WeightedToken::WeightedToken() : Token(), freq(0) {}
-WeightedToken::WeightedToken(word_t &&_data, freq_t _freq) : Token(std::move(_data)), freq(_freq) {}
-
-bool operator==(const WeightedToken &t1, const WeightedToken &t2) {
-    return t1.data == t2.data && t1.freq == t2.freq;
-}
-
-bool operator!=(const WeightedToken &t1, const WeightedToken &t2) {
-    return !(t1 == t2);
-}
-
-bool operator<(const WeightedToken &t1, const WeightedToken &t2) {
-    return t1.freq < t2.freq;
-}
-
-bool operator<=(const WeightedToken &t1, const WeightedToken &t2) {
-    return t1.freq <= t2.freq;
-}
-
-bool operator>(const WeightedToken &t1, const WeightedToken &t2) {
-    return t1.freq > t2.freq;
-}
-
-bool operator>=(const WeightedToken &t1, const WeightedToken &t2) {
-    return t1.freq >= t2.freq;
-}
-
-} // namespace ime::nlp

app/src/main/cpp/ime/nlp/token.h

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#ifndef FLORISBOARD_TOKEN_H
-#define FLORISBOARD_TOKEN_H
-
-#include "nlp.h"
-#include <string>
-
-namespace ime::nlp {
-
-class Token {
-public:
-    word_t data;
-    Token();
-    Token(word_t &&_data);
-
-    friend bool operator==(const Token &t1, const Token &t2);
-    friend bool operator!=(const Token &t1, const Token &t2);
-};
-
-class WeightedToken : public Token {
-public:
-    freq_t freq;
-    WeightedToken();
-    WeightedToken(word_t &&_data, freq_t _freq);
-
-    friend bool operator==(const WeightedToken &t1, const WeightedToken &t2);
-    friend bool operator!=(const WeightedToken &t1, const WeightedToken &t2);
-    friend bool operator<(const WeightedToken &t1, const WeightedToken &t2);
-    friend bool operator<=(const WeightedToken &t1, const WeightedToken &t2);
-    friend bool operator>(const WeightedToken &t1, const WeightedToken &t2);
-    friend bool operator>=(const WeightedToken &t1, const WeightedToken &t2);
-};
-
-} // namespace ime::nlp
-
-#endif // FLORISBOARD_TOKEN_H

app/src/main/cpp/ime/spelling/CMakeLists.txt

@@ -1,10 +0,0 @@
-add_library(
-        # Name
-        ime-spelling
-
-        # Headers
-        spellingdict.h
-
-        # Sources
-        spellingdict.cpp
-)

app/src/main/cpp/ime/spelling/spellingdict.cpp

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#include "spellingdict.h"
-#include "utils/log.h"
-
-using namespace ime::spellcheck;
-
-SpellingDict::SpellingDict(const nuspell::Dictionary& dict) : dictionary(std::make_unique<nuspell::Dictionary>(dict))
-{ }
-
-SpellingDict::~SpellingDict() = default;
-
-SpellingDict* SpellingDict::load(const std::string &basePath) {
-    utils::start_stdout_stderr_logger("spell-floris");
-    try {
-        auto temp = nuspell::Dictionary::load_from_path(basePath);
-        auto spellingDict = new SpellingDict(temp);
-        return spellingDict;
-    } catch (const nuspell::Dictionary_Loading_Error& e) {
-        utils::log_error("SpellingDict.load()", e.what());
-        return nullptr;
-    } catch (...) {
-        utils::log_error("SpellingDict.load()", "An unknown error occurred!");
-        return nullptr;
-    }
-}
-
-bool SpellingDict::spell(const std::string& word) {
-    bool result = dictionary->spell(word);
-    return result;
-}
-
-std::vector<std::string> SpellingDict::suggest(const std::string &word) {
-    auto result = std::vector<std::string>();
-    dictionary->suggest(word, result);
-    return result;
-}

app/src/main/cpp/ime/spelling/spellingdict.h

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 Patrick Goldinger
- *
- * 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
- *
- * http://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.
- */
-
-#ifndef FLORISBOARD_SPELLINGDICT_H
-#define FLORISBOARD_SPELLINGDICT_H
-
-#include "nuspell/dictionary.hxx"
-#include <string>
-#include <vector>
-
-namespace ime::spellcheck {
-
-class SpellingDict {
-public:
-    SpellingDict(const nuspell::Dictionary& dict);
-    ~SpellingDict();
-
-    static SpellingDict* load(const std::string& basePath);
-
-    bool spell(const std::string& word);
-    std::vector<std::string> suggest(const std::string& word);
-
-private:
-    std::unique_ptr<nuspell::Dictionary> dictionary;
-};
-
-} // namespace ime::spellcheck
-
-#endif // FLORISBOARD_SPELLINGDICT_H

app/src/main/cpp/nuspell/CMakeLists.txt

@@ -1,10 +0,0 @@
-add_library(nuspell
-aff_data.cxx     aff_data.hxx
-checker.cxx      checker.hxx
-suggester.cxx    suggester.hxx
-dictionary.cxx   dictionary.hxx
-                 unicode.hxx
-utils.cxx        utils.hxx
-                 structures.hxx)
-
-add_library(Nuspell::nuspell ALIAS nuspell)