New timeline items (#424)

* Cleanup session verification state machine configuration * Add support for new timeline items: loading indicators, stickers and invalid/unsupported events * Add sticker accessibility label, fix session verification ones * Add support for the new TimelineStart timeline item and new pagination API. Remove identifiers from individual timeline items and only set them in the TimelineTableViewController * Add changelog
2026-11-03 06:55:59 +00:00 · 2023-01-09 17:17:18 +02:00
parent 956e92a9ac
commit d70a240869
59 changed files with 802 additions and 296 deletions
@@ -22,7 +22,7 @@ struct EmoteRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hash
    let text: String
    var attributedComponents: [AttributedStringBuilderComponent]?
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -27,7 +27,7 @@ struct EncryptedRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable,
    let text: String
    let encryptionType: EncryptionType
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -21,7 +21,7 @@ struct FileRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hasha
    let id: String
    let text: String
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -21,7 +21,7 @@ struct ImageRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hash
    let id: String
    let text: String
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -22,7 +22,7 @@ struct NoticeRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Has
    let text: String
    var attributedComponents: [AttributedStringBuilderComponent]?
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -0,0 +1,21 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct PaginationIndicatorRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable {
+    let id: String = UUID().uuidString
+}
@@ -17,5 +17,5 @@
 import Foundation

 struct ReadMarkerRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable {
-    let id: String
+    let id: String = UUID().uuidString
 }
@@ -21,7 +21,7 @@ struct RedactedRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, H
    let id: String
    let text: String
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -23,5 +23,5 @@ struct RoomTimelineItemProperties: Hashable {
    /// The aggregated reactions that have been sent for this item.
    var reactions: [AggregatedReaction] = []
    /// The delivery status for this item.
-    var deliveryStatus: MessageTimelineItemDeliveryStatus = .unknown
+    var deliveryStatus: TimelineItemDeliveryStatus = .unknown
 }
@@ -17,6 +17,6 @@
 import Foundation

 struct SeparatorRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable {
-    let id: String
+    let id: String = UUID().uuidString
    let text: String
 }
@@ -0,0 +1,40 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+struct StickerRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hashable {
+    let id: String
+    let text: String
+    let timestamp: String
+    let groupState: TimelineItemGroupState
+    let isOutgoing: Bool
+    let isEditable: Bool
+    
+    let senderId: String
+    var senderDisplayName: String?
+    var senderAvatar: UIImage?
+    
+    let urlString: String?
+    var image: UIImage?
+    
+    var width: CGFloat?
+    var height: CGFloat?
+    var aspectRatio: CGFloat?
+    var blurhash: String?
+    
+    var properties = RoomTimelineItemProperties()
+}
@@ -22,7 +22,7 @@ struct TextRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hasha
    let text: String
    var attributedComponents: [AttributedStringBuilderComponent]?
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool
    
@@ -0,0 +1,22 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+struct TimelineStartRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable {
+    let id: String = UUID().uuidString
+    let name: String?
+}
@@ -0,0 +1,36 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+struct UnsupportedRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hashable {
+    let id: String
+    let text: String
+    
+    let eventType: String
+    let error: String
+    
+    let timestamp: String
+    let groupState: TimelineItemGroupState
+    let isOutgoing: Bool
+    let isEditable: Bool
+    
+    let senderId: String
+    var senderDisplayName: String?
+    var senderAvatar: UIImage?
+    
+    var properties = RoomTimelineItemProperties()
+}
@@ -21,7 +21,7 @@ struct VideoRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Hash
    let id: String
    let text: String
    let timestamp: String
-    let inGroupState: TimelineItemInGroupState
+    let groupState: TimelineItemGroupState
    let isOutgoing: Bool
    let isEditable: Bool