From aa627e6d9ff1660b587226621784cf5261b84b0e Mon Sep 17 00:00:00 2001 From: Honk2 Date: Sun, 21 Jul 2024 22:01:11 +0200 Subject: [PATCH 1/6] Fixes 139 --- .../kotlin/org/fossify/phone/activities/DialpadActivity.kt | 2 +- .../main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt b/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt index aada2a3d..d7b5f1bd 100644 --- a/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt @@ -273,7 +273,7 @@ class DialpadActivity : SimpleActivity() { (binding.dialpadList.adapter as? ContactsAdapter)?.finishActMode() val filtered = allContacts.filter { - var convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.name.normalizeString()) + var convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.name.normalizeString()).filterNot { it.isWhitespace() } if (hasRussianLocale) { var currConvertedName = "" diff --git a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt index df3dc5f5..d05fe94c 100644 --- a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.content.pm.ShortcutInfo import android.graphics.drawable.Icon import android.net.Uri +import android.telephony.PhoneNumberUtils import android.text.TextUtils import android.util.TypedValue import android.view.* @@ -368,7 +369,7 @@ class ContactsAdapter( if (name.contains(textToHighlight, true)) { name.highlightTextPart(textToHighlight, properPrimaryColor) } else { - name.highlightTextFromNumbers(textToHighlight, properPrimaryColor) + name.highlightTextFromNumbers(textToHighlight.replace('1', ' '), properPrimaryColor) } } } From 02097bccbd953877cde529b4e45a67873f65b355 Mon Sep 17 00:00:00 2001 From: Honk2 Date: Sun, 21 Jul 2024 22:29:41 +0200 Subject: [PATCH 2/6] fixes #139 --- .../org/fossify/phone/adapters/ContactsAdapter.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt index d05fe94c..f5920b80 100644 --- a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt @@ -369,7 +369,19 @@ class ContactsAdapter( if (name.contains(textToHighlight, true)) { name.highlightTextPart(textToHighlight, properPrimaryColor) } else { - name.highlightTextFromNumbers(textToHighlight.replace('1', ' '), properPrimaryColor) + var spacedTextToHighlight = textToHighlight + val strippedName = PhoneNumberUtils.convertKeypadLettersToDigits(name.filterNot { it.isWhitespace() }) + val startIndex = strippedName.indexOf(textToHighlight) + + if ( strippedName.contains(textToHighlight)) { + for (i in 0..spacedTextToHighlight.length) { + if (name[startIndex+i].isWhitespace()) { + spacedTextToHighlight = spacedTextToHighlight.replaceRange(i, i, " ") + } + } + } + + name.highlightTextFromNumbers(spacedTextToHighlight, properPrimaryColor) } } } From 77a86dd798d14b3ecfb4ddc140da25ce0e895d1e Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Sun, 12 Jan 2025 16:02:29 +0530 Subject: [PATCH 3/6] Add FAQ entry for emergency calls Closes https://github.com/FossifyOrg/Phone/issues/250 --- .../main/kotlin/org/fossify/phone/activities/MainActivity.kt | 1 + app/src/main/res/values/strings.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/kotlin/org/fossify/phone/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/phone/activities/MainActivity.kt index 7b30e375..c41b11c4 100644 --- a/app/src/main/kotlin/org/fossify/phone/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/phone/activities/MainActivity.kt @@ -557,6 +557,7 @@ class MainActivity : SimpleActivity() { val faqItems = arrayListOf( FAQItem(R.string.faq_1_title, R.string.faq_1_text), + FAQItem(R.string.faq_2_title, R.string.faq_2_text), FAQItem(R.string.faq_9_title_commons, R.string.faq_9_text_commons) ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 228654b5..9cb21300 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,9 @@ I hear incoming calls, but the screen doesn\'t turn on. What can I do? Such issues can have many device and system specific reasons, hard to say in general. You should look around in your device settings and make sure that the app is allowed to pop up when in background and allow displaying over other apps. + Why emergency calls don\'t work properly? + Due to system restrictions, emergency calls can only be made through your system\'s default dialer or phone app. To ensure emergency calls work properly, you need to keep the system app installed and enabled. + Speed dial