timestamp for media messages

element-hq · Jun 8, 2023 · 5c6d2a0 · 5c6d2a0
1 parent cc21a90
commit 5c6d2a0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -130,8 +130,8 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
 
     @ViewBuilder
     var styledContent: some View {
-        if shouldAvoidBubbling {
-            contentWithReply
+        if isMediaType {
+            contentWithTimestamp
                 .bubbleStyle(inset: false,
                              cornerRadius: cornerRadius,
                              corners: roundedCorners)
@@ -147,11 +147,20 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
     @ViewBuilder
     var contentWithTimestamp: some View {
         if isTextItem {
-            ZStack(alignment: .topLeading) {
+            ZStack(alignment: .bottomTrailing) {
+                contentWithReply
+                localizedSendInfo
+            }
+        } else if isMediaType {
+            ZStack(alignment: .bottomTrailing) {
                 contentWithReply
-                    .layoutPriority(1)
                 localizedSendInfo
-                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomTrailing)
+                    .padding(.horizontal, 4)
+                    .padding(.vertical, 2)
+                    .background(Color.element.system)
+                    .cornerRadius(10)
+                    .padding(.trailing, 4)
+                    .padding(.bottom, 4)
             }
         } else {
             HStack(alignment: .bottom, spacing: 4) {
@@ -176,7 +185,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
         }
         .font(.compound.bodyXS)
         .foregroundColor(timelineItem.properties.deliveryStatus == .sendingFailed ? .element.alert : .element.secondaryContent)
-        .padding(.bottom, -4)
+        .padding(.bottom, isMediaType ? 0 : -4)
     }
 
     @ViewBuilder
@@ -213,7 +222,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
         return timelineGroupStyle == .single || timelineGroupStyle == .first ? 8 : 0
     }
 
-    private var shouldAvoidBubbling: Bool {
+    private var isMediaType: Bool {
         timelineItem is ImageRoomTimelineItem || timelineItem is VideoRoomTimelineItem || timelineItem is StickerRoomTimelineItem
     }
 

diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -57,7 +57,8 @@ struct ImageRoomTimelineView_Previews: PreviewProvider {
     static let viewModel = RoomScreenViewModel.mock
 
     static var previews: some View {
-        body.environmentObject(viewModel.context)
+        body
+            .environmentObject(viewModel.context)
         body
             .environment(\.timelineStyle, .plain)
             .environmentObject(viewModel.context)