Merge branch 'develop' into resilience-rc

# Conflicts: # Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved # RiotSwiftUI/Modules/Room/Composer/View/Composer.swift # project.yml
2026-05-01 21:56:58 +02:00 · 2022-11-07 15:05:25 +01:00
parent 1df5432fbf 775784150e
commit b7bf6353d0
138 changed files with 1484 additions and 637 deletions
@@ -27,8 +27,8 @@ public class ThreadDataSource: RoomDataSource {
    
    public override func finalizeInitialization() {
        super.finalizeInitialization()
-        showReadMarker = false
-        showBubbleReceipts = false
+        showReadMarker = true
+        showBubbleReceipts = true
        showTypingRow = false

        NotificationCenter.default.addObserver(self,
@@ -42,22 +42,6 @@ public class ThreadDataSource: RoomDataSource {
                                               object: nil)
    }
    
-    public override var showReadMarker: Bool {
-        get {
-            return false
-        } set {
-            _ = newValue
-        }
-    }
-    
-    public override var showBubbleReceipts: Bool {
-        get {
-            return false
-        } set {
-            _ = newValue
-        }
-    }
-
    public override class func load(withRoomId roomId: String!,
                                    initialEventId: String!,
                                    threadId: String!,