diff options
Diffstat (limited to 'srcs/juloo.keyboard2')
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 1 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java | 3 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/KeyModifier.java | 61 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/KeyValue.java | 7 |
4 files changed, 71 insertions, 1 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 3eacae3..eda2740 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -357,6 +357,7 @@ final class Config case "qwerty_sv_se": id = R.xml.qwerty_sv_se; break; case "qwerty_tr": id = R.xml.qwerty_tr; break; case "qwerty_pl": id = R.xml.qwerty_pl; break; + case "qwerty_vi": id = R.xml.qwerty_vi; break; case "qwertz": id = R.xml.qwertz; break; case "qwertz_cs": id = R.xml.qwertz_cs; break; case "qwertz_de": id = R.xml.qwertz_de; break; diff --git a/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java b/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java index f013e51..8938d2d 100644 --- a/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java +++ b/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java @@ -31,6 +31,9 @@ public class ExtraKeyCheckBoxPreference extends CheckBoxPreference "accent_breve", "accent_slash", "accent_bar", + "accent_dot_below", + "accent_hook_above", + "accent_horn", "€", "ß", "£", diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java index c00ff07..ad41edc 100644 --- a/srcs/juloo.keyboard2/KeyModifier.java +++ b/srcs/juloo.keyboard2/KeyModifier.java @@ -60,6 +60,9 @@ class KeyModifier case SLASH: return apply_map_char(k, map_char_slash); case BAR: return apply_map_char(k, map_char_bar); case ARROW_RIGHT: return apply_combining(k, "\u20D7"); + case DOT_BELOW: return apply_map_char(k, map_char_dot_below); + case HORN: return apply_map_char(k, map_char_horn); + case HOOK_ABOVE: return apply_map_char(k, map_char_hook_above); default: return k; } } @@ -570,4 +573,62 @@ class KeyModifier } } }; + + private static final Map_char map_char_dot_below = + new Map_char() { + public char apply(char c) + { + switch (c) + { + case 'a': return 'ạ'; + case 'ă': return 'ặ'; + case 'â': return 'ậ'; + case 'e': return 'ẹ'; + case 'ê': return 'ệ'; + case 'i': return 'ị'; + case 'o': return 'ọ'; + case 'ô': return 'ộ'; + case 'ơ': return 'ợ'; + case 'u': return 'ụ'; + case 'ư': return 'ự'; + case 'y': return 'ỵ'; + default: return c; + } + } + }; + private static final Map_char map_char_horn = + new Map_char() { + public char apply(char c) + { + switch (c) + { + case 'o': return 'ơ'; + case 'u': return 'ư'; + default: return c; + } + } + }; + + private static final Map_char map_char_hook_above = + new Map_char() { + public char apply(char c) + { + switch (c) + { + case 'a': return 'ả'; + case 'ă': return 'ẳ'; + case 'â': return 'ẩ'; + case 'e': return 'ẻ'; + case 'ê': return 'ể'; + case 'i': return 'ỉ'; + case 'o': return 'ỏ'; + case 'ô': return 'ổ'; + case 'ơ': return 'ở'; + case 'u': return 'ủ'; + case 'ư': return 'ử'; + case 'y': return 'ỷ'; + default: return c; + } + } + }; } diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index e93e61f..f45bc7c 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -1,6 +1,5 @@ package juloo.keyboard2; -import android.view.KeyCharacterMap; import android.view.KeyEvent; import java.util.HashMap; @@ -30,12 +29,15 @@ final class KeyValue META, DOUBLE_AIGU, DOT_ABOVE, + DOT_BELOW, GRAVE, AIGU, CIRCONFLEXE, TILDE, CEDILLE, TREMA, + HORN, + HOOK_ABOVE, SUPERSCRIPT, SUBSCRIPT, RING, @@ -310,6 +312,9 @@ final class KeyValue case "accent_arrow_right": return diacritic(0x5D, Modifier.ARROW_RIGHT); case "accent_breve": return diacritic(0x5E, Modifier.BREVE); case "accent_bar": return diacritic(0x5F, Modifier.BAR); + case "accent_dot_below": return diacritic(0x60, Modifier.DOT_BELOW); + case "accent_horn": return diacritic(0x61, Modifier.HORN); + case "accent_hook_above": return diacritic(0x62, Modifier.HOOK_ABOVE); case "superscript": return modifierKey("Sup", Modifier.SUPERSCRIPT, 0); case "subscript": return modifierKey("Sub", Modifier.SUBSCRIPT, 0); case "ordinal": return modifierKey("Ord", Modifier.ORDINAL, 0); |