diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index a363323e5..ace645bb6 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -90,6 +90,7 @@ 27E9263DA75E266690A37EB1 /* PermalinkBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FB31A32C93D94930B253FBF /* PermalinkBuilderTests.swift */; }; 282A5F3375DDC774AE09B0C3 /* TracingConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1734A445A58ED855B977A0A8 /* TracingConfigurationTests.swift */; }; 28410F3DE89C2C44E4F75C92 /* MockBugReportService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0E7BF8F7BB1021F889C6483 /* MockBugReportService.swift */; }; + 28934460A497CD002249ED71 /* TimelineStartRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF73D6149F4755E9C530303 /* TimelineStartRoomTimelineItem.swift */; }; 290FDB0FFDC2F1DDF660343E /* TestMeasurementParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4048041C1A6B20CB97FD18 /* TestMeasurementParser.swift */; }; 297CD0A27C87B0C50FF192EE /* RoomTimelineViewFactoryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE384418EB1FEDFA62C9CD0 /* RoomTimelineViewFactoryProtocol.swift */; }; 29EE1791E0AFA1ABB7F23D2F /* SwiftyBeaver in Frameworks */ = {isa = PBXBuildFile; productRef = A981A4CA233FB5C13B9CA690 /* SwiftyBeaver */; }; @@ -124,6 +125,7 @@ 388FD50AC66E9E684DDFA9D8 /* ServerSelectionScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5D2C0950F8196232D88045C /* ServerSelectionScreen.swift */; }; 38C76D586404C1FDED095F3A /* LoginModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31B01468022EC826CB2FD2C0 /* LoginModels.swift */; }; 3910D3A2EF98587C0E7B9CCB /* EmojiMartEmoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11F7F3CF7E70518BD7D25E04 /* EmojiMartEmoji.swift */; }; + 392D0519E5597A538BFB2CAB /* UnsupportedRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7EDBCE09CCF06B5BB522502 /* UnsupportedRoomTimelineItem.swift */; }; 39929D29B265C3F6606047DE /* AlignedScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8872E9C5E91E9F2BFC4EBCCA /* AlignedScrollView.swift */; }; 3A08584ECDD4A4541DBF21F8 /* EmojiLoaderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201305507D7DFD16E544563A /* EmojiLoaderProtocol.swift */; }; 3A64A93A651A3CB8774ADE8E /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 21C83087604B154AA30E9A8F /* SnapshotTesting */; }; @@ -149,6 +151,7 @@ 49E9B99CB6A275C7744351F0 /* LoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D58333B377888012740101 /* LoginViewModel.swift */; }; 49F2E7DD8CAACE09CEECE3E6 /* SeparatorRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6390A6DC140CA3D6865A66FF /* SeparatorRoomTimelineView.swift */; }; 4A2E0DBB63919AC8309B6D40 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A191D3FDB995309C7E2DE7D /* SettingsViewModel.swift */; }; + 4A67D2EAB564B34EE5C03E11 /* StickerRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C84013BB71998CDD90C634C /* StickerRoomTimelineItem.swift */; }; 4BB282209EA82015D0DF8F89 /* NavigationStackCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C698E30698EC59302A8EEBD /* NavigationStackCoordinatorTests.swift */; }; 4C3365818DE1CEAEDF590FD3 /* MediaProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C888BCD78E2A55DCE364F160 /* MediaProviderProtocol.swift */; }; 4E8F17EBA24FBBA6ABB62ECB /* MockBackgroundTaskService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3948D16F021DFDB2CD26EAA8 /* MockBackgroundTaskService.swift */; }; @@ -213,6 +216,7 @@ 6E6E0AAF6C44C0B117EBBE5A /* SlidingSyncViewProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41F3B445BD6EF1C751806B22 /* SlidingSyncViewProxy.swift */; }; 6F2AB43A1EFAD8A97AF41A15 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = A7CA6F33C553805035C3B114 /* DeviceKit */; }; 6FC10A00D268FCD48B631E37 /* ViewFrameReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFF7BF82A950B91BC5469E91 /* ViewFrameReader.swift */; }; + 6FF51EB400DBA0668FC38B97 /* TimelineStartRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9ED8E731E21055F728E5FED /* TimelineStartRoomTimelineView.swift */; }; 7002C55A4C917F3715765127 /* MediaProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C888BCD78E2A55DCE364F160 /* MediaProviderProtocol.swift */; }; 702694459B649B9D3A3C34F8 /* TimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9212AE02CBDD692C56A879F /* TimelineTableViewController.swift */; }; 70558528EF68CAAEF09972D5 /* RoomTimelineItemFixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96ED747FF90332EA1333C22 /* RoomTimelineItemFixtures.swift */; }; @@ -229,6 +233,7 @@ 755727E0B756430DFFEC4732 /* SessionVerificationViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05DA24F71B455E8EFEBC3B /* SessionVerificationViewModelTests.swift */; }; 758BF44CA565AB0AB84F2185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7109E709A7738E6BCC4553E6 /* Localizable.strings */; }; 75EA4ABBFAA810AFF289D6F4 /* TemplateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDB6E40BAD4504D899FAAC9A /* TemplateViewModel.swift */; }; + 764AFCC225B044CF5F9B41E5 /* PaginationIndicatorRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42EEA67A6796BDC2761619C5 /* PaginationIndicatorRoomTimelineView.swift */; }; 77119672143B2BF0C9838DDC /* RoomDetailsModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC031D32CED2CBE122E5038 /* RoomDetailsModels.swift */; }; 7732B2F635626BE1C1CD92A4 /* UIActivityViewControllerWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57A4AFA6A068668AFBD070 /* UIActivityViewControllerWrapper.swift */; }; 7756C4E90CABE6F14F7920A0 /* BugReportUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6FEA87EA3752203065ECE27 /* BugReportUITests.swift */; }; @@ -395,6 +400,7 @@ CD6A72B65D3B6076F4045C30 /* PHGPostHogConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6B891A6DA826E2461DBB40F /* PHGPostHogConfiguration.swift */; }; CE1694C7BB93C3311524EF28 /* Untranslated.strings in Resources */ = {isa = PBXBuildFile; fileRef = D2F7194F440375338F8E2487 /* Untranslated.strings */; }; CE7148E80F09B7305E026AC6 /* OnboardingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1198B925F4A88DA74083662 /* OnboardingViewModel.swift */; }; + CE79753EA0C433641F0449C0 /* PaginationIndicatorRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756288D339AFC15D2C3F4A0D /* PaginationIndicatorRoomTimelineItem.swift */; }; CE9530A4CA661E090635C2F2 /* NotificationItemProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */; }; CEB8FB1269DE20536608B957 /* LoginMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41FABA2B0AEF4389986495 /* LoginMode.swift */; }; CF6319CC05F964B4D05BF614 /* MockFileCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEC96B3DC55090BBF8876CC2 /* MockFileCache.swift */; }; @@ -425,6 +431,7 @@ E01373F2043E76393A0CE073 /* AnalyticsPromptViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A11B74ACE8D71747E1044A9C /* AnalyticsPromptViewModel.swift */; }; E0A4DCA633D174EB43AD599F /* BackgroundTaskProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA028DCD4157F9A1F999827 /* BackgroundTaskProtocol.swift */; }; E1DF24D085572A55C9758A2D /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E89E530A8E92EC44301CA1 /* Bundle.swift */; }; + E1F446C6B78A3A0FEA15079C /* UnsupportedRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC3C656E960E15B5905E05 /* UnsupportedRoomTimelineView.swift */; }; E290C78E7F09F47FD2662986 /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40C19719687984FD9478FBE /* Task.swift */; }; E3291AD16D7A5CB14781819C /* UserNotificationCenterProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D8149FDDA0315CDC553B4B /* UserNotificationCenterProtocol.swift */; }; E3CA565A4B9704F191B191F0 /* JoinedRoomSize+MemberCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF9AEA706926DD0DA2B954C /* JoinedRoomSize+MemberCount.swift */; }; @@ -452,6 +459,7 @@ F06CE9132855E81EBB6DDC32 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 800631D7250B7F93195035F1 /* KeychainAccess */; }; F0F82C3C848C865C3098AA52 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 67E7A6F388D3BF85767609D9 /* Sentry */; }; F257F964493A9CD02A6F720C /* OnboardingPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF2717AB91060260E5F4781 /* OnboardingPageView.swift */; }; + F32B271F60531BE92C6E62A1 /* StickerRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612EF972F2A1800682D32C5E /* StickerRoomTimelineView.swift */; }; F425C3F85BFF28C9AC593F52 /* MockNotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96561CC53F7C1E24D4C292E4 /* MockNotificationManager.swift */; }; F508683B76EF7B23BB2CBD6D /* TimelineItemPlainStylerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94BCC8A9C73C1F838122C645 /* TimelineItemPlainStylerView.swift */; }; F61AFA8BF2E739FBC30472F5 /* NotificationServiceProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD5FEE195446A9E458DDDAF /* NotificationServiceProxyProtocol.swift */; }; @@ -666,6 +674,7 @@ 40B21E611DADDEF00307E7AC /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; 41F3B445BD6EF1C751806B22 /* SlidingSyncViewProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlidingSyncViewProxy.swift; sourceTree = ""; }; 422724361B6555364C43281E /* RoomHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomHeaderView.swift; sourceTree = ""; }; + 42EEA67A6796BDC2761619C5 /* PaginationIndicatorRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaginationIndicatorRoomTimelineView.swift; sourceTree = ""; }; 434522ED2BDED08759048077 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = ""; }; 4488F5F92A64A137665C96CD /* pa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pa; path = pa.lproj/Localizable.strings; sourceTree = ""; }; 44AEEE13AC1BF303AE48CBF8 /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/Localizable.strings; sourceTree = ""; }; @@ -689,11 +698,13 @@ 4B362E695A7103C11F64B185 /* AnalyticsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsSettings.swift; sourceTree = ""; }; 4B40B7F6FCCE2D8C242492D9 /* ga */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ga; path = ga.lproj/Localizable.strings; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; + 4C84013BB71998CDD90C634C /* StickerRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickerRoomTimelineItem.swift; sourceTree = ""; }; 4C8D988E82A8DFA13BE46F7C /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = pl; path = pl.lproj/Localizable.stringsdict; sourceTree = ""; }; 4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4CDDDDD9FE1A699D23A5E096 /* LoginScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreen.swift; sourceTree = ""; }; 4D6E4C37E9F0E53D3DF951AC /* HomeScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenUITests.swift; sourceTree = ""; }; 4DF56C3239EA3C16951E1E66 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Localizable.strings; sourceTree = ""; }; + 4DF73D6149F4755E9C530303 /* TimelineStartRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStartRoomTimelineItem.swift; sourceTree = ""; }; 4E2245243369B99216C7D84E /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = ""; }; 4F0CB536D1C3CC15AA740CC6 /* AuthenticationServiceProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationServiceProxyProtocol.swift; sourceTree = ""; }; 4F49CDE349C490D617332770 /* NoticeRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeRoomTimelineItem.swift; sourceTree = ""; }; @@ -726,6 +737,7 @@ 5FF214969B25BFCBF87B908B /* bn-BD */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "bn-BD"; path = "bn-BD.lproj/Localizable.stringsdict"; sourceTree = ""; }; 6033779EB37259F27F938937 /* ClientProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientProxyProtocol.swift; sourceTree = ""; }; 607974D08BD2AF83725D817A /* RoomMessageProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMessageProtocol.swift; sourceTree = ""; }; + 612EF972F2A1800682D32C5E /* StickerRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickerRoomTimelineView.swift; sourceTree = ""; }; 616197D81103330BF2ADD559 /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = gl.lproj/Localizable.strings; sourceTree = ""; }; 624244C398804ADC885239AA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = ""; }; 62A81CCC2516D9CF9322DF01 /* MediaProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProviderTests.swift; sourceTree = ""; }; @@ -762,6 +774,7 @@ 72F910035944E5F38F4F801E /* RoomMembersScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersScreenUITests.swift; sourceTree = ""; }; 73FC861755C6388F62B9280A /* Analytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = ""; }; 748AE77AC3B0A01223033B87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 756288D339AFC15D2C3F4A0D /* PaginationIndicatorRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaginationIndicatorRoomTimelineItem.swift; sourceTree = ""; }; 799A3A11C434296ED28F87C8 /* iw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = iw; path = iw.lproj/Localizable.strings; sourceTree = ""; }; 7AB7ED3A898B07976F3AA90F /* BugReportViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportViewModelTests.swift; sourceTree = ""; }; 7B04BD3874D736127A8156B8 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; @@ -844,6 +857,7 @@ A11B74ACE8D71747E1044A9C /* AnalyticsPromptViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsPromptViewModel.swift; sourceTree = ""; }; A1C22B1B5FA3A765EADB2CC9 /* SessionVerificationStateMachineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationStateMachineTests.swift; sourceTree = ""; }; A1ED7E89865201EE7D53E6DA /* SeparatorRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorRoomTimelineItem.swift; sourceTree = ""; }; + A2AC3C656E960E15B5905E05 /* UnsupportedRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedRoomTimelineView.swift; sourceTree = ""; }; A2B6433F516F1E6DFA0E2D89 /* vls */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vls; path = vls.lproj/Localizable.strings; sourceTree = ""; }; A3004DFA1B10951962787D90 /* VideoPlayerViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlayerViewModelTests.swift; sourceTree = ""; }; A30A1758E2B73EF38E7C42F8 /* ServerSelectionModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionModels.swift; sourceTree = ""; }; @@ -928,6 +942,7 @@ C6FEA87EA3752203065ECE27 /* BugReportUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportUITests.swift; sourceTree = ""; }; C75EF87651B00A176AB08E97 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C789E7BFC066CF39B8AE0974 /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = ""; }; + C7EDBCE09CCF06B5BB522502 /* UnsupportedRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedRoomTimelineItem.swift; sourceTree = ""; }; C830A64609CBD152F06E0457 /* NotificationConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationConstants.swift; sourceTree = ""; }; C88508B6F7974CFABEC4B261 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; C888BCD78E2A55DCE364F160 /* MediaProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProviderProtocol.swift; sourceTree = ""; }; @@ -1044,6 +1059,7 @@ F899D02CF26EA7675EEBE74C /* UserSessionScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionScreenTests.swift; sourceTree = ""; }; F9212AE02CBDD692C56A879F /* TimelineTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineTableViewController.swift; sourceTree = ""; }; F9E785D5137510481733A3E8 /* TextRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineView.swift; sourceTree = ""; }; + F9ED8E731E21055F728E5FED /* TimelineStartRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStartRoomTimelineView.swift; sourceTree = ""; }; FA154570F693D93513E584C1 /* RoomMessageFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMessageFactory.swift; sourceTree = ""; }; FAB10E673916D2B8D21FD197 /* TemplateModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateModels.swift; sourceTree = ""; }; FBC776F301D374A3298C69DA /* AppCoordinatorProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinatorProtocol.swift; sourceTree = ""; }; @@ -1752,11 +1768,15 @@ C00A7110B937C6AE2EF5D7D6 /* FileRoomTimelineItem.swift */, 1A63815AD6A5C306453342F2 /* ImageRoomTimelineItem.swift */, 4F49CDE349C490D617332770 /* NoticeRoomTimelineItem.swift */, + 756288D339AFC15D2C3F4A0D /* PaginationIndicatorRoomTimelineItem.swift */, 02351B2D9CD9B2B914352908 /* ReadMarkerRoomTimelineItem.swift */, 9B577F829C693B8DFB7014FD /* RedactedRoomTimelineItem.swift */, 289FA233E896FBC5956C67E0 /* RoomTimelineItemProperties.swift */, A1ED7E89865201EE7D53E6DA /* SeparatorRoomTimelineItem.swift */, + 4C84013BB71998CDD90C634C /* StickerRoomTimelineItem.swift */, F6A8C632CEF4600107792899 /* TextRoomTimelineItem.swift */, + 4DF73D6149F4755E9C530303 /* TimelineStartRoomTimelineItem.swift */, + C7EDBCE09CCF06B5BB522502 /* UnsupportedRoomTimelineItem.swift */, A4B5B19A10D3F7C2BC5315DF /* VideoRoomTimelineItem.swift */, ); path = Items; @@ -2164,11 +2184,15 @@ F73FF1A33198F5FAE9D34B1F /* FormattedBodyText.swift */, D0A45283CF1DB96E583BECA6 /* ImageRoomTimelineView.swift */, B5B243E7818E5E9F6A4EDC7A /* NoticeRoomTimelineView.swift */, + 42EEA67A6796BDC2761619C5 /* PaginationIndicatorRoomTimelineView.swift */, 0950733DD4BA83EEE752E259 /* PlaceholderAvatarImage.swift */, B6311F21F911E23BE4DF51B4 /* ReadMarkerRoomTimelineView.swift */, C8F2A7A4E3F5060F52ACFFB0 /* RedactedRoomTimelineView.swift */, 6390A6DC140CA3D6865A66FF /* SeparatorRoomTimelineView.swift */, + 612EF972F2A1800682D32C5E /* StickerRoomTimelineView.swift */, F9E785D5137510481733A3E8 /* TextRoomTimelineView.swift */, + F9ED8E731E21055F728E5FED /* TimelineStartRoomTimelineView.swift */, + A2AC3C656E960E15B5905E05 /* UnsupportedRoomTimelineView.swift */, 1941C8817E6B6971BA4415F5 /* VideoRoomTimelineView.swift */, ); path = Timeline; @@ -3085,6 +3109,8 @@ CE7148E80F09B7305E026AC6 /* OnboardingViewModel.swift in Sources */, 992477AB8E3F3C36D627D32E /* OnboardingViewModelProtocol.swift in Sources */, CD6A72B65D3B6076F4045C30 /* PHGPostHogConfiguration.swift in Sources */, + CE79753EA0C433641F0449C0 /* PaginationIndicatorRoomTimelineItem.swift in Sources */, + 764AFCC225B044CF5F9B41E5 /* PaginationIndicatorRoomTimelineView.swift in Sources */, 80D00A7C62AAB44F54725C43 /* PermalinkBuilder.swift in Sources */, 7D1DAAA364A9A29D554BD24E /* PlaceholderAvatarImage.swift in Sources */, DF504B10A4918F971A57BEF2 /* PostHogAnalyticsClient.swift in Sources */, @@ -3167,6 +3193,8 @@ 165A883C29998EC779465068 /* SoftLogoutViewModelProtocol.swift in Sources */, DF004A5B2EABBD0574D06A04 /* SplashScreenCoordinator.swift in Sources */, B4AAB3257A83B73F53FB2689 /* StateStoreViewModel.swift in Sources */, + 4A67D2EAB564B34EE5C03E11 /* StickerRoomTimelineItem.swift in Sources */, + F32B271F60531BE92C6E62A1 /* StickerRoomTimelineView.swift in Sources */, 2F94054F50E312AF30BE07F3 /* String.swift in Sources */, A7D48E44D485B143AADDB77D /* Strings+Untranslated.swift in Sources */, 066A1E9B94723EE9F3038044 /* Strings.swift in Sources */, @@ -3187,6 +3215,8 @@ 440123E29E2F9B001A775BBE /* TimelineItemProxy.swift in Sources */, 9B582B3EEFEA615D4A6FBF1A /* TimelineReactionsView.swift in Sources */, ABF3FAB234AD3565B214309B /* TimelineSenderAvatarView.swift in Sources */, + 28934460A497CD002249ED71 /* TimelineStartRoomTimelineItem.swift in Sources */, + 6FF51EB400DBA0668FC38B97 /* TimelineStartRoomTimelineView.swift in Sources */, 69BCBB4FB2DC3D61A28D3FD8 /* TimelineStyle.swift in Sources */, FFD3E4FF948E06C7585317FC /* TimelineStyler.swift in Sources */, 702694459B649B9D3A3C34F8 /* TimelineTableViewController.swift in Sources */, @@ -3202,6 +3232,8 @@ E96005321849DBD7C72A28F2 /* UITestsAppCoordinator.swift in Sources */, 086C2FA7750378EB2BFD0BEE /* UITestsRootCoordinator.swift in Sources */, 071A017E415AD378F2961B11 /* URL.swift in Sources */, + 392D0519E5597A538BFB2CAB /* UnsupportedRoomTimelineItem.swift in Sources */, + E1F446C6B78A3A0FEA15079C /* UnsupportedRoomTimelineView.swift in Sources */, 7A71AEF419904209BB8C2833 /* UserAgentBuilder.swift in Sources */, 87BD4F95F9D603C309837378 /* UserNotification.swift in Sources */, E3291AD16D7A5CB14781819C /* UserNotificationCenterProtocol.swift in Sources */, @@ -3913,7 +3945,7 @@ repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = "1.0.27-alpha"; + version = "1.0.28-alpha"; }; }; 96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1478567a2..b32ed1bcf 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-rust-components-swift", "state" : { - "revision" : "91590089932586b623c03ef544daa9c56186bf07", - "version" : "1.0.27-alpha" + "revision" : "d8bd9bc10423fe68f54c89811950ca269af9da9e", + "version" : "1.0.28-alpha" } }, { diff --git a/ElementX/Resources/Localizations/en.lproj/Untranslated.strings b/ElementX/Resources/Localizations/en.lproj/Untranslated.strings index ad710534a..8c5997399 100644 --- a/ElementX/Resources/Localizations/en.lproj/Untranslated.strings +++ b/ElementX/Resources/Localizations/en.lproj/Untranslated.strings @@ -9,6 +9,7 @@ "settings_appearance" = "Appearance"; "settings_timeline_style" = "Timeline Style"; + "room_timeline_style_plain_long_description" = "Plain Timeline"; "room_timeline_style_bubbled_long_description" = "Bubbled Timeline"; @@ -21,6 +22,8 @@ "room_timeline_context_menu_retry_decryption" = "Retry decryption"; +"room_timeline_item_unsupported" = "Unsupported event"; + "session_verification_banner_title" = "Help keep your messages secure"; "session_verification_banner_message" = "Looks like you’re using a new device. Verify its you."; diff --git a/ElementX/Sources/Generated/Strings+Untranslated.swift b/ElementX/Sources/Generated/Strings+Untranslated.swift index d5393aa83..bdb639f28 100644 --- a/ElementX/Sources/Generated/Strings+Untranslated.swift +++ b/ElementX/Sources/Generated/Strings+Untranslated.swift @@ -36,6 +36,8 @@ extension ElementL10n { public static let roomTimelineContextMenuRetryDecryption = ElementL10n.tr("Untranslated", "room_timeline_context_menu_retry_decryption") /// Editing public static let roomTimelineEditing = ElementL10n.tr("Untranslated", "room_timeline_editing") + /// Unsupported event + public static let roomTimelineItemUnsupported = ElementL10n.tr("Untranslated", "room_timeline_item_unsupported") /// Failed creating the permalink public static let roomTimelinePermalinkCreationFailure = ElementL10n.tr("Untranslated", "room_timeline_permalink_creation_failure") /// Replying to %@ diff --git a/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift index ffb60042c..cbca7e5ac 100644 --- a/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift +++ b/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift @@ -88,7 +88,8 @@ struct BugReportScreen: View { Toggle(ElementL10n.sendBugReportIncludeLogs, isOn: $context.sendingLogsEnabled) .toggleStyle(ElementToggleStyle()) .accessibilityIdentifier("sendLogsToggle") - Text(ElementL10n.sendBugReportIncludeLogs).accessibilityIdentifier("sendLogsText") + Text(ElementL10n.sendBugReportIncludeLogs) + .accessibilityIdentifier("sendLogsText") } .onTapGesture { context.send(viewAction: .toggleSendLogs) diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift index 983a64732..049989a92 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift @@ -21,6 +21,7 @@ typealias RoomScreenViewModelType = StateStoreViewModel: View { @ViewBuilder var styledContentOutgoing: some View { - let topPadding: CGFloat? = timelineItem.inGroupState == .single || timelineItem.inGroupState == .beginning ? 8 : 0 + let topPadding: CGFloat? = timelineItem.groupState == .single || timelineItem.groupState == .beginning ? 8 : 0 if shouldAvoidBubbling { content() diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift index 4708d7d7a..7c2c9936f 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift @@ -16,7 +16,7 @@ import SwiftUI struct TimelineDeliveryStatusView: View { - let deliveryStatus: MessageTimelineItemDeliveryStatus + let deliveryStatus: TimelineItemDeliveryStatus @State var showDeliveryStatus: Bool @@ -29,7 +29,7 @@ struct TimelineDeliveryStatusView: View { } } - init(deliveryStatus: MessageTimelineItemDeliveryStatus) { + init(deliveryStatus: TimelineItemDeliveryStatus) { self.deliveryStatus = deliveryStatus switch deliveryStatus { diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift index 196e58c9f..a1ddd121b 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift @@ -31,7 +31,6 @@ struct EmoteRoomTimelineView: View { } } } - .id(timelineItem.id) } } @@ -57,7 +56,7 @@ struct EmoteRoomTimelineView_Previews: PreviewProvider { EmoteRoomTimelineItem(id: UUID().uuidString, text: text, timestamp: timestamp, - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: senderId) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift index 8191957bf..d587092b7 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift @@ -26,20 +26,19 @@ struct EncryptedRoomTimelineView: View { Button { showEncryptionInfo = !showEncryptionInfo } label: { - HStack(alignment: .top) { - Image(systemName: "lock.shield") - .foregroundColor(.red) - .padding(.top, 1.0) + Label { if showEncryptionInfo { FormattedBodyText(text: encryptionDetails) } else { FormattedBodyText(text: timelineItem.text) } + } icon: { + Image(systemName: "lock.shield") + .foregroundColor(.red) } .animation(nil, value: showEncryptionInfo) } } - .id(timelineItem.id) } private var encryptionDetails: String { @@ -79,7 +78,7 @@ struct EncryptedRoomTimelineView_Previews: PreviewProvider { text: text, encryptionType: .unknown, timestamp: timestamp, - inGroupState: .single, + groupState: .single, isOutgoing: isOutgoing, isEditable: false, senderId: senderId) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift index f54dfc4ee..25c1ee6c7 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift @@ -30,7 +30,6 @@ struct FileRoomTimelineView: View { .padding(.vertical, 12) .padding(.horizontal, 6) } - .id(timelineItem.id) } } @@ -45,7 +44,7 @@ struct FileRoomTimelineView_Previews: PreviewProvider { FileRoomTimelineView(timelineItem: FileRoomTimelineItem(id: UUID().uuidString, text: "document.pdf", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -55,7 +54,7 @@ struct FileRoomTimelineView_Previews: PreviewProvider { FileRoomTimelineView(timelineItem: FileRoomTimelineItem(id: UUID().uuidString, text: "document.docx", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -65,7 +64,7 @@ struct FileRoomTimelineView_Previews: PreviewProvider { FileRoomTimelineView(timelineItem: FileRoomTimelineItem(id: UUID().uuidString, text: "document.txt", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift index 3194a8aba..51a6dea83 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift @@ -44,7 +44,6 @@ struct ImageRoomTimelineView: View { .aspectRatio(timelineItem.aspectRatio, contentMode: .fit) } } - .id(timelineItem.id) .animation(.elementDefault, value: timelineItem.image) } } @@ -60,7 +59,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider { ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, text: "Some image", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -70,7 +69,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider { ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, text: "Some other image", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -80,7 +79,7 @@ struct ImageRoomTimelineView_Previews: PreviewProvider { ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, text: "Blurhashed image", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift index 6cded0eb2..1818a528e 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift @@ -31,7 +31,6 @@ struct NoticeRoomTimelineView: View { } } } - .id(timelineItem.id) } } @@ -57,7 +56,7 @@ struct NoticeRoomTimelineView_Previews: PreviewProvider { NoticeRoomTimelineItem(id: UUID().uuidString, text: text, timestamp: timestamp, - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: senderId) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PaginationIndicatorRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PaginationIndicatorRoomTimelineView.swift new file mode 100644 index 000000000..3007899ce --- /dev/null +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PaginationIndicatorRoomTimelineView.swift @@ -0,0 +1,33 @@ +// +// Copyright 2022 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 SwiftUI + +struct PaginationIndicatorRoomTimelineView: View { + let timelineItem: PaginationIndicatorRoomTimelineItem + + var body: some View { + ProgressView() + .frame(maxWidth: .infinity) + } +} + +struct PaginationIndicatorRoomTimelineView_Previews: PreviewProvider { + static var previews: some View { + let item = PaginationIndicatorRoomTimelineItem() + PaginationIndicatorRoomTimelineView(timelineItem: item) + } +} diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift index a80b5ea12..6b5fe63dd 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ReadMarkerRoomTimelineView.swift @@ -24,7 +24,6 @@ struct ReadMarkerRoomTimelineView: View { VStack { Spacer(minLength: 4.0) Divider() - .id(timelineItem.id) .frame(maxWidth: .infinity) .overlay(Color.element.accent) } @@ -33,7 +32,7 @@ struct ReadMarkerRoomTimelineView: View { struct ReadMarkerRoomTimelineView_Previews: PreviewProvider { static var previews: some View { - let item = ReadMarkerRoomTimelineItem(id: UUID().uuidString) + let item = ReadMarkerRoomTimelineItem() ReadMarkerRoomTimelineView(timelineItem: item) } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift index b57a8e3d1..91d292628 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/RedactedRoomTimelineView.swift @@ -27,7 +27,6 @@ struct RedactedRoomTimelineView: View { FormattedBodyText(text: timelineItem.text) } } - .id(timelineItem.id) } } @@ -44,7 +43,7 @@ struct RedactedRoomTimelineView_Previews: PreviewProvider { RedactedRoomTimelineItem(id: UUID().uuidString, text: text, timestamp: timestamp, - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: senderId) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift index 869a9d82c..4aec204eb 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift @@ -14,7 +14,6 @@ // limitations under the License. // -import Foundation import SwiftUI struct SeparatorRoomTimelineView: View { @@ -24,7 +23,6 @@ struct SeparatorRoomTimelineView: View { Text(timelineItem.text) .font(.element.footnote) .foregroundColor(.element.secondaryContent) - .id(timelineItem.id) .padding(.vertical, 24) .frame(maxWidth: .infinity) } @@ -32,7 +30,7 @@ struct SeparatorRoomTimelineView: View { struct SeparatorRoomTimelineView_Previews: PreviewProvider { static var previews: some View { - let item = SeparatorRoomTimelineItem(id: UUID().uuidString, text: "This is a separator") + let item = SeparatorRoomTimelineItem(text: "This is a separator") SeparatorRoomTimelineView(timelineItem: item) } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/StickerRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StickerRoomTimelineView.swift new file mode 100644 index 000000000..ade3f1ad3 --- /dev/null +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/StickerRoomTimelineView.swift @@ -0,0 +1,93 @@ +// +// 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 +import SwiftUI + +struct StickerRoomTimelineView: View { + let timelineItem: StickerRoomTimelineItem + + var body: some View { + TimelineStyler(timelineItem: timelineItem) { + if let image = timelineItem.image { + Image(uiImage: image) + .resizable() + .aspectRatio(timelineItem.aspectRatio, contentMode: .fit) + } else if let blurhash = timelineItem.blurhash, + // Build a small blurhash image so that it's fast + let image = UIImage(blurHash: blurhash, size: .init(width: 10.0, height: 10.0)) { + Image(uiImage: image) + .resizable() + .aspectRatio(timelineItem.aspectRatio, contentMode: .fit) + } else { + ZStack { + Rectangle() + .foregroundColor(.element.systemGray6) + .opacity(0.3) + + ProgressView(ElementL10n.loading) + .frame(maxWidth: .infinity) + } + .aspectRatio(timelineItem.aspectRatio, contentMode: .fit) + } + } + .animation(.elementDefault, value: timelineItem.image) + .accessibilityLabel(timelineItem.text) + } +} + +struct StickerRoomTimelineView_Previews: PreviewProvider { + static var previews: some View { + body + body.timelineStyle(.plain) + } + + static var body: some View { + VStack(spacing: 20.0) { + StickerRoomTimelineView(timelineItem: StickerRoomTimelineItem(id: UUID().uuidString, + text: "Some image", + timestamp: "Now", + groupState: .single, + isOutgoing: false, + isEditable: false, + senderId: "Bob", + urlString: nil, + image: UIImage(systemName: "photo"))) + + StickerRoomTimelineView(timelineItem: StickerRoomTimelineItem(id: UUID().uuidString, + text: "Some other image", + timestamp: "Now", + groupState: .single, + isOutgoing: false, + isEditable: false, + senderId: "Bob", + urlString: nil, + image: nil)) + + StickerRoomTimelineView(timelineItem: StickerRoomTimelineItem(id: UUID().uuidString, + text: "Blurhashed image", + timestamp: "Now", + groupState: .single, + isOutgoing: false, + isEditable: false, + senderId: "Bob", + urlString: nil, + image: nil, + aspectRatio: 0.7, + blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW")) + } + } +} diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift index 1b57468c0..c6d587641 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift @@ -28,7 +28,6 @@ struct TextRoomTimelineView: View { FormattedBodyText(text: timelineItem.text) } } - .id(timelineItem.id) } } @@ -66,7 +65,7 @@ struct TextRoomTimelineView_Previews: PreviewProvider { TextRoomTimelineItem(id: UUID().uuidString, text: text, timestamp: timestamp, - inGroupState: .single, + groupState: .single, isOutgoing: isOutgoing, isEditable: isOutgoing, senderId: senderId) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift new file mode 100644 index 000000000..bd2699982 --- /dev/null +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TimelineStartRoomTimelineView.swift @@ -0,0 +1,44 @@ +// +// 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 SwiftUI + +struct TimelineStartRoomTimelineView: View { + let timelineItem: TimelineStartRoomTimelineItem + + var body: some View { + Text(title) + .font(.element.footnote) + .foregroundColor(.element.secondaryContent) + .padding(.vertical, 24) + .frame(maxWidth: .infinity) + } + + var title: String { + var text = ElementL10n.thisIsTheBeginningOfRoomNoName + if let name = timelineItem.name { + text = ElementL10n.thisIsTheBeginningOfRoom(name) + } + return text + } +} + +struct TimelineStartRoomTimelineView_Previews: PreviewProvider { + static var previews: some View { + let item = TimelineStartRoomTimelineItem(name: "Alice and Bob") + TimelineStartRoomTimelineView(timelineItem: item) + } +} diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift new file mode 100644 index 000000000..564b01023 --- /dev/null +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift @@ -0,0 +1,74 @@ +// +// 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 SwiftUI + +struct UnsupportedRoomTimelineView: View { + let timelineItem: UnsupportedRoomTimelineItem + + var body: some View { + TimelineStyler(timelineItem: timelineItem) { + Label { + VStack(alignment: .leading) { + Text("\(timelineItem.text): \(timelineItem.eventType)") + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.element.primaryContent) + + Text(timelineItem.error) + .fixedSize(horizontal: false, vertical: true) + .font(.element.footnote) + .foregroundColor(.element.primaryContent) + } + } icon: { + Image(systemName: "exclamationmark.bubble") + .foregroundColor(.red) + } + } + } +} + +struct UnsupportedRoomTimelineView_Previews: PreviewProvider { + static var previews: some View { + body + body.timelineStyle(.plain) + } + + static var body: some View { + VStack(alignment: .leading, spacing: 20.0) { + UnsupportedRoomTimelineView(timelineItem: itemWith(text: "Text", + timestamp: "Now", + isOutgoing: false, + senderId: "Bob")) + + UnsupportedRoomTimelineView(timelineItem: itemWith(text: "Some other text", + timestamp: "Later", + isOutgoing: true, + senderId: "Anne")) + } + } + + private static func itemWith(text: String, timestamp: String, isOutgoing: Bool, senderId: String) -> UnsupportedRoomTimelineItem { + UnsupportedRoomTimelineItem(id: UUID().uuidString, + text: text, + eventType: "Some Event Type", + error: "Something went wrong", + timestamp: timestamp, + groupState: .single, + isOutgoing: isOutgoing, + isEditable: false, + senderId: senderId) + } +} diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift index 783a64cc0..41e71b236 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/VideoRoomTimelineView.swift @@ -40,7 +40,6 @@ struct VideoRoomTimelineView: View { .aspectRatio(timelineItem.aspectRatio, contentMode: .fit) } } - .id(timelineItem.id) .animation(.elementDefault, value: timelineItem.image) } @@ -70,7 +69,7 @@ struct VideoRoomTimelineView_Previews: PreviewProvider { VideoRoomTimelineView(timelineItem: VideoRoomTimelineItem(id: UUID().uuidString, text: "Some video", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -82,7 +81,7 @@ struct VideoRoomTimelineView_Previews: PreviewProvider { VideoRoomTimelineView(timelineItem: VideoRoomTimelineItem(id: UUID().uuidString, text: "Some other video", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", @@ -94,7 +93,7 @@ struct VideoRoomTimelineView_Previews: PreviewProvider { VideoRoomTimelineView(timelineItem: VideoRoomTimelineItem(id: UUID().uuidString, text: "Blurhashed video", timestamp: "Now", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "Bob", diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift index cca2c10e0..544421e2f 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineTableViewController.swift @@ -191,32 +191,29 @@ class TimelineTableViewController: UIViewController { cell.item = timelineItem cell.contentConfiguration = UIHostingConfiguration { - if case .backPaginationIndicator = timelineItem { - timelineItem - } else { - timelineItem - .frame(maxWidth: .infinity, alignment: .leading) - .opacity(opacity) - .contextMenu { - contextMenuBuilder?(timelineItem.id) - } - .onAppear { - coordinator.send(viewAction: .itemAppeared(id: timelineItem.id)) - } - .onDisappear { - coordinator.send(viewAction: .itemDisappeared(id: timelineItem.id)) - } - .environment(\.openURL, OpenURLAction { url in - coordinator.send(viewAction: .linkClicked(url: url)) - return .systemAction - }) - .onTapGesture(count: 2) { - coordinator.send(viewAction: .displayEmojiPicker(itemId: timelineItem.id)) - } - .onTapGesture { - coordinator.send(viewAction: .itemTapped(id: timelineItem.id)) - } - } + timelineItem + .id(timelineItem.id) + .frame(maxWidth: .infinity, alignment: .leading) + .opacity(opacity) + .contextMenu { + contextMenuBuilder?(timelineItem.id) + } + .onAppear { + coordinator.send(viewAction: .itemAppeared(id: timelineItem.id)) + } + .onDisappear { + coordinator.send(viewAction: .itemDisappeared(id: timelineItem.id)) + } + .environment(\.openURL, OpenURLAction { url in + coordinator.send(viewAction: .linkClicked(url: url)) + return .systemAction + }) + .onTapGesture(count: 2) { + coordinator.send(viewAction: .displayEmojiPicker(itemId: timelineItem.id)) + } + .onTapGesture { + coordinator.send(viewAction: .itemTapped(id: timelineItem.id)) + } } .margins(.all, self.timelineStyle.rowInsets) .minSize(height: 1) @@ -236,8 +233,6 @@ class TimelineTableViewController: UIViewController { let previousLayout = layout() var snapshot = NSDiffableDataSourceSnapshot() - snapshot.appendSections([.loadingIndicator]) - snapshot.appendItems([.backPaginationIndicator(isBackPaginating)]) snapshot.appendSections([.main]) snapshot.appendItems(timelineItems) dataSource.apply(snapshot, animatingDifferences: false) @@ -399,7 +394,6 @@ extension TimelineTableViewController: UITableViewDelegate { extension TimelineTableViewController { /// The sections of the table view used in the diffable data source. enum TimelineSection { - case loadingIndicator case main } diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift index a029ec371..dcd966fe4 100644 --- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift +++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift @@ -79,50 +79,54 @@ class SessionVerificationStateMachine { } init() { - stateMachine = StateMachine(state: .initial) { machine in - machine.addRoutes(event: .requestVerification, transitions: [.initial => .requestingVerification]) - machine.addRoutes(event: .didAcceptVerificationRequest, transitions: [.requestingVerification => .verificationRequestAccepted]) - machine.addRoutes(event: .startSasVerification, transitions: [.verificationRequestAccepted => .startingSasVerification]) - machine.addRoutes(event: .didFail, transitions: [.requestingVerification => .initial]) - machine.addRoutes(event: .restart, transitions: [.cancelled => .initial]) - - // Transitions with associated values need to be handled through `addRouteMapping` - machine.addRouteMapping { event, fromState, _ in - switch (event, fromState) { - case (.didStartSasVerification, _): - return .sasVerificationStarted - - case (.didReceiveChallenge(let emojis), .sasVerificationStarted): - return .showingChallenge(emojis: emojis) - case (.acceptChallenge, .showingChallenge(let emojis)): - return .acceptingChallenge(emojis: emojis) - case (.didFail, .acceptingChallenge(let emojis)): - return .showingChallenge(emojis: emojis) + stateMachine = StateMachine(state: .initial) + configure() + } + + // swiftlint:disable:next cyclomatic_complexity + private func configure() { + stateMachine.addRoutes(event: .requestVerification, transitions: [.initial => .requestingVerification]) + stateMachine.addRoutes(event: .didAcceptVerificationRequest, transitions: [.requestingVerification => .verificationRequestAccepted]) + stateMachine.addRoutes(event: .startSasVerification, transitions: [.verificationRequestAccepted => .startingSasVerification]) + stateMachine.addRoutes(event: .didFail, transitions: [.requestingVerification => .initial]) + stateMachine.addRoutes(event: .restart, transitions: [.cancelled => .initial]) + + // Transitions with associated values need to be handled through `addRouteMapping` + stateMachine.addRouteMapping { event, fromState, _ in + switch (event, fromState) { + case (.didStartSasVerification, _): + return .sasVerificationStarted - case (.didAcceptChallenge, .acceptingChallenge): - return .verified + case (.didReceiveChallenge(let emojis), .sasVerificationStarted): + return .showingChallenge(emojis: emojis) + case (.acceptChallenge, .showingChallenge(let emojis)): + return .acceptingChallenge(emojis: emojis) + case (.didFail, .acceptingChallenge(let emojis)): + return .showingChallenge(emojis: emojis) - case (.declineChallenge, .showingChallenge(let emojis)): - return .decliningChallenge(emojis: emojis) - case (.didFail, .decliningChallenge(let emojis)): - return .showingChallenge(emojis: emojis) + case (.didAcceptChallenge, .acceptingChallenge): + return .verified - case (.cancel, _): - return .cancelling - case (.didCancel, _): - return .cancelled - - default: - return nil - } + case (.declineChallenge, .showingChallenge(let emojis)): + return .decliningChallenge(emojis: emojis) + case (.didFail, .decliningChallenge(let emojis)): + return .showingChallenge(emojis: emojis) + + case (.cancel, _): + return .cancelling + case (.didCancel, _): + return .cancelled + + default: + return nil } - - addTransitionHandler { context in - if let event = context.event { - MXLog.info("Transitioning from `\(context.fromState)` to `\(context.toState)` with event `\(event)`") - } else { - MXLog.info("Transitioning from \(context.fromState)` to `\(context.toState)`") - } + } + + addTransitionHandler { context in + if let event = context.event { + MXLog.info("Transitioning from `\(context.fromState)` to `\(context.toState)` with event `\(event)`") + } else { + MXLog.info("Transitioning from \(context.fromState)` to `\(context.toState)`") } } } diff --git a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift index 928db4c73..a51bae9ab 100644 --- a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift +++ b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift @@ -125,13 +125,13 @@ struct SessionVerificationScreen: View { Label(ElementL10n.verificationSasMatch, systemImage: "checkmark") } .buttonStyle(.elementAction(.xLarge)) - .accessibilityLabel("challengeAcceptButton") + .accessibilityIdentifier("challengeAcceptButton") Button(ElementL10n.verificationSasDoNotMatch) { context.send(viewAction: .decline) } .font(.element.bodyBold) - .accessibilityLabel("challengeDeclineButton") + .accessibilityIdentifier("challengeDeclineButton") } case .verified: diff --git a/ElementX/Sources/Services/Room/MockRoomProxy.swift b/ElementX/Sources/Services/Room/MockRoomProxy.swift index 7c6601fb2..4a0291687 100644 --- a/ElementX/Sources/Services/Room/MockRoomProxy.swift +++ b/ElementX/Sources/Services/Room/MockRoomProxy.swift @@ -55,7 +55,7 @@ struct MockRoomProxy: RoomProxyProtocol { .failure(.failedAddingTimelineListener) } - func paginateBackwards(count: UInt) async -> Result { + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { .failure(.failedPaginatingBackwards) } diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift index 44b9985c8..f2dcb2beb 100644 --- a/ElementX/Sources/Services/Room/RoomProxy.swift +++ b/ElementX/Sources/Services/Room/RoomProxy.swift @@ -34,8 +34,6 @@ class RoomProxy: RoomProxyProtocol { private(set) var displayName: String? - private var backPaginationOutcome: PaginationOutcome? - private var timelineObservationToken: StoppableSpawn? deinit { @@ -138,17 +136,13 @@ class RoomProxy: RoomProxyProtocol { } } - func paginateBackwards(count: UInt) async -> Result { - guard backPaginationOutcome?.moreMessages != false else { - return .failure(.noMoreMessagesToBackPaginate) - } - + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { do { - let outcome: PaginationOutcome = try await Task.dispatch(on: .global()) { - try self.room.paginateBackwards(limit: UInt16(count)) + try await Task.dispatch(on: .global()) { + try self.room.paginateBackwards(opts: .untilNumItems(eventLimit: UInt16(requestSize), items: UInt16(untilNumberOfItems))) } - update(backPaginationOutcome: outcome) - return .success(UInt(outcome.numUpdates)) + + return .success(()) } catch { return .failure(.failedPaginatingBackwards) } @@ -255,8 +249,4 @@ class RoomProxy: RoomProxyProtocol { private func update(displayName: String) { self.displayName = displayName } - - private func update(backPaginationOutcome: PaginationOutcome) { - self.backPaginationOutcome = backPaginationOutcome - } } diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift index e2e6225c5..a398aa252 100644 --- a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift +++ b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift @@ -56,7 +56,7 @@ protocol RoomProxyProtocol { func addTimelineListener(listener: TimelineListener) -> Result - func paginateBackwards(count: UInt) async -> Result + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result func sendMessage(_ message: String, inReplyToEventId: String?) async -> Result diff --git a/ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift b/ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift index bf17b1457..4f60ae832 100644 --- a/ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift +++ b/ElementX/Sources/Services/Timeline/Fixtures/RoomTimelineItemFixtures.swift @@ -19,12 +19,11 @@ import Foundation enum RoomTimelineItemFixtures { /// The default timeline items used in Xcode previews etc. static var `default`: [RoomTimelineItemProtocol] = [ - SeparatorRoomTimelineItem(id: UUID().uuidString, - text: "Yesterday"), + SeparatorRoomTimelineItem(text: "Yesterday"), TextRoomTimelineItem(id: UUID().uuidString, text: "That looks so good!", timestamp: "10:10 AM", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "", @@ -33,7 +32,7 @@ enum RoomTimelineItemFixtures { TextRoomTimelineItem(id: UUID().uuidString, text: "Let’s get lunch soon! New salad place opened up 🥗. When are y’all free? 🤗", timestamp: "10:11 AM", - inGroupState: .beginning, + groupState: .beginning, isOutgoing: false, isEditable: false, senderId: "", @@ -44,7 +43,7 @@ enum RoomTimelineItemFixtures { TextRoomTimelineItem(id: UUID().uuidString, text: "I can be around on Wednesday. How about some 🌮 instead? Like https://www.tortilla.co.uk/", timestamp: "10:11 AM", - inGroupState: .end, + groupState: .end, isOutgoing: false, isEditable: false, senderId: "", @@ -53,12 +52,11 @@ enum RoomTimelineItemFixtures { AggregatedReaction(key: "🙏", count: 1, isHighlighted: false), AggregatedReaction(key: "🙌", count: 2, isHighlighted: true) ])), - SeparatorRoomTimelineItem(id: UUID().uuidString, - text: "Today"), + SeparatorRoomTimelineItem(text: "Today"), TextRoomTimelineItem(id: UUID().uuidString, text: "Wow, cool. Ok, lets go the usual place tomorrow?! Is that too soon? Here’s the menu, let me know what you want it’s on me!", timestamp: "5 PM", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "", @@ -66,7 +64,7 @@ enum RoomTimelineItemFixtures { TextRoomTimelineItem(id: UUID().uuidString, text: "And John's speech was amazing!", timestamp: "5 PM", - inGroupState: .beginning, + groupState: .beginning, isOutgoing: true, isEditable: true, senderId: "", @@ -74,7 +72,7 @@ enum RoomTimelineItemFixtures { TextRoomTimelineItem(id: UUID().uuidString, text: "New home office set up!", timestamp: "5 PM", - inGroupState: .end, + groupState: .end, isOutgoing: true, isEditable: true, senderId: "", @@ -91,7 +89,7 @@ enum RoomTimelineItemFixtures { AttributedStringBuilderComponent(attributedString: "That's amazing! Congrats 🥳", isBlockquote: false) ], timestamp: "5 PM", - inGroupState: .single, + groupState: .single, isOutgoing: false, isEditable: false, senderId: "", @@ -101,24 +99,24 @@ enum RoomTimelineItemFixtures { /// A small chunk of events, containing 2 text items. static var smallChunk: [RoomTimelineItemProtocol] { [TextRoomTimelineItem(text: "Hey there 👋", - inGroupState: .beginning, + groupState: .beginning, senderDisplayName: "Alice"), TextRoomTimelineItem(text: "How are you?", - inGroupState: .end, + groupState: .end, senderDisplayName: "Alice")] } /// A chunk of events that contains a single text item. static var singleMessageChunk: [RoomTimelineItemProtocol] { [TextRoomTimelineItem(text: "Tap tap tap 🎙️. Is this thing on?", - inGroupState: .single, + groupState: .single, senderDisplayName: "Helena")] } /// A single text item. static var incomingMessage: RoomTimelineItemProtocol { TextRoomTimelineItem(text: "Hello, World!", - inGroupState: .single, + groupState: .single, senderDisplayName: "Bob") } @@ -209,11 +207,11 @@ enum RoomTimelineItemFixtures { } private extension TextRoomTimelineItem { - init(text: String, inGroupState: TimelineItemInGroupState = .single, senderDisplayName: String) { + init(text: String, groupState: TimelineItemGroupState = .single, senderDisplayName: String) { self.init(id: UUID().uuidString, text: text, timestamp: "10:47 am", - inGroupState: inGroupState, + groupState: groupState, isOutgoing: senderDisplayName == "Alice", isEditable: false, senderId: "", diff --git a/ElementX/Sources/Services/Timeline/MockRoomTimelineProvider.swift b/ElementX/Sources/Services/Timeline/MockRoomTimelineProvider.swift index 269311de2..e3dda181f 100644 --- a/ElementX/Sources/Services/Timeline/MockRoomTimelineProvider.swift +++ b/ElementX/Sources/Services/Timeline/MockRoomTimelineProvider.swift @@ -23,7 +23,7 @@ struct MockRoomTimelineProvider: RoomTimelineProviderProtocol { private var itemProxies = [TimelineItemProxy]() - func paginateBackwards(_ count: UInt) async -> Result { + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { .failure(.failedPaginatingBackwards) } diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift index 4e5427233..8fe3b10ff 100644 --- a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift +++ b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift @@ -68,18 +68,14 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol { } } - func paginateBackwards(_ count: UInt) async -> Result { + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { // Set this back to false after actually updating the items or if failed backPaginationPublisher.send(true) MXLog.info("Started back pagination request") - switch await roomProxy.paginateBackwards(count: count) { - case .success(let numberOfUpdates): - MXLog.info("Finished back pagination request. Got \(numberOfUpdates) updates") - - if numberOfUpdates == 0 { - backPaginationPublisher.send(false) - } + switch await roomProxy.paginateBackwards(requestSize: requestSize, untilNumberOfItems: untilNumberOfItems) { + case .success: + MXLog.info("Finished back pagination request") return .success(()) case .failure(let error): MXLog.error("Failed back pagination request with error: \(error)") @@ -152,7 +148,7 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol { // MARK: - Private private func updateItemsWithDiffs(_ diffs: [TimelineDiff]) { - MXLog.info("Received timeline diffs") + MXLog.verbose("Received timeline diffs") itemProxies = diffs .reduce(itemProxies) { currentItems, diff in @@ -171,7 +167,7 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol { return updatedItems } - MXLog.info("Finished applying diffs") + MXLog.verbose("Finished applying diffs") } // swiftlint:disable:next cyclomatic_complexity function_body_length diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift b/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift index 8afb75d31..61c28df27 100644 --- a/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift +++ b/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift @@ -31,7 +31,7 @@ protocol RoomTimelineProviderProtocol { var backPaginationPublisher: CurrentValueSubject { get } - func paginateBackwards(_ count: UInt) async -> Result + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result func sendMessage(_ message: String, inReplyToItemId: String?) async -> Result diff --git a/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift index 2f2334329..f678048a3 100644 --- a/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift @@ -23,13 +23,6 @@ protocol MessageContentProtocol: RoomMessageEventContentProtocol { var body: String { get } } -/// The delivery status for the item. -enum MessageTimelineItemDeliveryStatus: Hashable { - case unknown - case sending - case sent(elapsedTime: TimeInterval) -} - /// A timeline item that represents an `m.room.message` event. struct MessageTimelineItem { let item: MatrixRustSDK.EventTimelineItem @@ -43,15 +36,6 @@ struct MessageTimelineItem { return eventID } } - - var deliveryStatus: MessageTimelineItemDeliveryStatus { - switch item.key() { - case .transactionId: - return .sending - case .eventId: - return .sent(elapsedTime: Date().timeIntervalSince1970 - timestamp.timeIntervalSince1970) - } - } var body: String { content.body @@ -61,18 +45,10 @@ struct MessageTimelineItem { item.content().asMessage()?.isEdited() == true } - var isEditable: Bool { - item.isEditable() - } - var inReplyTo: String? { item.content().asMessage()?.inReplyTo() } - var reactions: [Reaction] { - item.reactions() - } - var sender: String { item.sender() } diff --git a/ElementX/Sources/Services/Timeline/TimelineController/MockRoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/MockRoomTimelineController.swift index 9ad207f59..4fc6ec772 100644 --- a/ElementX/Sources/Services/Timeline/TimelineController/MockRoomTimelineController.swift +++ b/ElementX/Sources/Services/Timeline/TimelineController/MockRoomTimelineController.swift @@ -20,6 +20,9 @@ import Foundation class MockRoomTimelineController: RoomTimelineControllerProtocol { /// An array of timeline item arrays that will be inserted in order for each back pagination request. var backPaginationResponses: [[RoomTimelineItemProtocol]] = [] + /// The time delay added to each back pagination request. + var backPaginationDelay: Duration = .milliseconds(500) + /// An array of timeline items that will be appended in order when ``simulateIncomingItems()`` is called. var incomingItems: [RoomTimelineItemProtocol] = [] @@ -38,8 +41,22 @@ class MockRoomTimelineController: RoomTimelineControllerProtocol { } } - func paginateBackwards(_ count: UInt) async -> Result { - .failure(.generic) + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { + callbacks.send(.startedBackPaginating) + + guard !backPaginationResponses.isEmpty else { + callbacks.send(.finishedBackPaginating) + return .failure(.generic) + } + + let newItems = backPaginationResponses.removeFirst() + + try? await Task.sleep(for: backPaginationDelay) + timelineItems.insert(contentsOf: newItems, at: 0) + callbacks.send(.updatedTimelineItems) + callbacks.send(.finishedBackPaginating) + + return .success(()) } func processItemAppearance(_ itemId: String) async { } diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift index 00959eaf4..dff1fd8af 100644 --- a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift +++ b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift @@ -78,8 +78,8 @@ class RoomTimelineController: RoomTimelineControllerProtocol { NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil) } - func paginateBackwards(_ count: UInt) async -> Result { - switch await timelineProvider.paginateBackwards(count) { + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result { + switch await timelineProvider.paginateBackwards(requestSize: requestSize, untilNumberOfItems: untilNumberOfItems) { case .success: return .success(()) case .failure(let error): @@ -105,6 +105,8 @@ class RoomTimelineController: RoomTimelineControllerProtocol { await loadThumbnailForImageTimelineItem(item) case let item as VideoRoomTimelineItem: await loadThumbnailForVideoTimelineItem(item) + case let item as StickerRoomTimelineItem: + await loadThumbnailForStickerTimelineItem(item) default: break } @@ -225,6 +227,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol { } } + // swiftlint:disable:next cyclomatic_complexity private func asyncUpdateTimelineItems() async { var newTimelineItems = [RoomTimelineItemProtocol]() @@ -236,27 +239,31 @@ class RoomTimelineController: RoomTimelineControllerProtocol { let previousItemProxy = timelineProvider.itemsPublisher.value[safe: index - 1] let nextItemProxy = timelineProvider.itemsPublisher.value[safe: index + 1] - let inGroupState = inGroupState(for: itemProxy, previousItemProxy: previousItemProxy, nextItemProxy: nextItemProxy) + let groupState = computeGroupState(for: itemProxy, previousItemProxy: previousItemProxy, nextItemProxy: nextItemProxy) switch itemProxy { case .event(let eventItem): newTimelineItems.append(timelineItemFactory.buildTimelineItemFor(eventItemProxy: eventItem, - inGroupState: inGroupState)) + groupState: groupState)) case .virtual(let virtualItem): switch virtualItem { case .dayDivider(let year, let month, let day): // These components will be replaced by a timestamp in upcoming releases let dateComponents = DateComponents(calendar: .current, year: Int(year), month: Int(month), day: Int(day)) if let dateString = dateComponents.date?.formatted(date: .complete, time: .omitted) { - newTimelineItems.append(SeparatorRoomTimelineItem(id: UUID().uuidString, text: dateString)) + newTimelineItems.append(SeparatorRoomTimelineItem(text: dateString)) } else { MXLog.error("Failed formatting separator date") } case .readMarker: // Don't show the read marker if it's the last item in the timeline if index != timelineProvider.itemsPublisher.value.indices.last { - newTimelineItems.append(ReadMarkerRoomTimelineItem(id: UUID().uuidString)) + newTimelineItems.append(ReadMarkerRoomTimelineItem()) } + case .loadingIndicator: + newTimelineItems.append(PaginationIndicatorRoomTimelineItem()) + case .timelineStart: + newTimelineItems.append(TimelineStartRoomTimelineItem(name: roomProxy.displayName ?? roomProxy.name)) } default: break @@ -271,10 +278,10 @@ class RoomTimelineController: RoomTimelineControllerProtocol { callbacks.send(.updatedTimelineItems) } - - private func inGroupState(for itemProxy: TimelineItemProxy, - previousItemProxy: TimelineItemProxy?, - nextItemProxy: TimelineItemProxy?) -> TimelineItemInGroupState { + + private func computeGroupState(for itemProxy: TimelineItemProxy, + previousItemProxy: TimelineItemProxy?, + nextItemProxy: TimelineItemProxy?) -> TimelineItemGroupState { guard let previousItem = previousItemProxy else { // no previous item, check next item guard let nextItem = nextItemProxy else { @@ -364,6 +371,30 @@ class RoomTimelineController: RoomTimelineControllerProtocol { break } } + + private func loadThumbnailForStickerTimelineItem(_ timelineItem: StickerRoomTimelineItem) async { + if timelineItem.image != nil { + return + } + + guard let urlString = timelineItem.urlString else { + return + } + + switch await mediaProvider.loadImageFromURLString(urlString) { + case .success(let image): + guard let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }), + var item = timelineItems[index] as? StickerRoomTimelineItem else { + return + } + + item.image = image + timelineItems[index] = item + callbacks.send(.updatedTimelineItem(timelineItem.id)) + case .failure: + break + } + } private func loadVideoForTimelineItem(_ timelineItem: VideoRoomTimelineItem) async { if timelineItem.cachedVideoURL != nil { diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineControllerProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineControllerProtocol.swift index d52d78ba3..c7dca9d3b 100644 --- a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineControllerProtocol.swift +++ b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineControllerProtocol.swift @@ -48,7 +48,7 @@ protocol RoomTimelineControllerProtocol { func processItemTap(_ itemId: String) async -> RoomTimelineControllerAction - func paginateBackwards(_ count: UInt) async -> Result + func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result func sendMessage(_ message: String) async diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift index edcc842e6..da9f6d86c 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItemProxy.swift @@ -42,6 +42,13 @@ enum TimelineItemProxy { } } +/// The delivery status for the item. +enum TimelineItemDeliveryStatus: Hashable { + case unknown + case sending + case sent(elapsedTime: TimeInterval) +} + /// A light wrapper around event timeline items returned from Rust. struct EventTimelineItemProxy: CustomDebugStringConvertible { let item: MatrixRustSDK.EventTimelineItem @@ -59,6 +66,15 @@ struct EventTimelineItemProxy: CustomDebugStringConvertible { } } + var deliveryStatus: TimelineItemDeliveryStatus { + switch item.key() { + case .transactionId: + return .sending + case .eventId: + return .sent(elapsedTime: Date().timeIntervalSince1970 - timestamp.timeIntervalSince1970) + } + } + var body: String? { content.asMessage()?.body() } @@ -71,10 +87,6 @@ struct EventTimelineItemProxy: CustomDebugStringConvertible { item.content() } - var isRedacted: Bool { - content.isRedactedMessage() - } - var isOwn: Bool { item.isOwn() } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift index 8fb375dc1..d19b5235c 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift @@ -17,7 +17,7 @@ import Foundation import UIKit -enum TimelineItemInGroupState: Hashable { +enum TimelineItemGroupState: Hashable { case single case beginning case middle @@ -37,7 +37,7 @@ protocol EventBasedTimelineItemProtocol: RoomTimelineItemProtocol { var text: String { get } var timestamp: String { get } var shouldShowSenderDetails: Bool { get } - var inGroupState: TimelineItemInGroupState { get } + var groupState: TimelineItemGroupState { get } var isOutgoing: Bool { get } var isEditable: Bool { get } @@ -50,11 +50,11 @@ protocol EventBasedTimelineItemProtocol: RoomTimelineItemProtocol { extension EventBasedTimelineItemProtocol { var shouldShowSenderDetails: Bool { - inGroupState.shouldShowSenderDetails + groupState.shouldShowSenderDetails } var roundedCorners: UIRectCorner { - switch inGroupState { + switch groupState { case .single: return .allCorners case .beginning: diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift index 23a7ede37..03beb80d2 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EncryptedRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EncryptedRoomTimelineItem.swift index 0e9cc5853..478409f91 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EncryptedRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EncryptedRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/FileRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/FileRoomTimelineItem.swift index 278daf8b9..e8874f042 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/FileRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/FileRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift index 2cc790e57..5af081a8d 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift index a94b15f7a..ad206d02f 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/PaginationIndicatorRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/PaginationIndicatorRoomTimelineItem.swift new file mode 100644 index 000000000..db8fd0f52 --- /dev/null +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/PaginationIndicatorRoomTimelineItem.swift @@ -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 +} diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ReadMarkerRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ReadMarkerRoomTimelineItem.swift index 4226caea4..cc052846f 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ReadMarkerRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ReadMarkerRoomTimelineItem.swift @@ -17,5 +17,5 @@ import Foundation struct ReadMarkerRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable { - let id: String + let id: String = UUID().uuidString } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/RedactedRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/RedactedRoomTimelineItem.swift index 7a0516b5d..3e1a296b7 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/RedactedRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/RedactedRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/RoomTimelineItemProperties.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/RoomTimelineItemProperties.swift index 33c237225..a6d701348 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/RoomTimelineItemProperties.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/RoomTimelineItemProperties.swift @@ -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 } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift index 81458ee29..17ed9f5f9 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift @@ -17,6 +17,6 @@ import Foundation struct SeparatorRoomTimelineItem: DecorationTimelineItemProtocol, Identifiable, Hashable { - let id: String + let id: String = UUID().uuidString let text: String } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/StickerRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/StickerRoomTimelineItem.swift new file mode 100644 index 000000000..301c36a00 --- /dev/null +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/StickerRoomTimelineItem.swift @@ -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() +} diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift index 3acff832d..2f2f7fc60 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TimelineStartRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TimelineStartRoomTimelineItem.swift new file mode 100644 index 000000000..0839a569f --- /dev/null +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TimelineStartRoomTimelineItem.swift @@ -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? +} diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/UnsupportedRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/UnsupportedRoomTimelineItem.swift new file mode 100644 index 000000000..4f37d287c --- /dev/null +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/UnsupportedRoomTimelineItem.swift @@ -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() +} diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/VideoRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/VideoRoomTimelineItem.swift index f9c0d7c06..921006dac 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/VideoRoomTimelineItem.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/VideoRoomTimelineItem.swift @@ -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 diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift index 84a9152ef..fecb4f0ac 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift @@ -35,54 +35,117 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { self.attributedStringBuilder = attributedStringBuilder } + // swiftlint:disable:next cyclomatic_complexity func buildTimelineItemFor(eventItemProxy: EventTimelineItemProxy, - inGroupState: TimelineItemInGroupState) -> RoomTimelineItemProtocol { + groupState: TimelineItemGroupState) -> RoomTimelineItemProtocol { let displayName = roomProxy.displayNameForUserId(eventItemProxy.sender) let avatarURL = roomProxy.avatarURLStringForUserId(eventItemProxy.sender) let avatarImage = mediaProvider.imageFromURLString(avatarURL, avatarSize: .user(on: .timeline)) let isOutgoing = eventItemProxy.isOwn - if let encryptedMessage = eventItemProxy.content.asUnableToDecrypt() { - return buildEncryptedTimelineItem(eventItemProxy, encryptedMessage, isOutgoing, inGroupState, displayName, avatarImage) - } - - if eventItemProxy.isRedacted { - return buildRedactedTimelineItem(eventItemProxy, isOutgoing, inGroupState, displayName, avatarImage) - } - - guard let messageContent = eventItemProxy.content.asMessage() else { fatalError("Must be a message for now.") } - - switch messageContent.msgtype() { - case .text(content: let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildTextTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .image(content: let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildImageTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .video(let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildVideoTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .file(let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildFileTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .notice(content: let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildNoticeTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .emote(content: let content): - let message = MessageTimelineItem(item: eventItemProxy.item, content: content) - return buildEmoteTimelineItemFromMessage(message, isOutgoing, inGroupState, displayName, avatarImage) - case .none: - return buildFallbackTimelineItem(eventItemProxy, isOutgoing, inGroupState, displayName, avatarImage) + switch eventItemProxy.content.kind() { + case .unableToDecrypt(let encryptedMessage): + return buildEncryptedTimelineItem(eventItemProxy, encryptedMessage, isOutgoing, groupState, displayName, avatarImage) + case .redactedMessage: + return buildRedactedTimelineItem(eventItemProxy, isOutgoing, groupState, displayName, avatarImage) + case .sticker(let body, let imageInfo, let url): + return buildStickerTimelineItem(eventItemProxy, body, imageInfo, url, isOutgoing, groupState, displayName, avatarImage) + case .failedToParseMessageLike(let eventType, let error): + return buildUnsupportedTimelineItem(eventItemProxy, eventType, error, isOutgoing, groupState, displayName, avatarImage) + case .failedToParseState(let eventType, _, let error): + return buildUnsupportedTimelineItem(eventItemProxy, eventType, error, isOutgoing, groupState, displayName, avatarImage) + case .message: + guard let messageContent = eventItemProxy.content.asMessage() else { fatalError("Invalid message timeline item: \(eventItemProxy)") } + + switch messageContent.msgtype() { + case .text(content: let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildTextTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .image(content: let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildImageTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .video(let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildVideoTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .file(let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildFileTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .notice(content: let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildNoticeTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .emote(content: let content): + let message = MessageTimelineItem(item: eventItemProxy.item, content: content) + return buildEmoteTimelineItemFromMessage(eventItemProxy, message, isOutgoing, groupState, displayName, avatarImage) + case .none: + return buildFallbackTimelineItem(eventItemProxy, isOutgoing, groupState, displayName, avatarImage) + } } } // MARK: - Private + // swiftlint:disable:next function_parameter_count + private func buildUnsupportedTimelineItem(_ eventItemProxy: EventTimelineItemProxy, + _ eventType: String, + _ error: String, + _ isOutgoing: Bool, + _ groupState: TimelineItemGroupState, + _ displayName: String?, + _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { + UnsupportedRoomTimelineItem(id: eventItemProxy.id, + text: ElementL10n.roomTimelineItemUnsupported, + eventType: eventType, + error: error, + timestamp: eventItemProxy.timestamp.formatted(date: .omitted, time: .shortened), + groupState: groupState, + isOutgoing: isOutgoing, + isEditable: eventItemProxy.isEditable, + senderId: eventItemProxy.sender, + senderDisplayName: displayName, + senderAvatar: avatarImage, + properties: RoomTimelineItemProperties()) + } + + // swiftlint:disable:next function_parameter_count + private func buildStickerTimelineItem(_ eventItemProxy: EventTimelineItemProxy, + _ body: String, + _ imageInfo: ImageInfo, + _ urlString: String, + _ isOutgoing: Bool, + _ groupState: TimelineItemGroupState, + _ displayName: String?, + _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { + var aspectRatio: CGFloat? + let width = imageInfo.width.map(CGFloat.init) + let height = imageInfo.height.map(CGFloat.init) + if let width, let height { + aspectRatio = width / height + } + + return StickerRoomTimelineItem(id: eventItemProxy.id, + text: body, + timestamp: eventItemProxy.timestamp.formatted(date: .omitted, time: .shortened), + groupState: groupState, + isOutgoing: isOutgoing, + isEditable: eventItemProxy.isEditable, + senderId: eventItemProxy.sender, + senderDisplayName: displayName, + senderAvatar: avatarImage, + urlString: urlString, + image: mediaProvider.imageFromURLString(urlString), + width: width, + height: height, + aspectRatio: aspectRatio, + blurhash: imageInfo.blurhash, + properties: RoomTimelineItemProperties(reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) + } + // swiftlint:disable:next function_parameter_count private func buildEncryptedTimelineItem(_ eventItemProxy: EventTimelineItemProxy, _ encryptedMessage: EncryptedMessage, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { var encryptionType = EncryptedRoomTimelineItem.EncryptionType.unknown @@ -99,7 +162,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { text: ElementL10n.encryptionInformationDecryptionError, encryptionType: encryptionType, timestamp: eventItemProxy.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, isEditable: eventItemProxy.isEditable, senderId: eventItemProxy.sender, @@ -110,13 +173,13 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { private func buildRedactedTimelineItem(_ eventItemProxy: EventTimelineItemProxy, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { RedactedRoomTimelineItem(id: eventItemProxy.id, text: ElementL10n.eventRedacted, timestamp: eventItemProxy.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, isEditable: eventItemProxy.isEditable, senderId: eventItemProxy.sender, @@ -127,7 +190,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { private func buildFallbackTimelineItem(_ eventItemProxy: EventTimelineItemProxy, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { let attributedText = attributedStringBuilder.fromPlain(eventItemProxy.body) @@ -137,7 +200,7 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { text: eventItemProxy.body ?? "", attributedComponents: attributedComponents, timestamp: eventItemProxy.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, isEditable: eventItemProxy.isEditable, senderId: eventItemProxy.sender, @@ -147,9 +210,11 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { reactions: aggregateReactions(eventItemProxy.reactions))) } - private func buildTextTimelineItemFromMessage(_ message: MessageTimelineItem, + // swiftlint:disable:next function_parameter_count + private func buildTextTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { let attributedText = (message.htmlBody != nil ? attributedStringBuilder.fromHTML(message.htmlBody) : attributedStringBuilder.fromPlain(message.body)) @@ -159,20 +224,22 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { text: message.body, attributedComponents: attributedComponents, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } - private func buildImageTimelineItemFromMessage(_ message: MessageTimelineItem, + // swiftlint:disable:next function_parameter_count + private func buildImageTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { var aspectRatio: CGFloat? @@ -184,9 +251,9 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return ImageRoomTimelineItem(id: message.id, text: message.body, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, @@ -197,13 +264,15 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { aspectRatio: aspectRatio, blurhash: message.blurhash, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } - - private func buildVideoTimelineItemFromMessage(_ message: MessageTimelineItem, + + // swiftlint:disable:next function_parameter_count + private func buildVideoTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { var aspectRatio: CGFloat? @@ -215,9 +284,9 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { return VideoRoomTimelineItem(id: message.id, text: message.body, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, @@ -230,34 +299,38 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { aspectRatio: aspectRatio, blurhash: message.blurhash, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } - private func buildFileTimelineItemFromMessage(_ message: MessageTimelineItem, + // swiftlint:disable:next function_parameter_count + private func buildFileTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { FileRoomTimelineItem(id: message.id, text: message.body, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, source: message.source, thumbnailSource: message.thumbnailSource, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } - private func buildNoticeTimelineItemFromMessage(_ message: MessageTimelineItem, + // swiftlint:disable:next function_parameter_count + private func buildNoticeTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { let attributedText = (message.htmlBody != nil ? attributedStringBuilder.fromHTML(message.htmlBody) : attributedStringBuilder.fromPlain(message.body)) @@ -267,20 +340,22 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { text: message.body, attributedComponents: attributedComponents, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } - private func buildEmoteTimelineItemFromMessage(_ message: MessageTimelineItem, + // swiftlint:disable:next function_parameter_count + private func buildEmoteTimelineItemFromMessage(_ eventItemProxy: EventTimelineItemProxy, + _ message: MessageTimelineItem, _ isOutgoing: Bool, - _ inGroupState: TimelineItemInGroupState, + _ groupState: TimelineItemGroupState, _ displayName: String?, _ avatarImage: UIImage?) -> RoomTimelineItemProtocol { let attributedText = (message.htmlBody != nil ? attributedStringBuilder.fromHTML(message.htmlBody) : attributedStringBuilder.fromPlain(message.body)) @@ -290,15 +365,15 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol { text: message.body, attributedComponents: attributedComponents, timestamp: message.timestamp.formatted(date: .omitted, time: .shortened), - inGroupState: inGroupState, + groupState: groupState, isOutgoing: isOutgoing, - isEditable: message.isEditable, + isEditable: eventItemProxy.isEditable, senderId: message.sender, senderDisplayName: displayName, senderAvatar: avatarImage, properties: RoomTimelineItemProperties(isEdited: message.isEdited, - reactions: aggregateReactions(message.reactions), - deliveryStatus: message.deliveryStatus)) + reactions: aggregateReactions(eventItemProxy.reactions), + deliveryStatus: eventItemProxy.deliveryStatus)) } private func aggregateReactions(_ reactions: [Reaction]) -> [AggregatedReaction] { diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift index 188dbd3e4..81c73e408 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift @@ -19,5 +19,5 @@ import Foundation @MainActor protocol RoomTimelineItemFactoryProtocol { func buildTimelineItemFor(eventItemProxy: EventTimelineItemProxy, - inGroupState: TimelineItemInGroupState) -> RoomTimelineItemProtocol + groupState: TimelineItemGroupState) -> RoomTimelineItemProtocol } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift index 6d47628d9..44505a256 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift @@ -40,6 +40,14 @@ struct RoomTimelineViewFactory: RoomTimelineViewFactoryProtocol { return .encrypted(item) case let item as ReadMarkerRoomTimelineItem: return .readMarker(item) + case let item as PaginationIndicatorRoomTimelineItem: + return .paginationIndicator(item) + case let item as StickerRoomTimelineItem: + return .sticker(item) + case let item as UnsupportedRoomTimelineItem: + return .unsupported(item) + case let item as TimelineStartRoomTimelineItem: + return .timelineStart(item) default: fatalError("Unknown timeline item") } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift index c7831cb7b..185307f71 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift @@ -28,7 +28,10 @@ enum RoomTimelineViewProvider: Identifiable, Hashable { case redacted(RedactedRoomTimelineItem) case encrypted(EncryptedRoomTimelineItem) case readMarker(ReadMarkerRoomTimelineItem) - case backPaginationIndicator(Bool) + case paginationIndicator(PaginationIndicatorRoomTimelineItem) + case sticker(StickerRoomTimelineItem) + case unsupported(UnsupportedRoomTimelineItem) + case timelineStart(TimelineStartRoomTimelineItem) var id: String { switch self { @@ -52,8 +55,14 @@ enum RoomTimelineViewProvider: Identifiable, Hashable { return item.id case .readMarker(let item): return item.id - case .backPaginationIndicator: - return "BackpaginationLoadingIndicator" + case .paginationIndicator(let item): + return item.id + case .sticker(let item): + return item.id + case .unsupported(let item): + return item.id + case .timelineStart(let item): + return item.id } } } @@ -81,10 +90,14 @@ extension RoomTimelineViewProvider: View { EncryptedRoomTimelineView(timelineItem: item) case .readMarker(let item): ReadMarkerRoomTimelineView(timelineItem: item) - case .backPaginationIndicator(let isBackPaginating): - ProgressView() - .frame(maxWidth: .infinity) - .opacity(isBackPaginating ? 1.0 : 0.0) + case .paginationIndicator(let item): + PaginationIndicatorRoomTimelineView(timelineItem: item) + case .sticker(let item): + StickerRoomTimelineView(timelineItem: item) + case .unsupported(let item): + UnsupportedRoomTimelineView(timelineItem: item) + case .timelineStart(let item): + TimelineStartRoomTimelineView(timelineItem: item) } } } diff --git a/changelog.d/pr-424.feature b/changelog.d/pr-424.feature new file mode 100644 index 000000000..b6b94c3cc --- /dev/null +++ b/changelog.d/pr-424.feature @@ -0,0 +1 @@ +Add support for new timeline items: loading indicators, stickers, invalid events and begining of history \ No newline at end of file diff --git a/project.yml b/project.yml index a2b905ab5..925e7919c 100644 --- a/project.yml +++ b/project.yml @@ -40,7 +40,7 @@ include: packages: MatrixRustSDK: url: https://github.com/matrix-org/matrix-rust-components-swift - exactVersion: 1.0.27-alpha + exactVersion: 1.0.28-alpha # path: ../matrix-rust-sdk DesignKit: path: ./