Composer mode UI updates (#984)

* Fixes #975 - Update editing message UI

* Fixes #976 - Update reply composer mode UI to include message being replied to

* Use different icon corner radii in the timeline reply view depending on its placement

ElementX/Sources/Services/Timeline/TimelineItemContent/TimelineItemReplyDetails.swift

@@ -16,19 +16,9 @@
 
 import Foundation
 
-enum TimelineItemReplyContent: Hashable {
-    case audio(AudioRoomTimelineItemContent)
-    case emote(EmoteRoomTimelineItemContent)
-    case file(FileRoomTimelineItemContent)
-    case image(ImageRoomTimelineItemContent)
-    case notice(NoticeRoomTimelineItemContent)
-    case text(TextRoomTimelineItemContent)
-    case video(VideoRoomTimelineItemContent)
-}
-
 enum TimelineItemReplyDetails: Hashable {
     case notLoaded(eventID: String)
     case loading(eventID: String)
-    case loaded(sender: TimelineItemSender, content: TimelineItemReplyContent)
+    case loaded(sender: TimelineItemSender, contentType: EventBasedMessageTimelineItemContentType)
     case error(eventID: String, message: String)
 }

ElementX/Sources/Services/Timeline/TimelineItems/EventBasedMessageTimelineItemProtocol.swift

@@ -16,7 +16,17 @@
 
 import Foundation
 
-protocol EventBasedMessageTimelineItemProtocol: EventBasedTimelineItemProtocol {
-    var body: String { get }
-    var replyDetails: TimelineItemReplyDetails? { get }
+enum EventBasedMessageTimelineItemContentType: Hashable {
+    case audio(AudioRoomTimelineItemContent)
+    case emote(EmoteRoomTimelineItemContent)
+    case file(FileRoomTimelineItemContent)
+    case image(ImageRoomTimelineItemContent)
+    case notice(NoticeRoomTimelineItemContent)
+    case text(TextRoomTimelineItemContent)
+    case video(VideoRoomTimelineItemContent)
+}
+
+protocol EventBasedMessageTimelineItemProtocol: EventBasedTimelineItemProtocol {
+    var replyDetails: TimelineItemReplyDetails? { get }
+    var contentType: EventBasedMessageTimelineItemContentType { get }
 }

ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift

@@ -24,6 +24,8 @@ protocol EventBasedTimelineItemProtocol: RoomTimelineItemProtocol, CustomStringC
     
     var sender: TimelineItemSender { get }
     
+    var body: String { get }
+    
     var properties: RoomTimelineItemProperties { get }
 }
 

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/AudioRoomTimelineItem.swift

@@ -32,4 +32,8 @@ struct AudioRoomTimelineItem: EventBasedMessageTimelineItemProtocol, Identifiabl
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .audio(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/EmoteRoomTimelineItem.swift

@@ -33,4 +33,8 @@ struct EmoteRoomTimelineItem: TextBasedRoomTimelineItem, Identifiable, Hashable
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .emote(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/FileRoomTimelineItem.swift

@@ -34,4 +34,8 @@ struct FileRoomTimelineItem: EventBasedMessageTimelineItemProtocol, Identifiable
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .file(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/ImageRoomTimelineItem.swift

@@ -34,4 +34,8 @@ struct ImageRoomTimelineItem: EventBasedMessageTimelineItemProtocol, Identifiabl
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .image(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/NoticeRoomTimelineItem.swift

@@ -33,4 +33,8 @@ struct NoticeRoomTimelineItem: TextBasedRoomTimelineItem, Identifiable, Hashable
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .notice(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/TextRoomTimelineItem.swift

@@ -34,4 +34,8 @@ struct TextRoomTimelineItem: TextBasedRoomTimelineItem, Identifiable, Hashable {
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .text(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VideoRoomTimelineItem.swift

@@ -34,4 +34,8 @@ struct VideoRoomTimelineItem: EventBasedMessageTimelineItemProtocol, Identifiabl
     var body: String {
         content.body
     }
+    
+    var contentType: EventBasedMessageTimelineItemContentType {
+        .video(content)
+    }
 }

ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift

@@ -443,7 +443,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                                             avatarURL: nil)
             }
             
-            let replyContent: TimelineItemReplyContent
+            let replyContent: EventBasedMessageTimelineItemContentType
             switch message.msgtype() {
             case .audio(let content):
                 replyContent = .audio(buildAudioTimelineItemContent(content))
@@ -463,7 +463,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
                 return nil
             }
             
-            return .loaded(sender: sender, content: replyContent)
+            return .loaded(sender: sender, contentType: replyContent)
         case let .error(message):
             return .error(eventID: details.eventId, message: message)
         }