[MOB-3582] AI Shortcut Access Point on NTP #932
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,103 @@ | ||
| // 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 SwiftUI | ||
| import Common | ||
| import Ecosia | ||
|
|
||
| protocol NTPMultiPurposeEcosiaHeaderDelegate: AnyObject { | ||
| func multiPurposeEcosiaHeaderDidRequestAISearch() | ||
| } | ||
|
|
||
| /// NTP header cell containing multiple Ecosia-specific actions like AI search | ||
| @available(iOS 16.0, *) | ||
| final class NTPMultiPurposeEcosiaHeader: UICollectionViewCell, ThemeApplicable, ReusableCell { | ||
|
There was a problem hiding this comment. I understand the descriptiveness, but to be honest I think |
||
|
|
||
| // MARK: - Properties | ||
| private var hostingController: UIHostingController<AnyView>? | ||
| private var viewModel: NTPMultiPurposeEcosiaHeaderViewModel? | ||
|
|
||
| // MARK: - Init | ||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| setup() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| super.init(coder: coder) | ||
| setup() | ||
| } | ||
|
|
||
| // MARK: - Setup | ||
|
|
||
| private func setup() { | ||
| // Create a placeholder hosting controller - will be configured later | ||
| let hostingController = UIHostingController(rootView: AnyView(EmptyView())) | ||
| hostingController.view.backgroundColor = UIColor.clear | ||
| hostingController.view.translatesAutoresizingMaskIntoConstraints = false | ||
|
|
||
| contentView.addSubview(hostingController.view) | ||
| self.hostingController = hostingController | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| hostingController.view.topAnchor.constraint(equalTo: contentView.topAnchor), | ||
| hostingController.view.leadingAnchor.constraint(equalTo: contentView.leadingAnchor), | ||
| hostingController.view.trailingAnchor.constraint(equalTo: contentView.trailingAnchor), | ||
| hostingController.view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor) | ||
| ]) | ||
| } | ||
|
|
||
| // MARK: - Public Methods | ||
|
|
||
| func configure(with viewModel: NTPMultiPurposeEcosiaHeaderViewModel, windowUUID: WindowUUID) { | ||
| self.viewModel = viewModel | ||
|
|
||
| // Update the SwiftUI view with the new view model | ||
| let swiftUIView = NTPMultiPurposeEcosiaHeaderView( | ||
| viewModel: viewModel, | ||
| windowUUID: windowUUID | ||
| ) | ||
|
|
||
| hostingController?.rootView = AnyView(swiftUIView) | ||
| } | ||
|
|
||
| // MARK: - Theming | ||
| func applyTheme(theme: Theme) { | ||
| // Theme is handled by the SwiftUI view | ||
| } | ||
| } | ||
|
|
||
| // MARK: - SwiftUI Multi-Purpose Header View | ||
| @available(iOS 16.0, *) | ||
| struct NTPMultiPurposeEcosiaHeaderView: View { | ||
| @ObservedObject var viewModel: NTPMultiPurposeEcosiaHeaderViewModel | ||
| let windowUUID: WindowUUID | ||
|
|
||
| var body: some View { | ||
| HStack { | ||
| Spacer() | ||
|
|
||
| // AI Search Button positioned on the right | ||
| // Ecosia: Use theme colors from view model (following FeedbackView pattern) | ||
| EcosiaAISearchButton( | ||
| backgroundColor: viewModel.buttonBackgroundColor, | ||
| iconColor: viewModel.buttonIconColor, | ||
| onTap: handleAISearchTap | ||
| ) | ||
| } | ||
| .padding(.leading, .ecosia.space._m) | ||
| .padding(.trailing, .ecosia.space._m) | ||
| .onReceive(NotificationCenter.default.publisher(for: .ThemeDidChange)) { notification in | ||
| // Ecosia: Listen to theme changes (following FeedbackView pattern) | ||
| guard let uuid = notification.windowUUID, uuid == windowUUID else { return } | ||
| let themeManager = AppContainer.shared.resolve() as ThemeManager | ||
| viewModel.applyTheme(theme: themeManager.getCurrentTheme(for: windowUUID)) | ||
| } | ||
| } | ||
|
|
||
| private func handleAISearchTap() { | ||
| viewModel.openAISearch() | ||
| } | ||
| } | ||
This file contains hidden or 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,114 @@ | ||
| // 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 | ||
| import SwiftUI | ||
| import Ecosia | ||
|
|
||
| final class NTPMultiPurposeEcosiaHeaderViewModel: ObservableObject { | ||
| struct UX { | ||
| static let topInset: CGFloat = 24 | ||
| } | ||
|
|
||
| // MARK: - Properties | ||
| private let windowUUID: WindowUUID | ||
| internal weak var delegate: NTPMultiPurposeEcosiaHeaderDelegate? | ||
| internal var theme: Theme | ||
|
|
||
| // MARK: - Theme Properties (following FeedbackView pattern) | ||
| @Published var buttonBackgroundColor = Color.gray.opacity(0.2) | ||
| @Published var buttonIconColor = Color.primary | ||
|
|
||
| // MARK: - Initialization | ||
| init(theme: Theme, | ||
| windowUUID: WindowUUID, | ||
| delegate: NTPMultiPurposeEcosiaHeaderDelegate? = nil) { | ||
| self.theme = theme | ||
| self.windowUUID = windowUUID | ||
| self.delegate = delegate | ||
|
|
||
| // Apply initial theme | ||
| applyTheme(theme: theme) | ||
| } | ||
|
|
||
| // MARK: - Theme Handling | ||
| func applyTheme(theme: Theme) { | ||
| self.theme = theme | ||
| buttonBackgroundColor = Color(theme.colors.ecosia.backgroundElevation1) | ||
| buttonIconColor = Color(theme.colors.ecosia.textPrimary) | ||
| } | ||
|
Comment on lines
+38
to
+42
There was a problem hiding this comment. It feels a bit bad to me that this is on the view model, but I remember this was already the case for the latest feedback view implementation. Can you remind me why that is? Couldn't we leave handling colors as a responsibility of the view similar to how |
||
|
|
||
| // MARK: - Public Methods | ||
|
|
||
| func openAISearch() { | ||
| delegate?.multiPurposeEcosiaHeaderDidRequestAISearch() | ||
| Analytics.shared.aiSearchNTPButtonTapped() | ||
| } | ||
| } | ||
|
|
||
| // MARK: HomeViewModelProtocol | ||
| extension NTPMultiPurposeEcosiaHeaderViewModel: HomepageViewModelProtocol, FeatureFlaggable { | ||
| var sectionType: HomepageSectionType { | ||
| return .multiPurposeEcosiaHeader | ||
| } | ||
|
|
||
| var headerViewModel: LabelButtonHeaderViewModel { | ||
| return .emptyHeader | ||
| } | ||
|
|
||
| func section(for traitCollection: UITraitCollection, size: CGSize) -> NSCollectionLayoutSection { | ||
| let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), | ||
| heightDimension: .estimated(64)) | ||
| let item = NSCollectionLayoutItem(layoutSize: itemSize) | ||
|
|
||
| let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), | ||
| heightDimension: .estimated(64)) | ||
| let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitem: item, count: 1) | ||
|
|
||
| let section = NSCollectionLayoutSection(group: group) | ||
|
|
||
| section.contentInsets = NSDirectionalEdgeInsets( | ||
| top: UX.topInset, | ||
| leading: 0, | ||
| bottom: 0, | ||
| trailing: 0) | ||
|
|
||
| return section | ||
| } | ||
|
|
||
| func numberOfItemsInSection() -> Int { | ||
| return 1 | ||
| } | ||
|
|
||
| var isEnabled: Bool { | ||
| AISearchMVPExperiment.isEnabled | ||
| } | ||
|
|
||
| func setTheme(theme: Theme) { | ||
| // Ecosia: Use applyTheme for consistency (following FeedbackView pattern) | ||
| applyTheme(theme: theme) | ||
| } | ||
|
|
||
| func refreshData(for traitCollection: UITraitCollection, size: CGSize, isPortrait: Bool, device: UIUserInterfaceIdiom) { | ||
| // No data refresh needed for multi-purpose header | ||
| } | ||
| } | ||
|
|
||
| extension NTPMultiPurposeEcosiaHeaderViewModel: HomepageSectionHandler { | ||
|
|
||
| func configure(_ cell: UICollectionViewCell, at indexPath: IndexPath) -> UICollectionViewCell { | ||
| if #available(iOS 16.0, *) { | ||
| guard let multiPurposeHeaderCell = cell as? NTPMultiPurposeEcosiaHeader else { return cell } | ||
| multiPurposeHeaderCell.configure(with: self, windowUUID: windowUUID) | ||
| return multiPurposeHeaderCell | ||
| } | ||
| return cell | ||
| } | ||
|
|
||
| func didSelectItem(at indexPath: IndexPath, homePanelDelegate: HomePanelDelegate?, libraryPanelDelegate: LibraryPanelDelegate?) { | ||
| // This cell handles its own button actions, no cell selection needed | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you check with Product if no problem not supporting iOS 15? I see no issue and to be honest will likely soon be the case for the FF base, just checking.