fix MessagEase keyboard #7

ufal · Apr 16, 2022 · 722aeb5 · 722aeb5
1 parent d3b4d60
commit 722aeb5
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 2 deletions.
diff --git a/app/src/main/java/cz/cuni/mff/ufal/translator/interactors/DiacriticsFixer.kt b/app/src/main/java/cz/cuni/mff/ufal/translator/interactors/DiacriticsFixer.kt
@@ -0,0 +1,47 @@
+package cz.cuni.mff.ufal.translator.interactors
+
+/**
+ * @author Tomas Krabac
+ */
+object DiacriticsFixer {
+
+    private val diacriticsMap = hashMapOf(
+        "Eˇ" to "Ě",
+        "Sˇ" to "Š",
+        "Cˇ" to "Č",
+        "Rˇ" to "Ř",
+        "Zˇ" to "Ž",
+        "Y´" to "Ý",
+        "A´" to "Á",
+        "I´" to "Í",
+        "E´" to "É",
+        "U´" to "Ú",
+        "U˚" to "Ů",
+        "Dˇ" to "Ď",
+        "Tˇ" to "Ť",
+        "Nˇ" to "Ň",
+
+        "eˇ" to "ě",
+        "sˇ" to "š",
+        "cˇ" to "č",
+        "rˇ" to "ř",
+        "zˇ" to "ž",
+        "y´" to "ý",
+        "a´" to "á",
+        "i´" to "í",
+        "e´" to "é",
+        "u´" to "ú",
+        "u˚" to "ů",
+        "dˇ" to "ď",
+        "tˇ" to "ť",
+    )
+
+    fun fixDiacritic(text: String) : String {
+        var result = text
+        diacriticsMap.entries.forEach{ entry ->
+            result = result.replace(entry.key, entry.value)
+        }
+        return result
+    }
+
+}
diff --git a/app/src/main/java/cz/cuni/mff/ufal/translator/ui/translations/screens/widgets/InputText.kt b/app/src/main/java/cz/cuni/mff/ufal/translator/ui/translations/screens/widgets/InputText.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import cz.cuni.mff.ufal.translator.R
+import cz.cuni.mff.ufal.translator.interactors.DiacriticsFixer
 import cz.cuni.mff.ufal.translator.ui.translations.models.InputTextData
 import cz.cuni.mff.ufal.translator.ui.translations.models.Language
 import cz.cuni.mff.ufal.translator.ui.translations.models.TextSource
@@ -89,8 +90,10 @@ fun InputText(
                     Box(Modifier.size(16.dp)) //fake end padding
                 },
                 onValueChange = {
-                    textFieldValue = it
-                    onValueChange(InputTextData(it.text, TextSource.Keyboard))
+                    val fixedText = DiacriticsFixer.fixDiacritic(it.text)
+
+                    textFieldValue = it.copy(fixedText)
+                    onValueChange(InputTextData(fixedText , TextSource.Keyboard))
                 },
                 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Go),
                 keyboardActions = KeyboardActions(