Merge pull request #378 from pavelpoley/fix/recents-menu-items

Show only the needed floating menu action buttons
This commit is contained in:
Tibor Kaputa
2022-06-16 14:43:58 +02:00
committed by GitHub
2 changed files with 19 additions and 1 deletions

View File

@@ -8,7 +8,6 @@ import android.text.TextUtils
import android.util.TypedValue import android.util.TypedValue
import android.view.* import android.view.*
import android.widget.PopupMenu import android.widget.PopupMenu
import androidx.core.view.isVisible
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
@@ -338,6 +337,7 @@ class RecentCallsAdapter(
val theme = activity.getPopupMenuTheme() val theme = activity.getPopupMenuTheme()
val contextTheme = ContextThemeWrapper(activity, theme) val contextTheme = ContextThemeWrapper(activity, theme)
val contact = findContactByCall(call) val contact = findContactByCall(call)
val selectedNumber = "tel:${call.phoneNumber}"
PopupMenu(contextTheme, view, Gravity.END).apply { PopupMenu(contextTheme, view, Gravity.END).apply {
inflate(R.menu.menu_recent_item_options) inflate(R.menu.menu_recent_item_options)
@@ -347,6 +347,8 @@ class RecentCallsAdapter(
findItem(R.id.cab_call_sim_1).isVisible = areMultipleSIMsAvailable findItem(R.id.cab_call_sim_1).isVisible = areMultipleSIMsAvailable
findItem(R.id.cab_call_sim_2).isVisible = areMultipleSIMsAvailable findItem(R.id.cab_call_sim_2).isVisible = areMultipleSIMsAvailable
findItem(R.id.cab_view_details).isVisible = contact != null findItem(R.id.cab_view_details).isVisible = contact != null
findItem(R.id.cab_block_number).isVisible = isNougatPlus()
findItem(R.id.cab_remove_default_sim).isVisible = activity.config.getCustomSIM(selectedNumber) != ""
} }
setOnMenuItemClickListener { item -> setOnMenuItemClickListener { item ->
val callId = call.id val callId = call.id
@@ -394,6 +396,16 @@ class RecentCallsAdapter(
selectedKeys.add(callId) selectedKeys.add(callId)
askConfirmRemove() askConfirmRemove()
} }
R.id.cab_copy_number -> {
executeItemMenuOperation(callId) {
copyNumber()
}
}
R.id.cab_remove_default_sim -> {
executeItemMenuOperation(callId) {
removeDefaultSIM()
}
}
} }
true true
} }

View File

@@ -24,10 +24,16 @@
android:id="@+id/cab_add_number" android:id="@+id/cab_add_number"
android:icon="@drawable/ic_add_person_vector" android:icon="@drawable/ic_add_person_vector"
android:title="@string/add_number_to_contact" /> android:title="@string/add_number_to_contact" />
<item
android:id="@+id/cab_copy_number"
android:title="@string/copy_number_to_clipboard" />
<item <item
android:id="@+id/cab_show_call_details" android:id="@+id/cab_show_call_details"
android:icon="@drawable/ic_info_vector" android:icon="@drawable/ic_info_vector"
android:title="@string/show_call_details" /> android:title="@string/show_call_details" />
<item
android:id="@+id/cab_remove_default_sim"
android:title="@string/unset_default_sim" />
<item <item
android:id="@+id/cab_block_number" android:id="@+id/cab_block_number"
android:icon="@drawable/ic_minus_circle_vector" android:icon="@drawable/ic_minus_circle_vector"