-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add FXIOS-9126 [Menu] Add popup sheet menu (#21022)
- Loading branch information
1 parent
ca5d8ca
commit 9231f26
Showing
9 changed files
with
309 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
firefox-ios/Client/Frontend/Browser/Menu/MainMenuCoordinator.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Common | ||
| import Foundation | ||
| import Shared | ||
|
|
||
| protocol MainMenuCoordinatorDelegate: AnyObject { | ||
| // Define any coordinator delegate methods | ||
| } | ||
|
|
||
| class MainMenuCoordinator: BaseCoordinator, FeatureFlaggable { | ||
| weak var parentCoordinator: ParentCoordinatorDelegate? | ||
| private var profile: Profile | ||
| private let tabManager: TabManager | ||
|
|
||
| init(router: Router, | ||
| profile: Profile = AppContainer.shared.resolve(), | ||
| tabManager: TabManager) { | ||
| self.tabManager = tabManager | ||
| self.profile = profile | ||
| super.init(router: router) | ||
| } | ||
|
|
||
| func startModal() { | ||
| let viewController = createMainMenuViewController() | ||
|
|
||
| if let sheet = viewController.sheetPresentationController { | ||
| sheet.detents = [.medium(), .large()] | ||
| } | ||
| router.present(viewController, animated: true) | ||
| } | ||
|
|
||
| func dismissModal(animated: Bool) { | ||
| router.dismiss(animated: animated, completion: nil) | ||
| parentCoordinator?.didFinish(from: self) | ||
| } | ||
|
|
||
| private func createMainMenuViewController() -> MainMenuViewController { | ||
| let mainMenuViewController = MainMenuViewController( | ||
| windowUUID: tabManager.windowUUID, | ||
| viewModel: MainMenuViewModel(windowUUID: tabManager.windowUUID) | ||
| ) | ||
| return mainMenuViewController | ||
| } | ||
| } |
163 changes: 163 additions & 0 deletions
163
firefox-ios/Client/Frontend/Browser/Menu/MainMenuViewController.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Common | ||
| import ComponentLibrary | ||
| import UIKit | ||
| import Shared | ||
| import Redux | ||
|
|
||
| class MainMenuViewController: UIViewController, | ||
| Themeable, | ||
| Notifiable, | ||
| UIAdaptivePresentationControllerDelegate, | ||
| UISheetPresentationControllerDelegate, | ||
| UIScrollViewDelegate, | ||
| StoreSubscriber { | ||
| typealias SubscriberStateType = BrowserViewControllerState | ||
|
|
||
| private struct UX { | ||
| static let closeButtonWidthHeight: CGFloat = 30 | ||
| static let scrollContentStackSpacing: CGFloat = 16 | ||
| } | ||
|
|
||
| var notificationCenter: NotificationProtocol | ||
| var themeManager: ThemeManager | ||
| var themeObserver: NSObjectProtocol? | ||
|
|
||
| private var viewModel: MainMenuViewModel | ||
| private let windowUUID: WindowUUID | ||
|
|
||
| var currentWindowUUID: UUID? { return windowUUID } | ||
|
|
||
| private lazy var scrollView: UIScrollView = .build() | ||
|
|
||
| private lazy var contentStackView: UIStackView = .build { stackView in | ||
| stackView.axis = .vertical | ||
| stackView.spacing = UX.scrollContentStackSpacing | ||
| } | ||
|
|
||
| private lazy var closeButton: CloseButton = .build { view in | ||
| let viewModel = CloseButtonViewModel( | ||
| a11yLabel: .Shopping.CloseButtonAccessibilityLabel, | ||
| a11yIdentifier: AccessibilityIdentifiers.Shopping.sheetCloseButton | ||
| ) | ||
| view.configure(viewModel: viewModel) | ||
| view.addTarget(self, action: #selector(self.closeTapped), for: .touchUpInside) | ||
| } | ||
|
|
||
| // MARK: - Initializers | ||
| init( | ||
| windowUUID: WindowUUID, | ||
| viewModel: MainMenuViewModel, | ||
| notificationCenter: NotificationProtocol = NotificationCenter.default, | ||
| themeManager: ThemeManager = AppContainer.shared.resolve() | ||
| ) { | ||
| self.viewModel = viewModel | ||
| self.windowUUID = windowUUID | ||
| self.notificationCenter = notificationCenter | ||
| self.themeManager = themeManager | ||
| super.init(nibName: nil, bundle: nil) | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| // MARK: - View setup & lifecycle | ||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
| presentationController?.delegate = self | ||
| sheetPresentationController?.delegate = self | ||
| scrollView.delegate = self | ||
|
|
||
| setupNotifications(forObserver: self, | ||
| observing: [.DynamicFontChanged]) | ||
|
|
||
| setupView() | ||
| listenForThemeChange(view) | ||
| subscribeToRedux() | ||
| } | ||
|
|
||
| override func viewWillAppear(_ animated: Bool) { | ||
| super.viewWillAppear(animated) | ||
| applyTheme() | ||
| } | ||
|
|
||
| override func viewDidAppear(_ animated: Bool) { | ||
| super.viewDidAppear(animated) | ||
| updateModalA11y() | ||
| } | ||
|
|
||
| // MARK: - View setup | ||
| private func setupView() { } | ||
|
|
||
| private func updateContent() { | ||
| contentStackView.removeAllArrangedViews() | ||
| applyTheme() | ||
| } | ||
|
|
||
| // MARK: - Redux | ||
| func subscribeToRedux() { | ||
| let uuid = windowUUID | ||
| store.subscribe(self, transform: { | ||
| $0.select({ appState in | ||
| return BrowserViewControllerState(appState: appState, uuid: uuid) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| func unsubscribeFromRedux() { | ||
| store.unsubscribe(self) | ||
| } | ||
|
|
||
| func newState(state: BrowserViewControllerState) { | ||
| } | ||
|
|
||
| // MARK: - UX related | ||
| func applyTheme() { | ||
| let theme = themeManager.getCurrentTheme(for: windowUUID) | ||
| view.backgroundColor = theme.colors.layer1 | ||
| } | ||
|
|
||
| // MARK: - Notifications | ||
| func handleNotifications(_ notification: Notification) { } | ||
|
|
||
| @objc | ||
| private func closeTapped() { } | ||
|
|
||
| deinit { | ||
| unsubscribeFromRedux() | ||
| } | ||
|
|
||
| // In iOS 15 modals with a large detent read content underneath the modal | ||
| // in voice over. To prevent this we manually turn this off. | ||
| private func updateModalA11y() { | ||
| var currentDetent: UISheetPresentationController.Detent.Identifier? = viewModel.getCurrentDetent( | ||
| for: sheetPresentationController | ||
| ) | ||
|
|
||
| if currentDetent == nil, | ||
| let sheetPresentationController, | ||
| let firstDetent = sheetPresentationController.detents.first { | ||
| if firstDetent == .medium() { | ||
| currentDetent = .medium | ||
| } else if firstDetent == .large() { | ||
| currentDetent = .large | ||
| } | ||
| } | ||
|
|
||
| view.accessibilityViewIsModal = currentDetent == .large ? true : false | ||
| } | ||
|
|
||
| // MARK: - UIAdaptivePresentationControllerDelegate | ||
| func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { } | ||
|
|
||
| // MARK: - UISheetPresentationControllerDelegate | ||
| func sheetPresentationControllerDidChangeSelectedDetentIdentifier( | ||
| _ sheetPresentationController: UISheetPresentationController | ||
| ) { | ||
| updateModalA11y() | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
firefox-ios/Client/Frontend/Browser/Menu/MainMenuViewModel.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import UIKit | ||
| import Common | ||
| import Shared | ||
|
|
||
| class MainMenuViewModel { | ||
| let windowUUID: WindowUUID | ||
|
|
||
| init(profile: Profile = AppContainer.shared.resolve(), | ||
| windowUUID: WindowUUID) { | ||
| self.windowUUID = windowUUID | ||
| } | ||
|
|
||
| func getCurrentDetent( | ||
| for presentedController: UIPresentationController? | ||
| ) -> UISheetPresentationController.Detent.Identifier? { | ||
| guard let sheetController = presentedController as? UISheetPresentationController else { return nil } | ||
| return sheetController.selectedDetentIdentifier | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.