6.0.3

Goodwy · Dec 7, 2024 · 8db4f37 · 8db4f37
1 parent e1414d9
commit 8db4f37
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/app/src/main/kotlin/com/goodwy/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/goodwy/dialer/activities/MainActivity.kt
@@ -900,14 +900,14 @@ class MainActivity : SimpleActivity() {
         val showTabs = config.showTabs
         val fragments = arrayListOf<MyViewPagerFragment<*>?>()
 
-        if (showTabs and TAB_CALL_HISTORY > 0) {
-            fragments.add(getRecentsFragment())
-        }
-
         if (showTabs and TAB_FAVORITES > 0) {
             fragments.add(getFavoritesFragment())
         }
 
+        if (showTabs and TAB_CALL_HISTORY > 0) {
+            fragments.add(getRecentsFragment())
+        }
+
         if (showTabs and TAB_CONTACTS > 0) {
             fragments.add(getContactsFragment())
         }

diff --git a/app/src/main/kotlin/com/goodwy/dialer/activities/SettingsActivity.kt b/app/src/main/kotlin/com/goodwy/dialer/activities/SettingsActivity.kt
@@ -1561,7 +1561,7 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupOptionsMenu() {
-        val id = 602 //TODO changelog
+        val id = 603 //TODO changelog
         binding.settingsToolbar.menu.apply {
             findItem(R.id.whats_new).isVisible = BuildConfig.VERSION_CODE == id
         }
@@ -1578,7 +1578,7 @@ class SettingsActivity : SimpleActivity() {
 
     private fun showWhatsNewDialog(id: Int) {
         arrayListOf<Release>().apply {
-            add(Release(id, R.string.release_602)) //TODO changelog
+            add(Release(id, R.string.release_603)) //TODO changelog
             WhatsNewDialog(this@SettingsActivity, this)
         }
     }

diff --git a/app/src/main/kotlin/com/goodwy/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/goodwy/dialer/adapters/RecentCallsAdapter.kt
@@ -570,7 +570,7 @@ class RecentCallsAdapter(
                 var nameToShow = if (name == call.phoneNumber && formatPhoneNumbers) {
                     SpannableString(name.formatPhoneNumber())
                 } else {
-                    SpannableString(name)
+                    SpannableString(formatterUnicodeWrap(name))
                 }
 
                 if (call.groupedCalls != null) {
@@ -582,11 +582,17 @@ class RecentCallsAdapter(
                 }
 
                 itemRecentsName.apply {
-                    text = formatterUnicodeWrap(nameToShow.toString())
+                    text = nameToShow
                     setTextColor(if (call.type == Calls.MISSED_TYPE) missedCallColor else textColor)
                     setTextSize(TypedValue.COMPLEX_UNIT_PX, currentFontSize)
                 }
 
+                var numberToShow =
+                    if (formatPhoneNumbers) SpannableString(call.phoneNumber.formatPhoneNumber()) else SpannableString(call.phoneNumber)
+                if (textToHighlight.isNotEmpty() && numberToShow.contains(textToHighlight, true)) {
+                    numberToShow = SpannableString(numberToShow.toString().highlightTextPart(textToHighlight, properPrimaryColor))
+                }
+
                 itemRecentsNumber.apply {
                     setTextColor(textColor)
                     setTextSize(TypedValue.COMPLEX_UNIT_PX, currentFontSize * 0.8f)
@@ -598,7 +604,7 @@ class RecentCallsAdapter(
                             if (formatPhoneNumbers) call.phoneNumber.formatPhoneNumber() else call.phoneNumber
                         }
                     }
-                    text = formatterUnicodeWrap(recentsNumber)
+                    text = if (name != call.phoneNumber && textToHighlight.isNotEmpty()) numberToShow else formatterUnicodeWrap(recentsNumber)
                 }
 
                 itemRecentsDateTime.apply {
@@ -713,7 +719,7 @@ class RecentCallsAdapter(
                 var nameToShow = if (name == call.phoneNumber && formatPhoneNumbers) {
                     SpannableString(name.formatPhoneNumber())
                 } else {
-                    SpannableString(name)
+                    SpannableString(formatterUnicodeWrap(name))
                 }
 
                 if (call.groupedCalls != null) {
@@ -725,11 +731,17 @@ class RecentCallsAdapter(
                 }
 
                 itemRecentsName.apply {
-                    text = formatterUnicodeWrap(nameToShow.toString())
+                    text = nameToShow
                     setTextColor(if (call.type == Calls.MISSED_TYPE) missedCallColor else textColor)
                     setTextSize(TypedValue.COMPLEX_UNIT_PX, currentFontSize)
                 }
 
+                var numberToShow =
+                    if (formatPhoneNumbers) SpannableString(call.phoneNumber.formatPhoneNumber()) else SpannableString(call.phoneNumber)
+                if (textToHighlight.isNotEmpty() && numberToShow.contains(textToHighlight, true)) {
+                    numberToShow = SpannableString(numberToShow.toString().highlightTextPart(textToHighlight, properPrimaryColor))
+                }
+
                 itemRecentsNumber.apply {
                     setTextColor(textColor)
                     setTextSize(TypedValue.COMPLEX_UNIT_PX, currentFontSize * 0.8f)
@@ -741,7 +753,7 @@ class RecentCallsAdapter(
                             if (formatPhoneNumbers) call.phoneNumber.formatPhoneNumber() else call.phoneNumber
                         }
                     }
-                    text = formatterUnicodeWrap(recentsNumber)
+                    text = if (name != call.phoneNumber && textToHighlight.isNotEmpty()) numberToShow else formatterUnicodeWrap(recentsNumber)
                 }
 
                 itemRecentsDateTime.apply {

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -3,7 +3,7 @@
     <string name="app_name_g">Right Dialer</string>
 
     <!-- Release notes --><!-- TODO changelog -->
-    <string name="release_602">
+    <string name="release_603">
         Changed theme logic\n
         Added ‘App icon color’ option\n
         Add dynamic shortcuts for starred contacts\n

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,8 +32,8 @@ app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
 #versioning
 app-version-appId = "com.goodwy.dialer"
-app-version-versionCode = "602"
-app-version-versionName = "6.0.2"
+app-version-versionCode = "603"
+app-version-versionName = "6.0.3"
 [libraries]
 #EventBus
 eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }