From 3d92f602e7a7275a2d3911135c43ea438abf5007 Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Tue, 11 Aug 2026 17:05:42 +0800 Subject: [PATCH 1/2] fix(android): stop isDebug() reaching ReactNativeHost (fatal on New Architecture) --- .../main/java/com/reactnativenavigation/utils/Context.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/reactnativenavigation/utils/Context.kt b/android/src/main/java/com/reactnativenavigation/utils/Context.kt index adee027a42..1badcce6ec 100644 --- a/android/src/main/java/com/reactnativenavigation/utils/Context.kt +++ b/android/src/main/java/com/reactnativenavigation/utils/Context.kt @@ -1,13 +1,13 @@ package com.reactnativenavigation.utils import android.content.Context +import android.content.pm.ApplicationInfo import android.content.res.Configuration import androidx.appcompat.app.AppCompatDelegate -import com.facebook.react.ReactApplication import com.reactnativenavigation.NavigationApplication fun Context.isDebug(): Boolean { - return (applicationContext as ReactApplication).reactNativeHost.useDeveloperSupport + return (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0 } fun isDarkMode() = NavigationApplication.instance.isDarkMode() fun Context.isDarkMode(): Boolean = when (AppCompatDelegate.getDefaultNightMode()) { @@ -16,4 +16,4 @@ fun Context.isDarkMode(): Boolean = when (AppCompatDelegate.getDefaultNightMode( else -> resources.configuration.isDarkMode() } fun Configuration.isDarkMode() = - (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES \ No newline at end of file + (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES From b4585246ba57baabb6d223e458214b9ddc4dda3f Mon Sep 17 00:00:00 2001 From: Calvin Cheng Date: Tue, 11 Aug 2026 17:08:49 +0800 Subject: [PATCH 2/2] chore: preserve original file ending --- .../src/main/java/com/reactnativenavigation/utils/Context.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/reactnativenavigation/utils/Context.kt b/android/src/main/java/com/reactnativenavigation/utils/Context.kt index 1badcce6ec..baad863254 100644 --- a/android/src/main/java/com/reactnativenavigation/utils/Context.kt +++ b/android/src/main/java/com/reactnativenavigation/utils/Context.kt @@ -16,4 +16,4 @@ fun Context.isDarkMode(): Boolean = when (AppCompatDelegate.getDefaultNightMode( else -> resources.configuration.isDarkMode() } fun Configuration.isDarkMode() = - (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES + (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES \ No newline at end of file