From 74959d7744dab043b4802f331ec4672545e6960f Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 9 Dec 2019 12:33:40 +1100 Subject: [PATCH] Implement restore screen redesign --- Signal.xcodeproj/project.pbxproj | 12 +- .../View Controllers/DisplayNameVC.swift | 2 +- .../Redesign/View Controllers/LandingVC.swift | 14 +- .../{PublicKeyVC.swift => RegisterVC.swift} | 2 +- .../Redesign/View Controllers/RestoreVC.swift | 165 ++++++++++++++++++ .../translations/en.lproj/Localizable.strings | 2 + 6 files changed, 189 insertions(+), 8 deletions(-) rename Signal/src/Loki/Redesign/View Controllers/{PublicKeyVC.swift => RegisterVC.swift} (99%) create mode 100644 Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 599bab5a9..9cb188bee 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -568,8 +568,9 @@ B82584A02315024B001B41CB /* LokiRSSFeedPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */; }; B82B40882399EB0E00A248E7 /* LandingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40872399EB0E00A248E7 /* LandingVC.swift */; }; B82B408A2399EC0600A248E7 /* FakeChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B40892399EC0600A248E7 /* FakeChatView.swift */; }; - B82B408C239A068800A248E7 /* PublicKeyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408B239A068800A248E7 /* PublicKeyVC.swift */; }; + B82B408C239A068800A248E7 /* RegisterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408B239A068800A248E7 /* RegisterVC.swift */; }; B82B408E239DC00D00A248E7 /* DisplayNameVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408D239DC00D00A248E7 /* DisplayNameVC.swift */; }; + B82B4090239DD75000A248E7 /* RestoreVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B408F239DD75000A248E7 /* RestoreVC.swift */; }; B846365B22B7418B00AF1514 /* Identicon+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B846365A22B7418B00AF1514 /* Identicon+ObjC.swift */; }; B84664F5235022F30083A1CD /* MentionUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B84664F4235022F30083A1CD /* MentionUtilities.swift */; }; B86BD08423399ACF000F5AE3 /* Modal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B86BD08323399ACF000F5AE3 /* Modal.swift */; }; @@ -1401,8 +1402,9 @@ B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LokiRSSFeedPoller.swift; sourceTree = ""; }; B82B40872399EB0E00A248E7 /* LandingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingVC.swift; sourceTree = ""; }; B82B40892399EC0600A248E7 /* FakeChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeChatView.swift; sourceTree = ""; }; - B82B408B239A068800A248E7 /* PublicKeyVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicKeyVC.swift; sourceTree = ""; }; + B82B408B239A068800A248E7 /* RegisterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterVC.swift; sourceTree = ""; }; B82B408D239DC00D00A248E7 /* DisplayNameVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayNameVC.swift; sourceTree = ""; }; + B82B408F239DD75000A248E7 /* RestoreVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestoreVC.swift; sourceTree = ""; }; B846365A22B7418B00AF1514 /* Identicon+ObjC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Identicon+ObjC.swift"; sourceTree = ""; }; B84664F4235022F30083A1CD /* MentionUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionUtilities.swift; sourceTree = ""; }; B86BD08323399ACF000F5AE3 /* Modal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Modal.swift; sourceTree = ""; }; @@ -2809,8 +2811,9 @@ B86BD08323399ACF000F5AE3 /* Modal.swift */, B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, - B82B408B239A068800A248E7 /* PublicKeyVC.swift */, B886B4A62398B23E00211ABE /* QRCodeVC.swift */, + B82B408B239A068800A248E7 /* RegisterVC.swift */, + B82B408F239DD75000A248E7 /* RestoreVC.swift */, B893063E2383961A005EAA8E /* ScanQRCodeWrapperVC.swift */, B86BD08523399CEF000F5AE3 /* SeedModal.swift */, B8CCF6422397711F0091D419 /* SettingsVC.swift */, @@ -3925,7 +3928,7 @@ 4CC613362227A00400E21A3A /* ConversationSearch.swift in Sources */, 340FC8B2204DAC8D007AEB0F /* AdvancedSettingsTableViewController.m in Sources */, 452B999020A34B6B006F2F9E /* AddContactShareToExistingContactViewController.swift in Sources */, - B82B408C239A068800A248E7 /* PublicKeyVC.swift in Sources */, + B82B408C239A068800A248E7 /* RegisterVC.swift in Sources */, 346129991FD1E4DA00532771 /* SignalApp.m in Sources */, 3496957121A301A100DCFE74 /* OWSBackupImportJob.m in Sources */, 34BECE301F7ABCF800D7438D /* GifPickerLayout.swift in Sources */, @@ -4012,6 +4015,7 @@ 34277A5E20751BDC006049F2 /* OWSQuotedMessageView.m in Sources */, 458DE9D61DEE3FD00071BB03 /* PeerConnectionClient.swift in Sources */, 45DDA6242090CEB500DE97F8 /* ConversationHeaderView.swift in Sources */, + B82B4090239DD75000A248E7 /* RestoreVC.swift in Sources */, 3488F9362191CC4000E524CC /* ConversationMediaView.swift in Sources */, 45F32C242057297A00A300D5 /* MessageDetailViewController.swift in Sources */, 3496955C219B605E00DCFE74 /* ImagePickerController.swift in Sources */, diff --git a/Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift b/Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift index 75cae0279..b22dc7329 100644 --- a/Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift +++ b/Signal/src/Loki/Redesign/View Controllers/DisplayNameVC.swift @@ -156,7 +156,7 @@ final class DisplayNameVC : UIViewController { } TSAccountManager.sharedInstance().didRegister() UserDefaults.standard.set(true, forKey: "didUpdateForMainnet") - OWSProfileManager.shared().updateLocalProfileName("User", avatarImage: nil, success: { }, failure: { }) // Try to save the user name but ignore the result + OWSProfileManager.shared().updateLocalProfileName(displayName, avatarImage: nil, success: { }, failure: { }) // Try to save the user name but ignore the result let homeVC = HomeVC() navigationController!.setViewControllers([ homeVC ], animated: true) } diff --git a/Signal/src/Loki/Redesign/View Controllers/LandingVC.swift b/Signal/src/Loki/Redesign/View Controllers/LandingVC.swift index 5b22ae9ab..e4bd83b8b 100644 --- a/Signal/src/Loki/Redesign/View Controllers/LandingVC.swift +++ b/Signal/src/Loki/Redesign/View Controllers/LandingVC.swift @@ -57,6 +57,7 @@ final class LandingVC : UIViewController { let restoreButton = Button(style: .prominentOutline, size: .large) restoreButton.setTitle(NSLocalizedString("Continue your Loki Messenger", comment: ""), for: UIControl.State.normal) restoreButton.titleLabel!.font = .boldSystemFont(ofSize: Values.mediumFontSize) + restoreButton.addTarget(self, action: #selector(restore), for: UIControl.Event.touchUpInside) // Set up button stack view let buttonStackView = UIStackView(arrangedSubviews: [ registerButton, restoreButton ]) buttonStackView.axis = .vertical @@ -89,7 +90,16 @@ final class LandingVC : UIViewController { DispatchQueue.main.async { self.fakeChatView.contentOffset = self.fakeChatViewContentOffset } - let publicKeyVC = PublicKeyVC() - navigationController!.pushViewController(publicKeyVC, animated: true) + let registerVC = RegisterVC() + navigationController!.pushViewController(registerVC, animated: true) + } + + @objc private func restore() { + fakeChatViewContentOffset = fakeChatView.contentOffset + DispatchQueue.main.async { + self.fakeChatView.contentOffset = self.fakeChatViewContentOffset + } + let restoreVC = RestoreVC() + navigationController!.pushViewController(restoreVC, animated: true) } } diff --git a/Signal/src/Loki/Redesign/View Controllers/PublicKeyVC.swift b/Signal/src/Loki/Redesign/View Controllers/RegisterVC.swift similarity index 99% rename from Signal/src/Loki/Redesign/View Controllers/PublicKeyVC.swift rename to Signal/src/Loki/Redesign/View Controllers/RegisterVC.swift index b43dcc248..7f5438476 100644 --- a/Signal/src/Loki/Redesign/View Controllers/PublicKeyVC.swift +++ b/Signal/src/Loki/Redesign/View Controllers/RegisterVC.swift @@ -1,5 +1,5 @@ -final class PublicKeyVC : UIViewController { +final class RegisterVC : UIViewController { private var seed: Data! { didSet { updateKeyPair() } } private var keyPair: ECKeyPair! { didSet { updatePublicKeyLabel() } } diff --git a/Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift b/Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift new file mode 100644 index 000000000..18d825c3a --- /dev/null +++ b/Signal/src/Loki/Redesign/View Controllers/RestoreVC.swift @@ -0,0 +1,165 @@ + +final class RestoreVC : UIViewController { + private var spacer1HeightConstraint: NSLayoutConstraint! + private var spacer2HeightConstraint: NSLayoutConstraint! + private var restoreButtonBottomOffsetConstraint: NSLayoutConstraint! + private var bottomConstraint: NSLayoutConstraint! + + // MARK: Components + private lazy var mnemonicTextField: TextField = { + let result = TextField(placeholder: NSLocalizedString("Enter your seed", comment: "")) + result.layer.borderColor = Colors.text.cgColor + return result + }() + + // MARK: Settings + override var preferredStatusBarStyle: UIStatusBarStyle { return .lightContent } + + // MARK: Lifecycle + override func viewDidLoad() { + // Set gradient background + view.backgroundColor = .clear + let gradient = Gradients.defaultLokiBackground + view.setGradient(gradient) + // Set up navigation bar + let navigationBar = navigationController!.navigationBar + navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) + navigationBar.shadowImage = UIImage() + navigationBar.isTranslucent = false + navigationBar.barTintColor = Colors.navigationBarBackground + // Set up logo image view + let logoImageView = UIImageView() + logoImageView.image = #imageLiteral(resourceName: "Loki") + logoImageView.contentMode = .scaleAspectFit + logoImageView.set(.width, to: 32) + logoImageView.set(.height, to: 32) + navigationItem.titleView = logoImageView + // Set up title label + let titleLabel = UILabel() + titleLabel.textColor = Colors.text + titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize) + titleLabel.text = NSLocalizedString("Restore your account using your seed", comment: "") + titleLabel.numberOfLines = 0 + titleLabel.lineBreakMode = .byWordWrapping + // Set up explanation label + let explanationLabel = UILabel() + explanationLabel.textColor = Colors.text + explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) + explanationLabel.text = "explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation explanation" + explanationLabel.numberOfLines = 0 + explanationLabel.lineBreakMode = .byWordWrapping + // Set up spacers + let topSpacer = UIView.vStretchingSpacer() + let spacer1 = UIView() + spacer1HeightConstraint = spacer1.set(.height, to: Values.veryLargeSpacing) + let spacer2 = UIView() + spacer2HeightConstraint = spacer2.set(.height, to: Values.veryLargeSpacing) + let bottomSpacer = UIView.vStretchingSpacer() + let restoreButtonBottomOffsetSpacer = UIView() + restoreButtonBottomOffsetConstraint = restoreButtonBottomOffsetSpacer.set(.height, to: Values.onboardingButtonBottomOffset) + // Set up restore button + let restoreButton = Button(style: .prominentFilled, size: .large) + restoreButton.setTitle(NSLocalizedString("Continue", comment: ""), for: UIControl.State.normal) + restoreButton.titleLabel!.font = .boldSystemFont(ofSize: Values.mediumFontSize) + restoreButton.addTarget(self, action: #selector(restore), for: UIControl.Event.touchUpInside) + // Set up restore button container + let restoreButtonContainer = UIView() + restoreButtonContainer.addSubview(restoreButton) + restoreButton.pin(.leading, to: .leading, of: restoreButtonContainer, withInset: Values.massiveSpacing) + restoreButton.pin(.top, to: .top, of: restoreButtonContainer) + restoreButtonContainer.pin(.trailing, to: .trailing, of: restoreButton, withInset: Values.massiveSpacing) + restoreButtonContainer.pin(.bottom, to: .bottom, of: restoreButton) + // Set up top stack view + let topStackView = UIStackView(arrangedSubviews: [ titleLabel, spacer1, explanationLabel, spacer2, mnemonicTextField ]) + topStackView.axis = .vertical + topStackView.alignment = .fill + // Set up top stack view container + let topStackViewContainer = UIView() + topStackViewContainer.addSubview(topStackView) + topStackView.pin(.leading, to: .leading, of: topStackViewContainer, withInset: Values.veryLargeSpacing) + topStackView.pin(.top, to: .top, of: topStackViewContainer) + topStackViewContainer.pin(.trailing, to: .trailing, of: topStackView, withInset: Values.veryLargeSpacing) + topStackViewContainer.pin(.bottom, to: .bottom, of: topStackView) + // Set up main stack view + let mainStackView = UIStackView(arrangedSubviews: [ topSpacer, topStackViewContainer, bottomSpacer, restoreButtonContainer, restoreButtonBottomOffsetSpacer ]) + mainStackView.axis = .vertical + mainStackView.alignment = .fill + view.addSubview(mainStackView) + mainStackView.pin(.leading, to: .leading, of: view) + mainStackView.pin(.top, to: .top, of: view) + mainStackView.pin(.trailing, to: .trailing, of: view) + bottomConstraint = mainStackView.pin(.bottom, to: .bottom, of: view) + topSpacer.heightAnchor.constraint(equalTo: bottomSpacer.heightAnchor, multiplier: 1).isActive = true + // Dismiss keyboard on tap + let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard)) + view.addGestureRecognizer(tapGestureRecognizer) + // Listen to keyboard notifications + let notificationCenter = NotificationCenter.default + notificationCenter.addObserver(self, selector: #selector(handleKeyboardWillChangeFrameNotification(_:)), name: UIResponder.keyboardWillChangeFrameNotification, object: nil) + notificationCenter.addObserver(self, selector: #selector(handleKeyboardWillHideNotification(_:)), name: UIResponder.keyboardWillHideNotification, object: nil) + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + mnemonicTextField.becomeFirstResponder() + } + + deinit { + NotificationCenter.default.removeObserver(self) + } + + // MARK: General + @objc private func dismissKeyboard() { + mnemonicTextField.resignFirstResponder() + } + + // MARK: Updating + @objc private func handleKeyboardWillChangeFrameNotification(_ notification: Notification) { + guard let newHeight = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue.size.height else { return } + bottomConstraint.constant = -newHeight // Negative due to how the constraint is set up + restoreButtonBottomOffsetConstraint.constant = Values.largeSpacing + spacer1HeightConstraint.constant = Values.mediumSpacing + spacer2HeightConstraint.constant = Values.mediumSpacing + UIView.animate(withDuration: 0.25) { + self.view.layoutIfNeeded() + } + } + + @objc private func handleKeyboardWillHideNotification(_ notification: Notification) { + bottomConstraint.constant = 0 + restoreButtonBottomOffsetConstraint.constant = Values.onboardingButtonBottomOffset + spacer1HeightConstraint.constant = Values.veryLargeSpacing + spacer2HeightConstraint.constant = Values.veryLargeSpacing + UIView.animate(withDuration: 0.25) { + self.view.layoutIfNeeded() + } + } + + // MARK: Interaction + @objc private func restore() { + func showError(title: String, message: String = "") { + let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) + alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: ""), style: .default, handler: nil)) + presentAlert(alert) + } + let mnemonic = mnemonicTextField.text! + do { + let hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic) + let seed = Data(hex: hexEncodedSeed) + let keyPair = Curve25519.generateKeyPair(fromSeed: seed + seed) + let identityManager = OWSIdentityManager.shared() + let databaseConnection = identityManager.value(forKey: "dbConnection") as! YapDatabaseConnection + databaseConnection.setObject(seed.toHexString(), forKey: "LKLokiSeed", inCollection: OWSPrimaryStorageIdentityKeyStoreCollection) + databaseConnection.setObject(keyPair, forKey: OWSPrimaryStorageIdentityKeyStoreIdentityKey, inCollection: OWSPrimaryStorageIdentityKeyStoreCollection) + TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = keyPair.hexEncodedPublicKey + mnemonicTextField.resignFirstResponder() + Timer.scheduledTimer(withTimeInterval: 0.25, repeats: false) { _ in + let displayNameVC = DisplayNameVC() + self.navigationController!.pushViewController(displayNameVC, animated: true) + } + } catch let error { + let error = error as? Mnemonic.DecodingError ?? Mnemonic.DecodingError.generic + showError(title: error.errorDescription!) + } + } +} diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index ab34e4bbd..8145b5a85 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2736,3 +2736,5 @@ "Copy Public Key" = "Copy Public Key"; "Pick your public display name" = "Pick your public display name"; "Enter a display name" = "Enter a display name"; +"Restore your account using your seed" = "Restore your account using your seed"; +"Enter your seed" = "Enter your seed";