Additional language on dialpad #49
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package org.fossify.phone.helpers | ||
|
|
||
| import android.telephony.PhoneNumberUtils | ||
| import com.google.gson.JsonParser | ||
|
|
||
| private typealias CharMap = HashMap<Char, Int> | ||
|
|
||
| /** | ||
| * A helper class to map chars of various alphabets to numbers | ||
| */ | ||
| object DialpadT9 { | ||
|
|
||
| private class T9Language{ | ||
| public val letters = Array<String>(8) {""} | ||
| public val charMap = CharMap() | ||
|
Comment on lines
+14
to
+15
|
||
| } | ||
|
|
||
| private val languages = HashMap<String, T9Language>() | ||
|
|
||
| /** | ||
| * Create a map for Latin (English) characters according to ITU E.161 and ISO/IEC 9995-8 | ||
| */ | ||
| private fun initLatinChars() { | ||
| val lang = T9Language() | ||
| for (c in 'A'..'Z') { | ||
| val number = PhoneNumberUtils.convertKeypadLettersToDigits(c.toString()).toInt(); | ||
| if(number in 2..9) { | ||
|
There was a problem hiding this comment. There is no space between |
||
| lang.letters[number - 2] += c.toString() | ||
| lang.charMap[c] = number | ||
| } | ||
| } | ||
|
|
||
| languages[LOCALE_EN] = lang | ||
| } | ||
|
|
||
| public var Initialized = false | ||
|
There was a problem hiding this comment. The variable name should start with a lowercase letter. Another redundant |
||
|
|
||
| init { | ||
| initLatinChars() | ||
| } | ||
|
|
||
| /** | ||
| * Read extra languages data from JSON | ||
| */ | ||
| public fun readFromJson(jsonText: String){ | ||
|
There was a problem hiding this comment. There is no space between |
||
| for (arrayElement in JsonParser.parseString(jsonText).asJsonArray) { | ||
| val objectElement = arrayElement.asJsonObject | ||
| val lang = objectElement["lang"].asString | ||
| if (languages[lang] != null) { | ||
| continue | ||
| } | ||
| val language = T9Language() | ||
| var i = 0 | ||
| for (lettersElement in objectElement["letters"].asJsonArray) { | ||
| val letters = lettersElement.asString | ||
| language.letters[i] = letters | ||
| for (c in letters) { | ||
| language.charMap[c] = i + 2 | ||
| } | ||
| i++ | ||
| } | ||
| languages[lang] = language | ||
| } | ||
|
|
||
| Initialized = true; | ||
|
|
||
| } | ||
|
|
||
| public fun getLettersForNumber(number: Int, language: String): String { | ||
| val lang = languages[language] | ||
| return if (lang == null || number < 2 || number > 9) { | ||
| "" | ||
| } else { | ||
| lang.letters[number - 2] | ||
| } | ||
| } | ||
|
|
||
| public fun convertLettersToNumbers(letters: String, language: String): String { | ||
| var res = "" | ||
| val lang = languages[language] | ||
| val langEn = languages[LOCALE_EN] | ||
|
|
||
| for (c in letters) { | ||
| if (lang != null && lang.charMap.containsKey(c)) { | ||
| res += lang.charMap[c] | ||
| } | ||
| else if (langEn != null && langEn.charMap.containsKey(c)) { | ||
|
There was a problem hiding this comment. The code in |
||
| res += langEn.charMap[c] | ||
| } | ||
| } | ||
|
|
||
| return res | ||
| } | ||
|
|
||
| public fun getSupportedSecondaryLanguages(): List<String> { | ||
| val res = MutableList<String>(0) {""} | ||
| for (lang in languages.keys) { | ||
| if (lang != LOCALE_EN) | ||
| res += lang | ||
| } | ||
| res.sort() | ||
| return res | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Duplicated code from
setupFontSize()