abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/values/arrays.xml6
-rw-r--r--res/xml/devanagari_1.xml (renamed from res/xml/hindi.xml)0
-rw-r--r--res/xml/devanagari_2.xml30
-rw-r--r--res/xml/method.xml4
-rw-r--r--srcs/juloo.keyboard2/Config.java3
-rw-r--r--srcs/juloo.keyboard2/KeyModifier.java56
6 files changed, 95 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 989ad32..dacc0b4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -28,7 +28,8 @@
<item>bone</item>
<item>jcuken_ua</item>
<item>bangla</item>
- <item>hindi</item>
+ <item>devanagari_1</item>
+ <item>devanagari_2</item>
<item>he_il_1452_1</item>
<item>he_il_1452_2</item>
<item>custom</item>
@@ -61,7 +62,8 @@
<item>Bone</item>
<item>ЙЦУКЕН (Українська)</item>
<item>বাংলা</item>
- <item>हिन्दी</item>
+ <item>देवनागरी (हिंदी)-1</item>
+ <item>देवनागरी (हिंदी)-2</item>
<item>Hebrew SI-1452-1</item>
<item>Hebrew SI-1452-2</item>
<item>@string/pref_layout_e_custom</item>
diff --git a/res/xml/hindi.xml b/res/xml/devanagari_1.xml
index a8787a4..a8787a4 100644
--- a/res/xml/hindi.xml
+++ b/res/xml/devanagari_1.xml
diff --git a/res/xml/devanagari_2.xml b/res/xml/devanagari_2.xml
new file mode 100644
index 0000000..7e1f770
--- /dev/null
+++ b/res/xml/devanagari_2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+ <row>
+ <key shift="0.35" width="0.9" key0="क" key1="ख" key2="घ" key3="ङ" key4="ग"/>
+ <key width="0.9" key0="च" key1="छ" key2="झ" key3="ञ" key4="ज"/>
+ <key width="0.9" key0="ट" key1="ठ" key2="ढ" key3="ण" key4="ड"/>
+ <key width="0.9" key0="त" key1="थ" key2="ध" key3="न" key4="द"/>
+ <key width="0.9" key0="प" key1="फ" key2="भ" key3="म" key4="ब"/>
+ <key width="0.9" key0="र" key1="ज्ञ" key2="ल" key3="य" key4="व"/>
+ <key width="0.9" key0="ह" key1="श" key2="ळ" key3="स" key4="ष"/>
+ </row>
+ <row>
+ <key shift="0.35" width="0.9" key0="ा" key1="अ" key2="आ"/>
+ <key width="0.9" key0="ि" key1="इ"/>
+ <key width="0.9" key0="ी" key1="ई"/>
+ <key width="0.9" key0="ु" key1="उ" key2="ऊ" key4="ू"/>
+ <key width="0.9" key0="े" key1="ए" key2="ऋ" key4="ृ"/>
+ <key width="0.9" key0="ै" key1="ऐ" key2="ऌ" key4="ॢ"/>
+ <key width="0.9" key0="ो" key1="ओ" key2="औ" key4="ौ"/>
+ </row>
+ <row>
+ <key key0="्" key2="tab" key4="esc"/>
+ <key key0="ँ" key1="₹" key2="॑" key3="ॖ" key4="॓"/>
+ <key key0="ं" key1="ॐ" key2="ऽ" key3="ः" key4="&quot;"/>
+ <key key0="।" key1="," key2=";" key3="!" key4="\?"/>
+ <key key0="़" key1="॰" key2="०" key3="-" key4="॒"/>
+ <key key0="५" key1="१" key2="३" key3="७" key4="९" key5="४" key6="६" key7="२" key8="८"/>
+ <key key0="backspace" key2="delete"/>
+ </row>
+</keyboard> \ No newline at end of file
diff --git a/res/xml/method.xml b/res/xml/method.xml
index d81e300..8e91024 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -11,7 +11,9 @@
<subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
<subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
<subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=he_il_1452_1,extra_keys=₪|€"/>
- <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=hindi,extra_keys=₹"/>
+ <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+ <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+ <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
<subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
<subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_grave|accent_aigu|€"/>
<subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_ko"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 3a28c75..a596f09 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -348,7 +348,8 @@ final class Config
case "bone": id = R.xml.bone; break;
case "colemak": id = R.xml.colemak; break;
case "dvorak": id = R.xml.dvorak; break;
- case "hindi": id = R.xml.hindi; break;
+ case "devanagari_1": id = R.xml.devanagari_1; break;
+ case "devanagari_2": id = R.xml.devanagari_2; break;
case "jcuken_ua": id = R.xml.jcuken_ua; break;
case "neo2": id = R.xml.neo2; break;
case "qwerty": id = R.xml.qwerty; break;
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 392b740..d9b5a47 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -281,6 +281,62 @@ class KeyModifier
case 'ס': return "segol";
case 'ב': return "hataf_segol"; // reduced segol
case 'צ': return "tsere";
+ // Devanagari symbols
+ case 'ए': return "ऍ";
+ case 'े': return "ॅ";
+ case 'ऐ': return "ऎ";
+ case 'ै': return "ॆ";
+ case 'ऋ': return "ॠ";
+ case 'ृ': return "ॄ";
+ case 'ळ': return "ऴ";
+ case 'र': return "ऱ";
+ case 'क': return "क़";
+ case 'ख': return "ख़";
+ case 'ग': return "ग़";
+ case 'घ': return "ॻ";
+ case 'ढ': return "ढ़";
+ case 'न': return "ऩ";
+ case 'ड': return "ड़";
+ case 'ट': return "ॸ";
+ case 'ण': return "ॾ";
+ case 'फ': return "फ़";
+ case 'ऌ': return "ॡ";
+ case 'ॢ': return "ॣ";
+ case 'औ': return "ॵ";
+ case 'ौ': return "ॏ";
+ case 'ओ': return "ऒ";
+ case 'ो': return "ॊ";
+ case 'च': return "ॼ";
+ case 'ज': return "ज़";
+ case 'ब': return "ॿ";
+ case 'व': return "ॺ";
+ case 'य': return "य़";
+ case 'अ': return "ॲ";
+ case 'आ': return "ऑ";
+ case 'ा': return "ॉ";
+ case 'झ': return "ॹ";
+ case 'ई': return "ॴ";
+ case 'ी': return "ऻ";
+ case 'इ': return "ॳ";
+ case 'ि': return "ऺ";
+ case 'उ': return "ॶ";
+ case 'ऊ': return "ॷ";
+ case 'ु': return "ऄ";
+ case 'ष': return "क्ष";
+ case 'थ': return "त्र";
+ case 'द': return "द्र";
+ case 'प': return "प्र";
+ case 'श': return "श्र";
+ case 'छ': return "श्च";
+ case 'ँ': return "ऀ";
+ case '₹': return "₨";
+ case 'ॖ': return "ॗ";
+ case '॓': return "॔";
+ case '॰': return "ॱ";
+ case '।': return "॥";
+ case 'ं': return "ॕ";
+ case '़': return "ॎ";
+ case 'ऽ': return "ॽ";
// other
case ' ': return "nbsp";
default: return null;