fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-04-13 01:32:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding a menu item for displaying grouped Recent calls

Browse Source
This commit is contained in:
tibbi 2020-12-31 20:25:11 +01:00
parent c4be7561ca
commit f55bbfd96d
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
View File

@ -46,16 +46,17 @@ class ContactsAdapter(activity: SimpleActivity, var contacts: ArrayList<SimpleCo
override fun prepareActionMode(menu: Menu) { override fun prepareActionMode(menu: Menu) {
val hasMultipleSIMs = activity.areMultipleSIMsAvailable() val hasMultipleSIMs = activity.areMultipleSIMsAvailable()
val isOneItemSelected = isOneItemSelected()
val selectedNumber = "tel:${getSelectedPhoneNumber()}" val selectedNumber = "tel:${getSelectedPhoneNumber()}"
menu.apply { menu.apply {
findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected() findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_call_sim_2).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_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
findItem(R.id.cab_delete).isVisible = showDeleteButton findItem(R.id.cab_delete).isVisible = showDeleteButton
findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected() && isOreoPlus() findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected && isOreoPlus()
findItem(R.id.cab_view_details).isVisible = isOneItemSelected() findItem(R.id.cab_view_details).isVisible = isOneItemSelected
} }
} }

20
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
View File

@ -46,16 +46,19 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
override fun prepareActionMode(menu: Menu) { override fun prepareActionMode(menu: Menu) {
val hasMultipleSIMs = activity.areMultipleSIMsAvailable() val hasMultipleSIMs = activity.areMultipleSIMsAvailable()
val selectedItems = getSelectedItems()
val isOneItemSelected = selectedItems.size == 1
val selectedNumber = "tel:${getSelectedPhoneNumber()}" val selectedNumber = "tel:${getSelectedPhoneNumber()}"
menu.apply { menu.apply {
findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected() findItem(R.id.cab_call_sim_1).isVisible = hasMultipleSIMs && isOneItemSelected
findItem(R.id.cab_call_sim_2).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_remove_default_sim).isVisible = isOneItemSelected && activity.config.getCustomSIM(selectedNumber) != ""
findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_block_number).isVisible = isNougatPlus()
findItem(R.id.cab_add_number).isVisible = isOneItemSelected() findItem(R.id.cab_add_number).isVisible = isOneItemSelected
findItem(R.id.cab_copy_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_block_number -> askConfirmBlock()
R.id.cab_add_number -> addNumberToContact() R.id.cab_add_number -> addNumberToContact()
R.id.cab_send_sms -> sendSMS() R.id.cab_send_sms -> sendSMS()
R.id.cab_show_grouped_calls -> showGroupedCalls()
R.id.cab_copy_number -> copyNumber() R.id.cab_copy_number -> copyNumber()
R.id.cab_remove -> askConfirmRemove() R.id.cab_remove -> askConfirmRemove()
R.id.cab_select_all -> selectAll() R.id.cab_select_all -> selectAll()
@ -177,6 +181,10 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
activity.launchSendSMSIntent(recipient) activity.launchSendSMSIntent(recipient)
} }
private fun showGroupedCalls() {
}
private fun copyNumber() { private fun copyNumber() {
val recentCall = getSelectedItems().firstOrNull() ?: return val recentCall = getSelectedItems().firstOrNull() ?: return
activity.copyToClipboard(recentCall.phoneNumber) 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 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) { private fun setupView(view: View, call: RecentCall) {
view.apply { view.apply {

4
app/src/main/res/menu/cab_recent_calls.xml
View File

@ -31,6 +31,10 @@
android:icon="@drawable/ic_sms_vector" android:icon="@drawable/ic_sms_vector"
android:title="@string/send_sms" android:title="@string/send_sms"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_show_grouped_calls"
android:title="@string/show_grouped_calls"
app:showAsAction="never" />
<item <item
android:id="@+id/cab_copy_number" android:id="@+id/cab_copy_number"
android:title="@string/copy_number_to_clipboard" android:title="@string/copy_number_to_clipboard"