From c7540e24c5ecddcedf8e5844481aa810c4222249 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 26 May 2023 12:16:14 +0200
Subject: [PATCH] Media : Fix small issues after merge

---
 .../android/features/messages/impl/timeline/TimelineView.kt   | 2 --
 .../impl/timeline/components/event/TimelineItemContentView.kt | 2 +-
 .../messages/impl/timeline/groups/TimelineItemGrouper.kt      | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
index 65abc98071..40be750c14 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
@@ -311,13 +311,11 @@ fun TimelineItemStateEventRow(
                 .zIndex(-1f)
                 .widthIn(max = 320.dp)
         ) {
-            val contentModifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp)
             TimelineItemEventContentView(
                 content = event.content,
                 interactionSource = interactionSource,
                 onClick = onClick,
                 onLongClick = onLongClick,
-                modifier = contentModifier
             )
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemContentView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemContentView.kt
index 9c9fb17c5f..2bb6056d35 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemContentView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemContentView.kt
@@ -77,7 +77,7 @@ fun TimelineItemEventContentView(
         )
         is TimelineItemStateContent -> TimelineItemStateView(
             content = content,
-            modifier = modifier
+            modifier = modifier.defaultContentPadding()
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
index 3cd1b8fd4a..24f74f4b5c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
@@ -19,6 +19,7 @@ package io.element.android.features.messages.impl.timeline.groups
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEmoteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemProfileChangeContent
@@ -27,6 +28,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.libraries.core.bool.orFalse
 import kotlinx.collections.immutable.toImmutableList
 
@@ -66,6 +68,8 @@ class TimelineItemGrouper @Inject constructor() {
             is TimelineItemEmoteContent,
             is TimelineItemNoticeContent,
             is TimelineItemTextContent,
+            is TimelineItemFileContent,
+            is TimelineItemVideoContent,
             TimelineItemUnknownContent -> false
             is TimelineItemProfileChangeContent,
             is TimelineItemRoomMembershipContent,