Commit fede4c6c by zhangchengbo

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

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