Align status bar color using same var as front end (#2827)

home-assistant · Jun 27, 2024 · 5e234d2 · 5e234d2
1 parent 4770757
commit 5e234d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Sources/App/Resources/WebSocketBridge.js b/Sources/App/Resources/WebSocketBridge.js
@@ -8,6 +8,7 @@ const notifyThemeColors = () => {
 
  [
  '--app-header-background-color',
+ '--app-theme-color',
  '--primary-background-color',
  '--text-primary-color',
  '--primary-color',

diff --git a/Sources/App/Utilities/ThemeColors.swift b/Sources/App/Utilities/ThemeColors.swift
@@ -6,6 +6,7 @@ public struct ThemeColors: Codable {
  public enum Color: String, CaseIterable {
  // these are in WebSocketBridge.js in this repo (we inject it)
  case appHeaderBackgroundColor = "--app-header-background-color"
+ case appThemeColor = "--app-theme-color"
  case primaryBackgroundColor = "--primary-background-color"
  case textPrimaryColor = "--text-primary-color"
  case primaryColor = "--primary-color"
@@ -77,6 +78,7 @@ private extension ThemeColors.Color {
  case .primaryBackgroundColor: return UIColor(red: 0.98, green: 0.98, blue: 0.98, alpha: 1.0)
  case .primaryColor: return UIColor.white
  case .textPrimaryColor: return UIColor.white
+ case .appThemeColor: return UIColor(red: 0.01, green: 0.66, blue: 0.96, alpha: 1.0)
  }
  }
 }
diff --git a/Sources/App/WebView/WebViewController.swift b/Sources/App/WebView/WebViewController.swift
@@ -346,12 +346,12 @@ final class WebViewController: UIViewController, WKNavigationDelegate, WKUIDeleg
  webView?.scrollView.backgroundColor = cachedColors[.primaryBackgroundColor]
 
  if let statusBarView = view.viewWithTag(111) {
- statusBarView.backgroundColor = cachedColors[.appHeaderBackgroundColor]
+ statusBarView.backgroundColor = cachedColors[.appThemeColor]
  }
 
  refreshControl.tintColor = cachedColors[.primaryColor]
 
- let headerBackgroundIsLight = cachedColors[.appHeaderBackgroundColor].isLight
+ let headerBackgroundIsLight = cachedColors[.appThemeColor].isLight
  underlyingPreferredStatusBarStyle = headerBackgroundIsLight ? .darkContent : .lightContent
 
  setNeedsStatusBarAppearanceUpdate()