[Jetpack Content Migration Flow] Add Help Screen

WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderViewConfiguration.swift

@@ -0,0 +1,30 @@
+import UIKit
+
+struct MeHeaderViewConfiguration {
+
+    let gravatarEmail: String?
+    let username: String
+    let displayName: String
+}
+
+extension MeHeaderViewConfiguration {
+
+    init(account: WPAccount) {
+        self.init(
+            gravatarEmail: account.email,
+            username: account.username,
+            displayName: account.displayName
+        )
+    }
+}
+
+extension MeHeaderView {
+
+    func update(with configuration: Configuration) {
+        self.gravatarEmail = configuration.gravatarEmail
+        self.username = configuration.username
+        self.displayName = configuration.displayName
+    }
+
+    typealias Configuration = MeHeaderViewConfiguration
+}

WordPress/Classes/ViewRelated/Site Creation/Shared/UITableView+Header.swift

@@ -42,7 +42,10 @@ extension UITableView {
             withHorizontalFittingPriority: .required,
             verticalFittingPriority: .fittingSizeLevel
         )
-        tableHeaderView.frame = CGRect(origin: .zero, size: size)
-        self.tableHeaderView = tableHeaderView
+        let newFrame = CGRect(origin: .zero, size: size)
+        if tableHeaderView.frame.height != newFrame.height {
+            tableHeaderView.frame = newFrame
+            self.tableHeaderView = tableHeaderView
+        }
     }
 }

WordPress/Classes/ViewRelated/Support/LogOutActionHandler.swift

@@ -0,0 +1,38 @@
+import UIKit
+
+struct LogOutActionHandler {
+
+    func logOut(with viewController: UIViewController) {
+        let alert  = UIAlertController(title: logOutAlertTitle, message: nil, preferredStyle: .alert)
+        alert.addActionWithTitle(Strings.alertCancelAction, style: .cancel)
+        alert.addActionWithTitle(Strings.alertLogoutAction, style: .destructive) { [weak viewController] _ in
+            viewController?.dismiss(animated: true) {
+                AccountHelper.logOutDefaultWordPressComAccount()
+            }
+        }
+        viewController.present(alert, animated: true)
+    }
+
+    private var logOutAlertTitle: String {
+        let context = ContextManager.sharedInstance().mainContext
+        let count = AbstractPost.countLocalPosts(in: context)
+
+        guard count > 0 else {
+            return Strings.alertDefaultTitle
+        }
+
+        let format = count > 1 ? Strings.alertUnsavedTitlePlural : Strings.alertUnsavedTitleSingular
+        return String(format: format, count)
+    }
+
+
+    private struct Strings {
+        static let alertDefaultTitle = AppConstants.Logout.alertTitle
+        static let alertUnsavedTitleSingular = NSLocalizedString("You have changes to %d post that hasn't been uploaded to your site. Logging out now will delete those changes. Log out anyway?",
+                                                            comment: "Warning displayed before logging out. The %d placeholder will contain the number of local posts (SINGULAR!)")
+        static let alertUnsavedTitlePlural = NSLocalizedString("You have changes to %d posts that haven’t been uploaded to your site. Logging out now will delete those changes. Log out anyway?",
+                                                          comment: "Warning displayed before logging out. The %d placeholder will contain the number of local posts (PLURAL!)")
+        static let alertCancelAction = NSLocalizedString("Cancel", comment: "Verb. A button title. Tapping cancels an action.")
+        static let alertLogoutAction = NSLocalizedString("Log Out", comment: "Button for confirming logging out from WordPress.com account")
+    }
+}

WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift

@@ -5,6 +5,9 @@ class SupportTableViewController: UITableViewController {
 
     // MARK: - Properties
 
+    /// Configures the appearance of the support screen.
+    let configuration: Configuration
+
     var sourceTag: WordPressSupportSourceTag?
 
     // If set, the Zendesk views will be shown from this view instead of in the navigation controller.
@@ -21,7 +24,8 @@ class SupportTableViewController: UITableViewController {
 
     // MARK: - Init
 
-    override init(style: UITableView.Style) {
+    init(configuration: Configuration = .init(), style: UITableView.Style = .grouped) {
+        self.configuration = configuration
         super.init(style: style)
     }
 
@@ -46,6 +50,11 @@ class SupportTableViewController: UITableViewController {
         ZendeskUtils.fetchUserInformation()
     }
 
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        self.tableView.sizeToFitHeaderView()
+    }
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         reloadViewModel()
@@ -78,7 +87,6 @@ class SupportTableViewController: UITableViewController {
         dismissTapped?()
         dismiss(animated: true)
     }
-
 }
 
 // MARK: - Private Extension
@@ -107,14 +115,18 @@ private extension SupportTableViewController {
                                 NavigationItemRow.self,
                                 TextRow.self,
                                 HelpRow.self,
+                                DestructiveButtonRow.self,
                                 SupportEmailRow.self],
                                tableView: tableView)
         tableHandler = ImmuTableViewHandler(takeOver: self)
         reloadViewModel()
         WPStyleGuide.configureColors(view: view, tableView: tableView)
