diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index 42cfb9e..777d35f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -12,7 +12,6 @@ import android.view.inputmethod.EditorInfo
import android.view.inputmethod.EditorInfo.IME_ACTION_NONE
import androidx.annotation.XmlRes
import com.simplemobiletools.keyboard.R
-import java.util.*
/**
* Loads an XML description of a keyboard and stores the attributes of the keys. A keyboard consists of rows of keys.
@@ -61,6 +60,7 @@ class MyKeyboard {
const val KEYCODE_ENTER = -4
const val KEYCODE_DELETE = -5
const val KEYCODE_SPACE = 32
+ const val KEYCODE_EMOJI = -6
fun getDimensionOrFraction(a: TypedArray, index: Int, base: Int, defValue: Int): Int {
val value = a.peekValue(index) ?: return defValue
@@ -203,7 +203,7 @@ class MyKeyboard {
topSmallNumber = a.getString(R.styleable.MyKeyboard_Key_topSmallNumber) ?: ""
if (label.isNotEmpty() && code != KEYCODE_MODE_CHANGE && code != KEYCODE_SHIFT) {
- code = label[0].toInt()
+ code = label[0].code
}
a.recycle()
}
@@ -281,7 +281,7 @@ class MyKeyboard {
key.x = x
key.y = y
key.label = character.toString()
- key.code = character.toInt()
+ key.code = character.code
column++
x += key.width + key.gap
mKeys!!.add(key)
diff --git a/app/src/main/res/xml/keys_letters_english_dvorak.xml b/app/src/main/res/xml/keys_letters_english_dvorak.xml
index 3da740e..f23a93f 100644
--- a/app/src/main/res/xml/keys_letters_english_dvorak.xml
+++ b/app/src/main/res/xml/keys_letters_english_dvorak.xml
@@ -122,10 +122,15 @@
+
+ app:keyWidth="40%p" />
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_english_qwertz.xml b/app/src/main/res/xml/keys_letters_english_qwertz.xml
index 60cc165..c1ea8f4 100644
--- a/app/src/main/res/xml/keys_letters_english_qwertz.xml
+++ b/app/src/main/res/xml/keys_letters_english_qwertz.xml
@@ -121,10 +121,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_french.xml b/app/src/main/res/xml/keys_letters_french.xml
index 94fc391..9f532f3 100644
--- a/app/src/main/res/xml/keys_letters_french.xml
+++ b/app/src/main/res/xml/keys_letters_french.xml
@@ -102,10 +102,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_german.xml b/app/src/main/res/xml/keys_letters_german.xml
index a55ec3f..0c1cd9c 100644
--- a/app/src/main/res/xml/keys_letters_german.xml
+++ b/app/src/main/res/xml/keys_letters_german.xml
@@ -121,10 +121,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_romanian.xml b/app/src/main/res/xml/keys_letters_romanian.xml
index cfb7e81..5a27c75 100644
--- a/app/src/main/res/xml/keys_letters_romanian.xml
+++ b/app/src/main/res/xml/keys_letters_romanian.xml
@@ -105,10 +105,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_russian.xml b/app/src/main/res/xml/keys_letters_russian.xml
index 55514b3..ea8c795 100644
--- a/app/src/main/res/xml/keys_letters_russian.xml
+++ b/app/src/main/res/xml/keys_letters_russian.xml
@@ -155,10 +155,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_slovenian.xml b/app/src/main/res/xml/keys_letters_slovenian.xml
index 6bc4da3..0f4a798 100644
--- a/app/src/main/res/xml/keys_letters_slovenian.xml
+++ b/app/src/main/res/xml/keys_letters_slovenian.xml
@@ -108,10 +108,15 @@
+
+ app:keyWidth="40%p" />
diff --git a/app/src/main/res/xml/keys_letters_spanish_qwerty.xml b/app/src/main/res/xml/keys_letters_spanish_qwerty.xml
index b4148b8..f839cad 100644
--- a/app/src/main/res/xml/keys_letters_spanish_qwerty.xml
+++ b/app/src/main/res/xml/keys_letters_spanish_qwerty.xml
@@ -6,130 +6,135 @@
app:keyLabel="q"
app:popupCharacters="1"
app:popupKeyboard="@xml/keyboard_popup_template"
- app:topSmallNumber="1"/>
+ app:topSmallNumber="1" />
+ app:topSmallNumber="2" />
+ app:topSmallNumber="3" />
+ app:topSmallNumber="4" />
+ app:topSmallNumber="5" />
+ app:topSmallNumber="6" />
+ app:topSmallNumber="7" />
+ app:topSmallNumber="8" />
+ app:topSmallNumber="9" />
+ app:topSmallNumber="0" />
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+ app:popupKeyboard="@xml/keyboard_popup_template" />
-
-
-
-
-
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+
+
+
+
+
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+ app:keyLabel="ñ" />
+ app:keyWidth="15%p" />
-
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+
-
-
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+
+
-
+ app:popupKeyboard="@xml/keyboard_popup_template" />
+
+ app:keyWidth="15%p" />
+ app:keyWidth="15%p" />
+ app:keyWidth="10%p" />
+
+ app:keyWidth="40%p" />
+ app:keyWidth="10%p" />
+ app:keyWidth="15%p" />