diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 46631387b..506e1bdec 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 56; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -1140,12 +1140,12 @@ 033DB41C51865A2E83174E87 /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = ""; }; 035177BCD8E8308B098AC3C2 /* WindowManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowManager.swift; sourceTree = ""; }; 0376C429FAB1687C3D905F3E /* MockCoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCoder.swift; sourceTree = ""; }; - 0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_voice_message.m4a; sourceTree = ""; }; + 0392E3FDE372C9B56FEEED8B /* test_voice_message.m4a */ = {isa = PBXFileReference; path = test_voice_message.m4a; sourceTree = ""; }; 03DD998E523D4EC93C7ED703 /* RoomNotificationSettingsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenViewModelProtocol.swift; sourceTree = ""; }; 03FABD73FD8086EFAB699F42 /* MediaUploadPreviewScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadPreviewScreenViewModelTests.swift; sourceTree = ""; }; 044E501B8331B339874D1B96 /* CompoundIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompoundIcon.swift; sourceTree = ""; }; 045253F9967A535EE5B16691 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = ""; }; - 048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 04BB8DDE245ED86C489BA983 /* AccessibilityIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityIdentifiers.swift; sourceTree = ""; }; 04DF593C3F7AF4B2FBAEB05D /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = ""; }; 0516C69708D5CBDE1A8E77EC /* RoomDirectorySearchProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchProxyProtocol.swift; sourceTree = ""; }; @@ -1177,6 +1177,7 @@ 0BD116096CAA9139B95EEA9C /* UserProfileScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileScreenViewModel.swift; sourceTree = ""; }; 0C34667458773B02AB5FB0B2 /* LegalInformationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegalInformationScreenViewModel.swift; sourceTree = ""; }; 0C62E07C1164F5120727A2A8 /* AppLockSetupBiometricsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupBiometricsScreenCoordinator.swift; sourceTree = ""; }; + 0CB569EAA5017B5B23970655 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = ""; }; 0CCC6C31102E1D8B9106DEDE /* AppLockSetupBiometricsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupBiometricsScreenViewModelProtocol.swift; sourceTree = ""; }; 0D0B159AFFBBD8ECFD0E37FA /* LoginScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreenModels.swift; sourceTree = ""; }; 0D879FC4E881E748BB9B34DC /* RoomChangePermissionsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangePermissionsScreenCoordinator.swift; sourceTree = ""; }; @@ -1203,7 +1204,7 @@ 127C8472672A5BA09EF1ACF8 /* CurrentValuePublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentValuePublisher.swift; sourceTree = ""; }; 128501375217576AF0FE3E92 /* RoomAttachmentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomAttachmentPicker.swift; sourceTree = ""; }; 12F1E7F9C2BE8BB751037826 /* WaitlistScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreenCoordinator.swift; sourceTree = ""; }; - 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = IntegrationTests.xctestplan; sourceTree = ""; }; + 1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; path = IntegrationTests.xctestplan; sourceTree = ""; }; 130ED565A078F7E0B59D9D25 /* UNTextInputNotificationResponse+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNTextInputNotificationResponse+Creator.swift"; sourceTree = ""; }; 136F80A613B55BDD071DCEA5 /* JoinRoomScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomScreenModels.swift; sourceTree = ""; }; 13802897C7AFA360EA74C0B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -1292,7 +1293,7 @@ 25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationItemProxy.swift; sourceTree = ""; }; 25F8664F1FB95AF3C4202478 /* PollFormScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenCoordinator.swift; sourceTree = ""; }; 260004737C573A56FA01E86E /* Encodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = ""; }; - 267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = PreviewTests.xctestplan; sourceTree = ""; }; + 267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; path = PreviewTests.xctestplan; sourceTree = ""; }; 26B0A96B8FE4849227945067 /* VoiceMessageRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorder.swift; sourceTree = ""; }; 26EAAB54C6CE91D64B69A9F8 /* AppLockServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockServiceProtocol.swift; sourceTree = ""; }; 2721D7B051F0159AA919DA05 /* RoomChangePermissionsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangePermissionsScreenViewModelProtocol.swift; sourceTree = ""; }; @@ -1304,6 +1305,7 @@ 27D0EA07BD545CC9F234DB8D /* UserDetailsEditScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsEditScreenModels.swift; sourceTree = ""; }; 28146817C61423CACCF942F5 /* CallScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallScreenModels.swift; sourceTree = ""; }; 283974987DA7EC61D2AB57D9 /* VoiceMessageCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageCacheTests.swift; sourceTree = ""; }; + 284FEEB0789B8894E52A7F34 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 287FC98AF2664EAD79C0D902 /* UIDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDevice.swift; sourceTree = ""; }; 28C19F54A0C4FC9AB7ABD583 /* TextRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItemContent.swift; sourceTree = ""; }; 295E28C3B9EAADF519BF2F44 /* AuthenticationFlowCoordinatorUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationFlowCoordinatorUITests.swift; sourceTree = ""; }; @@ -1349,7 +1351,7 @@ 3558A15CFB934F9229301527 /* RestorationToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestorationToken.swift; sourceTree = ""; }; 35AFCF4C05DEED04E3DB1A16 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; 35FA991289149D31F4286747 /* UserPreference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreference.swift; sourceTree = ""; }; - 36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 36FD673E24FBFCFDF398716A /* RoomMemberProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMemberProxyMock.swift; sourceTree = ""; }; 376D941BF8BB294389C0DE24 /* MapTilerURLBuildersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTilerURLBuildersTests.swift; sourceTree = ""; }; 37A243E04B58DC6E41FDCD82 /* EmojiItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiItem.swift; sourceTree = ""; }; @@ -1364,6 +1366,7 @@ 398817652FA8ABAE0A31AC6D /* ReadableFrameModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadableFrameModifier.swift; sourceTree = ""; }; 39C0D861FC397AC34BCF089E /* KeychainControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainControllerMock.swift; sourceTree = ""; }; 3A12D3D8138F1B71AFA7C858 /* CompletionSuggestionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionSuggestionService.swift; sourceTree = ""; }; + 3AD253E7EFF88F308D644272 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SAS.strings"; sourceTree = ""; }; 3B5E97E9615A158C76B2AB77 /* DateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTests.swift; sourceTree = ""; }; 3BAC027034248429A438886B /* AppMediatorMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMediatorMock.swift; sourceTree = ""; }; 3BC1B7CB061C9865B2B91B56 /* QRCodeLoginScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeLoginScreenViewModel.swift; sourceTree = ""; }; @@ -1442,7 +1445,7 @@ 4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; 4BD371B60E07A5324B9507EF /* AnalyticsSettingsScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsSettingsScreenCoordinator.swift; sourceTree = ""; }; - 4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 = ""; }; 4D3A7375AB22721C436EB056 /* ComposerToolbarModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerToolbarModels.swift; sourceTree = ""; }; 4E2245243369B99216C7D84E /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = ""; }; @@ -1630,6 +1633,7 @@ 80A07343F18BB8EAC17B07B7 /* QRCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeLoginController.swift; sourceTree = ""; }; 80C4927D09099497233E9980 /* WaitlistScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistScreen.swift; sourceTree = ""; }; 80E815FF3CC5E5A355E3A25E /* RoomMessageEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMessageEventStringBuilder.swift; sourceTree = ""; }; + 8166F121C79C7B62BF01D508 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = pt; path = pt.lproj/Localizable.stringsdict; sourceTree = ""; }; 818695BED971753243FEF897 /* StickerRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickerRoomTimelineItem.swift; sourceTree = ""; }; 81A9B5225D0881CEFA2CF7C9 /* RoomNotificationSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenViewModel.swift; sourceTree = ""; }; 81B17B1F29448D1B9049B11C /* ReportContentScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportContentScreenViewModel.swift; sourceTree = ""; }; @@ -1682,7 +1686,7 @@ 8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateEventStringBuilder.swift; sourceTree = ""; }; 8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 8DC2C9E0E15C79BBDA80F0A2 /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = ""; }; - 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITests.xctestplan; sourceTree = ""; }; + 8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; path = UITests.xctestplan; sourceTree = ""; }; 8E1BBA73B611EDEEA6E20E05 /* InvitesScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenModels.swift; sourceTree = ""; }; 8F21ED7205048668BEB44A38 /* AppActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppActivityView.swift; sourceTree = ""; }; 8F61A0DD8243B395499C99A2 /* InvitesScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenUITests.swift; sourceTree = ""; }; @@ -1778,6 +1782,7 @@ A7D452AF7B5F7E3A0A7DB54C /* SessionVerificationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenViewModelProtocol.swift; sourceTree = ""; }; A84D413BF49F0E980F010A6B /* LogViewerScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewerScreenCoordinator.swift; sourceTree = ""; }; A861DA5932B128FE1DCB5CE2 /* InviteUsersScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteUsersScreenCoordinator.swift; sourceTree = ""; }; + A8DF55467ED4CE76B7AE9A33 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = ""; }; A9B069D7772DDF6513E0F1B8 /* AuthenticationFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationFlowCoordinator.swift; sourceTree = ""; }; A9FAFE1C2149E6AC8156ED2B /* Collection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = ""; }; AA19C32BD97F45847724E09A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Untranslated.strings; sourceTree = ""; }; @@ -1785,6 +1790,7 @@ AACE9B8E1A4AE79A7E2914F6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = es; path = es.lproj/Localizable.stringsdict; sourceTree = ""; }; AAD01F7FC2BBAC7351948595 /* UserProfile+Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserProfile+Mock.swift"; sourceTree = ""; }; AAD8234D0E9C9B12BF9F240B /* LocationAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationAnnotation.swift; sourceTree = ""; }; + AB26D5444A4A7E095222DE8B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = ""; }; ABA4CF2F5B4F68D02E412004 /* ServerConfirmationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfirmationScreenViewModelProtocol.swift; sourceTree = ""; }; AC0275CEE9CA078B34028BDF /* AppLockScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockScreenViewModelTests.swift; sourceTree = ""; }; AC1DA29A5A041CC0BACA7CB0 /* MockImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockImageCache.swift; sourceTree = ""; }; @@ -1838,7 +1844,7 @@ B53AC78E49A297AC1D72A7CF /* AppMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMediator.swift; sourceTree = ""; }; B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadableAvatarImage.swift; sourceTree = ""; }; B5B243E7818E5E9F6A4EDC7A /* NoticeRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeRoomTimelineView.swift; sourceTree = ""; }; - B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = ConfettiScene.scn; sourceTree = ""; }; + B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; path = ConfettiScene.scn; sourceTree = ""; }; B6311F21F911E23BE4DF51B4 /* ReadMarkerRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMarkerRoomTimelineView.swift; sourceTree = ""; }; B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModel.swift; sourceTree = ""; }; B6404166CBF5CC88673FF9E2 /* RoomDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetails.swift; sourceTree = ""; }; @@ -1874,6 +1880,7 @@ BE9BBB18FB27F09032AD8769 /* NotificationPermissionsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationPermissionsScreenViewModel.swift; sourceTree = ""; }; BEA38B9851CFCC4D67F5587D /* EmojiPickerScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerScreenCoordinator.swift; sourceTree = ""; }; BEBA759D1347CFFB3D84ED1F /* UserSessionStoreProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionStoreProtocol.swift; sourceTree = ""; }; + BEE365C5A4E90ACBE398EFFE /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/SAS.strings; sourceTree = ""; }; BF34A2FD6797535C95AC918D /* PlaceholderScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderScreenCoordinator.swift; sourceTree = ""; }; BFA9EA59D5C0DA1BFC7B3621 /* QRCodeLoginScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeLoginScreen.swift; sourceTree = ""; }; BFDCAC6CAAD65A2C24EA9C4B /* Dictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = ""; }; @@ -1950,7 +1957,7 @@ CE47A97726F0675DEE387BF9 /* TypingIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypingIndicatorView.swift; sourceTree = ""; }; CEE0E6043EFCF6FD2A341861 /* TimelineReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineReplyView.swift; sourceTree = ""; }; CEE20623EB4A9B88FB29F2BA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SAS.strings; sourceTree = ""; }; - CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = ""; }; + CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; path = UnitTests.xctestplan; sourceTree = ""; }; CF48AF076424DBC1615C74AD /* AuthenticationServiceProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationServiceProxy.swift; sourceTree = ""; }; D071F86CD47582B9196C9D16 /* UserDiscoverySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoverySection.swift; sourceTree = ""; }; D086854995173E897F993C26 /* AdvancedSettingsScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModelProtocol.swift; sourceTree = ""; }; @@ -2071,7 +2078,7 @@ ED044D00F2176681CC02CD54 /* HomeScreenRoomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRoomCell.swift; sourceTree = ""; }; ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = ""; }; ED33988DA4FD4FC666800106 /* SessionVerificationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenViewModel.swift; sourceTree = ""; }; - ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = message.caf; sourceTree = ""; }; + ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; path = message.caf; sourceTree = ""; }; ED60E4D2CD678E1EBF16F77A /* BlockedUsersScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockedUsersScreen.swift; sourceTree = ""; }; ED983D4DCA5AFA6E1ED96099 /* StateRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateRoomTimelineView.swift; sourceTree = ""; }; EDAA4472821985BF868CC21C /* ServerSelectionViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionViewModelTests.swift; sourceTree = ""; }; @@ -2094,7 +2101,7 @@ F174A5627CDB3CAF280D1880 /* EmojiPickerScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerScreenModels.swift; sourceTree = ""; }; F17EFA1D3D09FC2F9C5E1CB2 /* MediaProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaProvider.swift; sourceTree = ""; }; F1B8500C152BC59445647DA8 /* UnsupportedRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsupportedRoomTimelineItem.swift; sourceTree = ""; }; - F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = portrait_test_video.mp4; sourceTree = ""; }; + F2D513D2477B57F90E98EEC0 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; path = portrait_test_video.mp4; sourceTree = ""; }; F2E4EF80DFB8FE7C4469B15D /* RoomDirectorySearchScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchScreen.swift; sourceTree = ""; }; F31F59030205A6F65B057E1A /* MatrixEntityRegexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MatrixEntityRegexTests.swift; sourceTree = ""; }; F348B5F2C12F9D4F4B4D3884 /* VideoRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineItem.swift; sourceTree = ""; }; @@ -2138,6 +2145,7 @@ FDF73F49E6B6683F7E2D26F0 /* SecureBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupScreenCoordinator.swift; sourceTree = ""; }; FE1E6FAA3719E9B7A2D5510B /* FormattingToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormattingToolbar.swift; sourceTree = ""; }; FE87C931165F5E201CACBB87 /* MediaPlayerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlayerProtocol.swift; sourceTree = ""; }; + FF720BA68256297680980481 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; FFECCE59967018204876D0A5 /* LocationMarkerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationMarkerView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -5415,11 +5423,13 @@ hu, id, it, + pt, ro, ru, sk, sv, uk, + "zh-Hans", "zh-Hant-TW", ); mainGroup = 405B00F139AEE3994601B36A; @@ -6689,10 +6699,12 @@ D196116D2DD3F2757D45FCB7 /* hu */, 330AF4D121C3396F7A14B21D /* id */, 61B33F23681660E940BA57F4 /* it */, + BEE365C5A4E90ACBE398EFFE /* pt */, 105429F29096729EDD3152CF /* ru */, A02D1A490944BF01A37586E1 /* sk */, 7509AB72755DCC4B4E721B36 /* sv */, AFEF489B8E2450E2BA1A314E /* uk */, + 3AD253E7EFF88F308D644272 /* zh-Hans */, ); name = SAS.strings; sourceTree = ""; @@ -6710,11 +6722,13 @@ C95ADE8D9527523572532219 /* hu */, 475D47D0BFE961B02BAC5D49 /* id */, 6FC5015B9634698BDB8701AF /* it */, + 8166F121C79C7B62BF01D508 /* pt */, E9D059BFE329BE09B6D96A9F /* ro */, E5F2B6443D1ED8602F328539 /* ru */, 667DD3A9D932D7D9EB380CAA /* sk */, 0EE9EAF0309A2A1D67D8FAF5 /* sv */, 5F12E996BFBEB43815189ABF /* uk */, + AB26D5444A4A7E095222DE8B /* zh-Hans */, 49E6066092ED45E36BB306F7 /* zh-Hant-TW */, ); name = Localizable.stringsdict; @@ -6733,11 +6747,13 @@ 624244C398804ADC885239AA /* hu */, EF98A02DED04075F7CF0C721 /* id */, 7B04BD3874D736127A8156B8 /* it */, + 0CB569EAA5017B5B23970655 /* pt */, 33E49C5C6F802B4D94CA78D1 /* ro */, E8294DB9E95C0C0630418466 /* ru */, AD378D580A41E42560C60E9C /* sk */, ACA11F7F50A4A3887A18CA5A /* sv */, ADCB8A232D3A8FB3E16A7303 /* uk */, + 284FEEB0789B8894E52A7F34 /* zh-Hans */, 91CF6F7D08228D16BA69B63B /* zh-Hant-TW */, ); name = Localizable.strings; @@ -6756,11 +6772,13 @@ 1D652E78832289CD9EB64488 /* hu */, 7199693797B66245EF97BCF5 /* id */, 44C314C00533E2C297796B60 /* it */, + A8DF55467ED4CE76B7AE9A33 /* pt */, 86C8CE2630F54D5FE1591786 /* ro */, 9B7D8D3638864B7482E148CC /* ru */, 7D39AF1F659923D77778511E /* sk */, 969694F67E844FCA51F7E051 /* sv */, D66B5D86A9AB95E0E01BED82 /* uk */, + FF720BA68256297680980481 /* zh-Hans */, ); name = InfoPlist.strings; sourceTree = ""; @@ -6797,7 +6815,9 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_NSE"; + OTHER_SWIFT_FLAGS = ( + "-DIS_NSE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; @@ -6846,7 +6866,9 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; + OTHER_SWIFT_FLAGS = ( + "-DIS_MAIN_APP", + ); PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -6872,7 +6894,9 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP"; + OTHER_SWIFT_FLAGS = ( + "-DIS_MAIN_APP", + ); PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(APP_NAME)"; @@ -7117,7 +7141,9 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = "$(MARKETING_VERSION)"; - OTHER_SWIFT_FLAGS = "-DIS_NSE"; + OTHER_SWIFT_FLAGS = ( + "-DIS_NSE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse"; PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)"; PRODUCT_NAME = NSE; diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift index 8c8b4292b..3e89036cd 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift @@ -19,16 +19,19 @@ import UIKit enum RoomScreenInteractionHandlerAction { case composer(action: RoomScreenComposerAction) - case displayError(RoomScreenErrorType) + case displayEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set) case displayReportContent(itemID: TimelineItemIdentifier, senderID: String) case displayMessageForwarding(itemID: TimelineItemIdentifier) case displayMediaUploadPreviewScreen(url: URL) case displayPollForm(mode: PollFormMode) case displayRoomMemberDetails(userID: String) + case showActionMenu(TimelineItemActionMenuInfo) case showDebugInfo(TimelineItemDebugInfo) - case showConfirmationAlert(AlertInfo) + + case displayAudioRecorderPermissionError + case displayErrorToast(String) } @MainActor @@ -85,7 +88,7 @@ class RoomScreenInteractionHandler { // MARK: Timeline Item Action Menu - func showTimelineItemActionMenu(for itemID: TimelineItemIdentifier) { + func displayTimelineItemActionMenu(for itemID: TimelineItemIdentifier) { Task { if case let .success(value) = await roomProxy.canUserRedactOther(userID: roomProxy.ownUserID) { canCurrentUserRedactOthers = value @@ -186,7 +189,7 @@ class RoomScreenInteractionHandler { return .init(actions: actions, debugActions: debugActions) } - func processTimelineItemMenuAction(_ action: TimelineItemMenuAction, itemID: TimelineItemIdentifier) { + func handleTimelineItemMenuAction(_ action: TimelineItemMenuAction, itemID: TimelineItemIdentifier) { guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID), let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol else { return @@ -214,13 +217,13 @@ class RoomScreenInteractionHandler { } case .copyPermalink: guard let eventID = eventTimelineItem.id.eventID else { - actionsSubject.send(.displayError(.alert(L10n.errorFailedCreatingThePermalink))) + actionsSubject.send(.displayErrorToast(L10n.errorFailedCreatingThePermalink)) return } Task { guard case let .success(permalinkURL) = await roomProxy.matrixToEventPermalink(eventID) else { - actionsSubject.send(.displayError(.alert(L10n.errorFailedCreatingThePermalink))) + actionsSubject.send(.displayErrorToast(L10n.errorFailedCreatingThePermalink)) return } @@ -256,7 +259,7 @@ class RoomScreenInteractionHandler { case .report: actionsSubject.send(.displayReportContent(itemID: itemID, senderID: eventTimelineItem.sender.id)) case .react: - showEmojiPicker(for: itemID) + displayEmojiPicker(for: itemID) case .toggleReaction(let key): guard let eventID = itemID.eventID else { return } Task { await roomProxy.timeline.toggleReaction(key, to: eventID) } @@ -294,7 +297,7 @@ class RoomScreenInteractionHandler { case .success: break case .failure: - actionsSubject.send(.displayError(.toast(L10n.errorUnknown))) + actionsSubject.send(.displayErrorToast(L10n.errorUnknown)) } } } @@ -307,7 +310,7 @@ class RoomScreenInteractionHandler { case .success: break case .failure: - actionsSubject.send(.displayError(.toast(L10n.errorUnknown))) + actionsSubject.send(.displayErrorToast(L10n.errorUnknown)) } } } @@ -318,7 +321,7 @@ class RoomScreenInteractionHandler { guard let contentType = provider.preferredContentType, let preferredExtension = contentType.preferredFilenameExtension else { MXLog.error("Invalid NSItemProvider: \(provider)") - actionsSubject.send(.displayError(.toast(L10n.screenRoomErrorFailedProcessingMedia))) + actionsSubject.send(.displayErrorToast(L10n.screenRoomErrorFailedProcessingMedia)) return } @@ -334,13 +337,13 @@ class RoomScreenInteractionHandler { } if let error { - self.actionsSubject.send(.displayError(.toast(L10n.screenRoomErrorFailedProcessingMedia))) + self.actionsSubject.send(.displayErrorToast(L10n.screenRoomErrorFailedProcessingMedia)) MXLog.error("Failed processing NSItemProvider: \(providerDescription) with error: \(error)") return } guard let data else { - self.actionsSubject.send(.displayError(.toast(L10n.screenRoomErrorFailedProcessingMedia))) + self.actionsSubject.send(.displayErrorToast(L10n.screenRoomErrorFailedProcessingMedia)) MXLog.error("Invalid NSItemProvider data: \(providerDescription)") return } @@ -359,7 +362,7 @@ class RoomScreenInteractionHandler { self.actionsSubject.send(.displayMediaUploadPreviewScreen(url: url)) } catch { - self.actionsSubject.send(.displayError(.toast(L10n.screenRoomErrorFailedProcessingMedia))) + self.actionsSubject.send(.displayErrorToast(L10n.screenRoomErrorFailedProcessingMedia)) MXLog.error("Failed storing NSItemProvider data \(providerDescription) with error: \(error)") } } @@ -381,11 +384,7 @@ class RoomScreenInteractionHandler { switch error { case .audioRecorderError(.recordPermissionNotGranted): MXLog.info("permission to record audio has not been granted.") - actionsSubject.send(.showConfirmationAlert(.init(id: .init(), - title: L10n.dialogPermissionMicrophoneTitleIos(InfoPlistReader.main.bundleDisplayName), - message: L10n.dialogPermissionMicrophoneDescriptionIos, - primaryButton: .init(title: L10n.commonSettings, action: { [weak self] in self?.openSystemSettings() }), - secondaryButton: .init(title: L10n.actionNotNow, role: .cancel, action: nil)))) + actionsSubject.send(.displayAudioRecorderPermissionError) default: MXLog.error("failed to start voice message recording. \(error)") actionsSubject.send(.composer(action: .setMode(mode: .default))) @@ -427,7 +426,7 @@ class RoomScreenInteractionHandler { func sendCurrentVoiceMessage() async { guard let audioPlayerState = voiceMessageRecorder.previewAudioPlayerState, let recordingURL = voiceMessageRecorder.recordingURL else { - actionsSubject.send(.displayError(.alert(L10n.errorFailedUploadingVoiceMessage))) + actionsSubject.send(.displayErrorToast(L10n.errorFailedUploadingVoiceMessage)) return } @@ -445,7 +444,7 @@ class RoomScreenInteractionHandler { case .failure(let error): MXLog.error("failed to send the voice message. \(error)") actionsSubject.send(.composer(action: .setMode(mode: .previewVoiceMessage(state: audioPlayerState, waveform: .url(recordingURL), isUploading: false)))) - actionsSubject.send(.displayError(.alert(L10n.errorFailedUploadingVoiceMessage))) + actionsSubject.send(.displayErrorToast(L10n.errorFailedUploadingVoiceMessage)) } } @@ -578,7 +577,7 @@ class RoomScreenInteractionHandler { // MARK: Other - func showEmojiPicker(for itemID: TimelineItemIdentifier) { + func displayEmojiPicker(for itemID: TimelineItemIdentifier) { guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID), timelineItem.isReactable, let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol else { @@ -588,7 +587,7 @@ class RoomScreenInteractionHandler { actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis)) } - func handleTappedUser(userID: String) async { + func displayRoomMemberDetails(userID: String) async { actionsSubject.send(.displayRoomMemberDetails(userID: userID)) } @@ -623,10 +622,6 @@ class RoomScreenInteractionHandler { } } - private func openSystemSettings() { - appMediator.openAppSettings() - } - private func displayMediaActionIfPossible(timelineItem: RoomTimelineItemProtocol) async -> RoomTimelineControllerAction { var source: MediaSourceProxy? var body: String diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift index a867f2c79..651f63ebe 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift @@ -68,14 +68,12 @@ enum RoomScreenViewPollAction { case edit(pollStartID: String, poll: Poll) } -enum RoomScreenViewAudioAction { +enum RoomScreenAudioPlayerAction { case playPause(itemID: TimelineItemIdentifier) case seek(itemID: TimelineItemIdentifier, progress: Double) } enum RoomScreenViewAction { - case displayRoomDetails - case itemAppeared(itemID: TimelineItemIdentifier) case itemDisappeared(itemID: TimelineItemIdentifier) @@ -86,27 +84,20 @@ enum RoomScreenViewAction { case paginateForwards case scrollToBottom - case timelineItemMenu(itemID: TimelineItemIdentifier) - case timelineItemMenuAction(itemID: TimelineItemIdentifier, action: TimelineItemMenuAction) + case displayTimelineItemMenu(itemID: TimelineItemIdentifier) + case handleTimelineItemMenuAction(itemID: TimelineItemIdentifier, action: TimelineItemMenuAction) + case displayRoomDetails + case displayRoomMemberDetails(userID: String) + case displayReactionSummary(itemID: TimelineItemIdentifier, key: String) case displayEmojiPicker(itemID: TimelineItemIdentifier) + case displayMessageSendingFailureAlert(itemID: TimelineItemIdentifier) + case displayReadReceipts(itemID: TimelineItemIdentifier) + case displayCall case handlePasteOrDrop(provider: NSItemProvider) - - case tappedOnUser(userID: String) - - case reactionSummary(itemID: TimelineItemIdentifier, key: String) - - case retrySend(itemID: TimelineItemIdentifier) - case cancelSend(itemID: TimelineItemIdentifier) - - case showReadReceipts(itemID: TimelineItemIdentifier) - - case poll(RoomScreenViewPollAction) - - case audio(RoomScreenViewAudioAction) - - case presentCall + case handlePollAction(RoomScreenViewPollAction) + case handleAudioPlayerAction(RoomScreenAudioPlayerAction) /// Focus the timeline onto the specified event ID (switching to a detached timeline if needed). case focusOnEventID(String) @@ -161,18 +152,12 @@ struct RoomScreenViewStateBindings { /// A media item that will be previewed with QuickLook. var mediaPreviewItem: MediaPreviewItem? - /// Information describing the currently displayed alert. - var alertInfo: AlertInfo? - - /// An alert info for confirmation actions (e.g. ending a poll) - var confirmationAlertInfo: AlertInfo? + var alertInfo: AlertInfo? var debugInfo: TimelineItemDebugInfo? var actionMenuInfo: TimelineItemActionMenuInfo? - var sendFailedConfirmationDialogInfo: SendFailedConfirmationDialogInfo? - var reactionSummaryInfo: ReactionSummaryInfo? var readReceiptsSummaryInfo: ReadReceiptSummaryInfo? @@ -190,9 +175,7 @@ struct TimelineItemActionMenuInfo: Equatable, Identifiable { } } -struct SendFailedConfirmationDialogInfo: ConfirmationDialogProtocol { - let title = L10n.screenRoomRetrySendMenuTitle - +struct MessageSendingFailureInfo: Hashable { let itemID: TimelineItemIdentifier } @@ -210,11 +193,10 @@ struct ReadReceiptSummaryInfo: Identifiable { let id: TimelineItemIdentifier } -enum RoomScreenErrorType: Hashable { - /// A specific error message shown in an alert. - case alert(String) - /// A specific error message shown in a toast. - case toast(String) +enum RoomScreenAlertInfoType: Hashable { + case audioRecodingPermissionError + case pollEndConfirmation(String) + case messageSendingFailure(TimelineItemIdentifier) } struct RoomMemberState { diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift index 162f79d72..5d42ba9ab 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift @@ -143,48 +143,51 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol override func process(viewAction: RoomScreenViewAction) { switch viewAction { - case .displayRoomDetails: - actionsSubject.send(.displayRoomDetails) case .itemAppeared(let id): Task { await timelineController.processItemAppearance(id) } case .itemDisappeared(let id): Task { await timelineController.processItemDisappearance(id) } + case .itemTapped(let id): Task { await handleItemTapped(with: id) } case .toggleReaction(let emoji, let itemId): Task { await timelineController.toggleReaction(emoji, to: itemId) } case .sendReadReceiptIfNeeded(let lastVisibleItemID): Task { await sendReadReceiptIfNeeded(for: lastVisibleItemID) } - case .timelineItemMenu(let itemID): - roomScreenInteractionHandler.showTimelineItemActionMenu(for: itemID) - case .timelineItemMenuAction(let itemID, let action): - roomScreenInteractionHandler.processTimelineItemMenuAction(action, itemID: itemID) - case .handlePasteOrDrop(let provider): - roomScreenInteractionHandler.handlePasteOrDrop(provider) - case .tappedOnUser(userID: let userID): - Task { await roomScreenInteractionHandler.handleTappedUser(userID: userID) } - case .displayEmojiPicker(let itemID): - roomScreenInteractionHandler.showEmojiPicker(for: itemID) - case .reactionSummary(let itemID, let key): - showReactionSummary(for: itemID, selectedKey: key) - case .retrySend(let itemID): - Task { await timelineController.retrySending(itemID: itemID) } - case .cancelSend(let itemID): - Task { await timelineController.cancelSending(itemID: itemID) } case .paginateBackwards: paginateBackwards() case .paginateForwards: paginateForwards() case .scrollToBottom: scrollToBottom() - case .poll(let pollAction): - processPollAction(pollAction) - case .audio(let audioAction): - processAudioAction(audioAction) - case .presentCall: + + case .displayTimelineItemMenu(let itemID): + roomScreenInteractionHandler.displayTimelineItemActionMenu(for: itemID) + case .handleTimelineItemMenuAction(let itemID, let action): + roomScreenInteractionHandler.handleTimelineItemMenuAction(action, itemID: itemID) + + case .displayRoomDetails: + actionsSubject.send(.displayRoomDetails) + case .displayRoomMemberDetails(userID: let userID): + Task { await roomScreenInteractionHandler.displayRoomMemberDetails(userID: userID) } + case .displayEmojiPicker(let itemID): + roomScreenInteractionHandler.displayEmojiPicker(for: itemID) + case .displayReactionSummary(let itemID, let key): + displayReactionSummary(for: itemID, selectedKey: key) + case .displayMessageSendingFailureAlert(let itemID): + displayAlert(.messageSendingFailure(itemID)) + case .displayReadReceipts(itemID: let itemID): + displayReadReceipts(for: itemID) + case .displayCall: actionsSubject.send(.displayCallScreen) - case .showReadReceipts(itemID: let itemID): - showReadReceipts(for: itemID) + + case .handlePasteOrDrop(let provider): + roomScreenInteractionHandler.handlePasteOrDrop(provider) + case .handlePollAction(let pollAction): + handlePollAction(pollAction) + case .handleAudioPlayerAction(let audioPlayerAction): + handleAudioPlayerAction(audioPlayerAction) + case .focusOnEventID(let eventID): Task { await focusOnEvent(eventID: eventID) } case .focusLive: @@ -245,9 +248,9 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol MXLog.error("Failed to focus on event \(eventID)") if case .eventNotFound = error { - displayError(.toast(L10n.errorMessageNotFound)) + displayErrorToast(L10n.errorMessageNotFound) } else { - displayError(.toast(L10n.commonFailed)) + displayErrorToast(L10n.commonFailed) } } } @@ -277,7 +280,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol return } - roomScreenInteractionHandler.processTimelineItemMenuAction(.edit, itemID: item.id) + roomScreenInteractionHandler.handleTimelineItemMenuAction(.edit, itemID: item.id) } private func attach(_ attachment: ComposerAttachmentType) { @@ -295,22 +298,18 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol } } - private func processPollAction(_ action: RoomScreenViewPollAction) { + private func handlePollAction(_ action: RoomScreenViewPollAction) { switch action { case let .selectOption(pollStartID, optionID): roomScreenInteractionHandler.sendPollResponse(pollStartID: pollStartID, optionID: optionID) case let .end(pollStartID): - state.bindings.confirmationAlertInfo = .init(id: .init(), - title: L10n.actionEndPoll, - message: L10n.commonPollEndConfirmation, - primaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil), - secondaryButton: .init(title: L10n.actionOk, action: { self.roomScreenInteractionHandler.endPoll(pollStartID: pollStartID) })) + displayAlert(.pollEndConfirmation(pollStartID)) case .edit(let pollStartID, let poll): actionsSubject.send(.displayPollForm(mode: .edit(eventID: pollStartID, poll: poll))) } } - private func processAudioAction(_ action: RoomScreenViewAudioAction) { + private func handleAudioPlayerAction(_ action: RoomScreenAudioPlayerAction) { switch action { case .playPause(let itemID): Task { await roomScreenInteractionHandler.playPauseAudio(for: itemID) } @@ -424,8 +423,10 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol switch action { case .composer(let action): actionsSubject.send(.composer(action: action)) - case .displayError(let type): - displayError(type) + case .displayAudioRecorderPermissionError: + displayAlert(.audioRecodingPermissionError) + case .displayErrorToast(let title): + displayErrorToast(title) case .displayEmojiPicker(let itemID, let selectedEmojis): actionsSubject.send(.displayEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis)) case .displayMessageForwarding(let itemID): @@ -442,8 +443,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol state.bindings.actionMenuInfo = actionMenuInfo case .showDebugInfo(let debugInfo): state.bindings.debugInfo = debugInfo - case .showConfirmationAlert(let alertInfo): - state.bindings.confirmationAlertInfo = alertInfo } } .store(in: &cancellables) @@ -483,7 +482,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol switch await timelineController.paginateBackwards(requestSize: Constants.paginationEventLimit) { case .failure: - displayError(.toast(L10n.errorFailedLoadingMessages)) + displayErrorToast(L10n.errorFailedLoadingMessages) default: break } @@ -503,7 +502,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol switch await timelineController.paginateForwards(requestSize: Constants.paginationEventLimit) { case .failure: - displayError(.toast(L10n.errorFailedLoadingMessages)) + displayErrorToast(L10n.errorFailedLoadingMessages) default: break } @@ -718,7 +717,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol // MARK: - Reactions - private func showReactionSummary(for itemID: TimelineItemIdentifier, selectedKey: String) { + private func displayReactionSummary(for itemID: TimelineItemIdentifier, selectedKey: String) { guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID), let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol else { return @@ -729,7 +728,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol // MARK: - Read Receipts - private func showReadReceipts(for itemID: TimelineItemIdentifier) { + private func displayReadReceipts(for itemID: TimelineItemIdentifier) { guard let timelineItem = timelineController.timelineItems.firstUsingStableID(itemID), let eventTimelineItem = timelineItem as? EventBasedTimelineItemProtocol else { return @@ -737,7 +736,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol state.bindings.readReceiptsSummaryInfo = .init(orderedReceipts: eventTimelineItem.properties.orderedReadReceipts, id: eventTimelineItem.id) } - + // MARK: - Message forwarding private func forwardMessage(itemID: TimelineItemIdentifier) async { @@ -758,19 +757,38 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol userIndicatorController.retractIndicatorWithId(Constants.focusTimelineToastIndicatorID) } - private func displayError(_ type: RoomScreenErrorType) { + private func displayAlert(_ type: RoomScreenAlertInfoType) { switch type { - case .alert(let message): - state.bindings.alertInfo = AlertInfo(id: type, - title: L10n.commonError, - message: message) - case .toast(let message): - userIndicatorController.submitIndicator(UserIndicator(id: Constants.toastErrorID, - type: .toast, - title: message, - iconName: "xmark")) + case .audioRecodingPermissionError: + state.bindings.alertInfo = .init(id: type, + title: L10n.dialogPermissionMicrophoneTitleIos(InfoPlistReader.main.bundleDisplayName), + message: L10n.dialogPermissionMicrophoneDescriptionIos, + primaryButton: .init(title: L10n.commonSettings, action: { [weak self] in self?.appMediator.openAppSettings() }), + secondaryButton: .init(title: L10n.actionNotNow, role: .cancel, action: nil)) + case .pollEndConfirmation(let pollStartID): + state.bindings.alertInfo = .init(id: type, + title: L10n.actionEndPoll, + message: L10n.commonPollEndConfirmation, + primaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil), + secondaryButton: .init(title: L10n.actionOk, action: { self.roomScreenInteractionHandler.endPoll(pollStartID: pollStartID) })) + case .messageSendingFailure(let itemID): + state.bindings.alertInfo = .init(id: type, + title: L10n.screenRoomRetrySendMenuTitle, + primaryButton: .init(title: L10n.screenRoomRetrySendMenuSendAgainAction) { + Task { await self.timelineController.retrySending(itemID: itemID) } + }, + secondaryButton: .init(title: L10n.actionRemove, role: .destructive) { + Task { await self.timelineController.cancelSending(itemID: itemID) } + }) } } + + private func displayErrorToast(_ title: String) { + userIndicatorController.submitIndicator(UserIndicator(id: Constants.toastErrorID, + type: .toast, + title: title, + iconName: "xmark")) + } } private extension RoomProxyProtocol { diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift index ccd6f63e2..12335d15e 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift @@ -55,7 +55,6 @@ struct RoomScreen: View { .toolbarBackground(.visible, for: .navigationBar) // Fix the toolbar's background. .overlay { loadingIndicator } .alert(item: $context.alertInfo) - .alert(item: $context.confirmationAlertInfo) .sheet(item: $context.debugInfo) { TimelineItemDebugView(info: $0) } .sheet(item: $context.actionMenuInfo) { info in context.viewState.timelineItemMenuActionProvider?(info.item.id).map { actions in @@ -82,14 +81,6 @@ struct RoomScreen: View { context.send(viewAction: .handlePasteOrDrop(provider: provider)) return true } - .confirmationDialog(item: $context.sendFailedConfirmationDialogInfo, titleVisibility: .visible) { info in - Button(L10n.screenRoomRetrySendMenuSendAgainAction) { - context.send(viewAction: .retrySend(itemID: info.itemID)) - } - Button(L10n.actionRemove, role: .destructive) { - context.send(viewAction: .cancelSend(itemID: info.itemID)) - } - } } private var timeline: some View { @@ -168,7 +159,7 @@ struct RoomScreen: View { private var callButton: some View { if context.viewState.hasOngoingCall { Button { - context.send(viewAction: .presentCall) + context.send(viewAction: .displayCall) } label: { Label(L10n.actionJoin, icon: \.videoCallSolid) .labelStyle(.titleAndIcon) @@ -177,7 +168,7 @@ struct RoomScreen: View { .accessibilityIdentifier(A11yIdentifiers.roomScreen.joinCall) } else { Button { - context.send(viewAction: .presentCall) + context.send(viewAction: .displayCall) } label: { CompoundIcon(\.videoCallSolid) } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift index 4c08e2648..61f54fed1 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift @@ -99,7 +99,7 @@ struct TimelineItemBubbledStylerView: View { // sender info are read inside the `TimelineAccessibilityModifier` .accessibilityHidden(true) .onTapGesture { - context.send(viewAction: .tappedOnUser(userID: timelineItem.sender.id)) + context.send(viewAction: .displayRoomMemberDetails(userID: timelineItem.sender.id)) } .padding(.top, 8) } @@ -111,9 +111,9 @@ struct TimelineItemBubbledStylerView: View { messageBubble .timelineItemAccessibility(timelineItem) { if adjustedDeliveryStatus == .sendingFailed { - context.sendFailedConfirmationDialogInfo = .init(itemID: timelineItem.id) + context.send(viewAction: .displayMessageSendingFailureAlert(itemID: timelineItem.id)) } else { - context.send(viewAction: .timelineItemMenu(itemID: timelineItem.id)) + context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id)) } } @@ -139,7 +139,7 @@ struct TimelineItemBubbledStylerView: View { // We need a tap gesture before this long one so that it doesn't // steal away the gestures from the scroll view .longPressWithFeedback { - context.send(viewAction: .timelineItemMenu(itemID: timelineItem.id)) + context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id)) } .swipeRightAction { SwipeToReplyView(timelineItem: timelineItem) @@ -147,12 +147,12 @@ struct TimelineItemBubbledStylerView: View { context.viewState.timelineItemMenuActionProvider?(timelineItem.id)?.canReply ?? false } action: { let isThread = (timelineItem as? EventBasedMessageTimelineItemProtocol)?.isThreaded ?? false - context.send(viewAction: .timelineItemMenuAction(itemID: timelineItem.id, action: .reply(isThread: isThread))) + context.send(viewAction: .handleTimelineItemMenuAction(itemID: timelineItem.id, action: .reply(isThread: isThread))) } .contextMenu { TimelineItemMacContextMenu(item: timelineItem, actionProvider: context.viewState.timelineItemMenuActionProvider) { action in - context.send(viewAction: .timelineItemMenuAction(itemID: timelineItem.id, action: action)) + context.send(viewAction: .handleTimelineItemMenuAction(itemID: timelineItem.id, action: action)) } } .padding(.top, messageBubbleTopPadding) @@ -180,7 +180,7 @@ struct TimelineItemBubbledStylerView: View { if adjustedDeliveryStatus == .sendingFailed { layoutedLocalizedSendInfo .onTapGesture { - context.sendFailedConfirmationDialogInfo = .init(itemID: timelineItem.id) + context.send(viewAction: .displayMessageSendingFailureAlert(itemID: timelineItem.id)) } } else { layoutedLocalizedSendInfo diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift index f6e7ec610..0609013a1 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift @@ -69,7 +69,7 @@ struct TimelineItemPlainStylerView: View { content() .layoutPriority(1) .timelineItemAccessibility(timelineItem) { - context.send(viewAction: .timelineItemMenu(itemID: timelineItem.id)) + context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id)) } } .onTapGesture(count: 2) { @@ -81,7 +81,7 @@ struct TimelineItemPlainStylerView: View { // We need a tap gesture before this long one so that it doesn't // steal away the gestures from the scroll view .longPressWithFeedback { - context.send(viewAction: .timelineItemMenu(itemID: timelineItem.id)) + context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id)) } .swipeRightAction { SwipeToReplyView(timelineItem: timelineItem) @@ -89,12 +89,12 @@ struct TimelineItemPlainStylerView: View { context.viewState.timelineItemMenuActionProvider?(timelineItem.id)?.canReply ?? false } action: { let isThread = (timelineItem as? EventBasedMessageTimelineItemProtocol)?.isThreaded ?? false - context.send(viewAction: .timelineItemMenuAction(itemID: timelineItem.id, action: .reply(isThread: isThread))) + context.send(viewAction: .handleTimelineItemMenuAction(itemID: timelineItem.id, action: .reply(isThread: isThread))) } .contextMenu { TimelineItemMacContextMenu(item: timelineItem, actionProvider: context.viewState.timelineItemMenuActionProvider) { action in - context.send(viewAction: .timelineItemMenuAction(itemID: timelineItem.id, action: action)) + context.send(viewAction: .handleTimelineItemMenuAction(itemID: timelineItem.id, action: action)) } } } @@ -111,7 +111,7 @@ struct TimelineItemPlainStylerView: View { .lineLimit(1) } .onTapGesture { - context.send(viewAction: .tappedOnUser(userID: timelineItem.sender.id)) + context.send(viewAction: .displayRoomMemberDetails(userID: timelineItem.sender.id)) } Spacer() Text(timelineItem.timestamp) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift index 5b1e4ce00..c12dc9e97 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineItemStatusView.swift @@ -56,7 +56,7 @@ struct TimelineItemStatusView: View { CompoundIcon(\.error, size: .xSmall, relativeTo: .compound.bodyMD) .foregroundColor(.compound.iconCriticalPrimary) .onTapGesture { - context.sendFailedConfirmationDialogInfo = .init(itemID: timelineItem.id) + context.send(viewAction: .displayMessageSendingFailureAlert(itemID: timelineItem.id)) } .accessibilityLabel(L10n.commonSendingFailed) .accessibilityHint(L10n.actionTapForOptions) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift index ef5eea22e..f0b83a6f9 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift @@ -57,7 +57,7 @@ struct TimelineReactionsView: View { feedbackGenerator.impactOccurred() context.send(viewAction: .toggleReaction(key: key, itemID: itemID)) } showReactionSummary: { key in - context.send(viewAction: .reactionSummary(itemID: itemID, key: key)) + context.send(viewAction: .displayReactionSummary(itemID: itemID, key: key)) } .reactionLayoutItem(.reaction) .environment(\.layoutDirection, layoutDirection) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift index 7bcb54b06..f171c1e6e 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift @@ -46,7 +46,7 @@ struct TimelineReadReceiptsView: View { } } .onTapGesture { - context.send(viewAction: .showReadReceipts(itemID: timelineItem.id)) + context.send(viewAction: .displayReadReceipts(itemID: timelineItem.id)) } .accessibilityElement(children: .ignore) .accessibilityLabel(accessibilityLabel) diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift index 5eaac64d7..650d7ac36 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollRoomTimelineView.swift @@ -26,13 +26,13 @@ struct PollRoomTimelineView: View { switch action { case .selectOption(let optionID): guard let eventID, let option = poll.options.first(where: { $0.id == optionID }), !option.isSelected else { return } - context.send(viewAction: .poll(.selectOption(pollStartID: eventID, optionID: option.id))) + context.send(viewAction: .handlePollAction(.selectOption(pollStartID: eventID, optionID: option.id))) case .edit: guard let eventID else { return } - context.send(viewAction: .poll(.edit(pollStartID: eventID, poll: poll))) + context.send(viewAction: .handlePollAction(.edit(pollStartID: eventID, poll: poll))) case .end: guard let eventID else { return } - context.send(viewAction: .poll(.end(pollStartID: eventID))) + context.send(viewAction: .handlePollAction(.end(pollStartID: eventID))) } } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift index 7c20573b3..8cd175217 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift @@ -298,7 +298,7 @@ struct TimelineItemMenu: View { dismiss() // Otherwise we might get errors that a sheet is already presented DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { - context.send(viewAction: .timelineItemMenuAction(itemID: item.id, action: action)) + context.send(viewAction: .handleTimelineItemMenuAction(itemID: item.id, action: action)) } } } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift index a2434e1ab..d7e6dbf08 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomTimelineView.swift @@ -40,22 +40,22 @@ struct VoiceMessageRoomTimelineView: View { } private func onPlaybackPlayPause() { - context.send(viewAction: .audio(.playPause(itemID: timelineItem.id))) + context.send(viewAction: .handleAudioPlayerAction(.playPause(itemID: timelineItem.id))) } private func onPlaybackSeek(_ progress: Double) { - context.send(viewAction: .audio(.seek(itemID: timelineItem.id, progress: progress))) + context.send(viewAction: .handleAudioPlayerAction(.seek(itemID: timelineItem.id, progress: progress))) } private func onPlaybackScrubbing(_ dragging: Bool) { if dragging { if playerState.playbackState == .playing { resumePlaybackAfterScrubbing = true - context.send(viewAction: .audio(.playPause(itemID: timelineItem.id))) + context.send(viewAction: .handleAudioPlayerAction(.playPause(itemID: timelineItem.id))) } } else { if resumePlaybackAfterScrubbing { - context.send(viewAction: .audio(.playPause(itemID: timelineItem.id))) + context.send(viewAction: .handleAudioPlayerAction(.playPause(itemID: timelineItem.id))) resumePlaybackAfterScrubbing = false } } diff --git a/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift b/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift index a934e335a..1647fd2ad 100644 --- a/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift @@ -112,7 +112,7 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase { } func testEndPoll() async throws { - let deferred = deferFulfillment(interactionHandler.publisher) { _ in true } + let deferred = deferFulfillment(interactionHandler.publisher.delay(for: 0.1, scheduler: DispatchQueue.main)) { _ in true } interactionHandler.endPollPollStartIDReturnValue = .success(()) viewModel.context.send(viewAction: .end(pollStartID: "somePollID")) diff --git a/UnitTests/Sources/RoomScreenViewModelTests.swift b/UnitTests/Sources/RoomScreenViewModelTests.swift index 772a7a8c0..96fb33724 100644 --- a/UnitTests/Sources/RoomScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomScreenViewModelTests.swift @@ -244,84 +244,6 @@ class RoomScreenViewModelTests: XCTestCase { XCTAssertEqual(viewModel.context.viewState.timelineViewState.focussedEvent, .init(eventID: "t10", appearance: .immediate)) } - // MARK: - Sending - - func testRetrySend() async throws { - let timelineController = MockRoomTimelineController() - let roomProxy = RoomProxyMock(with: .init(name: "")) - - let timelineProxy = TimelineProxyMock() - timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() - - roomProxy.underlyingTimeline = timelineProxy - timelineController.roomProxy = roomProxy - - let viewModel = makeViewModel(roomProxy: roomProxy, timelineController: timelineController) - - viewModel.context.send(viewAction: .retrySend(itemID: .init(timelineID: UUID().uuidString, transactionID: "test retry send id"))) - - try? await Task.sleep(for: .milliseconds(100)) - - XCTAssert(timelineProxy.retrySendTransactionIDCallsCount == 1) - XCTAssert(timelineProxy.retrySendTransactionIDReceivedInvocations == ["test retry send id"]) - } - - func testRetrySendNoTransactionID() async { - let timelineController = MockRoomTimelineController() - let roomProxy = RoomProxyMock(with: .init(name: "")) - - let timelineProxy = TimelineProxyMock() - timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() - - roomProxy.underlyingTimeline = timelineProxy - - let viewModel = makeViewModel(roomProxy: roomProxy, timelineController: timelineController) - - viewModel.context.send(viewAction: .retrySend(itemID: .random)) - - try? await Task.sleep(for: .milliseconds(100)) - - XCTAssert(timelineProxy.retrySendTransactionIDCallsCount == 0) - } - - func testCancelSend() async { - let timelineController = MockRoomTimelineController() - let roomProxy = RoomProxyMock(with: .init(name: "")) - - let timelineProxy = TimelineProxyMock() - timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() - - roomProxy.underlyingTimeline = timelineProxy - timelineController.roomProxy = roomProxy - - let viewModel = makeViewModel(roomProxy: roomProxy, timelineController: timelineController) - - viewModel.context.send(viewAction: .cancelSend(itemID: .init(timelineID: UUID().uuidString, transactionID: "test cancel send id"))) - - try? await Task.sleep(for: .milliseconds(100)) - - XCTAssert(timelineProxy.cancelSendTransactionIDCallsCount == 1) - XCTAssert(timelineProxy.cancelSendTransactionIDReceivedInvocations == ["test cancel send id"]) - } - - func testCancelSendNoTransactionID() async { - let timelineController = MockRoomTimelineController() - let roomProxy = RoomProxyMock(with: .init(name: "")) - - let timelineProxy = TimelineProxyMock() - timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() - - roomProxy.underlyingTimeline = timelineProxy - - let viewModel = makeViewModel(roomProxy: roomProxy, timelineController: timelineController) - - viewModel.context.send(viewAction: .cancelSend(itemID: .random)) - - try? await Task.sleep(for: .milliseconds(100)) - - XCTAssert(timelineProxy.cancelSendTransactionIDCallsCount == 0) - } - // MARK: - Read Receipts // swiftlint:disable force_unwrapping @@ -465,7 +387,7 @@ class RoomScreenViewModelTests: XCTestCase { value.bindings.readReceiptsSummaryInfo?.orderedReceipts == receipts } - viewModel.context.send(viewAction: .showReadReceipts(itemID: id)) + viewModel.context.send(viewAction: .displayReadReceipts(itemID: id)) try await deferred.fulfill() } diff --git a/changelog.d/2808.bugfix b/changelog.d/2808.bugfix new file mode 100644 index 000000000..5c83e4413 --- /dev/null +++ b/changelog.d/2808.bugfix @@ -0,0 +1 @@ +Prevent the message sending failure options from showing up as a popup on the room list on iPads \ No newline at end of file