Skip to content

Commit 8d4f6f3

Browse files
stefanceriustefanceriu
committed
Better timeline handling, based on improved rust APIs.
1 parent fc8e92e commit 8d4f6f3

11 files changed

+217
-78
lines changed

‎ElementX.xcodeproj/project.pbxproj

+42-15
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,19 @@
88

99
/* Begin PBXBuildFile section */
1010
182BC48127C4EBBB00A30C33 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 182BC48027C4EBBB00A30C33 /* Kingfisher */; };
11+
184B31DF27D898960075A669 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 184B31DE27D898960075A669 /* Introspect */; };
1112
1850253F27B6918D002E6B18 /* ElementXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850253E27B6918D002E6B18 /* ElementXTests.swift */; };
1213
1850254927B6918D002E6B18 /* ElementXUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254827B6918D002E6B18 /* ElementXUITests.swift */; };
1314
1850254B27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254A27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift */; };
14-
1850255927B69388002E6B18 /* MatrixRustSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 1850255827B69388002E6B18 /* MatrixRustSDK */; };
1515
1850256C27B6A135002E6B18 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850256227B6A135002E6B18 /* AppCoordinator.swift */; };
1616
1850256F27B6A135002E6B18 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850256527B6A135002E6B18 /* AppDelegate.swift */; };
1717
1850257027B6A135002E6B18 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1850256827B6A135002E6B18 /* Assets.xcassets */; };
1818
1850257127B6A135002E6B18 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1850256927B6A135002E6B18 /* LaunchScreen.storyboard */; };
19+
1859CF5527D7A6FF00E86E4E /* MatrixRustSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 1859CF5427D7A6FF00E86E4E /* MatrixRustSDK */; };
1920
1863A3FC27BA5A9100B52E4D /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 1863A3FB27BA5A9100B52E4D /* KeychainAccess */; };
2021
1863A40627BA6DFC00B52E4D /* SwiftyBeaver in Frameworks */ = {isa = PBXBuildFile; productRef = 1863A40527BA6DFC00B52E4D /* SwiftyBeaver */; };
22+
18A318DC27DA42C9000867CD /* RoomTimelineItemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A318DA27DA42C9000867CD /* RoomTimelineItemProtocol.swift */; };
23+
18A318DD27DA42C9000867CD /* TextRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A318DB27DA42C9000867CD /* TextRoomTimelineItem.swift */; };
2124
18F2BAD727D25B4000DD1988 /* RoomProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BA7327D25B4000DD1988 /* RoomProxyProtocol.swift */; };
2225
18F2BAD827D25B4000DD1988 /* RoomProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BA7427D25B4000DD1988 /* RoomProxy.swift */; };
2326
18F2BAD927D25B4000DD1988 /* MockRoomProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BA7527D25B4000DD1988 /* MockRoomProxy.swift */; };
@@ -76,8 +79,6 @@
7679
18F2BB2027D25D3400DD1988 /* RoomScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BAC127D25B4000DD1988 /* RoomScreenUITests.swift */; };
7780
18F2BB2127D25D3C00DD1988 /* HomeScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BAA727D25B4000DD1988 /* HomeScreenUITests.swift */; };
7881
18F2BB2227D25D4600DD1988 /* LoginScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BACF27D25B4000DD1988 /* LoginScreenUITests.swift */; };
79-
18F2BB2427D262A900DD1988 /* RoomTimelineItemProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BB2327D262A900DD1988 /* RoomTimelineItemProtocol.swift */; };
80-
18F2BB2627D262FA00DD1988 /* TextRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BB2527D262FA00DD1988 /* TextRoomTimelineItem.swift */; };
8182
18F2BB2827D2647A00DD1988 /* MockRoomTimelineController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BB2727D2647A00DD1988 /* MockRoomTimelineController.swift */; };
8283
18F2BB2A27D2648900DD1988 /* RoomTimelineControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F2BB2927D2648900DD1988 /* RoomTimelineControllerProtocol.swift */; };
8384
/* End PBXBuildFile section */
@@ -111,6 +112,9 @@
111112
1850256727B6A135002E6B18 /* ElementX.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = ElementX.entitlements; sourceTree = "<group>"; };
112113
1850256827B6A135002E6B18 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
113114
1850256A27B6A135002E6B18 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
115+
18A318D827D9E7AD000867CD /* matrix-rust-components-swift */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "matrix-rust-components-swift"; path = "../matrix-rust-components-swift"; sourceTree = "<group>"; };
116+
18A318DA27DA42C9000867CD /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = "<group>"; };
117+
18A318DB27DA42C9000867CD /* TextRoomTimelineItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItem.swift; sourceTree = "<group>"; };
114118
18F2BA7327D25B4000DD1988 /* RoomProxyProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoomProxyProtocol.swift; sourceTree = "<group>"; };
115119
18F2BA7427D25B4000DD1988 /* RoomProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoomProxy.swift; sourceTree = "<group>"; };
116120
18F2BA7527D25B4000DD1988 /* MockRoomProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockRoomProxy.swift; sourceTree = "<group>"; };
@@ -169,8 +173,6 @@
169173
18F2BAD427D25B4000DD1988 /* LoginScreenCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginScreenCoordinator.swift; sourceTree = "<group>"; };
170174
18F2BAD627D25B4000DD1988 /* LoginScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginScreen.swift; sourceTree = "<group>"; };
171175
18F2BB1927D25BE800DD1988 /* RoomTimelineController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineController.swift; sourceTree = "<group>"; };
172-
18F2BB2327D262A900DD1988 /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = "<group>"; };
173-
18F2BB2527D262FA00DD1988 /* TextRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItem.swift; sourceTree = "<group>"; };
174176
18F2BB2727D2647A00DD1988 /* MockRoomTimelineController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomTimelineController.swift; sourceTree = "<group>"; };
175177
18F2BB2927D2648900DD1988 /* RoomTimelineControllerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineControllerProtocol.swift; sourceTree = "<group>"; };
176178
18FE279627C7B85300016375 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -183,7 +185,8 @@
183185
files = (
184186
182BC48127C4EBBB00A30C33 /* Kingfisher in Frameworks */,
185187
1863A3FC27BA5A9100B52E4D /* KeychainAccess in Frameworks */,
186-
1850255927B69388002E6B18 /* MatrixRustSDK in Frameworks */,
188+
184B31DF27D898960075A669 /* Introspect in Frameworks */,
189+
1859CF5527D7A6FF00E86E4E /* MatrixRustSDK in Frameworks */,
187190
1863A40627BA6DFC00B52E4D /* SwiftyBeaver in Frameworks */,
188191
);
189192
runOnlyForDeploymentPostprocessing = 0;
@@ -208,6 +211,7 @@
208211
1850251B27B6918C002E6B18 = {
209212
isa = PBXGroup;
210213
children = (
214+
18A318D827D9E7AD000867CD /* matrix-rust-components-swift */,
211215
1850252627B6918C002E6B18 /* ElementX */,
212216
1850253D27B6918D002E6B18 /* ElementXTests */,
213217
1850254727B6918D002E6B18 /* ElementXUITests */,
@@ -274,6 +278,15 @@
274278
path = "Supporting Files";
275279
sourceTree = "<group>";
276280
};
281+
18A318D927DA42C9000867CD /* TimelineItems */ = {
282+
isa = PBXGroup;
283+
children = (
284+
18A318DA27DA42C9000867CD /* RoomTimelineItemProtocol.swift */,
285+
18A318DB27DA42C9000867CD /* TextRoomTimelineItem.swift */,
286+
);
287+
path = TimelineItems;
288+
sourceTree = "<group>";
289+
};
277290
18F2BA7227D25B4000DD1988 /* Services */ = {
278291
isa = PBXGroup;
279292
children = (
@@ -293,8 +306,7 @@
293306
18F2BB1927D25BE800DD1988 /* RoomTimelineController.swift */,
294307
18F2BB2727D2647A00DD1988 /* MockRoomTimelineController.swift */,
295308
18F2BA7727D25B4000DD1988 /* RoomTimelineProvider.swift */,
296-
18F2BB2327D262A900DD1988 /* RoomTimelineItemProtocol.swift */,
297-
18F2BB2527D262FA00DD1988 /* TextRoomTimelineItem.swift */,
309+
18A318D927DA42C9000867CD /* TimelineItems */,
298310
);
299311
path = Timeline;
300312
sourceTree = "<group>";
@@ -575,10 +587,11 @@
575587
);
576588
name = ElementX;
577589
packageProductDependencies = (
578-
1850255827B69388002E6B18 /* MatrixRustSDK */,
579590
1863A3FB27BA5A9100B52E4D /* KeychainAccess */,
580591
1863A40527BA6DFC00B52E4D /* SwiftyBeaver */,
581592
182BC48027C4EBBB00A30C33 /* Kingfisher */,
593+
1859CF5427D7A6FF00E86E4E /* MatrixRustSDK */,
594+
184B31DE27D898960075A669 /* Introspect */,
582595
);
583596
productName = ElementX;
584597
productReference = 1850252427B6918C002E6B18 /* ElementX.app */;
@@ -654,10 +667,11 @@
654667
);
655668
mainGroup = 1850251B27B6918C002E6B18;
656669
packageReferences = (
657-
1850255727B69388002E6B18 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */,
658670
1863A3FA27BA5A9100B52E4D /* XCRemoteSwiftPackageReference "KeychainAccess" */,
659671
1863A40427BA6DFC00B52E4D /* XCRemoteSwiftPackageReference "SwiftyBeaver" */,
660672
182BC47F27C4EBBB00A30C33 /* XCRemoteSwiftPackageReference "Kingfisher" */,
673+
1859CF5327D7A6FF00E86E4E /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */,
674+
184B31DD27D898960075A669 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
661675
);
662676
productRefGroup = 1850252527B6918C002E6B18 /* Products */;
663677
projectDirPath = "";
@@ -728,6 +742,7 @@
728742
18F2BAFF27D25B4000DD1988 /* HomeScreenModels.swift in Sources */,
729743
18F2BB1527D25B4000DD1988 /* LoginScreenViewModelProtocol.swift in Sources */,
730744
18F2BAEB27D25B4000DD1988 /* LabelledActivityIndicatorView.swift in Sources */,
745+
18A318DC27DA42C9000867CD /* RoomTimelineItemProtocol.swift in Sources */,
731746
18F2BAE427D25B4000DD1988 /* Presentable.swift in Sources */,
732747
18F2BAF927D25B4000DD1988 /* SplashViewController.swift in Sources */,
733748
18F2BAE327D25B4000DD1988 /* RootRouter.swift in Sources */,
@@ -736,7 +751,6 @@
736751
18F2BAD927D25B4000DD1988 /* MockRoomProxy.swift in Sources */,
737752
18F2BAE727D25B4000DD1988 /* RoundedToastView.swift in Sources */,
738753
18F2BAF227D25B4000DD1988 /* WeakDictionaryKeyReference.swift in Sources */,
739-
18F2BB2427D262A900DD1988 /* RoomTimelineItemProtocol.swift in Sources */,
740754
18F2BAE027D25B4000DD1988 /* NavigationRouter.swift in Sources */,
741755
18F2BAF627D25B4000DD1988 /* Coordinator.swift in Sources */,
742756
18F2BAEA27D25B4000DD1988 /* ActivityCenter.swift in Sources */,
@@ -761,14 +775,14 @@
761775
18F2BADF27D25B4000DD1988 /* NavigationRouterStore.swift in Sources */,
762776
18F2BAFE27D25B4000DD1988 /* HomeScreenViewModelProtocol.swift in Sources */,
763777
18F2BAE827D25B4000DD1988 /* RectangleToastView.swift in Sources */,
764-
18F2BB2627D262FA00DD1988 /* TextRoomTimelineItem.swift in Sources */,
765778
18F2BB1627D25B4000DD1988 /* LoginScreenModels.swift in Sources */,
766779
18F2BADA27D25B4000DD1988 /* RoomTimelineProvider.swift in Sources */,
767780
18F2BB0027D25B4000DD1988 /* HomeScreen.swift in Sources */,
768781
18F2BB2827D2647A00DD1988 /* MockRoomTimelineController.swift in Sources */,
769782
18F2BB0127D25B4000DD1988 /* HomeScreenViewModel.swift in Sources */,
770783
18F2BAF027D25B4000DD1988 /* ActivityDismissal.swift in Sources */,
771784
18F2BADD27D25B4000DD1988 /* KeychainController.swift in Sources */,
785+
18A318DD27DA42C9000867CD /* TextRoomTimelineItem.swift in Sources */,
772786
18F2BAFB27D25B4000DD1988 /* HomeScreenCoordinator.swift in Sources */,
773787
18F2BB0C27D25B4000DD1988 /* RoomScreenCoordinator.swift in Sources */,
774788
18F2BB0E27D25B4000DD1988 /* RoomScreenViewModelProtocol.swift in Sources */,
@@ -1136,7 +1150,15 @@
11361150
minimumVersion = 7.0.0;
11371151
};
11381152
};
1139-
1850255727B69388002E6B18 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */ = {
1153+
184B31DD27D898960075A669 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
1154+
isa = XCRemoteSwiftPackageReference;
1155+
repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git";
1156+
requirement = {
1157+
branch = master;
1158+
kind = branch;
1159+
};
1160+
};
1161+
1859CF5327D7A6FF00E86E4E /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */ = {
11401162
isa = XCRemoteSwiftPackageReference;
11411163
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift.git";
11421164
requirement = {
@@ -1168,9 +1190,14 @@
11681190
package = 182BC47F27C4EBBB00A30C33 /* XCRemoteSwiftPackageReference "Kingfisher" */;
11691191
productName = Kingfisher;
11701192
};
1171-
1850255827B69388002E6B18 /* MatrixRustSDK */ = {
1193+
184B31DE27D898960075A669 /* Introspect */ = {
1194+
isa = XCSwiftPackageProductDependency;
1195+
package = 184B31DD27D898960075A669 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
1196+
productName = Introspect;
1197+
};
1198+
1859CF5427D7A6FF00E86E4E /* MatrixRustSDK */ = {
11721199
isa = XCSwiftPackageProductDependency;
1173-
package = 1850255727B69388002E6B18 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */;
1200+
package = 1859CF5327D7A6FF00E86E4E /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */;
11741201
productName = MatrixRustSDK;
11751202
};
11761203
1863A3FB27BA5A9100B52E4D /* KeychainAccess */ = {

‎ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
6666
self.roomList = roomList
6767

6868
roomList.forEach({ roomProxy in
69-
roomProxy.paginateBackwards(start: 0, finish: 1)
70-
roomProxy.startLiveEventListener()
69+
roomProxy.paginateBackwards(count: 1, callback: nil)
7170
roomProxy.callbacks.sink { [weak self] callback in
7271
switch callback {
7372
case .updatedLastMessage:

‎ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift

-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ private var dateFormatter: DateFormatter = {
3232
}()
3333

3434
struct RoomScreenMessage: Identifiable, Equatable {
35-
3635
let id: String
3736
let sender: String
3837
let text: String
@@ -45,6 +44,5 @@ struct RoomScreenMessage: Identifiable, Equatable {
4544

4645
struct RoomScreenViewState: BindableState {
4746
var roomTitle: String?
48-
var isLoading: Bool = false
4947
var messages: [RoomScreenMessage] = []
5048
}

‎ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
5050
self.state.messages = self.buildRoomScreenMessages(timelineController.timelineItems)
5151
}
5252
}.store(in: &cancellables)
53-
54-
timelineController.paginateBackwards(Constants.backPaginationPageSize)
5553
}
5654

5755
// MARK: - Public

0 commit comments

Comments
 (0)