fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-02-19 13:00:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #20, add russian letters to the dialpad

Browse Source
This commit is contained in:
tibbi 2021-05-22 21:25:45 +02:00
parent 20799d490a
commit b461e1e88d
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
View File

@ -34,11 +34,14 @@ import kotlin.collections.ArrayList
class DialpadActivity : SimpleActivity() { class DialpadActivity : SimpleActivity() {
private var allContacts = ArrayList<SimpleContact>() private var allContacts = ArrayList<SimpleContact>()
private var speedDialValues = ArrayList<SpeedDial>() private var speedDialValues = ArrayList<SpeedDial>()
private val russianCharsMap = HashMap<Char, Int>()
private var hasRussianLocale = false
private var privateCursor: Cursor? = null private var privateCursor: Cursor? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_dialpad) setContentView(R.layout.activity_dialpad)
hasRussianLocale = Locale.getDefault().language == "ru"
if (checkAppSideloading()) { if (checkAppSideloading()) {
return return
@ -47,7 +50,8 @@ class DialpadActivity : SimpleActivity() {
speedDialValues = config.getSpeedDialValues() speedDialValues = config.getSpeedDialValues()
privateCursor = getMyContactsCursor(false, true)?.loadInBackground() privateCursor = getMyContactsCursor(false, true)?.loadInBackground()
if (Locale.getDefault().language == "ru") { if (hasRussianLocale) {
initRussianChars()
dialpad_2_letters.append("\nАБВГ") dialpad_2_letters.append("\nАБВГ")
dialpad_3_letters.append("\nДЕЁЖЗ") dialpad_3_letters.append("\nДЕЁЖЗ")
dialpad_4_letters.append("\nИЙКЛ") dialpad_4_letters.append("\nИЙКЛ")
@ -200,8 +204,19 @@ class DialpadActivity : SimpleActivity() {
} }
(dialpad_list.adapter as? ContactsAdapter)?.finishActMode() (dialpad_list.adapter as? ContactsAdapter)?.finishActMode()
val filtered = allContacts.filter { val filtered = allContacts.filter {
val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.name.normalizeString()) var convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.name.normalizeString())
if (hasRussianLocale) {
var currConvertedName = ""
convertedName.toLowerCase().forEach { char ->
val convertedChar = russianCharsMap.getOrElse(char) { char }
currConvertedName += convertedChar
}
convertedName = currConvertedName
}
it.doesContainPhoneNumber(text) || (convertedName.contains(text, true)) it.doesContainPhoneNumber(text) || (convertedName.contains(text, true))
}.sortedWith(compareBy { }.sortedWith(compareBy {
!it.doesContainPhoneNumber(text) !it.doesContainPhoneNumber(text)
@ -248,4 +263,15 @@ class DialpadActivity : SimpleActivity() {
} }
} }
} }
private fun initRussianChars() {
russianCharsMap['а'] = 2; russianCharsMap['б'] = 2; russianCharsMap['в'] = 2; russianCharsMap['г'] = 2
russianCharsMap['д'] = 3; russianCharsMap['е'] = 3; russianCharsMap['ё'] = 3; russianCharsMap['ж'] = 3; russianCharsMap['з'] = 3
russianCharsMap['и'] = 4; russianCharsMap['й'] = 4; russianCharsMap['к'] = 4; russianCharsMap['л'] = 4
russianCharsMap['м'] = 5; russianCharsMap['н'] = 5; russianCharsMap['о'] = 5; russianCharsMap['п'] = 5
russianCharsMap['р'] = 6; russianCharsMap['с'] = 6; russianCharsMap['т'] = 6; russianCharsMap['у'] = 6
russianCharsMap['ф'] = 7; russianCharsMap['х'] = 7; russianCharsMap['ц'] = 7; russianCharsMap['ч'] = 7
russianCharsMap['ш'] = 8; russianCharsMap['щ'] = 8; russianCharsMap['ъ'] = 8; russianCharsMap['ы'] = 8
russianCharsMap['ь'] = 9; russianCharsMap['э'] = 9; russianCharsMap['ю'] = 9; russianCharsMap['я'] = 9
}
} }