use bar location for autocomplete

duckduckgo · Oct 6, 2023 · a9698f5 · a9698f5
1 parent 69daa4d
commit a9698f5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/DuckDuckGo/AutocompleteViewController.swift b/DuckDuckGo/AutocompleteViewController.swift
@@ -33,8 +33,6 @@ class AutocompleteViewController: UIViewController {
     weak var delegate: AutocompleteViewControllerDelegate?
     weak var presentationDelegate: AutocompleteViewControllerPresentationDelegate?
 
-    let appSettings: AppSettings
-
     private var lastRequest: AutocompleteRequest?
     private var receivedResponse = false
     private var pendingRequest = false
@@ -45,10 +43,15 @@ class AutocompleteViewController: UIViewController {
 
     private var bookmarksSearch: BookmarksStringSearch!
 
+    var isAddressBarAtBottom: Bool {
+        guard let rect = delegate?.autocompleteDidRequestSearchBarRect() else { return false }
+        return rect.minY > view.frame.midY
+    }
+
     var backgroundColor: UIColor {
-        appSettings.currentAddressBarPosition == .top ?
-            UIColor.black.withAlphaComponent(0.2) :
-            UIColor(designSystemColor: .background)
+        isAddressBarAtBottom ?
+            UIColor(designSystemColor: .background) :
+            UIColor.black.withAlphaComponent(0.2)
     }
 
     var showBackground = true {
@@ -72,24 +75,13 @@ class AutocompleteViewController: UIViewController {
     static func loadFromStoryboard(bookmarksSearch: BookmarksStringSearch) -> AutocompleteViewController {
         let storyboard = UIStoryboard(name: "Autocomplete", bundle: nil)
 
-        guard let controller = storyboard.instantiateInitialViewController(creator: { coder in
-            AutocompleteViewController(coder: coder, appSettings: AppDependencyProvider.shared.appSettings)
-        }) else {
+        guard let controller = storyboard.instantiateInitialViewController() as? AutocompleteViewController else {
             fatalError("Failed to instatiate correct Autocomplete view controller")
         }
         controller.bookmarksSearch = bookmarksSearch
         return controller
     }
 
-    required init?(coder: NSCoder) {
-        fatalError("not implemented")
-    }
-
-    required init?(coder: NSCoder, appSettings: AppSettings) {
-        self.appSettings = appSettings
-        super.init(coder: coder)
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         configureTableView()
@@ -230,7 +222,7 @@ extension AutocompleteViewController: UITableViewDataSource {
 
         let currentTheme = ThemeManager.shared.currentTheme
 
-        cell.updateFor(query: query, suggestion: suggestions[indexPath.row], with: currentTheme, appSettings: appSettings)
+        cell.updateFor(query: query, suggestion: suggestions[indexPath.row], with: currentTheme, isAddressBarAtBottom: isAddressBarAtBottom)
         cell.plusButton.tag = indexPath.row
 
         let color = indexPath.row == selectedItem ? currentTheme.tableCellSelectedColor : UIColor(designSystemColor: .panel)

diff --git a/DuckDuckGo/AutocompleteViewControllerDelegate.swift b/DuckDuckGo/AutocompleteViewControllerDelegate.swift
@@ -28,6 +28,8 @@ protocol AutocompleteViewControllerDelegate: AnyObject {
     func autocomplete(pressedPlusButtonForSuggestion suggestion: Suggestion)
 
     func autocompleteWasDismissed()
+
+    func autocompleteDidRequestSearchBarRect() -> CGRect
 }
 
 protocol AutocompleteViewControllerPresentationDelegate: AnyObject {

diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -113,6 +113,11 @@ class MainViewController: UIViewController {
         return tabManager?.current
     }
 
+    var searchBarRect: CGRect {
+        let view = UIApplication.shared.windows.filter({ $0.isKeyWindow }).first?.rootViewController?.view
+        return omniBar.searchContainer.convert(omniBar.searchContainer.bounds, to: view)
+    }
+
     var keyModifierFlags: UIKeyModifierFlags?
     var showKeyboardAfterFireButton: DispatchWorkItem?
 
@@ -1435,6 +1440,10 @@ extension MainViewController: AutocompleteViewControllerDelegate {
     func autocompleteWasDismissed() {
         dismissOmniBar()
     }
+
+    func autocompleteDidRequestSearchBarRect() -> CGRect {
+        searchBarRect
+    }
 }
 
 extension MainViewController: HomeControllerDelegate {
@@ -1635,8 +1644,7 @@ extension MainViewController: TabDelegate {
     }
 
     func tabDidRequestSearchBarRect(tab: TabViewController) -> CGRect {
-        let view = UIApplication.shared.windows.filter({ $0.isKeyWindow }).first?.rootViewController?.view
-        return omniBar.searchContainer.convert(omniBar.searchContainer.bounds, to: view)
+        searchBarRect
     }
 
     func tab(_ tab: TabViewController,

diff --git a/DuckDuckGo/SuggestionTableViewCell.swift b/DuckDuckGo/SuggestionTableViewCell.swift
@@ -32,7 +32,7 @@ class SuggestionTableViewCell: UITableViewCell {
     @IBOutlet weak var typeImage: UIImageView!
     @IBOutlet weak var plusButton: UIButton!
 
-    func updateFor(query: String, suggestion: Suggestion, with theme: Theme, appSettings: AppSettings) {
+    func updateFor(query: String, suggestion: Suggestion, with theme: Theme, isAddressBarAtBottom: Bool) {
 
         switch suggestion.source {
         case .local:
@@ -49,10 +49,9 @@ class SuggestionTableViewCell: UITableViewCell {
         }
 
         self.plusButton.accessibilityLabel = UserText.voiceoverActionAutocomplete
-        switch appSettings.currentAddressBarPosition {
-        case .bottom:
+        if isAddressBarAtBottom {
             self.plusButton.setImage(UIImage(named: "Arrow-Down-Left-24"), for: .normal)
-        case .top:
+        } else {
             self.plusButton.setImage(UIImage(named: "Arrow-Top-Left-24"), for: .normal)
         }