Remove voiceSearchHelper from AppDependencyProvider.

duckduckgo · Oct 18, 2024 · 7b59503 · 7b59503
1 parent 4ecadd6
commit 7b59503
Show file tree

Hide file tree

Showing 18 changed files with 364 additions and 369 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -105,6 +105,8 @@ import os.log
     private let launchOptionsHandler = LaunchOptionsHandler()
     private let onboardingPixelReporter = OnboardingPixelReporter()
 
+    private let voiceSearchHelper = VoiceSearchHelper()
+
     private let marketplaceAdPostbackManager = MarketplaceAdPostbackManager()
     override init() {
         super.init()
@@ -320,7 +322,8 @@ import os.log
         if shouldPresentInsufficientDiskSpaceAlertAndCrash {
 
             window = UIWindow(frame: UIScreen.main.bounds)
-            window?.rootViewController = BlankSnapshotViewController(appSettings: AppDependencyProvider.shared.appSettings)
+            window?.rootViewController = BlankSnapshotViewController(appSettings: AppDependencyProvider.shared.appSettings,
+                                                                     voiceSearchHelper: voiceSearchHelper)
             window?.makeKeyAndVisible()
 
             presentInsufficientDiskSpaceAlert()
@@ -342,7 +345,8 @@ import os.log
                                           contextualOnboardingPresenter: contextualOnboardingPresenter,
                                           contextualOnboardingLogic: daxDialogs,
                                           contextualOnboardingPixelReporter: onboardingPixelReporter,
-                                          subscriptionFeatureAvailability: subscriptionFeatureAvailability)
+                                          subscriptionFeatureAvailability: subscriptionFeatureAvailability,
+                                          voiceSearchHelper: voiceSearchHelper)
 
             main.loadViewIfNeeded()
             syncErrorHandler.alertPresenter = main
@@ -359,7 +363,7 @@ import os.log
             }
         }
 
-        AppDependencyProvider.shared.voiceSearchHelper.migrateSettingsFlagIfNecessary()
+        self.voiceSearchHelper.migrateSettingsFlagIfNecessary()
 
         // Task handler registration needs to happen before the end of `didFinishLaunching`, otherwise submitting a task can throw an exception.
         // Having both in `didBecomeActive` can sometimes cause the exception when running on a physical device, so registration happens here.
@@ -828,7 +832,7 @@ import os.log
         overlayWindow = UIWindow(frame: frame)
         overlayWindow?.windowLevel = UIWindow.Level.alert
 
-        let overlay = BlankSnapshotViewController(appSettings: AppDependencyProvider.shared.appSettings)
+        let overlay = BlankSnapshotViewController(appSettings: AppDependencyProvider.shared.appSettings, voiceSearchHelper: voiceSearchHelper)
         overlay.delegate = self
 
         overlayWindow?.rootViewController = overlay

diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
@@ -34,7 +34,6 @@ protocol DependencyProvider {
     var internalUserDecider: InternalUserDecider { get }
     var featureFlagger: FeatureFlagger { get }
     var storageCache: StorageCache { get }
-    var voiceSearchHelper: VoiceSearchHelperProtocol { get }
     var downloadManager: DownloadManager { get }
     var autofillLoginSession: AutofillLoginSession { get }
     var autofillNeverPromptWebsitesManager: AutofillNeverPromptWebsitesManager { get }
@@ -64,7 +63,6 @@ final class AppDependencyProvider: DependencyProvider {
     let featureFlagger: FeatureFlagger
 
     let storageCache = StorageCache()
-    let voiceSearchHelper: VoiceSearchHelperProtocol = VoiceSearchHelper()
     let downloadManager = DownloadManager()
     let autofillLoginSession = AutofillLoginSession()
     lazy var autofillNeverPromptWebsitesManager = AutofillNeverPromptWebsitesManager()

diff --git a/DuckDuckGo/BlankSnapshotViewController.swift b/DuckDuckGo/BlankSnapshotViewController.swift
@@ -37,13 +37,15 @@ class BlankSnapshotViewController: UIViewController {
 
     var tabSwitcherButton: TabSwitcherButton!
     let appSettings: AppSettings
+    let voiceSearchHelper: VoiceSearchHelperProtocol
 
     var viewCoordinator: MainViewCoordinator!
 
     weak var delegate: BlankSnapshotViewRecoveringDelegate?
 
-    init(appSettings: AppSettings) {
+    init(appSettings: AppSettings, voiceSearchHelper: VoiceSearchHelperProtocol) {
         self.appSettings = appSettings
+        self.voiceSearchHelper = voiceSearchHelper
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -56,7 +58,7 @@ class BlankSnapshotViewController: UIViewController {
 
         tabSwitcherButton = TabSwitcherButton()
 
-        viewCoordinator = MainViewFactory.createViewHierarchy(view)
+        viewCoordinator = MainViewFactory.createViewHierarchy(view, voiceSearchHelper: voiceSearchHelper)
         if appSettings.currentAddressBarPosition.isBottom {
             viewCoordinator.moveAddressBarToPosition(.bottom)
             viewCoordinator.hideToolbarSeparator()

diff --git a/DuckDuckGo/LargeOmniBarState.swift b/DuckDuckGo/LargeOmniBarState.swift
@@ -30,25 +30,27 @@ struct LargeOmniBarState {
         let showShareButton: Bool = false
         let clearTextOnStart = true
         let allowsTrackersAnimation = false
-        let showSearchLoupe = !AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         let showPrivacyIcon = false
         let showBackground = false
         let showClear = false
         let showRefresh = false
         let showMenu = false
         let showSettings = true
         let showCancel: Bool = false
-        let showVoiceSearch = AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         var name: String { return "Pad" + Type.name(self) }
-        var onEditingStoppedState: OmniBarState { return HomeNonEditingState() }
+        var onEditingStoppedState: OmniBarState { return HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEditingStartedState: OmniBarState { return self }
         var onTextClearedState: OmniBarState { return self }
-        var onTextEnteredState: OmniBarState { return HomeTextEditingState() }
-        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState() }
+        var onTextEnteredState: OmniBarState { return HomeTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onBrowsingStoppedState: OmniBarState { return self }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeEmptyEditingState() }
-        var onReloadState: OmniBarState { return BrowsingNonEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var showSearchLoupe: Bool { !voiceSearchHelper.isVoiceSearchEnabled }
+        var showVoiceSearch: Bool { voiceSearchHelper.isVoiceSearchEnabled }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
     struct HomeTextEditingState: OmniBarState {
@@ -59,25 +61,27 @@ struct LargeOmniBarState {
         let showShareButton: Bool = false
         let clearTextOnStart = false
         let allowsTrackersAnimation = false
-        let showSearchLoupe = !AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         let showPrivacyIcon = false
         let showBackground = false
         let showClear = true
         let showRefresh = false
         let showMenu = false
         let showSettings = true
         let showCancel: Bool = false
-        let showVoiceSearch = AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         var name: String { return "Pad" + Type.name(self) }
-        var onEditingStoppedState: OmniBarState { return HomeNonEditingState() }
+        var onEditingStoppedState: OmniBarState { return HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEditingStartedState: OmniBarState { return self }
-        var onTextClearedState: OmniBarState { return HomeEmptyEditingState() }
+        var onTextClearedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onTextEnteredState: OmniBarState { return self }
-        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState() }
-        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState() }
+        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeTextEditingState() }
-        var onReloadState: OmniBarState { return HomeTextEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return HomeTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var showSearchLoupe: Bool { !voiceSearchHelper.isVoiceSearchEnabled }
+        var showVoiceSearch: Bool { voiceSearchHelper.isVoiceSearchEnabled }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
     struct HomeNonEditingState: OmniBarState {
@@ -96,17 +100,19 @@ struct LargeOmniBarState {
         let showMenu = false
         let showSettings = true
         let showCancel: Bool = false
-        let showVoiceSearch = AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         var name: String { return "Pad" + Type.name(self) }
         var onEditingStoppedState: OmniBarState { return self }
-        var onEditingStartedState: OmniBarState { return HomeEmptyEditingState() }
-        var onTextClearedState: OmniBarState { return HomeEmptyEditingState() }
-        var onTextEnteredState: OmniBarState { return HomeTextEditingState() }
-        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState() }
-        var onBrowsingStoppedState: OmniBarState { return HomeNonEditingState() }
+        var onEditingStartedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onTextClearedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onTextEnteredState: OmniBarState { return HomeTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onBrowsingStartedState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onBrowsingStoppedState: OmniBarState { return HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeNonEditingState() }
-        var onReloadState: OmniBarState { return HomeNonEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var showVoiceSearch: Bool { voiceSearchHelper.isVoiceSearchEnabled }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
     struct BrowsingEmptyEditingState: OmniBarState {
@@ -117,25 +123,27 @@ struct LargeOmniBarState {
         let showShareButton: Bool = true
         let clearTextOnStart = true
         let allowsTrackersAnimation = false
-        let showSearchLoupe = !AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         let showPrivacyIcon = false
         let showBackground = false
         let showClear = false
         let showRefresh = false
         let showMenu = true
         let showSettings = false
         let showCancel: Bool = false
-        let showVoiceSearch = AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         var name: String { return "Pad" + Type.name(self) }
-        var onEditingStoppedState: OmniBarState { return BrowsingNonEditingState() }
+        var onEditingStoppedState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEditingStartedState: OmniBarState { return self }
         var onTextClearedState: OmniBarState { return self }
-        var onTextEnteredState: OmniBarState { return BrowsingTextEditingState() }
+        var onTextEnteredState: OmniBarState { return BrowsingTextEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onBrowsingStartedState: OmniBarState { return self }
-        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState() }
+        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingEmptyEditingState() }
-        var onReloadState: OmniBarState { return BrowsingEmptyEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return BrowsingEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var showSearchLoupe: Bool { !voiceSearchHelper.isVoiceSearchEnabled }
+        var showVoiceSearch: Bool { voiceSearchHelper.isVoiceSearchEnabled }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
     struct BrowsingTextEditingState: OmniBarState {
@@ -146,25 +154,27 @@ struct LargeOmniBarState {
         let showShareButton: Bool = true
         let clearTextOnStart = false
         let allowsTrackersAnimation = false
-        let showSearchLoupe = !AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         let showPrivacyIcon = false
         let showBackground = false
         let showClear = true
         let showRefresh = false
         let showMenu = true
         let showSettings = false
         let showCancel: Bool = false
-        let showVoiceSearch = AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled
         var name: String { return "Pad" + Type.name(self) }
-        var onEditingStoppedState: OmniBarState { return BrowsingNonEditingState() }
+        var onEditingStoppedState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEditingStartedState: OmniBarState { return self }
-        var onTextClearedState: OmniBarState { return BrowsingEmptyEditingState() }
+        var onTextClearedState: OmniBarState { return BrowsingEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onTextEnteredState: OmniBarState { return self }
         var onBrowsingStartedState: OmniBarState { return self }
-        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState() }
+        var onBrowsingStoppedState: OmniBarState { return HomeEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingTextEditingState() }
-        var onReloadState: OmniBarState { return BrowsingTextEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return BrowsingTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var showSearchLoupe: Bool { !voiceSearchHelper.isVoiceSearchEnabled }
+        var showVoiceSearch: Bool { voiceSearchHelper.isVoiceSearchEnabled }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
     struct BrowsingNonEditingState: OmniBarState {
@@ -186,14 +196,16 @@ struct LargeOmniBarState {
         let showVoiceSearch = false
         var name: String { return "Pad" + Type.name(self) }
         var onEditingStoppedState: OmniBarState { return self }
-        var onEditingStartedState: OmniBarState { return BrowsingTextEditingState() }
-        var onTextClearedState: OmniBarState { return BrowsingEmptyEditingState() }
-        var onTextEnteredState: OmniBarState { return BrowsingTextEditingState() }
+        var onEditingStartedState: OmniBarState { return BrowsingTextEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onTextClearedState: OmniBarState { return BrowsingEmptyEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onTextEnteredState: OmniBarState { return BrowsingTextEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onBrowsingStartedState: OmniBarState { return self }
-        var onBrowsingStoppedState: OmniBarState { return HomeNonEditingState() }
+        var onBrowsingStoppedState: OmniBarState { return HomeNonEditingState(voiceSearchHelper: voiceSearchHelper) }
         var onEnterPadState: OmniBarState { return self }
-        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingNonEditingState() }
-        var onReloadState: OmniBarState { return BrowsingNonEditingState() }
+        var onEnterPhoneState: OmniBarState { return SmallOmniBarState.BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+        var onReloadState: OmniBarState { return BrowsingNonEditingState(voiceSearchHelper: voiceSearchHelper) }
+
+        let voiceSearchHelper: VoiceSearchHelperProtocol
     }
 
 }
diff --git a/DuckDuckGo/MainView.swift b/DuckDuckGo/MainView.swift
@@ -22,17 +22,19 @@ import UIKit
 class MainViewFactory {
 
     private let coordinator: MainViewCoordinator
+    private let voiceSearchHelper: VoiceSearchHelperProtocol
 
     var superview: UIView {
         coordinator.superview
     }
 
-    private init(_ superview: UIView) {
+    private init(superview: UIView, voiceSearchHelper: VoiceSearchHelperProtocol) {
         coordinator = MainViewCoordinator(superview: superview)
+        self.voiceSearchHelper = voiceSearchHelper
     }
 
-    static func createViewHierarchy(_ superview: UIView) -> MainViewCoordinator {
-        let factory = MainViewFactory(superview)
+    static func createViewHierarchy(_ superview: UIView, voiceSearchHelper: VoiceSearchHelperProtocol) -> MainViewCoordinator {
+        let factory = MainViewFactory(superview: superview, voiceSearchHelper: voiceSearchHelper)
         factory.createViews()
         factory.disableAutoresizingOnImmediateSubviews(superview)
         factory.constrainViews()
@@ -70,7 +72,7 @@ extension MainViewFactory {
     }
 
     private func createOmniBar() {
-        coordinator.omniBar = OmniBar.loadFromXib()
+        coordinator.omniBar = OmniBar.loadFromXib(voiceSearchHelper: voiceSearchHelper)
         coordinator.omniBar.translatesAutoresizingMaskIntoConstraints = false
     }
 

diff --git a/DuckDuckGo/MainViewController+Segues.swift b/DuckDuckGo/MainViewController+Segues.swift
@@ -308,6 +308,7 @@ extension MainViewController {
         let settingsViewModel = SettingsViewModel(legacyViewProvider: legacyViewProvider,
                                                   subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
                                                   subscriptionFeatureAvailability: subscriptionFeatureAvailability,
+                                                  voiceSearchHelper: voiceSearchHelper,
                                                   deepLink: deepLinkTarget,
                                                   historyManager: historyManager,
                                                   syncPausedStateManager: syncPausedStateManager,