diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj index 1502232c2..fb86d3110 100644 --- a/Riot.xcodeproj/project.pbxproj +++ b/Riot.xcodeproj/project.pbxproj @@ -739,11 +739,11 @@ B1DCC63922E85E9A00625807 /* EmojiMartStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DCC63822E85E9A00625807 /* EmojiMartStore.swift */; }; B1DCC63B22E85EF800625807 /* EmojiMartCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DCC63A22E85EF800625807 /* EmojiMartCategory.swift */; }; B1DCC63F22E9A3AE00625807 /* EmojiItem+EmojiMart.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DCC63E22E9A3AE00625807 /* EmojiItem+EmojiMart.swift */; }; - B1DE85E7249A5733006454AF /* SecureKeyBackupSetupCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E4249A5732006454AF /* SecureKeyBackupSetupCoordinatorType.swift */; }; - B1DE85E8249A5733006454AF /* SecureKeyBackupSetupCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E5249A5732006454AF /* SecureKeyBackupSetupCoordinator.swift */; }; - B1DE85E9249A5733006454AF /* SecureKeyBackupSetupCoordinatorBridgePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E6249A5732006454AF /* SecureKeyBackupSetupCoordinatorBridgePresenter.swift */; }; - B1DE85EC249A5819006454AF /* SecureKeyBackupSetupIntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85EB249A5819006454AF /* SecureKeyBackupSetupIntroViewController.swift */; }; - B1DE85EE249A5981006454AF /* SecureKeyBackupSetupIntroViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1DE85ED249A5981006454AF /* SecureKeyBackupSetupIntroViewController.storyboard */; }; + B1DE85E7249A5733006454AF /* SecureBackupSetupCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E4249A5732006454AF /* SecureBackupSetupCoordinatorType.swift */; }; + B1DE85E8249A5733006454AF /* SecureBackupSetupCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E5249A5732006454AF /* SecureBackupSetupCoordinator.swift */; }; + B1DE85E9249A5733006454AF /* SecureBackupSetupCoordinatorBridgePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85E6249A5732006454AF /* SecureBackupSetupCoordinatorBridgePresenter.swift */; }; + B1DE85EC249A5819006454AF /* SecureBackupSetupIntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE85EB249A5819006454AF /* SecureBackupSetupIntroViewController.swift */; }; + B1DE85EE249A5981006454AF /* SecureBackupSetupIntroViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1DE85ED249A5981006454AF /* SecureBackupSetupIntroViewController.storyboard */; }; B1DE8608249A5C4B006454AF /* SecretsSetupRecoveryKeyViewAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8600249A5C4A006454AF /* SecretsSetupRecoveryKeyViewAction.swift */; }; B1DE8609249A5C4B006454AF /* SecretsSetupRecoveryKeyViewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8601249A5C4A006454AF /* SecretsSetupRecoveryKeyViewState.swift */; }; B1DE860A249A5C4B006454AF /* SecretsSetupRecoveryKeyCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8602249A5C4A006454AF /* SecretsSetupRecoveryKeyCoordinator.swift */; }; @@ -752,8 +752,8 @@ B1DE860D249A5C4B006454AF /* SecretsSetupRecoveryKeyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8605249A5C4B006454AF /* SecretsSetupRecoveryKeyViewModel.swift */; }; B1DE860E249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8606249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.swift */; }; B1DE860F249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1DE8607249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.storyboard */; }; - B1DE8611249BB448006454AF /* SecureKeyBackupSetupIntroCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8610249BB448006454AF /* SecureKeyBackupSetupIntroCell.swift */; }; - B1DE8613249BB470006454AF /* SecureKeyBackupSetupIntroCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1DE8612249BB470006454AF /* SecureKeyBackupSetupIntroCell.xib */; }; + B1DE8611249BB448006454AF /* SecureBackupSetupIntroCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1DE8610249BB448006454AF /* SecureBackupSetupIntroCell.swift */; }; + B1DE8613249BB470006454AF /* SecureBackupSetupIntroCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1DE8612249BB470006454AF /* SecureBackupSetupIntroCell.xib */; }; B1E5368921FB1E20001F3AFF /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E5368821FB1E20001F3AFF /* UIButton.swift */; }; B1E5368D21FB7245001F3AFF /* KeyBackupRecoverFromPassphraseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E5368C21FB7245001F3AFF /* KeyBackupRecoverFromPassphraseViewController.swift */; }; B1E5368F21FB7258001F3AFF /* KeyBackupRecoverFromPassphraseViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B1E5368E21FB7258001F3AFF /* KeyBackupRecoverFromPassphraseViewController.storyboard */; }; @@ -1775,11 +1775,11 @@ B1DCC63822E85E9A00625807 /* EmojiMartStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiMartStore.swift; sourceTree = ""; }; B1DCC63A22E85EF800625807 /* EmojiMartCategory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiMartCategory.swift; sourceTree = ""; }; B1DCC63E22E9A3AE00625807 /* EmojiItem+EmojiMart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EmojiItem+EmojiMart.swift"; sourceTree = ""; }; - B1DE85E4249A5732006454AF /* SecureKeyBackupSetupCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureKeyBackupSetupCoordinatorType.swift; sourceTree = ""; }; - B1DE85E5249A5732006454AF /* SecureKeyBackupSetupCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureKeyBackupSetupCoordinator.swift; sourceTree = ""; }; - B1DE85E6249A5732006454AF /* SecureKeyBackupSetupCoordinatorBridgePresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureKeyBackupSetupCoordinatorBridgePresenter.swift; sourceTree = ""; }; - B1DE85EB249A5819006454AF /* SecureKeyBackupSetupIntroViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureKeyBackupSetupIntroViewController.swift; sourceTree = ""; }; - B1DE85ED249A5981006454AF /* SecureKeyBackupSetupIntroViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SecureKeyBackupSetupIntroViewController.storyboard; sourceTree = ""; }; + B1DE85E4249A5732006454AF /* SecureBackupSetupCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureBackupSetupCoordinatorType.swift; sourceTree = ""; }; + B1DE85E5249A5732006454AF /* SecureBackupSetupCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureBackupSetupCoordinator.swift; sourceTree = ""; }; + B1DE85E6249A5732006454AF /* SecureBackupSetupCoordinatorBridgePresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureBackupSetupCoordinatorBridgePresenter.swift; sourceTree = ""; }; + B1DE85EB249A5819006454AF /* SecureBackupSetupIntroViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupSetupIntroViewController.swift; sourceTree = ""; }; + B1DE85ED249A5981006454AF /* SecureBackupSetupIntroViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SecureBackupSetupIntroViewController.storyboard; sourceTree = ""; }; B1DE8600249A5C4A006454AF /* SecretsSetupRecoveryKeyViewAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretsSetupRecoveryKeyViewAction.swift; sourceTree = ""; }; B1DE8601249A5C4A006454AF /* SecretsSetupRecoveryKeyViewState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretsSetupRecoveryKeyViewState.swift; sourceTree = ""; }; B1DE8602249A5C4A006454AF /* SecretsSetupRecoveryKeyCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretsSetupRecoveryKeyCoordinator.swift; sourceTree = ""; }; @@ -1788,8 +1788,8 @@ B1DE8605249A5C4B006454AF /* SecretsSetupRecoveryKeyViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretsSetupRecoveryKeyViewModel.swift; sourceTree = ""; }; B1DE8606249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretsSetupRecoveryKeyViewController.swift; sourceTree = ""; }; B1DE8607249A5C4B006454AF /* SecretsSetupRecoveryKeyViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SecretsSetupRecoveryKeyViewController.storyboard; sourceTree = ""; }; - B1DE8610249BB448006454AF /* SecureKeyBackupSetupIntroCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureKeyBackupSetupIntroCell.swift; sourceTree = ""; }; - B1DE8612249BB470006454AF /* SecureKeyBackupSetupIntroCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SecureKeyBackupSetupIntroCell.xib; sourceTree = ""; }; + B1DE8610249BB448006454AF /* SecureBackupSetupIntroCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupSetupIntroCell.swift; sourceTree = ""; }; + B1DE8612249BB470006454AF /* SecureBackupSetupIntroCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SecureBackupSetupIntroCell.xib; sourceTree = ""; }; B1E5368821FB1E20001F3AFF /* UIButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButton.swift; sourceTree = ""; }; B1E5368C21FB7245001F3AFF /* KeyBackupRecoverFromPassphraseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyBackupRecoverFromPassphraseViewController.swift; sourceTree = ""; }; B1E5368E21FB7258001F3AFF /* KeyBackupRecoverFromPassphraseViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = KeyBackupRecoverFromPassphraseViewController.storyboard; sourceTree = ""; }; @@ -4398,9 +4398,9 @@ B1DE85E3249A51F7006454AF /* Setup */ = { isa = PBXGroup; children = ( - B1DE85E6249A5732006454AF /* SecureKeyBackupSetupCoordinatorBridgePresenter.swift */, - B1DE85E4249A5732006454AF /* SecureKeyBackupSetupCoordinatorType.swift */, - B1DE85E5249A5732006454AF /* SecureKeyBackupSetupCoordinator.swift */, + B1DE85E6249A5732006454AF /* SecureBackupSetupCoordinatorBridgePresenter.swift */, + B1DE85E4249A5732006454AF /* SecureBackupSetupCoordinatorType.swift */, + B1DE85E5249A5732006454AF /* SecureBackupSetupCoordinator.swift */, B1DE85EA249A5737006454AF /* Intro */, ); path = Setup; @@ -4409,10 +4409,10 @@ B1DE85EA249A5737006454AF /* Intro */ = { isa = PBXGroup; children = ( - B1DE85EB249A5819006454AF /* SecureKeyBackupSetupIntroViewController.swift */, - B1DE85ED249A5981006454AF /* SecureKeyBackupSetupIntroViewController.storyboard */, - B1DE8610249BB448006454AF /* SecureKeyBackupSetupIntroCell.swift */, - B1DE8612249BB470006454AF /* SecureKeyBackupSetupIntroCell.xib */, + B1DE85EB249A5819006454AF /* SecureBackupSetupIntroViewController.swift */, + B1DE85ED249A5981006454AF /* SecureBackupSetupIntroViewController.storyboard */, + B1DE8610249BB448006454AF /* SecureBackupSetupIntroCell.swift */, + B1DE8612249BB470006454AF /* SecureBackupSetupIntroCell.xib */, ); path = Intro; sourceTree = ""; @@ -4895,7 +4895,7 @@ F083BDF21E7009ED00A9B29C /* GoogleService-Info.plist in Resources */, 329E746622CD02EA006F9797 /* BubbleReactionActionViewCell.xib in Resources */, B1B558E320EF768F00210D55 /* RoomEmptyBubbleCell.xib in Resources */, - B1DE85EE249A5981006454AF /* SecureKeyBackupSetupIntroViewController.storyboard in Resources */, + B1DE85EE249A5981006454AF /* SecureBackupSetupIntroViewController.storyboard in Resources */, B1E5368F21FB7258001F3AFF /* KeyBackupRecoverFromPassphraseViewController.storyboard in Resources */, B1B5590420EF768F00210D55 /* RoomOutgoingAttachmentBubbleCell.xib in Resources */, B1B558F120EF768F00210D55 /* RoomIncomingAttachmentWithPaginationTitleBubbleCell.xib in Resources */, @@ -4986,7 +4986,7 @@ B105778F2213052A00334B1E /* KeyBackupSetupSuccessFromRecoveryKeyViewController.storyboard in Resources */, B19C4E90248F7A0E009A423F /* SecretsRecoveryWithPassphraseViewController.storyboard in Resources */, B1B5590F20EF782800210D55 /* TableViewCellWithPhoneNumberTextField.xib in Resources */, - B1DE8613249BB470006454AF /* SecureKeyBackupSetupIntroCell.xib in Resources */, + B1DE8613249BB470006454AF /* SecureBackupSetupIntroCell.xib in Resources */, B19C4E80248F79FD009A423F /* SecretsRecoveryWithKeyViewController.storyboard in Resources */, B1B5578520EF564900210D55 /* GroupTableViewCellWithSwitch.xib in Resources */, B1B557B320EF5AEF00210D55 /* EventDetailsView.xib in Resources */, @@ -5216,7 +5216,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B1DE8611249BB448006454AF /* SecureKeyBackupSetupIntroCell.swift in Sources */, + B1DE8611249BB448006454AF /* SecureBackupSetupIntroCell.swift in Sources */, B1B557D120EF5E3500210D55 /* MediaAlbumTableCell.m in Sources */, 32607D71243E0A55006674CC /* KeyBackupRecoverFromPrivateKeyViewState.swift in Sources */, 324A2053225FC571004FE8B0 /* DeviceVerificationIncomingViewModel.swift in Sources */, @@ -5242,7 +5242,7 @@ B1B5581C20EF625800210D55 /* RoomAvatarTitleView.m in Sources */, B169330820F3CA0E00746532 /* ContactsDataSource.m in Sources */, B1B5574B20EE6C4D00210D55 /* MediaAlbumContentViewController.m in Sources */, - B1DE85E9249A5733006454AF /* SecureKeyBackupSetupCoordinatorBridgePresenter.swift in Sources */, + B1DE85E9249A5733006454AF /* SecureBackupSetupCoordinatorBridgePresenter.swift in Sources */, B1B5598820EFC3E000210D55 /* WidgetManager.m in Sources */, B1DB4F0E22316FFF0065DBFA /* UserNameColorGenerator.swift in Sources */, 6E6F1CB524506FA40068B78B /* UITableView.swift in Sources */, @@ -5309,7 +5309,7 @@ B1B558CB20EF768F00210D55 /* RoomIncomingEncryptedTextMsgWithoutSenderInfoBubbleCell.m in Sources */, B11291EA238D35590077B478 /* SlidingModalPresentable.swift in Sources */, B157FAA823264BED00EBFBD4 /* SettingsDiscoveryThreePidDetailsCoordinatorBridgePresenter.swift in Sources */, - B1DE85E8249A5733006454AF /* SecureKeyBackupSetupCoordinator.swift in Sources */, + B1DE85E8249A5733006454AF /* SecureBackupSetupCoordinator.swift in Sources */, B169330B20F3CA3A00746532 /* Contact.m in Sources */, B1A5B33E227ADF2A004CBA85 /* UIImage.swift in Sources */, 6E6F1CB324506EC50068B78B /* UITableViewCell.swift in Sources */, @@ -5330,7 +5330,7 @@ B1CE83DC2422817200D07506 /* KeyVerificationVerifyByScanningViewState.swift in Sources */, B139C21B21FE5B9200BB68EC /* KeyBackupRecoverFromPassphraseViewModel.swift in Sources */, B1C45A8C232A8C2600165425 /* SettingsIdentityServerViewAction.swift in Sources */, - B1DE85E7249A5733006454AF /* SecureKeyBackupSetupCoordinatorType.swift in Sources */, + B1DE85E7249A5733006454AF /* SecureBackupSetupCoordinatorType.swift in Sources */, 32A6001E22C661100042C1D9 /* EditHistoryCoordinatorBridgePresenter.swift in Sources */, B1B5574A20EE6C4D00210D55 /* MediaPickerViewController.m in Sources */, B1BEE74623E093260003A4CB /* UserVerificationSessionStatusViewState.swift in Sources */, @@ -5739,7 +5739,7 @@ B1CE83DA2422817200D07506 /* KeyVerificationVerifyByScanningViewModel.swift in Sources */, 32242F0921E8B05F00725742 /* UIColor.swift in Sources */, B16932E720F3C37100746532 /* HomeMessagesSearchDataSource.m in Sources */, - B1DE85EC249A5819006454AF /* SecureKeyBackupSetupIntroViewController.swift in Sources */, + B1DE85EC249A5819006454AF /* SecureBackupSetupIntroViewController.swift in Sources */, B12D79FF23E2462200FACEDC /* UserVerificationStartViewState.swift in Sources */, B1B558CE20EF768F00210D55 /* RoomOutgoingEncryptedAttachmentBubbleCell.m in Sources */, B14B17672462C69000C2751E /* KeyVerificationManuallyVerifyViewState.swift in Sources */, diff --git a/Riot/Generated/Storyboards.swift b/Riot/Generated/Storyboards.swift index c3e8b4fb6..9d11ef21f 100644 --- a/Riot/Generated/Storyboards.swift +++ b/Riot/Generated/Storyboards.swift @@ -147,10 +147,10 @@ internal enum StoryboardScene { internal static let initialScene = InitialSceneType(storyboard: SecretsSetupRecoveryPassphraseViewController.self) } - internal enum SecureKeyBackupSetupIntroViewController: StoryboardType { - internal static let storyboardName = "SecureKeyBackupSetupIntroViewController" + internal enum SecureBackupSetupIntroViewController: StoryboardType { + internal static let storyboardName = "SecureBackupSetupIntroViewController" - internal static let initialScene = InitialSceneType(storyboard: SecureKeyBackupSetupIntroViewController.self) + internal static let initialScene = InitialSceneType(storyboard: SecureBackupSetupIntroViewController.self) } internal enum ServiceTermsModalScreenViewController: StoryboardType { internal static let storyboardName = "ServiceTermsModalScreenViewController" diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m index d5515985a..d332f8fbd 100644 --- a/Riot/Modules/Home/HomeViewController.m +++ b/Riot/Modules/Home/HomeViewController.m @@ -27,7 +27,7 @@ #import "MXRoom+Riot.h" -@interface HomeViewController () +@interface HomeViewController () { RecentsDataSource *recentsDataSource; @@ -41,8 +41,8 @@ CGFloat selectedCollectionViewContentOffset; } -@property (nonatomic, strong) SecureKeyBackupSetupCoordinatorBridgePresenter *secureBackupSetupCoordinatorBridgePresenter; -@property (nonatomic, strong) SecureBackupBannerCell *keyBackupBannerPrototypeCell; +@property (nonatomic, strong) SecureBackupSetupCoordinatorBridgePresenter *secureBackupSetupCoordinatorBridgePresenter; +@property (nonatomic, strong) SecureBackupBannerCell *secureBackupBannerPrototypeCell; @end @@ -144,18 +144,18 @@ } } -- (SecureBackupBannerCell *)keyBackupBannerPrototypeCell +- (SecureBackupBannerCell *)secureBackupBannerPrototypeCell { - if (!_keyBackupBannerPrototypeCell) + if (!_secureBackupBannerPrototypeCell) { - _keyBackupBannerPrototypeCell = [self.recentsTableView dequeueReusableCellWithIdentifier:SecureBackupBannerCell.defaultReuseIdentifier]; + _secureBackupBannerPrototypeCell = [self.recentsTableView dequeueReusableCellWithIdentifier:SecureBackupBannerCell.defaultReuseIdentifier]; } - return _keyBackupBannerPrototypeCell; + return _secureBackupBannerPrototypeCell; } - (void)presentSecureBackupSetup { - SecureKeyBackupSetupCoordinatorBridgePresenter *keyBackupSetupCoordinatorBridgePresenter = [[SecureKeyBackupSetupCoordinatorBridgePresenter alloc] initWithSession:self.mainSession]; + SecureBackupSetupCoordinatorBridgePresenter *keyBackupSetupCoordinatorBridgePresenter = [[SecureBackupSetupCoordinatorBridgePresenter alloc] initWithSession:self.mainSession]; keyBackupSetupCoordinatorBridgePresenter.delegate = self; [keyBackupSetupCoordinatorBridgePresenter presentFrom:self animated:YES]; @@ -368,7 +368,7 @@ else if (indexPath.section == recentsDataSource.secureBackupBannerSection) { CGFloat height = 0.0; - SecureBackupBannerCell *sizingCell = self.keyBackupBannerPrototypeCell; + SecureBackupBannerCell *sizingCell = self.secureBackupBannerPrototypeCell; [sizingCell configureFor:recentsDataSource.secureBackupBannerDisplay]; @@ -679,13 +679,13 @@ #pragma mark - SecureKeyBackupSetupCoordinatorBridgePresenterDelegate -- (void)secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidComplete:(SecureKeyBackupSetupCoordinatorBridgePresenter *)coordinatorBridgePresenter +- (void)secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete:(SecureBackupSetupCoordinatorBridgePresenter *)coordinatorBridgePresenter { [self.secureBackupSetupCoordinatorBridgePresenter dismissWithAnimated:YES completion:nil]; self.secureBackupSetupCoordinatorBridgePresenter = nil; } -- (void)secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel:(SecureKeyBackupSetupCoordinatorBridgePresenter *)coordinatorBridgePresenter +- (void)secureBackupSetupCoordinatorBridgePresenterDelegateDidCancel:(SecureBackupSetupCoordinatorBridgePresenter *)coordinatorBridgePresenter { [self.secureBackupSetupCoordinatorBridgePresenter dismissWithAnimated:YES completion:nil]; self.secureBackupSetupCoordinatorBridgePresenter = nil; diff --git a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.swift b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.swift similarity index 98% rename from Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.swift rename to Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.swift index 73961e2eb..c31b73726 100644 --- a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.swift +++ b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.swift @@ -17,7 +17,7 @@ import UIKit import Reusable -final class SecureKeyBackupSetupIntroCell: UIView, NibOwnerLoadable, Themable { +final class SecureBackupSetupIntroCell: UIView, NibOwnerLoadable, Themable { // MARK: - Constants diff --git a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.xib b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.xib similarity index 98% rename from Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.xib rename to Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.xib index 3b29fac64..4ac7e45a2 100644 --- a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroCell.xib +++ b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroCell.xib @@ -10,7 +10,7 @@ - + diff --git a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.storyboard b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.storyboard similarity index 94% rename from Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.storyboard rename to Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.storyboard index 0f6dd3102..7ace49499 100644 --- a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.storyboard +++ b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.storyboard @@ -10,10 +10,10 @@ - + - + @@ -27,7 +27,7 @@ - - + - + diff --git a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.swift b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift similarity index 74% rename from Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.swift rename to Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift index 9213b3024..f621bbe25 100644 --- a/Riot/Modules/SecureBackup/Setup/Intro/SecureKeyBackupSetupIntroViewController.swift +++ b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift @@ -16,14 +16,14 @@ import UIKit -protocol SecureKeyBackupSetupIntroViewControllerDelegate: class { - func secureKeyBackupSetupIntroViewControllerDidTapUseKey(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) - func secureKeyBackupSetupIntroViewControllerDidTapUsePassphrase(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) - func secureKeyBackupSetupIntroViewControllerDidCancel(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) +protocol SecureBackupSetupIntroViewControllerDelegate: class { + func secureBackupSetupIntroViewControllerDidTapUseKey(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) + func secureBackupSetupIntroViewControllerDidTapUsePassphrase(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) + func secureBackupSetupIntroViewControllerDidCancel(_ secureBackupSetupIntroViewController: SecureBackupSetupIntroViewController) } @objcMembers -final class SecureKeyBackupSetupIntroViewController: UIViewController { +final class SecureBackupSetupIntroViewController: UIViewController { // MARK: - Properties @@ -32,8 +32,8 @@ final class SecureKeyBackupSetupIntroViewController: UIViewController { @IBOutlet private weak var informationLabel: UILabel! @IBOutlet private weak var topSeparatorView: UIView! - @IBOutlet private weak var secureKeyCell: SecureKeyBackupSetupIntroCell! - @IBOutlet private weak var securePassphraseCell: SecureKeyBackupSetupIntroCell! + @IBOutlet private weak var secureKeyCell: SecureBackupSetupIntroCell! + @IBOutlet private weak var securePassphraseCell: SecureBackupSetupIntroCell! // MARK: Private @@ -41,12 +41,12 @@ final class SecureKeyBackupSetupIntroViewController: UIViewController { // MARK: Public - weak var delegate: SecureKeyBackupSetupIntroViewControllerDelegate? + weak var delegate: SecureBackupSetupIntroViewControllerDelegate? // MARK: - Setup - class func instantiate() -> SecureKeyBackupSetupIntroViewController { - let viewController = StoryboardScene.SecureKeyBackupSetupIntroViewController.initialScene.instantiate() + class func instantiate() -> SecureBackupSetupIntroViewController { + let viewController = StoryboardScene.SecureBackupSetupIntroViewController.initialScene.instantiate() viewController.theme = ThemeService.shared().theme return viewController } @@ -76,7 +76,7 @@ final class SecureKeyBackupSetupIntroViewController: UIViewController { guard let self = self else { return } - self.delegate?.secureKeyBackupSetupIntroViewControllerDidCancel(self) + self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self) } self.navigationItem.rightBarButtonItem = cancelBarButtonItem @@ -92,7 +92,7 @@ final class SecureKeyBackupSetupIntroViewController: UIViewController { guard let self = self else { return } - self.delegate?.secureKeyBackupSetupIntroViewControllerDidTapUseKey(self) + self.delegate?.secureBackupSetupIntroViewControllerDidTapUseKey(self) } self.securePassphraseCell.fill(title: VectorL10n.secureKeyBackupSetupIntroUseSecurityPassphraseTitle, @@ -103,7 +103,7 @@ final class SecureKeyBackupSetupIntroViewController: UIViewController { guard let self = self else { return } - self.delegate?.secureKeyBackupSetupIntroViewControllerDidTapUsePassphrase(self) + self.delegate?.secureBackupSetupIntroViewControllerDidTapUsePassphrase(self) } } diff --git a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinator.swift b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift similarity index 90% rename from Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinator.swift rename to Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift index c3328a6e5..39ee8438d 100644 --- a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinator.swift +++ b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift @@ -19,7 +19,7 @@ import UIKit @objcMembers -final class SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupCoordinatorType { +final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType { // MARK: - Properties @@ -33,7 +33,7 @@ final class SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupCoordinatorType // Must be used only internally var childCoordinators: [Coordinator] = [] - weak var delegate: SecureKeyBackupSetupCoordinatorDelegate? + weak var delegate: SecureBackupSetupCoordinatorDelegate? // MARK: - Setup @@ -103,7 +103,7 @@ final class SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupCoordinatorType })) alertController.addAction(UIAlertAction(title: VectorL10n.keyBackupSetupSkipAlertSkipAction, style: .default, handler: { action in - self.delegate?.secureKeyBackupSetupCoordinatorDidCancel(self) + self.delegate?.secureBackupSetupCoordinatorDidCancel(self) })) self.navigationRouter.present(alertController, animated: true) @@ -113,17 +113,17 @@ final class SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupCoordinatorType if showSkipAlert { self.showCancelAlert() } else { - self.delegate?.secureKeyBackupSetupCoordinatorDidCancel(self) + self.delegate?.secureBackupSetupCoordinatorDidCancel(self) } } private func didComplete() { - self.delegate?.secureKeyBackupSetupCoordinatorDidComplete(self) + self.delegate?.secureBackupSetupCoordinatorDidComplete(self) } } // MARK: - SecureKeyBackupSetupIntroViewControllerDelegate -extension SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupIntroViewControllerDelegate { +extension SecureBackupSetupCoordinator: SecureKeyBackupSetupIntroViewControllerDelegate { func secureKeyBackupSetupIntroViewControllerDidTapUseKey(_ secureKeyBackupSetupIntroViewController: SecureKeyBackupSetupIntroViewController) { self.showSetupKey() @@ -139,7 +139,7 @@ extension SecureKeyBackupSetupCoordinator: SecureKeyBackupSetupIntroViewControll } // MARK: - SecretsSetupRecoveryKeyCoordinatorDelegate -extension SecureKeyBackupSetupCoordinator: SecretsSetupRecoveryKeyCoordinatorDelegate { +extension SecureBackupSetupCoordinator: SecretsSetupRecoveryKeyCoordinatorDelegate { func secretsSetupRecoveryKeyCoordinatorDidComplete(_ coordinator: SecretsSetupRecoveryKeyCoordinatorType) { self.didComplete() @@ -155,7 +155,7 @@ extension SecureKeyBackupSetupCoordinator: SecretsSetupRecoveryKeyCoordinatorDel } // MARK: - SecretsSetupRecoveryPassphraseCoordinatorDelegate -extension SecureKeyBackupSetupCoordinator: SecretsSetupRecoveryPassphraseCoordinatorDelegate { +extension SecureBackupSetupCoordinator: SecretsSetupRecoveryPassphraseCoordinatorDelegate { func secretsSetupRecoveryPassphraseCoordinator(_ coordinator: SecretsSetupRecoveryPassphraseCoordinatorType, didEnterNewPassphrase passphrase: String) { self.showSetupPassphraseConfirmation(with: passphrase) diff --git a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorBridgePresenter.swift b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift similarity index 69% rename from Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorBridgePresenter.swift rename to Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift index 4e69e3a8d..ca6ef2106 100644 --- a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorBridgePresenter.swift +++ b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift @@ -18,26 +18,26 @@ import Foundation -@objc protocol SecureKeyBackupSetupCoordinatorBridgePresenterDelegate { - func secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: SecureKeyBackupSetupCoordinatorBridgePresenter) - func secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: SecureKeyBackupSetupCoordinatorBridgePresenter) +@objc protocol SecureBackupSetupCoordinatorBridgePresenterDelegate { + func secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: SecureBackupSetupCoordinatorBridgePresenter) + func secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: SecureBackupSetupCoordinatorBridgePresenter) } /// SecureKeyBackupSetupCoordinatorBridgePresenter enables to start SecureKeyBackupSetupCoordinator from a view controller. /// This bridge is used while waiting for global usage of coordinator pattern. @objcMembers -final class SecureKeyBackupSetupCoordinatorBridgePresenter: NSObject { +final class SecureBackupSetupCoordinatorBridgePresenter: NSObject { // MARK: - Properties // MARK: Private private let session: MXSession - private var coordinator: SecureKeyBackupSetupCoordinator? + private var coordinator: SecureBackupSetupCoordinator? // MARK: Public - weak var delegate: SecureKeyBackupSetupCoordinatorBridgePresenterDelegate? + weak var delegate: SecureBackupSetupCoordinatorBridgePresenterDelegate? // MARK: - Setup @@ -54,7 +54,7 @@ final class SecureKeyBackupSetupCoordinatorBridgePresenter: NSObject { // } func present(from viewController: UIViewController, animated: Bool) { - let secureKeyBackupSetupCoordinator = SecureKeyBackupSetupCoordinator(session: self.session) + let secureKeyBackupSetupCoordinator = SecureBackupSetupCoordinator(session: self.session) secureKeyBackupSetupCoordinator.delegate = self viewController.present(secureKeyBackupSetupCoordinator.toPresentable(), animated: animated, completion: nil) secureKeyBackupSetupCoordinator.start() @@ -77,12 +77,12 @@ final class SecureKeyBackupSetupCoordinatorBridgePresenter: NSObject { } // MARK: - SecureKeyBackupSetupCoordinatorDelegate -extension SecureKeyBackupSetupCoordinatorBridgePresenter: SecureKeyBackupSetupCoordinatorDelegate { - func secureKeyBackupSetupCoordinatorDidComplete(_ coordinator: SecureKeyBackupSetupCoordinatorType) { - self.delegate?.secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidComplete(self) +extension SecureBackupSetupCoordinatorBridgePresenter: SecureBackupSetupCoordinatorDelegate { + func secureBackupSetupCoordinatorDidComplete(_ coordinator: SecureBackupSetupCoordinatorType) { + self.delegate?.secureBackupSetupCoordinatorBridgePresenterDelegateDidComplete(self) } - func secureKeyBackupSetupCoordinatorDidCancel(_ coordinator: SecureKeyBackupSetupCoordinatorType) { + func secureBackupSetupCoordinatorDidCancel(_ coordinator: SecureBackupSetupCoordinatorType) { self.delegate?.secureKeyBackupSetupCoordinatorBridgePresenterDelegateDidCancel(self) } } diff --git a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorType.swift b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorType.swift similarity index 57% rename from Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorType.swift rename to Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorType.swift index 0c51a497d..b4392672f 100644 --- a/Riot/Modules/SecureBackup/Setup/SecureKeyBackupSetupCoordinatorType.swift +++ b/Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorType.swift @@ -18,12 +18,12 @@ import Foundation -protocol SecureKeyBackupSetupCoordinatorDelegate: class { - func secureKeyBackupSetupCoordinatorDidComplete(_ coordinator: SecureKeyBackupSetupCoordinatorType) - func secureKeyBackupSetupCoordinatorDidCancel(_ coordinator: SecureKeyBackupSetupCoordinatorType) +protocol SecureBackupSetupCoordinatorDelegate: class { + func secureBackupSetupCoordinatorDidComplete(_ coordinator: SecureBackupSetupCoordinatorType) + func secureBackupSetupCoordinatorDidCancel(_ coordinator: SecureBackupSetupCoordinatorType) } -/// `SecureKeyBackupSetupCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow. -protocol SecureKeyBackupSetupCoordinatorType: Coordinator, Presentable { - var delegate: SecureKeyBackupSetupCoordinatorDelegate? { get } +/// `SecureBackupSetupCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow. +protocol SecureBackupSetupCoordinatorType: Coordinator, Presentable { + var delegate: SecureBackupSetupCoordinatorDelegate? { get } }