Merge pull request #585 from 33kk/master

Move hard sign to extended popup in Russian layout, add Ukrainian layout
florisboard · Apr 12, 2021 · 8933a03 · 8933a03
2 parents b341353 + d3240c9
commit 8933a03
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 3 deletions.
diff --git a/app/src/main/assets/ime/config.json b/app/src/main/assets/ime/config.json
@@ -489,6 +489,14 @@
         "characters": "jcuken_russian"
       }
     },
+    {
+      "id": 1351,
+      "languageTag": "uk",
+      "currencySet": "ukrainian_hryvnia",
+      "preferred": {
+        "characters": "jcuken_ukrainian"
+      }
+    },
     {
       "id": 1401,
       "languageTag": "el",

diff --git a/app/src/main/assets/ime/text/characters/extended_popups/ru.json b/app/src/main/assets/ime/text/characters/extended_popups/ru.json
@@ -1,14 +1,19 @@
 {
   "type": "characters/extended_popups",
   "name": "ru",
-  "authors": [ "williamtheaker" ],
+  "authors": [ "williamtheaker", "33kk" ],
   "mapping": {
     "all": {
       "е": {
         "relevant": [
           { "code":  1105, "label": "ё" }
         ]
       },
+      "ь": {
+        "relevant": [
+          { "code":  1098, "label": "ъ" }
+        ]
+      },
       "~right": {
         "main": { "code":   44, "label": "," },
         "relevant": [

diff --git a/app/src/main/assets/ime/text/characters/extended_popups/uk.json b/app/src/main/assets/ime/text/characters/extended_popups/uk.json
@@ -0,0 +1,45 @@
+{
+  "type": "characters/extended_popups",
+  "name": "uk",
+  "authors": [ "williamtheaker", "33kk" ],
+  "mapping": {
+    "all": {
+      "і": {
+        "relevant": [
+          { "code":  1111, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".ua" },
+          { "code": -255, "label": ".edu" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}
diff --git a/app/src/main/assets/ime/text/characters/jcuken_russian.json b/app/src/main/assets/ime/text/characters/jcuken_russian.json
@@ -16,8 +16,7 @@
       { "code":  1096, "label": "ш" },
       { "code":  1097, "label": "щ" },
       { "code":  1079, "label": "з" },
-      { "code":  1093, "label": "х" },
-      { "code":  1098, "label": "ъ" }
+      { "code":  1093, "label": "х" }
     ],
     [
       { "code": 1092 , "label": "ф" },

diff --git a/app/src/main/assets/ime/text/characters/jcuken_ukrainian.json b/app/src/main/assets/ime/text/characters/jcuken_ukrainian.json
@@ -0,0 +1,46 @@
+{
+  "type": "characters",
+  "name": "jcuken_ukrainian",
+  "label": "Ukrainian (JCUKEN)",
+  "authors": [ "williamtheaker", "33kk" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "code":  1081, "label": "й" },
+      { "code":  1094, "label": "ц" },
+      { "code":  1091, "label": "у" },
+      { "code":  1082, "label": "к" },
+      { "code":  1077, "label": "е" },
+      { "code":  1085, "label": "н" },
+      { "code":  1075, "label": "г" },
+      { "code":  1096, "label": "ш" },
+      { "code":  1097, "label": "щ" },
+      { "code":  1079, "label": "з" },
+      { "code":  1093, "label": "х" }
+    ],
+    [
+      { "code": 1092 , "label": "ф" },
+      { "code": 1110 , "label": "і" },
+      { "code": 1074 , "label": "в" },
+      { "code": 1072 , "label": "а" },
+      { "code": 1087 , "label": "п" },
+      { "code": 1088 , "label": "р" },
+      { "code": 1086 , "label": "о" },
+      { "code": 1083 , "label": "л" },
+      { "code": 1076 , "label": "д" },
+      { "code": 1078 , "label": "ж" },
+      { "code": 1108 , "label": "є" }
+    ],
+    [
+      { "code": 1103 , "label": "я" },
+      { "code": 1095 , "label": "ч" },
+      { "code": 1089 , "label": "с" },
+      { "code": 1084 , "label": "м" },
+      { "code": 1080 , "label": "и" },
+      { "code": 1090 , "label": "т" },
+      { "code": 1100 , "label": "ь" },
+      { "code": 1073 , "label": "б" },
+      { "code": 1102 , "label": "ю" }
+    ]
+  ]
+}