Skip to content

Bugfix/card #4867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Bugfix/card #4867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e10d690
New cover
SeniorZhai Aug 1, 2024
416acf5
Merge remote-tracking branch 'origin/master' into feature/app_card
SeniorZhai Aug 9, 2024
06a6bce
Check app card cover size
SeniorZhai Aug 9, 2024
76f6593
Card refactoring
SeniorZhai Aug 9, 2024
13ab03f
Merge commit '007ca4cdd857b5e7e084146e3348366695bb2919' into bugfix/c…
SeniorZhai Aug 9, 2024
e10b2df
Update bind layout
SeniorZhai Aug 9, 2024
f0c188b
Merge branch 'master' into feature/app_card
SeniorZhai Aug 12, 2024
d0dfaed
Update json
SeniorZhai Aug 12, 2024
c6bdc63
Merge remote-tracking branch 'origin/feature/app_card' into bugfix/ca…
SeniorZhai Aug 12, 2024
8ff811a
Merge branch 'master' into bugfix/card_blink
SeniorZhai Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions app/src/main/java/one/mixin/android/ui/common/share/renderer/ShareAppActionsCardRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ open class ShareAppActionsCardRenderer(val context: Context, containerWidth: Int
init {
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).horizontalBias = 0.5f
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).width = width
binding.chatContentLayout.update(width - 12.dp, 2.dp)
binding.chatGroupLayout.setLineSpacing(6.dp)
(binding.chatGroupLayout.layoutParams as LinearLayout.LayoutParams).apply {
width = this@ShareAppActionsCardRenderer.width - 16.dp
Expand All @@ -44,24 +45,7 @@ open class ShareAppActionsCardRenderer(val context: Context, containerWidth: Int
actionCard: AppCardData,
isNightMode: Boolean,
) {
binding.chatContentLayout.setContent {
AppCard(
actionCard,
contentClick = {
},
contentLongClick = {
},
urlClick = { _ ->
},
urlLongClick = { _ ->
},
width = width, createdAt = nowInUtc(), isLast = true, isMe = true,
status = MessageStatus.DELIVERED.name,
isPin = false,
isRepresentative = false,
isSecret = false,
)
}
binding.chatContentLayout.setData(actionCard, true, isMe = true, createdAt = nowInUtc(), status = MessageStatus.DELIVERED.name, isPin = false, isRepresentative = false, isSecret = false, onItemListener = null, textGestureListener = null)
if (!actionCard.actions.isNullOrEmpty()) {
binding.chatGroupLayout.isVisible = true
for (b in actionCard.actions) {
Expand Down
62 changes: 36 additions & 26 deletions app/src/main/java/one/mixin/android/ui/conversation/chathistory/ActionsCardHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ package one.mixin.android.ui.conversation.chathistory

import android.graphics.Color
import android.graphics.Typeface
import android.view.GestureDetector
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
import one.mixin.android.R
import one.mixin.android.databinding.ItemChatActionsCardBinding
import one.mixin.android.extension.doubleClickVibrate
import one.mixin.android.extension.dp
import one.mixin.android.extension.heavyClickVibrate
import one.mixin.android.extension.maxCardWidth
Expand All @@ -18,6 +21,7 @@ import one.mixin.android.util.GsonHelper
import one.mixin.android.vo.AppCardData
import one.mixin.android.vo.ChatHistoryMessageItem
import one.mixin.android.vo.MessageStatus
import one.mixin.android.vo.isSecret
import one.mixin.android.widget.ActionButton

class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
Expand Down Expand Up @@ -53,31 +57,9 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
} else {
binding.chatName.visibility = View.GONE
}
val actionCard =
GsonHelper.customGson.fromJson(messageItem.content, AppCardData::class.java)
binding.chatContentLayout.setContent {
AppCard(
actionCard,
contentClick = {
val actionCard = messageItem.appCardData?:return
binding.chatContentLayout.setData(actionCard, isLast, isMe, messageItem.createdAt, MessageStatus.DELIVERED.name, isPin = false, isRepresentative = false, isSecret = false, onItemListener = onItemListener, textGestureListener = textGestureListener)

},
contentLongClick = {
itemView.context.heavyClickVibrate()
onItemListener.onMenu(binding.chatJump, messageItem)
},
urlClick = { url ->
onItemListener.onUrlClick(url)
},
urlLongClick = { url ->
onItemListener.onUrlLongClick(url)
},
width = null, createdAt = messageItem.createdAt, isLast, isMe,
MessageStatus.DELIVERED.name,
false,
isRepresentative = false,
isSecret = false,
)
}
binding.chatGroupLayout.removeAllViews()
if (!actionCard.actions.isNullOrEmpty()) {
binding.chatGroupLayout.isVisible = true
Expand Down Expand Up @@ -138,8 +120,8 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
)
}
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).horizontalBias = 1f
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginStart = 8.dp
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginEnd = 12.dp
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginStart = 6.dp
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginEnd = 8.dp
} else {
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).horizontalBias = 0f
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginStart = 12.dp
Expand All @@ -159,4 +141,32 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
}
}
}

