From f8e5309dec0968f3a98daaac2bba4a31e6119596 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Wed, 19 Jul 2023 10:47:18 +1000
Subject: [PATCH] Updated simple-commons

---
 app/build.gradle                                  |  4 ++--
 .../dialer/activities/MainActivity.kt             | 15 +++++++++++----
 .../dialer/fragments/FavoritesFragment.kt         |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64aee3d6..587d27fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.simplemobiletools.dialer"
@@ -47,7 +47,7 @@ android {
         }
     }
 
-    flavorDimensions "variants"
+    flavorDimensions = ["variants"]
     productFlavors {
         core {}
         fdroid {}
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 a936e0d5..4932eb03 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -75,7 +75,12 @@ class MainActivity : SimpleActivity() {
 
             handleNotificationPermission { granted ->
                 if (!granted) {
-                    PermissionRequiredDialog(this, R.string.allow_notifications_incoming_calls)
+                    PermissionRequiredDialog(this,
+                        textId = R.string.allow_notifications_incoming_calls,
+                        positiveActionCallback = {
+                            openNotificationSettings()
+                        }
+                    )
                 }
             }
         } else {
@@ -213,11 +218,11 @@ class MainActivity : SimpleActivity() {
             RadioItem(it, resources.getQuantityString(R.plurals.column_counts, it, it))
         }
 
-        val currentColumnCount = config.contactsGridColumnCnt
+        val currentColumnCount = config.contactsGridColumnCount
         RadioGroupDialog(this, ArrayList(items), currentColumnCount) {
             val newColumnCount = it as Int
             if (currentColumnCount != newColumnCount) {
-                config.contactsGridColumnCnt = newColumnCount
+                config.contactsGridColumnCount = newColumnCount
                 favorites_fragment.updateListAdapter()
             }
         }
@@ -559,6 +564,7 @@ class MainActivity : SimpleActivity() {
             }
         }
     }
+
     private fun showFilterDialog() {
         FilterContactSourcesDialog(this) {
             favorites_fragment?.refreshItems {
@@ -573,13 +579,14 @@ class MainActivity : SimpleActivity() {
                 }
             }
 
-            recents_fragment?.refreshItems{
+            recents_fragment?.refreshItems {
                 if (main_menu.isSearchOpen) {
                     getCurrentFragment()?.onSearchQueryChanged(main_menu.getCurrentQuery())
                 }
             }
         }
     }
+
     fun cacheContacts(contacts: List<Contact>) {
         try {
             cachedContacts.clear()
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 85ec9bab..4cad19af 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
@@ -126,7 +126,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
                 }
 
                 onSpanCountListener = { newSpanCount ->
-                    context.config.contactsGridColumnCnt = newSpanCount
+                    context.config.contactsGridColumnCount = newSpanCount
                 }
             }
 
@@ -195,7 +195,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
     }
 
     private fun setViewType(viewType: Int) {
-        val spanCount = context.config.contactsGridColumnCnt
+        val spanCount = context.config.contactsGridColumnCount
 
         val layoutManager = if (viewType == VIEW_TYPE_GRID) {
             letter_fastscroller.beGone()