Bugfix FXIOS-12640 [Toolbar] Status bar overlay black when translucency is disabled (backport #27559) (#27564)

* Bugfix FXIOS-12640 [Toolbar] Status bar overlay black when translucency is disabled (#27559)

* Check if translucency is enabled before applying alpha

* Update and add tests

(cherry picked from commit 1c24c99)

# Conflicts:
#	firefox-ios/Client/Frontend/Components/StatusBarOverlay.swift

* Fix merge conflict

---------

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

Author: mergify[bot]

firefox-ios/Client/Frontend/Components/StatusBarOverlay.swift

@@ -35,10 +35,6 @@ class StatusBarOverlay: UIView,
     var notificationCenter: NotificationProtocol = NotificationCenter.default
     var hasTopTabs = false
 
-    private var isToolbarRefactorEnabled: Bool {
-        toolbarHelper.isToolbarRefactorEnabled
-    }
-
     /// Returns a value between 0 and 1 which indicates how far the user has scrolled.
     /// This is used as the alpha of the status bar background.
     /// 0 = no status bar background shown
@@ -80,17 +76,9 @@ class StatusBarOverlay: UIView,
 
     func resetState(isHomepage: Bool) {
         savedIsHomepage = isHomepage
-
-        // We only need no status bar for one edge case
-        var needsNoStatusBar = isHomepage && isBottomSearchBar
-        if !isToolbarRefactorEnabled {
-            needsNoStatusBar = needsNoStatusBar && wallpaperManager.currentWallpaper.hasImage
-        }
+        let needsNoStatusBar = needsNoStatusBar(isHomepage: isHomepage)
         scrollOffset = needsNoStatusBar ? 0 : 1
-
-        let translucencyBackgroundAlpha = toolbarHelper.backgroundAlpha()
-        let alpha = scrollOffset > translucencyBackgroundAlpha ? translucencyBackgroundAlpha : scrollOffset
-        backgroundColor = savedBackgroundColor?.withAlphaComponent(alpha)
+        updateStatusBarAlpha(isHomepage: isHomepage, needsNoStatusBar: needsNoStatusBar)
     }
 
     func showOverlay(animated: Bool) {
@@ -125,22 +113,20 @@ class StatusBarOverlay: UIView,
         }
     }
 
-    // MARK: - ThemeApplicable
-
-    func applyTheme(theme: Theme) {
-        savedBackgroundColor = (hasTopTabs || isToolbarRefactorEnabled) ? theme.colors.layer3 : theme.colors.layer1
-        let translucencyBackgroundAlpha = toolbarHelper.backgroundAlpha()
+    // MARK: - Helper
 
-        // We only need no status bar for one edge case
-        let isHomepage = savedIsHomepage ?? false
+    private func needsNoStatusBar(isHomepage: Bool) -> Bool {
         let isWallpaperedHomepage = isHomepage && wallpaperManager.currentWallpaper.hasImage
-        var needsNoStatusBar: Bool
 
-        if isToolbarRefactorEnabled {
-            needsNoStatusBar = isHomepage && isBottomSearchBar
+        if toolbarHelper.shouldBlur() {
+            return isHomepage && isBottomSearchBar
         } else {
-            needsNoStatusBar = isWallpaperedHomepage && isBottomSearchBar
+            return isWallpaperedHomepage && isBottomSearchBar
         }
+    }
+
+    private func updateStatusBarAlpha(isHomepage: Bool, needsNoStatusBar: Bool) {
+        let translucencyBackgroundAlpha = toolbarHelper.backgroundAlpha()
 
         if needsNoStatusBar {
             let alpha = scrollOffset > translucencyBackgroundAlpha ? translucencyBackgroundAlpha : scrollOffset
@@ -150,6 +136,16 @@ class StatusBarOverlay: UIView,
         }
     }
 
+    // MARK: - ThemeApplicable
+
+    func applyTheme(theme: Theme) {
+        savedBackgroundColor = (hasTopTabs || toolbarHelper.isToolbarRefactorEnabled) ?
+                                    theme.colors.layer3 : theme.colors.layer1
+        let isHomepage: Bool = savedIsHomepage ?? false
+        let needsNoStatusBar = needsNoStatusBar(isHomepage: isHomepage)
+        updateStatusBarAlpha(isHomepage: isHomepage, needsNoStatusBar: needsNoStatusBar)
+    }
+
     // MARK: - StatusBarScrollDelegate
 
     func scrollViewDidScroll(_ scrollView: UIScrollView, statusBarFrame: CGRect?, theme: Theme) {