private var textGestureListener: TextGestureListener? = null

class TextGestureListener(
var view: View,
var messageItem: ChatHistoryMessageItem,
var onItemListener: ChatHistoryAdapter.OnItemListener,
var absoluteAdapterPosition: Int = 0,
) : GestureDetector.SimpleOnGestureListener() {
var longPressed = false

override fun onDoubleTap(e: MotionEvent): Boolean {
view.context.doubleClickVibrate()
onItemListener.onTextDoubleClick(messageItem)
return true
}

override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
return true
}

override fun onLongPress(e: MotionEvent) {
if (longPressed) {
longPressed = false
return
}
}
}
}
81 changes: 48 additions & 33 deletions app/src/main/java/one/mixin/android/ui/conversation/holder/ActionsCardHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@ package one.mixin.android.ui.conversation.holder

import android.graphics.Color
import android.graphics.Typeface
import android.view.GestureDetector
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
import coil.load
import one.mixin.android.Constants.Colors.SELECT_COLOR
import one.mixin.android.R
import one.mixin.android.databinding.ItemChatActionsCardBinding
import one.mixin.android.extension.doubleClickVibrate
import one.mixin.android.extension.dp
import one.mixin.android.extension.heavyClickVibrate
import one.mixin.android.extension.loadImage
import one.mixin.android.extension.maxCardWidth
import one.mixin.android.ui.conversation.adapter.MessageAdapter
import one.mixin.android.ui.conversation.holder.base.BaseViewHolder
Expand Down Expand Up @@ -81,38 +86,9 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
} else {
binding.chatName.visibility = View.GONE
}
val actionCard =
GsonHelper.customGson.fromJson(messageItem.content, AppCardData::class.java)
val contentClick = {
if (hasSelect) {
onItemListener.onSelect(!isSelect, messageItem, absoluteAdapterPosition)
}
}
binding.chatContentLayout.setContent {
AppCard(
actionCard,
contentClick = contentClick,
contentLongClick = {
if (!hasSelect) {
itemView.context.heavyClickVibrate()
onItemListener.onLongClick(messageItem, absoluteAdapterPosition)
} else {
onItemListener.onSelect(!isSelect, messageItem, absoluteAdapterPosition)
}
},
urlClick = { url ->
onItemListener.onUrlClick(url)
},
urlLongClick = { url ->
onItemListener.onUrlLongClick(url)
},
width = null, createdAt = messageItem.createdAt, isLast, isMe,
messageItem.status,
messageItem.isPin ?: false,
isRepresentative = isRepresentative,
isSecret = messageItem.isSecret(),
)
}
val actionCard = messageItem.appCardData?:return
binding.chatContentLayout.setData(actionCard, isLast, isMe, messageItem.createdAt, messageItem.status, messageItem.isPin ?: false, isRepresentative, messageItem.isSecret(), onItemListener, textGestureListener)

binding.chatGroupLayout.removeAllViews()
if (!actionCard.actions.isNullOrEmpty()) {
binding.chatGroupLayout.isVisible = true
Expand Down Expand Up @@ -186,7 +162,7 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
}
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).horizontalBias = 1f
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginStart = 6.dp
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginEnd = 14.dp
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginEnd = 8.dp
} else {
(binding.chatLayout.layoutParams as ConstraintLayout.LayoutParams).horizontalBias = 0f
(binding.chatGroupLayout.layoutParams as MarginLayoutParams).marginStart = 12.dp
Expand All @@ -206,4 +182,43 @@ class ActionsCardHolder(val binding: ItemChatActionsCardBinding) :
}
}
}

private var textGestureListener: TextGestureListener? = null

class TextGestureListener(
var view: View,
var messageItem: MessageItem,
var hasSelect: Boolean = false,
var isSelect: Boolean = false,
var onItemListener: MessageAdapter.OnItemListener,
var absoluteAdapterPosition: Int = 0,
) : GestureDetector.SimpleOnGestureListener() {
var longPressed = false

override fun onDoubleTap(e: MotionEvent): Boolean {
view.context.doubleClickVibrate()
onItemListener.onTextDoubleClick(messageItem)
return true
}

override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
if (hasSelect) {
onItemListener.onSelect(!isSelect, messageItem, absoluteAdapterPosition)
}
return true
}

override fun onLongPress(e: MotionEvent) {
if (longPressed) {
longPressed = false
return
}

if (!hasSelect) {
view.performLongClick()
} else {
onItemListener.onSelect(!isSelect, messageItem, absoluteAdapterPosition)
}
}
}
}
Loading
Loading