added special nordic keyboard for Finnish and Swedish

3 files changed, 82 insertions, 5 deletions

diff --git a/src/ui/android/res/xml/cyrillic.xml b/src/ui/android/res/xml/cyrillic.xml
index d20cabcac..b699d9c19 100644
--- a/src/ui/android/res/xml/cyrillic.xml
+++ b/src/ui/android/res/xml/cyrillic.xml
@@ -8,7 +8,7 @@
     >
 
     <Row>
-        <Key android:codes="1103" android:keyLabel="я" android:keyEdgeFlags="left"/>
+        <Key android:codes="1103" android:keyLabel="я" android:horizontalGap="0.5%p" android:keyEdgeFlags="left"/>
         <Key android:codes="1074" android:keyLabel="в"/>
         <Key android:codes="1077" android:keyLabel="е" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ёєэ"/>
         <Key android:codes="1088" android:keyLabel="р"/>
@@ -22,7 +22,7 @@
     </Row>
     
     <Row>
-        <Key android:codes="1072" android:keyLabel="а" android:keyEdgeFlags="left"/>
+        <Key android:codes="1072" android:keyLabel="а" android:horizontalGap="0.5%p" android:keyEdgeFlags="left"/>
         <Key android:codes="1089" android:keyLabel="с"/>
         <Key android:codes="1076" android:keyLabel="д" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ђ"/>
         <Key android:codes="1092" android:keyLabel="ф"/>
@@ -73,4 +73,4 @@
         <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" 
                 android:keyWidth="20%p" android:keyEdgeFlags="right"/>
     </Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/src/ui/android/res/xml/nordic.xml b/src/ui/android/res/xml/nordic.xml
new file mode 100644
index 000000000..4ebc92cd7
--- /dev/null
+++ b/src/ui/android/res/xml/nordic.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:keyWidth="9%p"
+    android:horizontalGap="0px"
+    android:verticalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    >
+
+    <Row>
+        <Key android:codes="113" android:keyLabel="q" android:horizontalGap="0.5%p" android:keyEdgeFlags="left"/>
+        <Key android:codes="119" android:keyLabel="w"/>
+        <Key android:codes="101" android:keyLabel="e" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="èéêë"/>
+        <Key android:codes="114" android:keyLabel="r"/>
+        <Key android:codes="116" android:keyLabel="t"/>
+        <Key android:codes="121" android:keyLabel="y" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ýÿ"/>
+        <Key android:codes="117" android:keyLabel="u" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ùúûü"/>
+        <Key android:codes="105" android:keyLabel="i" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ìíîï"/>
+        <Key android:codes="111" android:keyLabel="o" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="òóôõöœø"/>
+        <Key android:codes="112" android:keyLabel="p"/>
+        <Key android:codes="229" android:keyLabel="å" android:keyEdgeFlags="right"/>
+    </Row>
+    
+    <Row>
+        <Key android:codes="97" android:keyLabel="a" android:horizontalGap="0.5%p"
+                android:keyEdgeFlags="left" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="àáâãäåæ"/>
+        <Key android:codes="115" android:keyLabel="s" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ß"/>
+        <Key android:codes="100" android:keyLabel="d"/>
+        <Key android:codes="102" android:keyLabel="f"/>
+        <Key android:codes="103" android:keyLabel="g"/>
+        <Key android:codes="104" android:keyLabel="h"/>
+        <Key android:codes="106" android:keyLabel="j"/>
+        <Key android:codes="107" android:keyLabel="k"/>
+        <Key android:codes="108" android:keyLabel="l"/>
+        <Key android:codes="107" android:keyLabel="ö"/>
+        <Key android:codes="107" android:keyLabel="ä" android:keyEdgeFlags="right"/>
+    </Row>
+    
+    <Row>
+        <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" 
+                android:keyWidth="15%p" android:isModifier="true"
+                android:isSticky="true" android:keyEdgeFlags="left"/>
+        <Key android:codes="122" android:keyLabel="z" android:keyWidth="10%p"/>
+        <Key android:codes="120" android:keyLabel="x" android:keyWidth="10%p"/>
+        <Key android:codes="99" android:keyLabel="c" android:keyWidth="10%p"/>
+        <Key android:codes="118" android:keyLabel="v" android:keyWidth="10%p"/>
+        <Key android:codes="98" android:keyLabel="b" android:keyWidth="10%p"/>
+        <Key android:codes="110" android:keyLabel="n" android:keyWidth="10%p" android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters="ñ"/>
+        <Key android:codes="109" android:keyLabel="m" android:keyWidth="10%p"/>
+        <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" 
+                android:keyWidth="15%p" android:keyEdgeFlags="right"
+                android:isRepeatable="true"/>
+    </Row>
+
+    <Row android:rowEdgeFlags="bottom" android:keyboardMode="@string/normalKeyboardMode">
+        <Key android:codes="-100" android:keyLabel="Sr" android:keyWidth="13%p" android:keyEdgeFlags="left"/>
+        <Key android:codes="-200" android:keyLabel="Tr" android:keyWidth="13%p"/>
+        <Key android:codes="-2" android:keyLabel="123" android:keyWidth="13%p"/>
+        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 
+                android:keyWidth="29%p" android:isRepeatable="true"/>
+        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters=","
+                android:keyWidth="14%p"/>
+        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" 
+                android:keyWidth="19%p" android:keyEdgeFlags="right"/>
+    </Row>
+    
+    <Row android:rowEdgeFlags="bottom" android:keyboardMode="@string/internalKeyboardMode">
+        <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p" android:horizontalGap="10%p" android:keyEdgeFlags="left"/>
+        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 
+                android:keyWidth="30%p" android:isRepeatable="true"/>
+        <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_keyboard" android:popupCharacters=","
+                android:keyWidth="15%p"/>
+        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" 
+                android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+    </Row>
+</Keyboard>
+    
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index e9a5ecee5..3afd267c5 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -60,13 +60,13 @@ public class Translator {
     	new Language("bg-BG", "Bulgarian", "AppBul", R.xml.cyrillic),
     	new Language("cmn-Hans-CN", "Chinese", "AppChi", R.xml.qwerty),
         new Language("nl-NL", "Dutch", "AppDut", R.xml.qwerty),
-        new Language("fi-FI", "Finnish", "AppFin", R.xml.qwerty),
+        new Language("fi-FI", "Finnish", "AppFin", R.xml.nordic),
         new Language("fr-FR", "French",  "AppFre", R.xml.qwerty),
         new Language("de-DE", "German",  "AppGer", R.xml.qwerty),
         new Language("hi-IN", "Hindi",   "AppHin", R.xml.devanagari_page1, R.xml.devanagari_page2),
         new Language("it-IT", "Italian", "AppIta", R.xml.qwerty),
         new Language("es-ES", "Spanish", "AppSpa", R.xml.qwerty),
-        new Language("sv-SE", "Swedish", "AppSwe", R.xml.qwerty),
+        new Language("sv-SE", "Swedish", "AppSwe", R.xml.nordic),
     };
     // */