Refactor FXIOS-12279 [Toolbar] Address Bar Shadow (backport #26937) (#26945)

Refactor FXIOS-12279 [Toolbar] Address Bar Shadow (#26937)

* Add shadow to address toolbar

* Change order of views

(cherry picked from commit 5e6c4ae)

Co-authored-by: Winnie Teichmann <[email protected]>

Author: mergify[bot]

BrowserKit/Sources/ToolbarKit/AddressToolbar/BrowserAddressToolbar.swift

@@ -31,6 +31,10 @@ public class BrowserAddressToolbar: UIView,
         static let toolbarAnimationTime: CGFloat = 0.15
         static let iconsAnimationTime: CGFloat = 0.1
         static let iconsAnimationDelay: CGFloat = 0.075
+
+        static let shadowRadius: CGFloat = 14
+        static let shadowOpacity: Float = 1
+        static let shadowOffset = CGSize(width: 0, height: 2)
     }
 
     public var notificationCenter: any NotificationProtocol = NotificationCenter.default
@@ -269,6 +273,16 @@ public class BrowserAddressToolbar: UIView,
         setupAccessibility()
     }
 
+    private func setupShadow(theme: Theme) {
+        locationContainer.layer.shadowPath = UIBezierPath(roundedRect: locationContainer.bounds,
+                                                          cornerRadius: locationContainer.layer.cornerRadius).cgPath
+        locationContainer.layer.shadowRadius = UX.shadowRadius
+        locationContainer.layer.shadowOffset = UX.shadowOffset
+        locationContainer.layer.shadowColor = theme.colors.shadowStrong.cgColor
+        locationContainer.layer.shadowOpacity = UX.shadowOpacity
+        locationContainer.layer.masksToBounds = false
+    }
+
     private func setupDragInteraction() {
         // Setup UIDragInteraction to handle dragging the location
         // bar for dropping its URL into other apps.
@@ -487,6 +501,7 @@ public class BrowserAddressToolbar: UIView,
         toolbarTopBorderView.backgroundColor = colors.borderPrimary
         toolbarBottomBorderView.backgroundColor = colors.borderPrimary
         locationView.applyTheme(theme: theme)
+        setupShadow(theme: theme)
         self.theme = theme
     }
 

firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift

@@ -1180,12 +1180,15 @@ class BrowserViewController: UIViewController,
 
         view.addSubview(header)
         view.addSubview(bottomContentStackView)
-        view.addSubview(overKeyboardContainer)
 
         let toolbarToShow = isToolbarRefactorEnabled ? navigationToolbarContainer : toolbar
 
         bottomContainer.addArrangedSubview(toolbarToShow)
         view.addSubview(bottomContainer)
+
+        // add overKeyboardContainer after bottomContainer so the address toolbar shadow
+        // for bottom toolbar doesn't get clipped
+        view.addSubview(overKeyboardContainer)
     }
 
     private func enqueueTabRestoration() {