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 0a8a0f21..18bb3552 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -201,8 +201,14 @@ class MyKeyboard {
a.recycle()
a = res.obtainAttributes(Xml.asAttributeSet(parser), R.styleable.MyKeyboard_Key)
+
+ label = a.getText(R.styleable.MyKeyboard_Key_keyLabel) ?: ""
code = a.getInt(R.styleable.MyKeyboard_Key_code, 0)
+ if (label.isNotEmpty() && code == 0) {
+ code = label[0].code
+ }
+
popupCharacters = a.getText(R.styleable.MyKeyboard_Key_popupCharacters)
popupResId = a.getResourceId(R.styleable.MyKeyboard_Key_popupKeyboard, 0)
repeatable = a.getBoolean(R.styleable.MyKeyboard_Key_isRepeatable, false)
@@ -213,12 +219,9 @@ class MyKeyboard {
secondaryIcon = a.getDrawable(R.styleable.MyKeyboard_Key_secondaryKeyIcon)
secondaryIcon?.setBounds(0, 0, secondaryIcon!!.intrinsicWidth, secondaryIcon!!.intrinsicHeight)
- label = a.getText(R.styleable.MyKeyboard_Key_keyLabel) ?: ""
topSmallNumber = a.getString(R.styleable.MyKeyboard_Key_topSmallNumber) ?: ""
- if (label.isNotEmpty() && code != KEYCODE_MODE_CHANGE && code != KEYCODE_SHIFT) {
- code = label[0].code
- }
+
a.recycle()
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index 50a184c6..76b41259 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -569,6 +569,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
for (i in 0 until keyCount) {
val key = keys[i]
val code = key.code
+
+ // TODO: Space key background on a KEYBOARD_PHONE should not be applied
setupKeyBackground(key, code, canvas)
// Switch the character to uppercase if shift is pressed
@@ -674,9 +676,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
private fun setupKeyBackground(key: MyKeyboard.Key, keyCode: Int, canvas: Canvas) {
- val keyBackground = when (keyCode) {
- KEYCODE_SPACE -> getSpaceKeyBackground()
- KEYCODE_ENTER -> getEnterKeyBackground()
+ val keyBackground = when {
+ keyCode == KEYCODE_SPACE && key.label.isBlank() -> getSpaceKeyBackground()
+ keyCode == KEYCODE_ENTER -> getEnterKeyBackground()
else -> mKeyBackground
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4ec8767a..4a1cf2ce 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -41,13 +41,32 @@
-
+ android:orientation="vertical">
+
+
+
+
+
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a23f5e14..bd6e4d59 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -34,6 +34,7 @@
ارتفاع لوحة المفاتيح
إظهار حدود المفاتيح
إظهار الأرقام في صف منفصل
+ Start sentences with a capital letter
الرموز التعبيرية
Эмодзі
Емоджита
Emojis
خەندەکان
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 16c4eb4b..778ebba0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -34,6 +34,7 @@
Výška klávesnice
Zobrazit ohraničení kláves
Zobrazit čísla na samostatném řádku
+ Start sentences with a capital letter
Emotikony
Emojis
Emojis
Emojis
Emojis
Emoticonos
Emojid
Emojit
Émojis
Emoticona
Emoji
Emojik
Emoji
Emoji
Emojis
絵文字
Emojis
ഇമോജികൾ
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index b26fb32b..84e9bc60 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -34,6 +34,7 @@
Keyboard height
Show key borders
Show numbers on a separate row
+ Start sentences with a capital letter
Emojis
Emoji\'s
ایموجیاں
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index f7ca4035..bd7eea37 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -34,6 +34,7 @@
ਕੀਬੋਰਡ ਦੀ ਉਚਾਈ
Show key borders
Show numbers on a separate row
+ Start sentences with a capital letter
ਇਮੋਜੀਆਂ
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b45c3c73..d3751419 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -34,6 +34,7 @@
Wysokość klawiatury
Pokazuj obramowania klawiszy
Pokazuj cyfry w osobnym wierszu
+ Zaczynaj zdania wielką literą
Emoji
Emojis
Emojis
Emoticoane
Эмодзи
Emoji
Emoji-ji
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index efc5135a..928e8e1a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -34,6 +34,7 @@
Висина тастатуре
Прикажи ивице кључева
Прикажи бројеве у посебном реду
+ Start sentences with a capital letter
Емоји
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0a87c9e0..08ab6978 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -34,6 +34,7 @@
Tangentbordshöjd
Visa ramar runt tangenterna
Visa siffror på en separat rad
+ Start sentences with a capital letter
Emojier
Emojis
Emojiler
Емодзі
表情符号
Emojis
+
Emojis