Fix status bar color on regular width size class (duckduckgo#2705)

Author: dus7

DuckDuckGo/BlankSnapshotViewController.swift

@@ -202,15 +202,30 @@ extension BlankSnapshotViewController: TabSwitcherButtonDelegate {
 
 extension BlankSnapshotViewController {
 
-    private func decorate() {
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        updateStatusBarBackgroundColor()
+    }
+
+    private func updateStatusBarBackgroundColor() {
         let theme = ThemeManager.shared.currentTheme
-        setNeedsStatusBarAppearanceUpdate()
 
-        if AppWidthObserver.shared.isLargeWidth {
-            viewCoordinator.statusBackground.backgroundColor = theme.tabsBarBackgroundColor
+        if appSettings.currentAddressBarPosition == .bottom {
+            viewCoordinator.statusBackground.backgroundColor = theme.backgroundColor
         } else {
-            viewCoordinator.statusBackground.backgroundColor = theme.omniBarBackgroundColor
+            if AppWidthObserver.shared.isPad && traitCollection.horizontalSizeClass == .regular {
+                viewCoordinator.statusBackground.backgroundColor = theme.tabsBarBackgroundColor
+            } else {
+                viewCoordinator.statusBackground.backgroundColor = theme.omniBarBackgroundColor
+            }
         }
+    }
+
+    private func decorate() {
+        let theme = ThemeManager.shared.currentTheme
+
+        setNeedsStatusBarAppearanceUpdate()
 
         view.backgroundColor = theme.mainViewBackgroundColor
 
@@ -223,11 +238,6 @@ extension BlankSnapshotViewController {
         viewCoordinator.toolbarTabSwitcherButton.tintColor = theme.barTintColor
 
         viewCoordinator.logoText.tintColor = theme.ddgTextTintColor
-
-        if appSettings.currentAddressBarPosition == .bottom {
-            viewCoordinator.statusBackground.backgroundColor = theme.backgroundColor
-        }
-        
      }
 
 }

DuckDuckGo/MainViewController.swift

@@ -548,7 +548,7 @@ class MainViewController: UIViewController {
     @objc func onAddressBarPositionChanged() {
         viewCoordinator.moveAddressBarToPosition(appSettings.currentAddressBarPosition)
         refreshViewsBasedOnAddressBarPosition(appSettings.currentAddressBarPosition)
-        updateAddressBarPositionRelatedColors()
+        updateStatusBarBackgroundColor()
     }
 
     @objc private func onShowFullURLAddressChanged() {
@@ -2411,13 +2411,19 @@ extension MainViewController: AutoClearWorker {
 
 extension MainViewController {
 
-    private func updateAddressBarPositionRelatedColors() {
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        updateStatusBarBackgroundColor()
+    }
+
+    private func updateStatusBarBackgroundColor() {
         let theme = ThemeManager.shared.currentTheme
 
         if appSettings.currentAddressBarPosition == .bottom {
             viewCoordinator.statusBackground.backgroundColor = theme.backgroundColor
         } else {
-            if AppWidthObserver.shared.isLargeWidth {
+            if AppWidthObserver.shared.isPad && traitCollection.horizontalSizeClass == .regular {
                 viewCoordinator.statusBackground.backgroundColor = theme.tabsBarBackgroundColor
             } else {
                 viewCoordinator.statusBackground.backgroundColor = theme.omniBarBackgroundColor
@@ -2428,22 +2434,20 @@ extension MainViewController {
     private func decorate() {
         let theme = ThemeManager.shared.currentTheme
 
-        setNeedsStatusBarAppearanceUpdate()
+        updateStatusBarBackgroundColor()
 
-        updateAddressBarPositionRelatedColors()
+        setNeedsStatusBarAppearanceUpdate()
 
         view.backgroundColor = theme.mainViewBackgroundColor
 
         viewCoordinator.navigationBarContainer.backgroundColor = theme.barBackgroundColor
         viewCoordinator.navigationBarContainer.tintColor = theme.barTintColor
-        
-        
+
         viewCoordinator.toolbar.barTintColor = theme.barBackgroundColor
         viewCoordinator.toolbar.tintColor = theme.barTintColor
 
         viewCoordinator.toolbarTabSwitcherButton.tintColor = theme.barTintColor
 
-        
         viewCoordinator.logoText.tintColor = theme.ddgTextTintColor
     }