Commit fede4c6c by zhangchengbo

fix:删除消息对话框长按ActionBar子项及点击事件

parent 6a258475
......@@ -7,6 +7,7 @@ import android.graphics.Typeface
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.util.Log
import android.util.Size
import android.util.TypedValue
import android.view.Menu
......@@ -32,7 +33,6 @@ import com.secspace.sms.R
import com.secspace.sms.activities.NewConversationActivity
import com.secspace.sms.activities.SimpleActivity
import com.secspace.sms.activities.ThreadActivity
import com.secspace.sms.activities.VCardViewerActivity
import com.secspace.sms.databinding.*
import com.secspace.sms.dialogs.DeleteConfirmationDialog
import com.secspace.sms.dialogs.MessageDetailsDialog
......@@ -63,14 +63,14 @@ class ThreadAdapter(
private val maxChatBubbleWidth = activity.usableScreenSize.x * 0.8f
init {
setupDragListener(true)
setupDragListener(false)
setHasStableIds(true)
}
override fun getActionMenuId() = R.menu.cab_thread
override fun getActionMenuId() = /*R.menu.cab_thread*/ 0
override fun prepareActionMode(menu: Menu) {
val isOneItemSelected = isOneItemSelected()
/*val isOneItemSelected = isOneItemSelected()
val selectedItem = getSelectedItems().firstOrNull() as? Message
val hasText = selectedItem?.body != null && selectedItem.body != ""
menu.apply {
......@@ -81,11 +81,11 @@ class ThreadAdapter(
findItem(R.id.cab_select_text).isVisible = isOneItemSelected && hasText
findItem(R.id.cab_properties).isVisible = isOneItemSelected
findItem(R.id.cab_restore).isVisible = isRecycleBin
}
}*/
}
override fun actionItemPressed(id: Int) {
if (selectedKeys.isEmpty()) {
/*if (selectedKeys.isEmpty()) {
return
}
......@@ -99,7 +99,7 @@ class ThreadAdapter(
R.id.cab_restore -> askConfirmRestore()
R.id.cab_select_all -> selectAll()
R.id.cab_properties -> showMessageDetails()
}
}*/
}
override fun getSelectableItemCount() = currentList.filterIsInstance<Message>().size
......@@ -457,28 +457,28 @@ class ThreadAdapter(
}
}
/* private fun setupVCardView(holder: ViewHolder, parent: LinearLayout, message: Message, attachment: Attachment) {
val uri = attachment.getUri()
val vCardView = ItemAttachmentVcardBinding.inflate(layoutInflater).apply {
setupVCardPreview(
activity = activity,
uri = uri,
onClick = {
if (actModeCallback.isSelectable) {
holder.viewClicked(message)
} else {
val intent = Intent(activity, VCardViewerActivity::class.java).also {
it.putExtra(EXTRA_VCARD_URI, uri)
}
activity.startActivity(intent)
}
},
onLongClick = { holder.viewLongClicked() }
)
}.root
parent.addView(vCardView)
}*/
/* private fun setupVCardView(holder: ViewHolder, parent: LinearLayout, message: Message, attachment: Attachment) {
val uri = attachment.getUri()
val vCardView = ItemAttachmentVcardBinding.inflate(layoutInflater).apply {
setupVCardPreview(
activity = activity,
uri = uri,
onClick = {
if (actModeCallback.isSelectable) {
holder.viewClicked(message)
} else {
val intent = Intent(activity, VCardViewerActivity::class.java).also {
it.putExtra(EXTRA_VCARD_URI, uri)
}
activity.startActivity(intent)
}
},
onLongClick = { holder.viewLongClicked() }
)
}.root
parent.addView(vCardView)
}*/
private fun setupFileView(holder: ViewHolder, parent: LinearLayout, message: Message, attachment: Attachment) {
val mimetype = attachment.mimetype
......
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