Add default values for timeline item properties.

element-hq · Sep 14, 2022 · ee33153 · ee33153
1 parent 879e7b0
commit ee33153
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 24 deletions.
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
@@ -60,7 +60,6 @@ struct EmoteRoomTimelineView_Previews: PreviewProvider {
                               timestamp: timestamp,
                               shouldShowSenderDetails: true,
                               isOutgoing: false,
-                              senderId: senderId,
-                              properties: RoomTimelineItemProperties())
+                              senderId: senderId)
     }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -73,8 +73,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider {
                                                                       isOutgoing: false,
                                                                       senderId: "Bob",
                                                                       source: nil,
-                                                                      image: UIImage(systemName: "photo"),
-                                                                      properties: RoomTimelineItemProperties()))
+                                                                      image: UIImage(systemName: "photo")))
 
             ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,
                                                                       text: "Some other image",
@@ -83,8 +82,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider {
                                                                       isOutgoing: false,
                                                                       senderId: "Bob",
                                                                       source: nil,
-                                                                      image: nil,
-                                                                      properties: RoomTimelineItemProperties()))
+                                                                      image: nil))
 
             ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,
                                                                       text: "Blurhashed image",
@@ -95,8 +93,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider {
                                                                       source: nil,
                                                                       image: nil,
                                                                       aspectRatio: 0.7,
-                                                                      blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW",
-                                                                      properties: RoomTimelineItemProperties()))
+                                                                      blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW"))
         }
     }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
@@ -61,7 +61,6 @@ struct NoticeRoomTimelineView_Previews: PreviewProvider {
                                timestamp: timestamp,
                                shouldShowSenderDetails: true,
                                isOutgoing: false,
-                               senderId: senderId,
-                               properties: RoomTimelineItemProperties())
+                               senderId: senderId)
     }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
@@ -76,7 +76,6 @@ struct TextRoomTimelineView_Previews: PreviewProvider {
                              timestamp: timestamp,
                              shouldShowSenderDetails: shouldShowSenderDetails,
                              isOutgoing: isOutgoing,
-                             senderId: senderId,
-                             properties: RoomTimelineItemProperties())
+                             senderId: senderId)
     }
 }
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift
@@ -29,5 +29,5 @@ struct EmoteRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Equa
     var senderDisplayName: String?
     var senderAvatar: UIImage?
 
-    let properties: RoomTimelineItemProperties
+    var properties = RoomTimelineItemProperties()
 }
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift
@@ -36,5 +36,5 @@ struct ImageRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Equa
     var aspectRatio: CGFloat?
     var blurhash: String?
 
-    let properties: RoomTimelineItemProperties
+    var properties = RoomTimelineItemProperties()
 }
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift
@@ -29,5 +29,5 @@ struct NoticeRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Equ
     var senderDisplayName: String?
     var senderAvatar: UIImage?
 
-    let properties: RoomTimelineItemProperties
+    var properties = RoomTimelineItemProperties()
 }
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift
@@ -29,5 +29,5 @@ struct TextRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Equat
     var senderDisplayName: String?
     var senderAvatar: UIImage?
 
-    let properties: RoomTimelineItemProperties
+    var properties = RoomTimelineItemProperties()
 }
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
@@ -67,8 +67,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                                     isOutgoing: isOutgoing,
                                     senderId: message.sender,
                                     senderDisplayName: displayName,
-                                    senderAvatar: avatarImage,
-                                    properties: RoomTimelineItemProperties())
+                                    senderAvatar: avatarImage)
     }
 
     private func buildImageTimelineItemFromMessage(_ message: ImageRoomMessage,
@@ -95,8 +94,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                                      width: message.width,
                                      height: message.height,
                                      aspectRatio: aspectRatio,
-                                     blurhash: message.blurhash,
-                                     properties: RoomTimelineItemProperties())
+                                     blurhash: message.blurhash)
     }
 
     private func buildNoticeTimelineItemFromMessage(_ message: NoticeRoomMessage,
@@ -115,8 +113,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                                       isOutgoing: isOutgoing,
                                       senderId: message.sender,
                                       senderDisplayName: displayName,
-                                      senderAvatar: avatarImage,
-                                      properties: RoomTimelineItemProperties())
+                                      senderAvatar: avatarImage)
     }
 
     private func buildEmoteTimelineItemFromMessage(_ message: EmoteRoomMessage,
@@ -135,7 +132,6 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                                      isOutgoing: isOutgoing,
                                      senderId: message.sender,
                                      senderDisplayName: displayName,
-                                     senderAvatar: avatarImage,
-                                     properties: RoomTimelineItemProperties())
+                                     senderAvatar: avatarImage)
     }
 }