control omnibar padding from the swipe controller

duckduckgo · Feb 1, 2024 · a94198c · a94198c
1 parent a83f693
commit a94198c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/DuckDuckGo/OmniBar.swift b/DuckDuckGo/OmniBar.swift
@@ -66,7 +66,6 @@ class OmniBar: UIView {
 
     weak var omniDelegate: OmniBarDelegate?
     fileprivate var state: OmniBarState = SmallOmniBarState.HomeNonEditingState()
-    private var safeAreaInsetsObservation: NSKeyValueObservation?
 
     private var privacyIconAndTrackersAnimator = PrivacyIconAndTrackersAnimator()
     private var notificationAnimator = OmniBarNotificationAnimator()
@@ -100,7 +99,6 @@ class OmniBar: UIView {
         configureEditingMenu()
         refreshState(state)
         enableInteractionsWithPointer()
-        observeSafeAreaInsets()
 
         privacyInfoContainer.isHidden = true
     }
@@ -140,13 +138,7 @@ class OmniBar: UIView {
                                                name: .speechRecognizerDidChangeAvailability,
                                                object: nil)
     }
-
-    private func observeSafeAreaInsets() {
-        safeAreaInsetsObservation = self.observe(\.safeAreaInsets, options: .new) { [weak self] (_, _) in
-            self?.updateOmniBarPadding()
-        }
-    }
-
+
     private func enableInteractionsWithPointer() {
         backButton.isPointerInteractionEnabled = true
         forwardButton.isPointerInteractionEnabled = true
@@ -346,18 +338,16 @@ class OmniBar: UIView {
         if state.showVoiceSearch && state.showClear {
             searchStackContainer.setCustomSpacing(13, after: voiceSearchButton)
         }
-
-        updateOmniBarPadding()
 
         UIView.animate(withDuration: 0.0) {
             self.layoutIfNeeded()
         }
 
     }
 
-    private func updateOmniBarPadding() {
-        omniBarLeadingConstraint.constant = (state.hasLargeWidth ? 24 : 8) + safeAreaInsets.left
-        omniBarTrailingConstraint.constant = (state.hasLargeWidth ? 24 : 14) + safeAreaInsets.right
+    func updateOmniBarPadding(left: CGFloat, right: CGFloat) {
+        omniBarLeadingConstraint.constant = (state.hasLargeWidth ? 24 : 8) + left
+        omniBarTrailingConstraint.constant = (state.hasLargeWidth ? 24 : 14) + right
     }
 
     /*

diff --git a/DuckDuckGo/SwipeTabsCoordinator.swift b/DuckDuckGo/SwipeTabsCoordinator.swift
@@ -348,40 +348,29 @@ extension SwipeTabsCoordinator: UICollectionViewDataSource {
 
 class OmniBarCell: UICollectionViewCell {
 
-    weak var leadingConstraint: NSLayoutConstraint?
-    weak var trailingConstraint: NSLayoutConstraint?
-
     weak var omniBar: OmniBar? {
         didSet {
             subviews.forEach { $0.removeFromSuperview() }
             if let omniBar {
                 addSubview(omniBar)
 
-                let leadingConstraint = constrainView(omniBar, by: .leadingMargin)
-                let trailingConstraint = constrainView(omniBar, by: .trailingMargin)
-
                 NSLayoutConstraint.activate([
-                    leadingConstraint,
-                    trailingConstraint,
+                    constrainView(omniBar, by: .leadingMargin),
+                    constrainView(omniBar, by: .trailingMargin),
                     constrainView(omniBar, by: .top),
                     constrainView(omniBar, by: .bottom),
                 ])
 
-                self.leadingConstraint = leadingConstraint
-                self.trailingConstraint = trailingConstraint
             }
         }
     }
 
     override func updateConstraints() {
         super.updateConstraints()
         print("***", #function)
-
         let left = superview?.safeAreaInsets.left ?? 0
         let right = superview?.safeAreaInsets.right ?? 0
-
-        leadingConstraint?.constant = -left
-        trailingConstraint?.constant = right
+        omniBar?.updateOmniBarPadding(left: left, right: right)
     }
 
 }