nicer animation for bottom bar, some code tidy up

duckduckgo · Oct 10, 2023 · fd963cc · fd963cc
1 parent bc39498
commit fd963cc
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 73 deletions.
diff --git a/DuckDuckGo/BrowserChromeManager.swift b/DuckDuckGo/BrowserChromeManager.swift
@@ -31,7 +31,7 @@ protocol BrowserChromeDelegate: AnyObject {
     var toolbarHeight: CGFloat { get }
     var barsMaxHeight: CGFloat { get }
 
-    var omniBar: OmniBar! { get }
+    var omniBar: OmniBar { get }
     var tabBarContainer: UIView { get }
 }
 

diff --git a/DuckDuckGo/BrowsingMenu/BrowsingMenuViewController.swift b/DuckDuckGo/BrowsingMenu/BrowsingMenuViewController.swift
@@ -61,7 +61,7 @@ final class BrowsingMenuViewController: UIViewController {
 
     var searchBarRect: () -> CGRect
 
-    var isAddressBarBottom: Bool {
+    var isAddressBarAtBottom: Bool {
         searchBarRect().minY > view.frame.midY
     }
 
@@ -227,7 +227,7 @@ final class BrowsingMenuViewController: UIViewController {
         topConstraint.constant = frame.minY + (isIPhoneLandscape ? -10 : 5)
         // Move menu up in Landscape, as bottom toolbar shrinks
 
-        let barPositionOffset: CGFloat = isAddressBarBottom ? 52 : 0
+        let barPositionOffset: CGFloat = isAddressBarAtBottom ? 52 : 0
         bottomConstraint.constant = windowBounds.maxY - frame.maxY - (isIPhoneLandscape ? 2 : 10) - barPositionOffset
         rightConstraint.constant = isIPad ? 67 : 10
 

diff --git a/DuckDuckGo/MainView.swift b/DuckDuckGo/MainView.swift
@@ -72,7 +72,10 @@ extension MainViewFactory {
 
     class NavigationBarContainer: UIView { }
     private func createNavigationBarContainer() {
+        coordinator.omniBar = OmniBar.loadFromXib()
+        coordinator.omniBar.translatesAutoresizingMaskIntoConstraints = false
         coordinator.navigationBarContainer = NavigationBarContainer()
+        coordinator.navigationBarContainer.addSubview(coordinator.omniBar)
         superview.addSubview(coordinator.navigationBarContainer)
     }
 
@@ -182,15 +185,22 @@ extension MainViewFactory {
     private func constrainNavigationBarContainer() {
         let navigationBarContainer = coordinator.navigationBarContainer!
         let toolbar = coordinator.toolbar!
+        let omniBar = coordinator.omniBar!
 
         coordinator.constraints.navigationBarContainerTop = navigationBarContainer.constrainView(superview.safeAreaLayoutGuide, by: .top)
         coordinator.constraints.navigationBarContainerBottom = navigationBarContainer.constrainView(toolbar, by: .bottom, to: .top)
+        coordinator.constraints.omniBarBottom = omniBar.constrainView(navigationBarContainer, by: .bottom, relatedBy: .greaterThanOrEqual)
 
         NSLayoutConstraint.activate([
+            coordinator.constraints.navigationBarContainerTop,
             navigationBarContainer.constrainView(superview, by: .centerX),
             navigationBarContainer.constrainView(superview, by: .width),
-            coordinator.constraints.navigationBarContainerTop,
-            navigationBarContainer.constrainAttribute(.height, to: 52),
+            navigationBarContainer.constrainAttribute(.height, to: 52, relatedBy: .greaterThanOrEqual),
+            omniBar.constrainAttribute(.height, to: 52),
+            omniBar.constrainView(navigationBarContainer, by: .top),
+            omniBar.constrainView(navigationBarContainer, by: .leading),
+            omniBar.constrainView(navigationBarContainer, by: .trailing),
+            coordinator.constraints.omniBarBottom,
         ])
     }
 
@@ -306,22 +316,23 @@ class MainViewCoordinator {
 
     let superview: UIView
 
-    var logoContainer: UIView!
+    var contentContainer: UIView!
+    var lastToolbarButton: UIBarButtonItem!
     var logo: UIImageView!
+    var logoContainer: UIView!
     var logoText: UIImageView!
-    var toolbar: UIToolbar!
-    var suggestionTrayContainer: UIView!
-    var contentContainer: UIView!
+    var navigationBarContainer: UIView!
     var notificationBarContainer: UIView!
+    var omniBar: OmniBar!
+    var progress: ProgressView!
     var statusBackground: UIView!
+    var suggestionTrayContainer: UIView!
     var tabBarContainer: UIView!
-    var navigationBarContainer: UIView!
-    var progress: ProgressView!
+    var toolbar: UIToolbar!
     var toolbarBackButton: UIBarButtonItem!
-    var toolbarForwardButton: UIBarButtonItem!
     var toolbarFireButton: UIBarButtonItem!
+    var toolbarForwardButton: UIBarButtonItem!
     var toolbarTabSwitcherButton: UIBarButtonItem!
-    var lastToolbarButton: UIBarButtonItem!
 
     let constraints = Constraints()
 
@@ -358,6 +369,7 @@ class MainViewCoordinator {
         var notificationContainerTopToNavigationBar: NSLayoutConstraint!
         var notificationContainerTopToStatusBackground: NSLayoutConstraint!
         var notificationContainerHeight: NSLayoutConstraint!
+        var omniBarBottom: NSLayoutConstraint!
         var progressBarTop: NSLayoutConstraint!
         var progressBarBottom: NSLayoutConstraint!
         var statusBackgroundToNavigationBarContainerBottom: NSLayoutConstraint!

diff --git a/DuckDuckGo/MainViewController+CookiesManaged.swift b/DuckDuckGo/MainViewController+CookiesManaged.swift
@@ -37,7 +37,7 @@ extension MainViewController {
               topURL == tabManager.current?.url
         else { return }
 
-        omniBar.showOrScheduleCookiesManagedNotification(isCosmetic: isCosmetic)
+        viewCoordinator.omniBar.showOrScheduleCookiesManagedNotification(isCosmetic: isCosmetic)
     }
 
 }
diff --git a/DuckDuckGo/MainViewController+KeyCommands.swift b/DuckDuckGo/MainViewController+KeyCommands.swift
@@ -71,7 +71,7 @@ extension MainViewController {
         }
 
         var arrowKeys = [UIKeyCommand]()
-        if omniBar.textField.isFirstResponder {
+        if viewCoordinator.omniBar.textField.isFirstResponder {
             arrowKeys = [
                 UIKeyCommand(title: "", action: #selector(keyboardMoveSelectionUp), input: UIKeyCommand.inputUpArrow, modifierFlags: []),
                 UIKeyCommand(title: "", action: #selector(keyboardMoveSelectionDown), input: UIKeyCommand.inputDownArrow, modifierFlags: [])
@@ -140,7 +140,7 @@ extension MainViewController {
             controller.launchNewSearch()
         } else {
             showBars()
-            omniBar.becomeFirstResponder()
+            viewCoordinator.omniBar.becomeFirstResponder()
         }
     }