-        // remove empty cells
-        tableView.tableFooterView = UIView()
-
+        tableView.tableFooterView = UIView() // remove empty cells
+        if let headerConfig = configuration.meHeaderConfiguration {
+            let headerView = MeHeaderView()
+            headerView.update(with: headerConfig)
+            tableView.tableHeaderView = headerView
+        }
         registerObservers()
     }
 
@@ -144,19 +156,34 @@ private extension SupportTableViewController {
             footerText: LocalizedText.helpFooter)
 
         // Information Section
-        let versionRow = TextRow(title: LocalizedText.version, value: Bundle.main.shortVersionString())
-        let switchRow = SwitchRow(title: LocalizedText.extraDebug,
-                                  value: userDefaults.bool(forKey: UserDefaultsKeys.extraDebug),
-                                  onChange: extraDebugToggled())
-        let logsRow = NavigationItemRow(title: LocalizedText.activityLogs, action: activityLogsSelected(), accessibilityIdentifier: "activity-logs-button")
+        var informationSection: ImmuTableSection?
+        if configuration.showsLogsSection {
+            let versionRow = TextRow(title: LocalizedText.version, value: Bundle.main.shortVersionString())
+            let switchRow = SwitchRow(title: LocalizedText.extraDebug,
+                                      value: userDefaults.bool(forKey: UserDefaultsKeys.extraDebug),
+                                      onChange: extraDebugToggled())
+            let logsRow = NavigationItemRow(title: LocalizedText.activityLogs, action: activityLogsSelected(), accessibilityIdentifier: "activity-logs-button")
+            informationSection = ImmuTableSection(
+                headerText: nil,
+                rows: [versionRow, switchRow, logsRow],
+                footerText: LocalizedText.informationFooter
+            )
+        }
 
-        let informationSection = ImmuTableSection(
-            headerText: nil,
-            rows: [versionRow, switchRow, logsRow],
-            footerText: LocalizedText.informationFooter)
+        // Log out Section
+        var logOutSections: ImmuTableSection?
+        if configuration.showsLogOutButton {
+            let logOutRow = DestructiveButtonRow(
+                title: LocalizedText.logOutButtonTitle,
+                action: logOutTapped(),
+                accessibilityIdentifier: ""
+            )
+            logOutSections = .init(headerText: LocalizedText.wpAccount, optionalRows: [logOutRow])
+        }
 
         // Create and return table
-        return ImmuTable(sections: [helpSection, informationSection])
+        let sections = [helpSection, informationSection, logOutSections].compactMap { $0 }
+        return ImmuTable(sections: sections)
     }
 
     @objc func refreshNotificationIndicator(_ notification: Foundation.Notification) {
@@ -274,6 +301,17 @@ private extension SupportTableViewController {
         }
     }
 
