Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Adjust edge to edge bars for different apis
  • Loading branch information
Gregman-js committed Jun 19, 2025
commit 2e73d2b6d723136041d9b02cfa35b342a16dbbcf
Original file line number Diff line number Diff line change
Expand Up @@ -1273,23 +1273,28 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi

// Set background colors
if (statusBarColor != 0 && !serverHandleInsets) {
window.statusBarColor = statusBarColor
binding.statusBarBackground.setBackgroundColor(statusBarColor)
} else {
Timber.e("Skipping coloring status bar...")
}
if (navigationBarColor != 0 && !serverHandleInsets) {
window.navigationBarColor = navigationBarColor
binding.navigationBarBackground.setBackgroundColor(navigationBarColor)

if (navigationBarColor != 0) {
// Below Android Q windowInsetsController.isAppearanceLightNavigationBars does not set navigation background color
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
window.navigationBarColor = ColorUtils.setAlphaComponent(navigationBarColor, 128)
}
if (!serverHandleInsets) {
binding.navigationBarBackground.setBackgroundColor(navigationBarColor)
}
} else {
Timber.e("Skipping coloring navigation bar...")
}

// Set foreground colors
if (statusBarColor != 0 && !serverHandleInsets) {
if (statusBarColor != 0) {
windowInsetsController.isAppearanceLightStatusBars = !isColorDark(statusBarColor)
}
if (navigationBarColor != 0 && !serverHandleInsets) {
if (navigationBarColor != 0) {
windowInsetsController.isAppearanceLightNavigationBars = !isColorDark(navigationBarColor)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ fun WebView.applyInsets(
val safeInsetBottom = pxToDp(safeInsets.bottom.toFloat(), displayMetrics)
val safeInsetLeft = pxToDp(safeInsets.left.toFloat(), displayMetrics)
val safeAreaJs = """
document.documentElement.style.setProperty('--android-safe-area-inset-top', '${safeInsetTop}px');
document.documentElement.style.setProperty('--android-safe-area-inset-bottom', '${safeInsetBottom}px');
document.documentElement.style.setProperty('--android-safe-area-inset-left', '${safeInsetLeft}px');
document.documentElement.style.setProperty('--android-safe-area-inset-right', '${safeInsetRight}px');
document.documentElement.style.setProperty('--app-safe-area-inset-top', '${safeInsetTop}px');
document.documentElement.style.setProperty('--app-safe-area-inset-bottom', '${safeInsetBottom}px');
document.documentElement.style.setProperty('--app-safe-area-inset-left', '${safeInsetLeft}px');
document.documentElement.style.setProperty('--app-safe-area-inset-right', '${safeInsetRight}px');
""".trimIndent()
evaluateJavascript(safeAreaJs, null)
}
Expand Down