From 8ea483b4b63e3e9dbd1e80b01330201e07b81d65 Mon Sep 17 00:00:00 2001 From: Pavel Poley Date: Tue, 7 Jun 2022 17:53:18 +0300 Subject: [PATCH 1/3] add some new items at floating contextual action menu --- .../dialer/adapters/RecentCallsAdapter.kt | 18 ++++++++++++++++++ .../main/res/menu/menu_recent_item_options.xml | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) 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 815500a9..23df6ef1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt @@ -369,6 +369,24 @@ class RecentCallsAdapter( launchContactDetailsIntent(contact) } } + R.id.cab_add_number -> { + executeItemMenuOperation(callId) { + addNumberToContact() + } + } + R.id.cab_show_call_details -> { + executeItemMenuOperation(callId) { + showCallDetails() + } + } + R.id.cab_block_number -> { + selectedKeys.add(callId) + askConfirmBlock() + } + R.id.cab_remove -> { + selectedKeys.add(callId) + askConfirmRemove() + } } true } diff --git a/app/src/main/res/menu/menu_recent_item_options.xml b/app/src/main/res/menu/menu_recent_item_options.xml index 0150c50a..0b7f018e 100644 --- a/app/src/main/res/menu/menu_recent_item_options.xml +++ b/app/src/main/res/menu/menu_recent_item_options.xml @@ -20,4 +20,20 @@ android:id="@+id/cab_view_details" android:icon="@drawable/ic_view_contact_details_vector" android:title="@string/view_contact_details" /> + + + + From 4c1d125294594c74a5fb615ec714b3c2c3adcbe3 Mon Sep 17 00:00:00 2001 From: Pavel Poley Date: Wed, 8 Jun 2022 11:26:48 +0300 Subject: [PATCH 2/3] hide overflow menu from ShowGroupedCallsDialog --- .../dialer/adapters/RecentCallsAdapter.kt | 23 ++++++++++++------- .../dialer/dialogs/ShowGroupedCallsDialog.kt | 3 +-- .../dialer/fragments/RecentsFragment.kt | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) 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 23df6ef1..144f7e09 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt @@ -8,6 +8,7 @@ import android.text.TextUtils import android.util.TypedValue import android.view.* import android.widget.PopupMenu +import androidx.core.view.isVisible import com.bumptech.glide.Glide import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog @@ -26,7 +27,11 @@ import com.simplemobiletools.dialer.models.RecentCall import kotlinx.android.synthetic.main.item_recent_call.view.* class RecentCallsAdapter( - activity: SimpleActivity, var recentCalls: ArrayList, recyclerView: MyRecyclerView, val refreshItemsListener: RefreshItemsListener?, + activity: SimpleActivity, + var recentCalls: ArrayList, + recyclerView: MyRecyclerView, + private val refreshItemsListener: RefreshItemsListener?, + private val showOverflowMenu: Boolean, itemClick: (Any) -> Unit ) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { @@ -315,13 +320,15 @@ class RecentCallsAdapter( item_recents_type.setImageDrawable(drawable) - overflow_menu_icon.drawable.apply { - mutate() - setTint(activity.getProperTextColor()) - } - - overflow_menu_icon.setOnClickListener { - showPopupMenu(overflow_menu_anchor, call) + overflow_menu_icon.isVisible = showOverflowMenu + if (showOverflowMenu) { + overflow_menu_icon.drawable.apply { + mutate() + setTint(activity.getProperTextColor()) + } + overflow_menu_icon.setOnClickListener { + showPopupMenu(overflow_menu_anchor, call) + } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt index 0071164f..1bf8a7ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/dialogs/ShowGroupedCallsDialog.kt @@ -9,7 +9,6 @@ import com.simplemobiletools.dialer.adapters.RecentCallsAdapter import com.simplemobiletools.dialer.helpers.RecentsHelper import com.simplemobiletools.dialer.models.RecentCall import kotlinx.android.synthetic.main.dialog_show_grouped_calls.view.* -import java.util.* class ShowGroupedCallsDialog(val activity: BaseSimpleActivity, callIds: ArrayList) { private var dialog: AlertDialog? = null @@ -20,7 +19,7 @@ class ShowGroupedCallsDialog(val activity: BaseSimpleActivity, callIds: ArrayLis RecentsHelper(activity).getRecentCalls(false) { allRecents -> val recents = allRecents.filter { callIds.contains(it.id) }.toMutableList() as ArrayList activity.runOnUiThread { - RecentCallsAdapter(activity as SimpleActivity, recents, select_grouped_calls_list, null) { + RecentCallsAdapter(activity as SimpleActivity, recents, select_grouped_calls_list, null, false) { }.apply { select_grouped_calls_list.adapter = this } 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 6336ef69..e7c59c32 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt @@ -90,7 +90,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage val currAdapter = recents_list.adapter if (currAdapter == null) { - RecentCallsAdapter(activity as SimpleActivity, recents, recents_list, this) { + RecentCallsAdapter(activity as SimpleActivity, recents, recents_list, this, true) { val recentCall = it as RecentCall if (context.config.showCallConfirmation) { CallConfirmationDialog(activity as SimpleActivity, recentCall.name) { From 4a6a208571beae8d1d809b5963704b5e6f247a54 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Wed, 8 Jun 2022 14:58:59 +0200 Subject: [PATCH 3/3] Update RecentCallsAdapter.kt --- .../com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 144f7e09..c37d35cf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt @@ -320,7 +320,7 @@ class RecentCallsAdapter( item_recents_type.setImageDrawable(drawable) - overflow_menu_icon.isVisible = showOverflowMenu + overflow_menu_icon.beVisibleIf(showOverflowMenu) if (showOverflowMenu) { overflow_menu_icon.drawable.apply { mutate()