+    private func logOutTapped() -> ImmuTableAction {
+        return { [weak self] row in
+            guard let self else {
+                return
+            }
+            self.tableView.deselectSelectedRowWithAnimation(true)
+            let actionHandler = LogOutActionHandler()
+            actionHandler.logOut(with: self)
+        }
+    }
+
     // MARK: - ImmuTableRow Struct
 
     struct HelpRow: ImmuTableRow {
@@ -345,6 +383,8 @@ private extension SupportTableViewController {
         static let contactEmail = NSLocalizedString("Contact Email", comment: "Support email label.")
         static let contactEmailAccessibilityHint = NSLocalizedString("Shows a dialog for changing the Contact Email.", comment: "Accessibility hint describing what happens if the Contact Email button is tapped.")
         static let emailNotSet = NSLocalizedString("Not Set", comment: "Display value for Support email field if there is no user email address.")
+        static let wpAccount = NSLocalizedString("WordPress.com Account", comment: "WordPress.com sign-out section header title")
+        static let logOutButtonTitle = NSLocalizedString("Log Out", comment: "Button for confirming logging out from WordPress.com account")
     }
 
     // MARK: - User Defaults Keys

WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift

@@ -0,0 +1,37 @@
+import Foundation
+
+struct SupportTableViewControllerConfiguration {
+
+    // MARK: Properties
+
+    var meHeaderConfiguration: MeHeaderView.Configuration?
+    var showsLogOutButton: Bool = false
+    var showsLogsSection: Bool = true
+
+    // MARK: Default Configurations
+
+    static func currentAccountConfiguration() -> Self {
+        var config = Self.init()
+        if let account = Self.makeAccount() {
+            config.meHeaderConfiguration = .init(account: account)
+            config.showsLogOutButton = true
+            config.showsLogsSection = false
+        }
+        return config
+    }
+
+    private static func makeAccount() -> WPAccount? {
+        let context = ContextManager.shared.mainContext
+        do {
+            return try WPAccount.lookupDefaultWordPressComAccount(in: context)
+        } catch {
+            DDLogError("Account lookup failed with error: \(error)")
+            return nil
+        }
+    }
+}
+
+extension SupportTableViewController {
+
+    typealias Configuration = SupportTableViewControllerConfiguration
+}

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/MigrationDependencyContainer.swift

@@ -44,12 +44,30 @@ struct MigrationViewControllerFactory {
         }
     }
 
-    private func makeWelcomeViewModel() -> MigrationWelcomeViewModel {
-        MigrationWelcomeViewModel(account: makeAccount(), coordinator: coordinator)
+    // MARK: - View Controllers
+
+    private func makeWelcomeViewModel(handlers: ActionHandlers) -> MigrationWelcomeViewModel {
+        let primaryHandler = { () -> Void in handlers.primary?() }
+        let secondaryHandler = { () -> Void in handlers.secondary?() }
+
+        let actions = MigrationActionsViewConfiguration(
+            step: .welcome,
+            primaryHandler: primaryHandler,
+            secondaryHandler: secondaryHandler
+        )
+
+        return .init(account: makeAccount(), actions: actions)
     }
 
     private func makeWelcomeViewController() -> UIViewController {
-        MigrationWelcomeViewController(viewModel: makeWelcomeViewModel())
+        let handlers = ActionHandlers()
+        let viewModel = makeWelcomeViewModel(handlers: handlers)
+
+        let viewController = MigrationWelcomeViewController(viewModel: viewModel)
+        handlers.primary = { [weak coordinator] in coordinator?.transitionToNextStep() }
+        handlers.secondary = makeSupportViewControllerRouter(with: viewController)
+
+        return viewController
     }
 
     private func makeNotificationsViewModel() -> MigrationNotificationsViewModel {
@@ -67,4 +85,20 @@ struct MigrationViewControllerFactory {
     private func makeDoneViewController() -> UIViewController {
         MigrationDoneViewController(viewModel: makeDoneViewModel())
     }
+
+    // MARK: - Routers
+
+    private func makeSupportViewControllerRouter(with presenter: UIViewController) -> () -> Void {
+        return { [weak presenter] in
+            let destination = SupportTableViewController(configuration: .currentAccountConfiguration(), style: .insetGrouped)
+            presenter?.present(UINavigationController(rootViewController: destination), animated: true)
+        }
+    }
+
+    // MARK: - Types
+
+    private class ActionHandlers {
+        var primary: (() -> Void)?
+        var secondary: (() -> Void)?
+    }
 }

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/Navigation/MigrationNavigationController.swift

@@ -10,15 +10,22 @@ class MigrationNavigationController: UINavigationController {
     private var cancellable: AnyCancellable?
 
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        if let presentedViewController {
+            return presentedViewController.supportedInterfaceOrientations
+        }
         if WPDeviceIdentification.isiPhone() {
             return .portrait
         } else {
             return .allButUpsideDown
         }
     }
 
+    // Force portrait orientation for migration view controllers only
     override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
-        .portrait
+        if let presentedViewController {
+            return presentedViewController.preferredInterfaceOrientationForPresentation
+        }
+        return .portrait
     }
 
     init(coordinator: MigrationFlowCoordinator, factory: MigrationViewControllerFactory) {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Welcome/MigrationWelcomeViewController.swift

@@ -65,7 +65,9 @@ final class MigrationWelcomeViewController: UIViewController {
     }
 
     private func setupNavigationBar() {
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(email: viewModel.gravatarEmail)
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(email: viewModel.gravatarEmail) { [weak self] () -> Void in
+            self?.viewModel.configuration.actionsConfiguration.secondaryHandler?()
+        }
     }
 
     private func setupBottomSheet() {