Skip to content

Fix Android KeyboardToolbar dark mode detection with extensible theme hook #1116

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Android KeyboardToolbar dark mode detection with extensible theme hook #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ba61d3
Fix Android dark mode detection for KeyboardToolbar
JustinHaut Sep 10, 2025
3916c4d
fix(android): improve KeyboardToolbar dark mode detection
JustinHaut Sep 12, 2025
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
8 changes: 2 additions & 6 deletions android/src/main/java/com/reactnativekeyboardcontroller/extensions/Context.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.reactnativekeyboardcontroller.extensions
import android.annotation.SuppressLint
import android.content.ComponentName
import android.content.Context
import android.content.res.Configuration
import android.graphics.Point
import android.os.Build
import android.provider.Settings
Expand Down Expand Up @@ -40,12 +41,7 @@ fun Context.getDisplaySize(): Point {
}

fun Context.isSystemDarkMode(): Boolean =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
(getSystemService(Context.UI_MODE_SERVICE) as? android.app.UiModeManager)
?.nightMode == android.app.UiModeManager.MODE_NIGHT_YES
} else {
false
}
resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES

fun Context.currentImePackage(): String? {
val id =
Expand Down
1 change: 1 addition & 0 deletions src/components/KeyboardToolbar/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const ButtonAndroid = ({
theme,
}: PropsWithChildren<ButtonProps>) => {
const colorScheme = useKeyboardState((state) => state.appearance);

const accessibilityState = useMemo(() => ({ disabled }), [disabled]);
const ripple = useMemo(
() =>
Expand Down