From 327cc78d9a3db99d4b1cda45987a69147480b081 Mon Sep 17 00:00:00 2001 From: Anton Poltoratskyi Date: Tue, 20 Mar 2018 12:17:05 +0200 Subject: [PATCH 1/2] Fixed merge conflicts. --- Nynja.xcodeproj/project.pbxproj | 100 +-------- .../Main/Presenter/MainPresenter.swift | 6 +- .../Main/View/MainViewController.swift | 2 +- .../WheelPositionPickerProtocols.swift | 2 +- .../Interactor/WebFullScreenInteractor.swift | 0 .../Presenter/WebFullScreenPresenter.swift | 0 .../View/WebFullScreenViewController.swift | 0 .../WebFullScreenProtocols.swift | 0 .../WireFrame/WebFullScreenWireFrame.swift | 0 .../WheelPositionPickerInteractor.swift | 22 -- .../WheelPositionPickerPresenter.swift | 55 ----- .../WheelPositionCellModel.swift | 41 ---- .../WheelPositionCollectionViewCell.swift | 85 -------- .../WheelPositionPickerViewController.swift | 202 ------------------ ...elPositionPickerViewControllerLayout.swift | 39 ---- .../WheelPositionPickerProtocols.swift | 62 ------ .../WheelPositionPickerWireFrame.swift | 32 --- 17 files changed, 8 insertions(+), 640 deletions(-) rename Nynja/Modules/{Settings => }/WebFullScreen/Interactor/WebFullScreenInteractor.swift (100%) rename Nynja/Modules/{Settings => }/WebFullScreen/Presenter/WebFullScreenPresenter.swift (100%) rename Nynja/Modules/{Settings => }/WebFullScreen/View/WebFullScreenViewController.swift (100%) rename Nynja/Modules/{Settings => }/WebFullScreen/WebFullScreenProtocols.swift (100%) rename Nynja/Modules/{Settings => }/WebFullScreen/WireFrame/WebFullScreenWireFrame.swift (100%) delete mode 100644 Nynja/Modules/WheelPositionPicker/Interactor/WheelPositionPickerInteractor.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/Presenter/WheelPositionPickerPresenter.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCellModel.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCollectionViewCell.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewController.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewControllerLayout.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/WheelPositionPickerProtocols.swift delete mode 100644 Nynja/Modules/WheelPositionPicker/WireFrame/WheelPositionPickerWireFrame.swift diff --git a/Nynja.xcodeproj/project.pbxproj b/Nynja.xcodeproj/project.pbxproj index 18e843f9e..fcfcc4f20 100644 --- a/Nynja.xcodeproj/project.pbxproj +++ b/Nynja.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ 26035BCE1F9A741C00003850 /* writer_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26035B2A1F9A73C200003850 /* writer_Spec.swift */; }; 260552A61F9E1CD100D68DE6 /* SearchHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260552A51F9E1CD100D68DE6 /* SearchHandler.swift */; }; 26060C961FFDCF4000E5C6F3 /* NSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26060C951FFDCF4000E5C6F3 /* NSLog.swift */; }; - 2607270A203C598F00290545 /* (null) in Sources */ = {isa = PBXBuildFile; }; 260629712056EF2800CB8F65 /* LinksCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260629702056EF2800CB8F65 /* LinksCell.swift */; }; 2607270A203C598F00290545 /* (null) in Sources */ = {isa = PBXBuildFile; }; 26142B0F20472B5C004E5FE4 /* String+Links.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26142B0E20472B5C004E5FE4 /* String+Links.swift */; }; @@ -328,13 +327,6 @@ 26AD28391FFB0AF9009E4580 /* StorageObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AD28381FFB0AF9009E4580 /* StorageObserver.swift */; }; 26AD283B1FFC1128009E4580 /* PresenterApearing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AD283A1FFC1128009E4580 /* PresenterApearing.swift */; }; 26AD283D1FFC1C9D009E4580 /* StorageService+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26AD283C1FFC1C9D009E4580 /* StorageService+Transaction.swift */; }; - 26B06C78206024F0005BF9AF /* WheelPositionPickerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C6C206024F0005BF9AF /* WheelPositionPickerPresenter.swift */; }; - 26B06C79206024F0005BF9AF /* WheelPositionPickerWireFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C6E206024F0005BF9AF /* WheelPositionPickerWireFrame.swift */; }; - 26B06C7A206024F0005BF9AF /* WheelPositionPickerProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C6F206024F0005BF9AF /* WheelPositionPickerProtocols.swift */; }; - 26B06C7B206024F0005BF9AF /* WheelPositionCellModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C72206024F0005BF9AF /* WheelPositionCellModel.swift */; }; - 26B06C7C206024F0005BF9AF /* WheelPositionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C73206024F0005BF9AF /* WheelPositionCollectionViewCell.swift */; }; - 26B06C7D206024F0005BF9AF /* WheelPositionPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C75206024F0005BF9AF /* WheelPositionPickerViewController.swift */; }; - 26B06C7E206024F0005BF9AF /* WheelPositionPickerInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C77206024F0005BF9AF /* WheelPositionPickerInteractor.swift */; }; 26B06C8020602643005BF9AF /* CarouselPickerCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B06C7F20602643005BF9AF /* CarouselPickerCollectionViewCell.swift */; }; 26B32B601FE170FE00888A0A /* MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B32B5E1FE170FE00888A0A /* MigrationManager.swift */; }; 26B32B661FE1715500888A0A /* CommonFileDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B32B611FE1715500888A0A /* CommonFileDownloader.swift */; }; @@ -764,8 +756,7 @@ 82FCF48AA4A8C04CC8B0B5B6 /* FavoritesWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC0DFB96051C50F0FC5B9CA /* FavoritesWireframe.swift */; }; 85018419204946C900F324A1 /* ThemeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85018418204946C900F324A1 /* ThemeCollectionViewCell.swift */; }; 85029EE3203DA8EC00FDD9B6 /* ChatState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85029EE2203DA8EC00FDD9B6 /* ChatState.swift */; }; - 85082DDD2045A873000AE4B2 /* UISettingsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85082DDC2045A873000AE4B2 /* UISettingsService.swift */; }; - 85082DDF2045A8C2000AE4B2 /* WheelPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85082DDE2045A8C2000AE4B2 /* WheelPosition.swift */; }; + 8502DB59206114D500613C8C /* WheelPositionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8502DB58206114D500613C8C /* WheelPositionCollectionViewCell.swift */; }; 8505917020407CCC00DD6501 /* NumericInputValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8505916F20407CCC00DD6501 /* NumericInputValidator.swift */; }; 85082DDD2045A873000AE4B2 /* UISettingsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85082DDC2045A873000AE4B2 /* UISettingsService.swift */; }; 85082DDF2045A8C2000AE4B2 /* WheelPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85082DDE2045A8C2000AE4B2 /* WheelPosition.swift */; }; @@ -831,7 +822,6 @@ 85788C59204450FE003600C9 /* WheelPositionPickerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85788C58204450FE003600C9 /* WheelPositionPickerPresenter.swift */; }; 85788C5B20445106003600C9 /* WheelPositionPickerInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85788C5A20445106003600C9 /* WheelPositionPickerInteractor.swift */; }; 85788C5D20445166003600C9 /* WheelPositionPickerWireFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85788C5C20445166003600C9 /* WheelPositionPickerWireFrame.swift */; }; - 85788C6420445BA7003600C9 /* CarouselPickerCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85788C6320445BA7003600C9 /* CarouselPickerCollectionViewCell.swift */; }; 857A06612035E3360097C49B /* ForwardAvatarCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 857A06602035E3360097C49B /* ForwardAvatarCollectionViewCell.swift */; }; 85801C3F20342A2F00CC364C /* ActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85801C3E20342A2F00CC364C /* ActionsView.swift */; }; 8586CAC5203335C7009F2A75 /* ForwardAvatarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8586CAC4203335C7009F2A75 /* ForwardAvatarViewModel.swift */; }; @@ -1503,13 +1493,6 @@ 26AD28381FFB0AF9009E4580 /* StorageObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageObserver.swift; sourceTree = ""; }; 26AD283A1FFC1128009E4580 /* PresenterApearing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresenterApearing.swift; sourceTree = ""; }; 26AD283C1FFC1C9D009E4580 /* StorageService+Transaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StorageService+Transaction.swift"; sourceTree = ""; }; - 26B06C6C206024F0005BF9AF /* WheelPositionPickerPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerPresenter.swift; sourceTree = ""; }; - 26B06C6E206024F0005BF9AF /* WheelPositionPickerWireFrame.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerWireFrame.swift; sourceTree = ""; }; - 26B06C6F206024F0005BF9AF /* WheelPositionPickerProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerProtocols.swift; sourceTree = ""; }; - 26B06C72206024F0005BF9AF /* WheelPositionCellModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionCellModel.swift; sourceTree = ""; }; - 26B06C73206024F0005BF9AF /* WheelPositionCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionCollectionViewCell.swift; sourceTree = ""; }; - 26B06C75206024F0005BF9AF /* WheelPositionPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerViewController.swift; sourceTree = ""; }; - 26B06C77206024F0005BF9AF /* WheelPositionPickerInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerInteractor.swift; sourceTree = ""; }; 26B06C7F20602643005BF9AF /* CarouselPickerCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarouselPickerCollectionViewCell.swift; sourceTree = ""; }; 26B32B5E1FE170FE00888A0A /* MigrationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationManager.swift; sourceTree = ""; }; 26B32B611FE1715500888A0A /* CommonFileDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommonFileDownloader.swift; sourceTree = ""; }; @@ -1806,8 +1789,7 @@ 83D3668B46C0CDA421807094 /* TimeZoneSelectorPresenter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TimeZoneSelectorPresenter.swift; sourceTree = ""; }; 85018418204946C900F324A1 /* ThemeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeCollectionViewCell.swift; sourceTree = ""; }; 85029EE2203DA8EC00FDD9B6 /* ChatState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatState.swift; sourceTree = ""; }; - 85082DDC2045A873000AE4B2 /* UISettingsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UISettingsService.swift; sourceTree = ""; }; - 85082DDE2045A8C2000AE4B2 /* WheelPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WheelPosition.swift; sourceTree = ""; }; + 8502DB58206114D500613C8C /* WheelPositionCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WheelPositionCollectionViewCell.swift; sourceTree = ""; }; 8505916F20407CCC00DD6501 /* NumericInputValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumericInputValidator.swift; sourceTree = ""; }; 85082DDC2045A873000AE4B2 /* UISettingsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UISettingsService.swift; sourceTree = ""; }; 85082DDE2045A8C2000AE4B2 /* WheelPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WheelPosition.swift; sourceTree = ""; }; @@ -1869,7 +1851,6 @@ 85788C58204450FE003600C9 /* WheelPositionPickerPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerPresenter.swift; sourceTree = ""; }; 85788C5A20445106003600C9 /* WheelPositionPickerInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerInteractor.swift; sourceTree = ""; }; 85788C5C20445166003600C9 /* WheelPositionPickerWireFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WheelPositionPickerWireFrame.swift; sourceTree = ""; }; - 85788C6320445BA7003600C9 /* CarouselPickerCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselPickerCollectionViewCell.swift; sourceTree = ""; }; 857A06602035E3360097C49B /* ForwardAvatarCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForwardAvatarCollectionViewCell.swift; sourceTree = ""; }; 85801C3E20342A2F00CC364C /* ActionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionsView.swift; sourceTree = ""; }; 8586CAC4203335C7009F2A75 /* ForwardAvatarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForwardAvatarViewModel.swift; sourceTree = ""; }; @@ -2821,68 +2802,6 @@ path = SyncFileManager; sourceTree = ""; }; - 26B06C6A206024F0005BF9AF /* WheelPositionPicker */ = { - isa = PBXGroup; - children = ( - 26B06C6F206024F0005BF9AF /* WheelPositionPickerProtocols.swift */, - 26B06C70206024F0005BF9AF /* View */, - 26B06C6B206024F0005BF9AF /* Presenter */, - 26B06C76206024F0005BF9AF /* Interactor */, - 26B06C6D206024F0005BF9AF /* WireFrame */, - ); - path = WheelPositionPicker; - sourceTree = ""; - }; - 26B06C6B206024F0005BF9AF /* Presenter */ = { - isa = PBXGroup; - children = ( - 26B06C6C206024F0005BF9AF /* WheelPositionPickerPresenter.swift */, - ); - path = Presenter; - sourceTree = ""; - }; - 26B06C6D206024F0005BF9AF /* WireFrame */ = { - isa = PBXGroup; - children = ( - 26B06C6E206024F0005BF9AF /* WheelPositionPickerWireFrame.swift */, - ); - path = WireFrame; - sourceTree = ""; - }; - 26B06C70206024F0005BF9AF /* View */ = { - isa = PBXGroup; - children = ( - 26B06C71206024F0005BF9AF /* CollectionView */, - 26B06C74206024F0005BF9AF /* ViewController */, - ); - path = View; - sourceTree = ""; - }; - 26B06C71206024F0005BF9AF /* CollectionView */ = { - isa = PBXGroup; - children = ( - 26B06C72206024F0005BF9AF /* WheelPositionCellModel.swift */, - 26B06C73206024F0005BF9AF /* WheelPositionCollectionViewCell.swift */, - ); - path = CollectionView; - sourceTree = ""; - }; - 26B06C74206024F0005BF9AF /* ViewController */ = { - isa = PBXGroup; - children = ( - 26B06C75206024F0005BF9AF /* WheelPositionPickerViewController.swift */, - ); - path = ViewController; - sourceTree = ""; - }; - 26B06C76206024F0005BF9AF /* Interactor */ = { - isa = PBXGroup; - children = ( - 26B06C77206024F0005BF9AF /* WheelPositionPickerInteractor.swift */, - ); - path = Interactor; - sourceTree = ""; - }; 26B32B701FE1722E00888A0A /* ContextMenu */ = { isa = PBXGroup; children = ( @@ -3820,6 +3739,7 @@ 3AB452082A8DAEAD93F689D8 /* Auth */, 71C1C60F76F3395F30D450E1 /* Tutorial */, D6ABBEEBA2D71463B8110D50 /* WebView */, + 85433F1C204D593100B373A7 /* WebFullScreen */, E90801F5EE14C0F1931F1B94 /* Main */, 476D272B32E52B3246CF1D18 /* Contacts */, 876B96AB0ABCBF19F269E019 /* QRCodeGenerator */, @@ -4855,7 +4775,7 @@ isa = PBXGroup; children = ( 854FC1C82044674E00B12BE5 /* WheelPositionCellModel.swift */, - 85018416204945F200F324A1 /* WheelPositionCollectionViewCell.swift */, + 8502DB58206114D500613C8C /* WheelPositionCollectionViewCell.swift */, ); path = CollectionView; sourceTree = ""; @@ -4940,7 +4860,6 @@ 859B86352048224B003272B2 /* Settings */ = { isa = PBXGroup; children = ( - 85433F1C204D593100B373A7 /* WebFullScreen */, 859B863A2048606F003272B2 /* CarouselPicker */, 85788C3A20442263003600C9 /* BuildNumber */, 8509547D20481AF900905B46 /* ThemePicker */, @@ -7238,7 +7157,6 @@ 8E6C4BDB1FF3F551009C8374 /* ContextMenuConfiguration+GroupStorage.swift in Sources */, 0008E9112031EF11003E316E /* process_Spec.swift in Sources */, 4B06D3222028A9C6003B275B /* GroupChatItemsFactory.swift in Sources */, - 26B06C7B206024F0005BF9AF /* WheelPositionCellModel.swift in Sources */, 26C1A3E72031AA860009F7F0 /* OtherUserPresenter.swift in Sources */, 26DAE5D01FFAF45800EDF412 /* BackgroundModeSubscriber.swift in Sources */, 4B1D7E072029D00000703228 /* OtherUserProfileItemsFactory.swift in Sources */, @@ -7264,7 +7182,6 @@ 6D485DD71F0AC94B00E12FB1 /* ContactCell.swift in Sources */, 261F2E2E200EB0AD007D0813 /* RepliesVC+CellDelegate.swift in Sources */, 26035B911F9A740A00003850 /* ok.swift in Sources */, - 85018417204945F200F324A1 /* WheelPositionCollectionViewCell.swift in Sources */, 6D485DDD1F0AC99F00E12FB1 /* ContactsWireframe.swift in Sources */, 4B0213042037331100650298 /* ScheduleMessageViewControllerConstants.swift in Sources */, 0008E92420347A8E003E316E /* DBJobMessage.swift in Sources */, @@ -7346,7 +7263,6 @@ 26035BAB1F9A741C00003850 /* container_Spec.swift in Sources */, 26035BB71F9A741C00003850 /* iterator_Spec.swift in Sources */, C9DF574A2023A29A006B990A /* SelectCountryTableDelegate.swift in Sources */, - 85788C6420445BA7003600C9 /* CarouselPickerCollectionViewCell.swift in Sources */, 26035BC91F9A741C00003850 /* Star_Spec.swift in Sources */, 3ABCE8F11EC9330D00A80B15 /* AppDelegate.swift in Sources */, 4B1D7E052029CF2900703228 /* ShareContactsItemsFactory.swift in Sources */, @@ -7469,7 +7385,6 @@ 3A771CAA1F191B38008D968A /* ProfileHandler.swift in Sources */, E78EFB871FC867A900C44975 /* DBP2p.swift in Sources */, 8ED0F3CF1FBC5CF2004916AB /* GroupsListPresenter.swift in Sources */, - 26B06C7C206024F0005BF9AF /* WheelPositionCollectionViewCell.swift in Sources */, 850A2BB22035AE5E00D68FDF /* ForwardCellViewModel.swift in Sources */, 0008E9132032D5AC003E316E /* MQTTServiceSchedule.swift in Sources */, 267BE2961FDEED9300C47E18 /* SettingsCellBaseModel.swift in Sources */, @@ -7522,7 +7437,6 @@ E77831001F9A075D0034634D /* ChatsService.swift in Sources */, 2600DAD6203479D000A2D4F7 /* ReturnToHomeHeaderView.swift in Sources */, E7B32C0A2007681A00371A67 /* MessageContentView.swift in Sources */, - 26B06C79206024F0005BF9AF /* WheelPositionPickerWireFrame.swift in Sources */, 27F05908F44F464BB3903C89 /* WebViewViewController.swift in Sources */, 0008E90F2031EEC5003E316E /* process.swift in Sources */, 005B0B222029ABDA000D6416 /* DateTimeItemView.swift in Sources */, @@ -7609,7 +7523,6 @@ E70A8D681FE84E7B008B0BD0 /* SendingStatus.swift in Sources */, E7F2CFE21F5EEF1E00806E43 /* PermissionManager.swift in Sources */, E7598F671FA1D8B90082FBE7 /* ProfileMessageCellLayout.swift in Sources */, - 26B06C7A206024F0005BF9AF /* WheelPositionPickerProtocols.swift in Sources */, F6A317F954DA5B46BFD50E3C /* QRCodeGeneratorWireframe.swift in Sources */, A9C6233FE6A819AAA64C1A35 /* QRCodeReaderProtocols.swift in Sources */, E7A3DAB51F9DEAC400856133 /* ProfileSectionModel.swift in Sources */, @@ -7691,14 +7604,12 @@ 26B32B831FE1727700888A0A /* ContextMenuItemCell.swift in Sources */, 6D6731101F29E1F4003E8F8F /* BottomCallView.swift in Sources */, 4B1D7DFE2029C41C00703228 /* AboutItemsFactory.swift in Sources */, - 26B06C7D206024F0005BF9AF /* WheelPositionPickerViewController.swift in Sources */, 26B32B781FE1724A00888A0A /* ContextMenuItemsView.swift in Sources */, 26035B991F9A740A00003850 /* Room.swift in Sources */, 5683555B8382F7F37FEE1AF5 /* ProfileWireframe.swift in Sources */, 26035B921F9A740A00003850 /* ok2.swift in Sources */, 8E23E086200614AB00A59B8C /* GroupVideosCell.swift in Sources */, 6D5157D01F30B36A002A27DB /* ChatView.swift in Sources */, - 26B06C7E206024F0005BF9AF /* WheelPositionPickerInteractor.swift in Sources */, 26035BA01F9A740A00003850 /* Typing.swift in Sources */, E7FF40B41F96089B00810D1C /* AudioManagerDelegate.swift in Sources */, E735853D1F6C2705003354B5 /* Geometry.swift in Sources */, @@ -7812,7 +7723,6 @@ 4B1D7E032029C80800703228 /* ByContactsItemsFactory.swift in Sources */, E72AE6521F8E3D24006417D0 /* CGContext+Gradient.swift in Sources */, 85788C5D20445166003600C9 /* WheelPositionPickerWireFrame.swift in Sources */, - 26B06C78206024F0005BF9AF /* WheelPositionPickerPresenter.swift in Sources */, E7D0E95A1F7E88EA003F21D4 /* ContactExtension.swift in Sources */, 3A237BC91F30AB0F00C42B6E /* EditProfileVC.swift in Sources */, 2661D1331F373D5900F3E125 /* WheelConfiguration.swift in Sources */, @@ -8018,6 +7928,7 @@ 0AB08BA89A51118248FA3233 /* MapInteractor.swift in Sources */, F6150A15F8A3E399EEB2C724 /* MapWireframe.swift in Sources */, 4B1D7E092029D86600703228 /* CreateGroupItemsFactory.swift in Sources */, + 8502DB59206114D500613C8C /* WheelPositionCollectionViewCell.swift in Sources */, 850FC5FA2032F64100832D87 /* ForwardSelectorWireFrame.swift in Sources */, 3AA4E6ACDBCB060172A7A279 /* FavoritesProtocols.swift in Sources */, C99D6CD77325A09D045DB760 /* FavoritesViewController.swift in Sources */, @@ -8074,7 +7985,6 @@ 8596CEF42048A98E006FC65D /* Theme.swift in Sources */, 2683F75C203F35BE0003181A /* LongPressWithUpSwipeGestureRecognizer.swift in Sources */, 04EDA50C90C7EBD46AA1FCB2 /* AddParticipantsViewController.swift in Sources */, - 26FF00AE1FCCCA21002170B1 /* CustomNavigationVC.swift in Sources */, 859B862E204820DC003272B2 /* ThemePickerProtocols.swift in Sources */, 1D1D5634D125333796D14E10 /* AddParticipantsPresenter.swift in Sources */, 26C1A3F32031EED30009F7F0 /* OtherUserHeaderView.swift in Sources */, diff --git a/Nynja/Modules/Main/Presenter/MainPresenter.swift b/Nynja/Modules/Main/Presenter/MainPresenter.swift index dd012b6cf..a5c27a14b 100644 --- a/Nynja/Modules/Main/Presenter/MainPresenter.swift +++ b/Nynja/Modules/Main/Presenter/MainPresenter.swift @@ -178,11 +178,7 @@ class MainPresenter: MainPresenterProtocol, MainInteractorOutputProtocol, Schedu func showSupport() { self.wireFrame.showSupport() } - - func showThemePicker() { - self.wireFrame.showThemePicker() - } - + func showContactsToShare() { self.wireFrame.showContactsToShare() } diff --git a/Nynja/Modules/Main/View/MainViewController.swift b/Nynja/Modules/Main/View/MainViewController.swift index 4b70fbaa5..c2ef6f1fb 100644 --- a/Nynja/Modules/Main/View/MainViewController.swift +++ b/Nynja/Modules/Main/View/MainViewController.swift @@ -17,7 +17,7 @@ enum MessageHandleMode { } -class MainViewController: BaseVC, MainViewProtocol, BaseInputViewProtocol, DefaultInputViewProtocol, RecordViewProtocol, ImageSelectorDelegate, HitTestDelegate, ALTextInputBarDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, CustomImagePickerDelegate, UISettingsRespondable { +class MainViewController: BaseVC, MainViewProtocol, BaseInputViewProtocol, DefaultInputViewProtocol, RecordViewProtocol, ImageSelectorDelegate, HitTestDelegate, ALTextInputBarDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, CustomImagePickerDelegate { var presenter: MainPresenterProtocol! diff --git a/Nynja/Modules/Settings/WheelPositionPicker/WheelPositionPickerProtocols.swift b/Nynja/Modules/Settings/WheelPositionPicker/WheelPositionPickerProtocols.swift index 25f356617..08c2e4e2f 100644 --- a/Nynja/Modules/Settings/WheelPositionPicker/WheelPositionPickerProtocols.swift +++ b/Nynja/Modules/Settings/WheelPositionPicker/WheelPositionPickerProtocols.swift @@ -27,7 +27,7 @@ protocol WheelPositionPickerViewProtocol: CarouselPickerViewProtocol { } -protocol WheelPositionPickerPresenterProtocol: class, CarouselPickerPresenterProtocol { +protocol WheelPositionPickerPresenterProtocol: CarouselPickerPresenterProtocol { var view: WheelPositionPickerViewProtocol! { get set } var interactor: WheelPositionPickerInteractorInputProtocol! { get set } diff --git a/Nynja/Modules/Settings/WebFullScreen/Interactor/WebFullScreenInteractor.swift b/Nynja/Modules/WebFullScreen/Interactor/WebFullScreenInteractor.swift similarity index 100% rename from Nynja/Modules/Settings/WebFullScreen/Interactor/WebFullScreenInteractor.swift rename to Nynja/Modules/WebFullScreen/Interactor/WebFullScreenInteractor.swift diff --git a/Nynja/Modules/Settings/WebFullScreen/Presenter/WebFullScreenPresenter.swift b/Nynja/Modules/WebFullScreen/Presenter/WebFullScreenPresenter.swift similarity index 100% rename from Nynja/Modules/Settings/WebFullScreen/Presenter/WebFullScreenPresenter.swift rename to Nynja/Modules/WebFullScreen/Presenter/WebFullScreenPresenter.swift diff --git a/Nynja/Modules/Settings/WebFullScreen/View/WebFullScreenViewController.swift b/Nynja/Modules/WebFullScreen/View/WebFullScreenViewController.swift similarity index 100% rename from Nynja/Modules/Settings/WebFullScreen/View/WebFullScreenViewController.swift rename to Nynja/Modules/WebFullScreen/View/WebFullScreenViewController.swift diff --git a/Nynja/Modules/Settings/WebFullScreen/WebFullScreenProtocols.swift b/Nynja/Modules/WebFullScreen/WebFullScreenProtocols.swift similarity index 100% rename from Nynja/Modules/Settings/WebFullScreen/WebFullScreenProtocols.swift rename to Nynja/Modules/WebFullScreen/WebFullScreenProtocols.swift diff --git a/Nynja/Modules/Settings/WebFullScreen/WireFrame/WebFullScreenWireFrame.swift b/Nynja/Modules/WebFullScreen/WireFrame/WebFullScreenWireFrame.swift similarity index 100% rename from Nynja/Modules/Settings/WebFullScreen/WireFrame/WebFullScreenWireFrame.swift rename to Nynja/Modules/WebFullScreen/WireFrame/WebFullScreenWireFrame.swift diff --git a/Nynja/Modules/WheelPositionPicker/Interactor/WheelPositionPickerInteractor.swift b/Nynja/Modules/WheelPositionPicker/Interactor/WheelPositionPickerInteractor.swift deleted file mode 100644 index 416a34247..000000000 --- a/Nynja/Modules/WheelPositionPicker/Interactor/WheelPositionPickerInteractor.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// WheelPositionPickerInteractor.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import Foundation - -final class WheelPositionPickerInteractor: WheelPositionPickerInteractorInputProtocol { - weak var presenter: WheelPositionPickerInteractorOutputProtocol! - - func getCurrentWheelPosition() -> WheelPosition { - return UISettingsService.shared.wheelPosition - } - - func setWheelPosition(_ wheelPosition: WheelPosition) { - UISettingsService.shared.wheelPosition = wheelPosition - presenter.didUpdateWheelPosition(wheelPosition) - } -} diff --git a/Nynja/Modules/WheelPositionPicker/Presenter/WheelPositionPickerPresenter.swift b/Nynja/Modules/WheelPositionPicker/Presenter/WheelPositionPickerPresenter.swift deleted file mode 100644 index 65e9fe773..000000000 --- a/Nynja/Modules/WheelPositionPicker/Presenter/WheelPositionPickerPresenter.swift +++ /dev/null @@ -1,55 +0,0 @@ -// -// WheelPositionPickerPresenter.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import Foundation - -final class WheelPositionPickerPresenter: BasePresenter, WheelPositionPickerPresenterProtocol, WheelPositionPickerInteractorOutputProtocol { - - override var itemsFactory: WCItemsFactory? { - return WheelPositionItemsFactory() - } - - weak var view: WheelPositionPickerViewProtocol! - var interactor: WheelPositionPickerInteractorInputProtocol! - var wireFrame: WheelPositionPickerWireFrameProtocol! - - func showed() { - let currentPosition = interactor.getCurrentWheelPosition() - setupView(for: currentPosition) - } - - func didSelectItemModel(_ itemPositionModel: WheelPositionCellModel) { - guard !itemPositionModel.isCurrent else { return } - - AlertManager.sharedInstance.showAlertWithTwoActions( - title: "wheel position alert title".localized, - message: "", - firstActionTitle: "yes".localized, - secondActionTitle: "no".localized, - firstAction: { - self.apply(wheelPosition: itemPositionModel.position) - }, - secondAction: nil - ) - } - - private func setupView(for currentPosition: WheelPosition) { - let items = WheelPosition.all.map { - WheelPositionCellModel(position: $0, isCurrent: $0 == currentPosition) - } - view.setupOptions(items) - } - - private func apply(wheelPosition: WheelPosition) { - interactor.setWheelPosition(wheelPosition) - } - - func didUpdateWheelPosition(_ wheelPosition: WheelPosition) { - setupView(for: wheelPosition) - } -} diff --git a/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCellModel.swift b/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCellModel.swift deleted file mode 100644 index 3deccd980..000000000 --- a/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCellModel.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// WheelPositionCellModel.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import Foundation - -struct WheelPositionCellModel: CellViewModel { - - let position: WheelPosition - let isCurrent: Bool - - func setup(cell: WheelPositionCollectionViewCell) { - switch position { - case .left: - cell.imageView.image = UIImage(named: "wheel_left_image") - case .right: - cell.imageView.image = UIImage(named: "wheel_right_image") - } - } - - func title() -> String { - switch position { - case .left: - if isCurrent { - return "\("wheel left hand".localized) (\("wheel current position".localized))" - } else { - return "wheel left hand".localized - } - case .right: - if isCurrent { - return "\("wheel right hand".localized) (\("wheel current position".localized))" - } else { - return "wheel right hand".localized - } - } - } -} diff --git a/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCollectionViewCell.swift b/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCollectionViewCell.swift deleted file mode 100644 index 314315967..000000000 --- a/Nynja/Modules/WheelPositionPicker/View/CollectionView/WheelPositionCollectionViewCell.swift +++ /dev/null @@ -1,85 +0,0 @@ -// -// WheelPositionCollectionViewCell.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import UIKit -import SnapKit - -final class WheelPositionCollectionViewCell: UICollectionViewCell { - - // MARK: - Views - - private(set) lazy var imageView: UIImageView = { - let imageView = UIImageView() - self.contentView.addSubview(imageView) - - imageView.layer.shadowOpacity = Constraints.shadow.alpha - imageView.layer.shadowRadius = Constraints.shadow.radius.adjustedByWidth - imageView.layer.shadowOffset = Constraints.shadow.offset.adjustedByWidth - - imageView.clipsToBounds = false - imageView.layer.masksToBounds = false - - imageView.snp.makeConstraints { maker in - maker.top.bottom.centerX.equalToSuperview() - maker.width.equalTo(imageView.snp.height).multipliedBy(Constraints.imageView.aspectRatio) - } - return imageView - }() - - - // MARK: - Init - - override init(frame: CGRect) { - super.init(frame: frame) - baseSetup() - } - - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - baseSetup() - } - - - // MARK: - UI Setup - - private func baseSetup() { - clipsToBounds = false - layer.masksToBounds = false - contentView.clipsToBounds = false - contentView.layer.masksToBounds = false - imageView.isHidden = false - } -} - -// MARK: - Layout -extension WheelPositionCollectionViewCell { - enum Constraints { - enum imageView { - static let minScale: CGFloat = scaledState.height / normalState.height - static let aspectRatio: CGFloat = normalState.width / normalState.height - - enum normalState { - static let width: CGFloat = 270 - static let height: CGFloat = 480 - } - enum scaledState { - static let height: CGFloat = 355 - } - } - enum itemLabel { - static let topOffset: CGFloat = 21 - static let height: CGFloat = 22 - static let width: CGFloat = 270 - } - enum shadow { - static let offset = CGSize(width: 0, height: 12) - static let radius: CGFloat = 12 - static let alpha: Float = 0.5 - } - } -} diff --git a/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewController.swift b/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewController.swift deleted file mode 100644 index 64bcb0f6f..000000000 --- a/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewController.swift +++ /dev/null @@ -1,202 +0,0 @@ -// -// WheelPositionPickerViewController.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import UIKit -import SnapKit - -final class WheelPositionPickerViewController: BaseVC, WheelPositionPickerViewProtocol { - - var presenter: WheelPositionPickerPresenterProtocol! { - didSet { - _presenter = presenter - } - } - - private var items: [WheelPositionCellModel] = [] { - didSet { - collectionView.reloadData() - } - } - - private var isAppeared = false - - - // MARK: - Views - - private lazy var collectionTitleLabel: UILabel = { - let width = Constraints.collectionTitleLabel.width.adjustedByWidth - let height = Constraints.collectionTitleLabel.height.adjustedByWidth - - let label = UILabel(size: CGSize(width: width, height: height), - color: Constants.colors.darkGray.getColor(), fontName: Constants.fonts.regular) - - label.textAlignment = .center - label.text = "choose wheel position".localized - - self.view.addSubview(label) - - label.snp.makeConstraints { maker in - let horizontalInset = Constraints.collectionTitleLabel.horizontalInset.adjustedByWidth - maker.left.equalToSuperview().offset(horizontalInset) - maker.right.equalToSuperview().inset(horizontalInset) - - let topOffset = Constraints.collectionTitleLabel.topOffset.adjustedByWidth - maker.top.equalTo(self.navigationView.snp.bottom).offset(topOffset) - - maker.height.equalTo(Constraints.collectionTitleLabel.height.adjustedByWidth) - } - - return label - }() - - private lazy var carouselLayout: CarouselFlowLayout = { - let layout = CarouselFlowLayout() - layout.spacingMode = .fixed(spacing: Constraints.collectionView.items.padding.adjustedByWidth) - layout.sideItemScale = WheelPositionCollectionViewCell.Constraints.imageView.minScale - layout.sideItemAlpha = 1.0 - layout.scrollDirection = .horizontal - - return layout - }() - - private lazy var collectionView: UICollectionView = { - let collectionView = UICollectionView(frame: .zero, collectionViewLayout: self.carouselLayout) - collectionView.backgroundColor = .clear - collectionView.showsHorizontalScrollIndicator = false - collectionView.clipsToBounds = false - - self.view.addSubview(collectionView) - - collectionView.snp.makeConstraints { maker in - maker.left.right.equalToSuperview() - maker.top.equalTo(collectionTitleLabel.snp.bottom).offset(Constraints.collectionView.topOffset.adjustedByWidth) - maker.bottom.equalToSuperview().inset(Constraints.collectionView.bottomOffset.adjustedByWidth) - } - - return collectionView - }() - - private(set) lazy var selectedItemLabel: UILabel = { - let width = Constraints.selectedItemLabel.width.adjustedByWidth - let height = Constraints.selectedItemLabel.height.adjustedByWidth - - let label = UILabel(size: CGSize(width: width, height: height), color: Constants.colors.white.getColor(), fontName: Constants.fonts.medium) - label.textAlignment = .center - - self.view.addSubview(label) - - label.snp.makeConstraints { maker in - maker.left.right.equalToSuperview() - maker.top.equalTo(collectionView.snp.bottom).offset(Constraints.selectedItemLabel.topOffset.adjustedByWidth) - maker.height.equalTo(Constraints.selectedItemLabel.topOffset.adjustedByWidth) - } - return label - }() - - private var currentItemIndexPath: IndexPath? { - var point = collectionView.contentOffset - point.x += collectionView.bounds.width / 2 - return collectionView.indexPathForItem(at: point) - } - - - // MARK: - Life Cycle - - override func viewDidLoad() { - super.viewDidLoad() - setupUI() - presenter.showed() - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - - guard !isAppeared else { return } - - carouselLayout.itemSize = CGSize( - width: collectionView.bounds.width - Constraints.collectionView.items.horizontalInset.adjustedByWidth * 2, - height: collectionView.bounds.height - ) - showSelectedPosition() - } - - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - isAppeared = true - } - - - // MARK: - UI Setup - - private func setupUI() { - screenTitle = "wheel position title".localized - collectionView.register(viewModel: WheelPositionCellModel.self) - collectionView.delegate = self - collectionView.dataSource = self - } - - private func setupTitle(for model: WheelPositionCellModel) { - selectedItemLabel.text = model.title() - } - - - // MARK: - WheelPositionPickerViewProtocol - - func setupOptions(_ items: [WheelPositionCellModel]) { - self.items = items - showSelectedPosition() - } - - private func showSelectedPosition() { - guard let index = items.index(where: { $0.isCurrent }) else { return } - scrollToModel(at: index, animated: false) - } - - private func scrollToModel(at index: Int, animated: Bool) { - let item = items[index] - setupTitle(for: item) - - let indexPath = IndexPath(item: index, section: 0) - collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: animated) - } -} - -// MARK: - UICollectionViewDataSource -extension WheelPositionPickerViewController: UICollectionViewDataSource { - - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return items.count - } - - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - return collectionView.dequeueReusableCell(withModel: itemModel(at: indexPath), for: indexPath) - } - - private func itemModel(at indexPath: IndexPath) -> WheelPositionCellModel { - return items[indexPath.row] - } -} - -// MARK: - UICollectionViewDelegate -extension WheelPositionPickerViewController: UICollectionViewDelegate { - - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - guard indexPath == self.currentItemIndexPath else { return } - - let selectedItem = itemModel(at: indexPath) - presenter.didSelectItemModel(selectedItem) - } - - func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) { - guard let indexPath = currentItemIndexPath else { - return - } - let itemModel = self.itemModel(at: indexPath) - setupTitle(for: itemModel) - } -} diff --git a/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewControllerLayout.swift b/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewControllerLayout.swift deleted file mode 100644 index d9adfac9c..000000000 --- a/Nynja/Modules/WheelPositionPicker/View/ViewController/WheelPositionPickerViewControllerLayout.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// WheelPositionPickerViewControllerLayout.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import Foundation - -extension WheelPositionPickerViewController { - - enum Constraints { - - enum collectionTitleLabel { - static let topOffset: CGFloat = 20 - static let height: CGFloat = 20 - static let width: CGFloat = 270 - static let horizontalInset: CGFloat = 16 - } - - enum collectionView { - static let topOffset: CGFloat = 20 - static let bottomOffset: CGFloat = 128 - - enum items { - static let padding: CGFloat = 24 - static let horizontalInset: CGFloat = 72 - } - } - - enum selectedItemLabel { - static let horizontalInset: CGFloat = 16 - static let topOffset: CGFloat = 21 - static let height: CGFloat = 22 - static let width: CGFloat = 270 - } - } -} diff --git a/Nynja/Modules/WheelPositionPicker/WheelPositionPickerProtocols.swift b/Nynja/Modules/WheelPositionPicker/WheelPositionPickerProtocols.swift deleted file mode 100644 index 4605be8c8..000000000 --- a/Nynja/Modules/WheelPositionPicker/WheelPositionPickerProtocols.swift +++ /dev/null @@ -1,62 +0,0 @@ -// -// WheelPositionPickerProtocols.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import UIKit - -protocol WheelPositionPickerWireFrameProtocol: class { - - func presentWheelPositionPicker(navigation: UINavigationController) - - /** - * Add here your methods for communication PRESENTER -> WIREFRAME - */ -} - -protocol WheelPositionPickerViewProtocol: class { - - var presenter: WheelPositionPickerPresenterProtocol! { get set } - - /** - * Add here your methods for communication PRESENTER -> VIEW - */ - - func setupOptions(_ items: [WheelPositionCellModel]) -} - -protocol WheelPositionPickerPresenterProtocol: class, BasePresenterProtocol { - - var view: WheelPositionPickerViewProtocol! { get set } - var interactor: WheelPositionPickerInteractorInputProtocol! { get set } - var wireFrame: WheelPositionPickerWireFrameProtocol! { get set } - - /** - * Add here your methods for communication VIEW -> PRESENTER - */ - - func showed() - func didSelectItemModel(_ itemPositionModel: WheelPositionCellModel) -} - -protocol WheelPositionPickerInteractorOutputProtocol: class { - - /** - * Add here your methods for communication INTERACTOR -> PRESENTER - */ - func didUpdateWheelPosition(_ wheelPosition: WheelPosition) -} - -protocol WheelPositionPickerInteractorInputProtocol: class { - - var presenter: WheelPositionPickerInteractorOutputProtocol! { get set } - - /** - * Add here your methods for communication PRESENTER -> INTERACTOR - */ - func getCurrentWheelPosition() -> WheelPosition - func setWheelPosition(_ wheelPosition: WheelPosition) -} diff --git a/Nynja/Modules/WheelPositionPicker/WireFrame/WheelPositionPickerWireFrame.swift b/Nynja/Modules/WheelPositionPicker/WireFrame/WheelPositionPickerWireFrame.swift deleted file mode 100644 index 815d30501..000000000 --- a/Nynja/Modules/WheelPositionPicker/WireFrame/WheelPositionPickerWireFrame.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// WheelPositionPickerWireFrame.swift -// Nynja -// -// Created by Anton Poltoratskyi on 26.02.2018. -// Copyright © 2018 TecSynt Solutions. All rights reserved. -// - -import Foundation - -final class WheelPositionPickerWireFrame: WheelPositionPickerWireFrameProtocol { - - weak var navigation: UINavigationController? - - func presentWheelPositionPicker(navigation: UINavigationController) { - self.navigation = navigation - - let view = WheelPositionPickerViewController() - let presenter = WheelPositionPickerPresenter() - let interactor = WheelPositionPickerInteractor() - - // Connecting - view.presenter = presenter - presenter.view = view - presenter.wireFrame = self - presenter.interactor = interactor - interactor.presenter = presenter - - navigation.pushViewController(view, animated: true) - } - -} -- GitLab From fed9efed8a2e6117abb830f8203d6caae5b13a76 Mon Sep 17 00:00:00 2001 From: Michael Katkov Date: Tue, 20 Mar 2018 14:13:59 +0200 Subject: [PATCH 2/2] 1923 fixed --- .../ScheduleMessage/Interactor/ScheduleMessageInteractor.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Nynja/Modules/ScheduleMessage/Interactor/ScheduleMessageInteractor.swift b/Nynja/Modules/ScheduleMessage/Interactor/ScheduleMessageInteractor.swift index 3740ebd3f..9aa62c316 100644 --- a/Nynja/Modules/ScheduleMessage/Interactor/ScheduleMessageInteractor.swift +++ b/Nynja/Modules/ScheduleMessage/Interactor/ScheduleMessageInteractor.swift @@ -49,6 +49,7 @@ class ScheduleMessageInteractor: ScheduleMessageInteractorInputProtocol, JobHand guard let phoneId = StorageService.sharedInstance.phoneId, let info = self.info, let (features, timestamp) = prepareDateTimeInfo(with: timeZone, date: date) else { return } let messages = info.targets.messages(from: info.message, phoneId: phoneId) + messages.forEach { $0.created = timestamp as AnyObject } let job = Job(phoneId: phoneId, messages: messages, timestamp: timestamp, features: features) MQTTService.sharedInstance.sendJob(job) -- GitLab