From f55bbfd96d75986b50c5f99f6c211efcdbfde28a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 31 Dec 2020 20:25:11 +0100
Subject: [PATCH] adding a menu item for displaying grouped Recent calls

---
 .../dialer/adapters/ContactsAdapter.kt        | 11 +++++-----
 .../dialer/adapters/RecentCallsAdapter.kt     | 20 +++++++++++++------
 app/src/main/res/menu/cab_recent_calls.xml    |  4 ++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
index 8ff9de2c..d2f086ff 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
@@ -46,16 +46,17 @@ class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList<SimpleCo
 
     override fun prepareActionMode(menu: Menu) {
         val hasMultipleSIMs = activity.areMultipleSIMsAvailable()
+        val isOneItemSelected = isOneItemSelected()
         val selectedNumber = "tel:${getSelectedPhoneNumber()}"
 
         menu.apply {
-            findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected()
-            findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected()
-            findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected() && activity.config.getCustomSIM(selectedNumber) != ""
+            findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
+            findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected
+            findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
 
             findItem(R.id.cab_delete).isVisible = showDeleteButton
-            findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected() && isOreoPlus()
-            findItem(R.id.cab_view_details).isVisible = isOneItemSelected()
+            findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected && isOreoPlus()
+            findItem(R.id.cab_view_details).isVisible = isOneItemSelected
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
index d0475aba..91479189 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
@@ -46,16 +46,19 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
 
     override fun prepareActionMode(menu: Menu) {
         val hasMultipleSIMs = activity.areMultipleSIMsAvailable()
+        val selectedItems = getSelectedItems()
+        val isOneItemSelected = selectedItems.size == 1
         val selectedNumber = "tel:${getSelectedPhoneNumber()}"
 
         menu.apply {
-            findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected()
-            findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected()
-            findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected() && activity.config.getCustomSIM(selectedNumber) != ""
+            findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
+            findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected
+            findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
 
             findItem(R.id.cab_block_number).isVisible = isNougatPlus()
-            findItem(R.id.cab_add_number).isVisible = isOneItemSelected()
-            findItem(R.id.cab_copy_number).isVisible = isOneItemSelected()
+            findItem(R.id.cab_add_number).isVisible = isOneItemSelected
+            findItem(R.id.cab_copy_number).isVisible = isOneItemSelected
+            findItem(R.id.cab_show_grouped_calls).isVisible = isOneItemSelected && selectedItems.first().neighbourIDs.isNotEmpty()
         }
     }
 
@@ -71,6 +74,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
             R.id.cab_block_number -> askConfirmBlock()
             R.id.cab_add_number -> addNumberToContact()
             R.id.cab_send_sms -> sendSMS()
+            R.id.cab_show_grouped_calls -> showGroupedCalls()
             R.id.cab_copy_number -> copyNumber()
             R.id.cab_remove -> askConfirmRemove()
             R.id.cab_select_all -> selectAll()
@@ -177,6 +181,10 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
         activity.launchSendSMSIntent(recipient)
     }
 
+    private fun showGroupedCalls() {
+
+    }
+
     private fun copyNumber() {
         val recentCall = getSelectedItems().firstOrNull() ?: return
         activity.copyToClipboard(recentCall.phoneNumber)
@@ -231,7 +239,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
 
     private fun getSelectedItems() = recentCalls.filter { selectedKeys.contains(it.id) } as ArrayList<RecentCall>
 
-    private fun getSelectedPhoneNumber() = getSelectedItems().firstOrNull()?.phoneNumber ?: null
+    private fun getSelectedPhoneNumber() = getSelectedItems().firstOrNull()?.phoneNumber
 
     private fun setupView(view: View, call: RecentCall) {
         view.apply {
diff --git a/app/src/main/res/menu/cab_recent_calls.xml b/app/src/main/res/menu/cab_recent_calls.xml
index 81076067..3511e52a 100644
--- a/app/src/main/res/menu/cab_recent_calls.xml
+++ b/app/src/main/res/menu/cab_recent_calls.xml
@@ -31,6 +31,10 @@
         android:icon="@drawable/ic_sms_vector"
         android:title="@string/send_sms"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/cab_show_grouped_calls"
+        android:title="@string/show_grouped_calls"
+        app:showAsAction="never" />
     <item
         android:id="@+id/cab_copy_number"
         android:title="@string/copy_number_to_clipboard"