diff --git a/packages/core/ui/frame/activity.android.ts b/packages/core/ui/frame/activity.android.ts index e1f2da869..398be2844 100644 --- a/packages/core/ui/frame/activity.android.ts +++ b/packages/core/ui/frame/activity.android.ts @@ -2,7 +2,7 @@ import '../../globals'; import { setActivityCallbacks } from '.'; import { Application } from '../../application'; import { isEmbedded } from '../embedding'; -import { enableEdgeToEdge } from '../../utils/android'; +import { enableEdgeToEdge } from '../../utils/native-helper-for-android'; const EMPTY_FN = () => {}; declare const com: any; diff --git a/packages/core/utils/native-helper.android.ts b/packages/core/utils/native-helper.android.ts index 686abedb0..6d43eb0f7 100644 --- a/packages/core/utils/native-helper.android.ts +++ b/packages/core/utils/native-helper.android.ts @@ -1,7 +1,7 @@ import { platformCheck } from './platform-check'; // importing this helper as a separate file avoids "android" symbol clash with the global android object -import { resources, collections, getWindow, getApplication, getCurrentActivity, getApplicationContext, getResources, getPackageName, getInputMethodManager, showSoftInput, dismissSoftInput, setStatusBarColor, setNavigationBarColor, setDarkModeHandler } from './native-helper-for-android'; +import { resources, collections, getWindow, getApplication, getCurrentActivity, getApplicationContext, getResources, getPackageName, getInputMethodManager, showSoftInput, dismissSoftInput, setStatusBarColor, setNavigationBarColor, setDarkModeHandler, enableEdgeToEdge } from './native-helper-for-android'; export { dataSerialize, dataDeserialize } from './native-helper-for-android'; export { getWindow } from './native-helper-for-android'; @@ -21,6 +21,7 @@ export const android = { setStatusBarColor, setNavigationBarColor, setDarkModeHandler, + enableEdgeToEdge, }; /** diff --git a/packages/core/utils/native-helper.d.ts b/packages/core/utils/native-helper.d.ts index c2bf14353..addfd3267 100644 --- a/packages/core/utils/native-helper.d.ts +++ b/packages/core/utils/native-helper.d.ts @@ -110,6 +110,16 @@ export const android: { setStatusBarColor: (lightColor: Color | null = null, darkColor: Color | null = null) => void; setNavigationBarColor: (lightColor: Color | null = null, darkColor: Color | null = null) => void; setDarkModeHandler: (handler: (bar: 'status' | 'navigation', resources: android.content.res.Resources) => boolean) => void; + enableEdgeToEdge: ( + activity: androidx.appcompat.app.AppCompatActivity, + options?: { + statusBarLightColor?: Color; + statusBarDarkColor?: Color; + navigationBarLightColor?: Color; + navigationBarDarkColor?: Color; + handleDarkMode?: (bar: 'status' | 'navigation', resources: android.content.res.Resources) => boolean; + }, + ) => void; }; /**