From 8e362f691936ca1a15e973994b7b4490d9e0b9ed Mon Sep 17 00:00:00 2001 From: sim Date: Wed, 31 Aug 2022 22:44:04 +0200 Subject: [PATCH 1/3] Hide playContentView for autoplayed animated stickers --- .../detail/timeline/helper/MessageInformationDataFactory.kt | 4 +++- .../home/room/detail/timeline/item/MessageImageVideoItem.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt index e86d3b2ec6..6d94837f88 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt @@ -34,9 +34,11 @@ import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent import org.matrix.android.sdk.api.session.events.model.getMsgType import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage +import org.matrix.android.sdk.api.session.events.model.isSticker import org.matrix.android.sdk.api.session.events.model.toModel import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent import org.matrix.android.sdk.api.session.room.model.RoomSummary +import org.matrix.android.sdk.api.session.room.model.message.MessageType import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent import org.matrix.android.sdk.api.session.room.send.SendState import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent @@ -122,7 +124,7 @@ class MessageInformationDataFactory @Inject constructor( isLastFromThisSender = isLastFromThisSender, e2eDecoration = e2eDecoration, sendStateDecoration = sendStateDecoration, - messageType = event.root.getMsgType() + messageType = if (event.root.isSticker()) { MessageType.MSGTYPE_STICKER_LOCAL } else { event.root.getMsgType() } ) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt index 910776f5d7..387ac669e0 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt @@ -82,7 +82,7 @@ abstract class MessageImageVideoItem : AbsMessageItem Date: Wed, 31 Aug 2022 22:53:49 +0200 Subject: [PATCH 2/3] Improve sticker visibility Increase its size and set timestamp inside --- .../room/detail/timeline/style/TimelineMessageLayoutFactory.kt | 1 + .../java/im/vector/app/features/media/ImageContentRenderer.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt index e1707decc9..14a02c7172 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt @@ -68,6 +68,7 @@ class TimelineMessageLayoutFactory @Inject constructor( private val MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE = setOf( MessageType.MSGTYPE_IMAGE, MessageType.MSGTYPE_VIDEO, + MessageType.MSGTYPE_STICKER_LOCAL, MessageType.MSGTYPE_BEACON_INFO, MessageType.MSGTYPE_LOCATION, MessageType.MSGTYPE_BEACON_LOCATION_DATA, diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt index 74c9b5c6b8..daaf3a19ec 100644 --- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt @@ -275,8 +275,7 @@ class ImageContentRenderer @Inject constructor( } Mode.STICKER -> { // limit on width - val maxWidthDp = min(dimensionConverter.dpToPx(120), maxImageWidth / 2) - finalWidth = min(dimensionConverter.dpToPx(width), maxWidthDp) + finalWidth = min(dimensionConverter.dpToPx(width), maxImageWidth * 3 / 4) finalHeight = finalWidth * height / width } } From 833ad6463cddef4901ef81347bf80040ce95cd9b Mon Sep 17 00:00:00 2001 From: sim Date: Wed, 31 Aug 2022 23:39:26 +0200 Subject: [PATCH 3/3] Add changelog detail Signed-off-by: sim --- changelog.d/6982.bugfix | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelog.d/6982.bugfix diff --git a/changelog.d/6982.bugfix b/changelog.d/6982.bugfix new file mode 100644 index 0000000000..baa75d9c15 --- /dev/null +++ b/changelog.d/6982.bugfix @@ -0,0 +1,2 @@ +Fix autoplayed animated stickers +Increase sticker size