diff --git a/app/build.gradle b/app/build.gradle
index 0883e403..26c2c7b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,6 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:d7c3f6de22'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:6cc19172f0'
implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c888ed58..111dad78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,21 +60,11 @@
android:label="@string/about"
android:parentActivityName=".activities.MainActivity" />
-
-
-
-
+ android:parentActivityName=".activities.MainActivity"
+ android:windowSoftInputMode="stateHidden">
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
index 244ccada..418a3fa2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -311,7 +311,7 @@ class MainActivity : SimpleActivity() {
private fun getTabIcon(position: Int): Drawable {
val drawableId = when (position) {
0 -> R.drawable.ic_person_vector
- 1 -> R.drawable.ic_star_on_vector
+ 1 -> R.drawable.ic_star_vector
else -> R.drawable.ic_clock_vector
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt
index 97104b45..9333fa4a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt
@@ -42,6 +42,24 @@ class SettingsActivity : SimpleActivity() {
setupDisableProximitySensor()
updateTextColors(settings_holder)
invalidateOptionsMenu()
+
+ arrayOf(
+ settings_color_customization_label,
+ settings_general_settings_label,
+ settings_startup_label,
+ settings_calls_label
+ ).forEach {
+ it.setTextColor(getAdjustedPrimaryColor())
+ }
+
+ arrayOf(
+ settings_color_customization_holder,
+ settings_general_settings_holder,
+ settings_startup_holder,
+ settings_calls_holder
+ ).forEach {
+ it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
+ }
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -51,6 +69,12 @@ class SettingsActivity : SimpleActivity() {
private fun setupPurchaseThankYou() {
settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
+
+ // make sure the corners at ripple fit the stroke rounded corners
+ if (settings_purchase_thank_you_holder.isGone()) {
+ settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
+ }
+
settings_purchase_thank_you_holder.setOnClickListener {
launchPurchaseThankYouIntent()
}
@@ -66,6 +90,11 @@ class SettingsActivity : SimpleActivity() {
private fun setupUseEnglish() {
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
settings_use_english.isChecked = config.useEnglish
+
+ if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
+ settings_manage_blocked_numbers_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
+ }
+
settings_use_english_holder.setOnClickListener {
settings_use_english.toggle()
config.useEnglish = settings_use_english.isChecked
@@ -77,6 +106,11 @@ class SettingsActivity : SimpleActivity() {
@TargetApi(Build.VERSION_CODES.N)
private fun setupManageBlockedNumbers() {
settings_manage_blocked_numbers_holder.beVisibleIf(isNougatPlus())
+
+ if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone() && settings_manage_blocked_numbers_holder.isGone()) {
+ settings_change_date_time_format_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
+ }
+
settings_manage_blocked_numbers_holder.setOnClickListener {
Intent(this, ManageBlockedNumbersActivity::class.java).apply {
startActivity(this)
@@ -164,10 +198,10 @@ class SettingsActivity : SimpleActivity() {
}
private fun setupStartNameWithSurname() {
- settings_start_with_surname.isChecked = config.startNameWithSurname
- settings_start_with_surname_holder.setOnClickListener {
- settings_start_with_surname.toggle()
- config.startNameWithSurname = settings_start_with_surname.isChecked
+ settings_start_name_with_surname.isChecked = config.startNameWithSurname
+ settings_start_name_with_surname_holder.setOnClickListener {
+ settings_start_name_with_surname.toggle()
+ config.startNameWithSurname = settings_start_name_with_surname.isChecked
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/SelectSIMDialog.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/SelectSIMDialog.kt
index 5832b0e6..2a3a5599 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/SelectSIMDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/SelectSIMDialog.kt
@@ -20,6 +20,11 @@ class SelectSIMDialog(val activity: BaseSimpleActivity, val phoneNumber: String,
init {
val radioGroup = view.select_sim_radio_group
+ view.apply {
+ select_sim_remember_holder.setOnClickListener {
+ select_sim_remember.toggle()
+ }
+ }
activity.getAvailableSIMCardLabels().forEachIndexed { index, SIMAccount ->
val radioButton = (activity.layoutInflater.inflate(R.layout.radio_button, null) as RadioButton).apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
index e88f9120..7f1c0cdc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/ContactsFragment.kt
@@ -108,6 +108,10 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
}.apply {
fragment_list.adapter = this
}
+
+ if (context.areSystemAnimationsEnabled) {
+ fragment_list.scheduleLayoutAnimation()
+ }
} else {
(currAdapter as ContactsAdapter).updateItems(contacts)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
index 4a5ec34b..6f8c9d98 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
@@ -85,6 +85,10 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
}.apply {
fragment_list.adapter = this
}
+
+ if (context.areSystemAnimationsEnabled) {
+ fragment_list.scheduleLayoutAnimation()
+ }
} else {
(currAdapter as ContactsAdapter).updateItems(contacts)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
index 5a14d93c..59db6c6b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
@@ -102,6 +102,10 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}.apply {
recents_list.adapter = this
}
+
+ if (context.areSystemAnimationsEnabled) {
+ recents_list.scheduleLayoutAnimation()
+ }
} else {
(currAdapter as RecentCallsAdapter).updateItems(recents)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt
index dfc9c380..464d10ac 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/CallManager.kt
@@ -55,13 +55,12 @@ class CallManager {
fun getCallContact(context: Context, callback: (CallContact?) -> Unit) {
ensureBackgroundThread {
val callContact = CallContact("", "", "")
- if (call == null || call?.details == null || call?.details?.handle == null) {
- callback(callContact)
- return@ensureBackgroundThread
+ val handle = try {
+ call?.details?.handle?.toString()
+ } catch (e: NullPointerException) {
+ null
}
- // something here can be null even after the previous check, so do it like this
- val handle = call?.details?.handle?.toString()
if (handle == null) {
callback(callContact)
return@ensureBackgroundThread
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt
index 83c5fb69..922b62b3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/services/CallService.kt
@@ -44,7 +44,7 @@ class CallService : InCallService() {
override fun onDestroy() {
super.onDestroy()
- CallManager.registerCallback(callListener)
+ CallManager.unregisterCallback(callListener)
callNotificationManager.cancelNotification()
callDurationHelper.cancel()
}
diff --git a/app/src/main/res/drawable/ic_backspace_vector.xml b/app/src/main/res/drawable/ic_backspace_vector.xml
index a5553c2a..27a88337 100644
--- a/app/src/main/res/drawable/ic_backspace_vector.xml
+++ b/app/src/main/res/drawable/ic_backspace_vector.xml
@@ -1,9 +1,3 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_call_accept.xml b/app/src/main/res/drawable/ic_call_accept.xml
index 546b3ac0..fa13df76 100644
--- a/app/src/main/res/drawable/ic_call_accept.xml
+++ b/app/src/main/res/drawable/ic_call_accept.xml
@@ -1,16 +1,9 @@
-
+
-
-
+
-
- -
-
+
-
- 
+
+