Skip to content

Respect theme enforceNavigationBarContrast attribute #56413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zoontek wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −12
Open

Respect theme enforceNavigationBarContrast attribute #56413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 29 additions & 12 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,40 @@ private fun Window.statusBarShow() {
internal fun Window.enableEdgeToEdge() {
WindowCompat.setDecorFitsSystemWindows(this, false)

val insetsController = WindowInsetsControllerCompat(this, decorView)
val isDarkMode = UiModeUtils.isDarkMode(context)

statusBarColor = Color.TRANSPARENT

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
navigationBarColor = Color.TRANSPARENT

val attrs = intArrayOf(android.R.attr.enforceNavigationBarContrast)
val typedArray = context.theme.obtainStyledAttributes(attrs)

val isContrastEnforced =
try {
typedArray.getBoolean(0, true)
} finally {
typedArray.recycle()
}

isStatusBarContrastEnforced = false
isNavigationBarContrastEnforced = true
}
isNavigationBarContrastEnforced = isContrastEnforced

statusBarColor = Color.TRANSPARENT
navigationBarColor =
when {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> Color.TRANSPARENT
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isDarkMode -> LightNavigationBarColor
else -> DarkNavigationBarColor
}

WindowInsetsControllerCompat(this, decorView).run {
isAppearanceLightNavigationBars = !isDarkMode
if (isContrastEnforced) {
insetsController.isAppearanceLightNavigationBars = !isDarkMode
}
} else {
val isAppearanceLight = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !isDarkMode

navigationBarColor =
when {
isAppearanceLight -> LightNavigationBarColor
else -> DarkNavigationBarColor
}

insetsController.isAppearanceLightNavigationBars = isAppearanceLight
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
Expand Down
Loading