Commit aac6f3f6 by zhangchengbo

fix:移除会话顶部菜单栏子项icon及点击事件

parent 16da07f7
...@@ -8,14 +8,12 @@ import com.secspace.sms.activities.SimpleActivity ...@@ -8,14 +8,12 @@ import com.secspace.sms.activities.SimpleActivity
import com.secspace.sms.dialogs.RenameConversationDialog import com.secspace.sms.dialogs.RenameConversationDialog
import com.secspace.sms.extensions.* import com.secspace.sms.extensions.*
import com.secspace.sms.helpers.refreshMessages import com.secspace.sms.helpers.refreshMessages
import com.secspace.sms.messaging.isShortCodeWithLetters
import com.secspace.sms.models.Conversation import com.secspace.sms.models.Conversation
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.FeatureLockedDialog import com.simplemobiletools.commons.dialogs.FeatureLockedDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.commons.helpers.KEY_PHONE
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isNougatPlus
import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.commons.views.MyRecyclerView
class ConversationsAdapter( class ConversationsAdapter(
...@@ -24,22 +22,23 @@ class ConversationsAdapter( ...@@ -24,22 +22,23 @@ class ConversationsAdapter(
override fun getActionMenuId() = R.menu.cab_conversations override fun getActionMenuId() = R.menu.cab_conversations
override fun prepareActionMode(menu: Menu) { override fun prepareActionMode(menu: Menu) {
val selectedItems = getSelectedItems() /* val selectedItems = getSelectedItems()
val isSingleSelection = isOneItemSelected() val isSingleSelection = isOneItemSelected()
val selectedConversation = selectedItems.firstOrNull() ?: return val selectedConversation = selectedItems.firstOrNull() ?: return
val isGroupConversation = selectedConversation.isGroupConversation val isGroupConversation = selectedConversation.isGroupConversation
val archiveAvailable = activity.config.isArchiveAvailable val archiveAvailable = activity.config.isArchiveAvailable*/
menu.apply { menu.apply {
findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number) findItem(R.id.cab_block_number).title = /*activity.addLockedLabelIfNeeded(com.simplemobiletools.commons.R.string.block_number)*/ ""
findItem(R.id.cab_block_number).isVisible = isNougatPlus() findItem(R.id.cab_block_number).isVisible = /*isNougatPlus()*/ false
findItem(R.id.cab_add_number_to_contact).isVisible = isSingleSelection && !isGroupConversation findItem(R.id.cab_add_number_to_contact).isVisible = /*isSingleSelection && !isGroupConversation*/ false
findItem(R.id.cab_dial_number).isVisible = /*isSingleSelection && !isGroupConversation && !isShortCodeWithLetters(selectedConversation.phoneNumber)*/ false findItem(R.id.cab_dial_number).isVisible =
findItem(R.id.cab_copy_number).isVisible = isSingleSelection && !isGroupConversation /*isSingleSelection && !isGroupConversation && !isShortCodeWithLetters(selectedConversation.phoneNumber)*/ false
findItem(R.id.cab_rename_conversation).isVisible = isSingleSelection && isGroupConversation findItem(R.id.cab_copy_number).isVisible = /*isSingleSelection && !isGroupConversation*/ false
findItem(R.id.cab_mark_as_read).isVisible = selectedItems.any { !it.read } findItem(R.id.cab_rename_conversation).isVisible = /*isSingleSelection && isGroupConversation*/ false
findItem(R.id.cab_mark_as_unread).isVisible = selectedItems.any { it.read } findItem(R.id.cab_mark_as_read).isVisible = /*selectedItems.any { !it.read }*/ false
findItem(R.id.cab_archive).isVisible = archiveAvailable findItem(R.id.cab_mark_as_unread).isVisible = /*selectedItems.any { it.read }*/ false
findItem(R.id.cab_archive).isVisible = /*archiveAvailable*/ false
checkPinBtnVisibility(this) checkPinBtnVisibility(this)
} }
} }
...@@ -50,7 +49,7 @@ class ConversationsAdapter( ...@@ -50,7 +49,7 @@ class ConversationsAdapter(
} }
when (id) { when (id) {
R.id.cab_add_number_to_contact -> addNumberToContact() /*R.id.cab_add_number_to_contact -> addNumberToContact()
R.id.cab_block_number -> tryBlocking() R.id.cab_block_number -> tryBlocking()
R.id.cab_dial_number -> dialNumber() R.id.cab_dial_number -> dialNumber()
R.id.cab_copy_number -> copyNumberToClipboard() R.id.cab_copy_number -> copyNumberToClipboard()
...@@ -59,9 +58,9 @@ class ConversationsAdapter( ...@@ -59,9 +58,9 @@ class ConversationsAdapter(
R.id.cab_rename_conversation -> renameConversation(getSelectedItems().first()) R.id.cab_rename_conversation -> renameConversation(getSelectedItems().first())
R.id.cab_mark_as_read -> markAsRead() R.id.cab_mark_as_read -> markAsRead()
R.id.cab_mark_as_unread -> markAsUnread() R.id.cab_mark_as_unread -> markAsUnread()
R.id.cab_select_all -> selectAll()*/
R.id.cab_pin_conversation -> pinConversation(true) R.id.cab_pin_conversation -> pinConversation(true)
R.id.cab_unpin_conversation -> pinConversation(false) R.id.cab_unpin_conversation -> pinConversation(false)
R.id.cab_select_all -> selectAll()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment