Merge pull request #4980 from wikimedia/T374879

Add profile icon to Settings (when in tab bar)
wikimedia · Sep 19, 2024 · edba179 · edba179
2 parents 1bbf820 + 10e56bb
commit edba179
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 85 deletions.
diff --git a/Wikipedia/Code/ExploreViewController.swift b/Wikipedia/Code/ExploreViewController.swift
@@ -204,12 +204,9 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo
  }()
 
  @objc func userDidTapProfile() {
- DonateFunnel.shared.logSettingsDidTapSettingsIcon()
-
  let coordinator = ProfileCoordinator(navigationController: self.navigationController!, theme: theme, dataStore: dataStore)
  self.profileCoordinator = coordinator
  coordinator.start()
-
  }
 
  open override func refresh() {

diff --git a/Wikipedia/Code/ProfileCoordinator.swift b/Wikipedia/Code/ProfileCoordinator.swift
@@ -2,7 +2,8 @@ import UIKit
 import SwiftUI
 import WMFComponents
 
-class ProfileCoordinator: Coordinator, ProfileCoordinatorDelegate {
+@objc(WMFProfileCoordinator)
+class ProfileCoordinator: NSObject, Coordinator, ProfileCoordinatorDelegate {
 
  // MARK: Coordinator Protocol Properties
 
@@ -15,15 +16,15 @@ class ProfileCoordinator: Coordinator, ProfileCoordinatorDelegate {
 
  // MARK: Lifecycle
 
- init(navigationController: UINavigationController, theme: Theme, dataStore: MWKDataStore) {
+ @objc init(navigationController: UINavigationController, theme: Theme, dataStore: MWKDataStore) {
  self.navigationController = navigationController
  self.theme = theme
  self.dataStore = dataStore
  }
 
  // MARK: Coordinator Protocol Methods
 
- func start() {
+ @objc func start() {
  let isLoggedIn = dataStore.authenticationManager.authStateIsPermanent
 
  let pageTitle = WMFLocalizedString("profile-page-title-logged-out", value: "Account", comment: "Page title for non-logged in users")

diff --git a/Wikipedia/Code/SettingsCoordinator.swift b/Wikipedia/Code/SettingsCoordinator.swift
@@ -23,6 +23,13 @@ public class SettingsCoordinator: Coordinator {
  // MARK: Coordinator Protocol Methods
 
  public func start() {
+
+ // If navigation controller already has WMFSettingsViewController as it's root view controller, no need to navigate anywhere
+ if navigationController.viewControllers.count == 1,
+ (navigationController.viewControllers.first as? WMFSettingsViewController) != nil {
+ return
+ }
+
  let settingsViewController = WMFSettingsViewController(dataStore: dataStore)
  settingsViewController.theme = theme
  let navVC = WMFThemeableNavigationController(rootViewController: settingsViewController, theme: theme)

diff --git a/Wikipedia/Code/UIViewController+FeatureComponentFactory.swift b/Wikipedia/Code/UIViewController+FeatureComponentFactory.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SwiftUI
 import WMFComponents
 import WMF
 import WMFData