Merge branch 'master' into bugfix/8061-overlay-with-a-view-with-stylezindex-blocks-touches

Author: gosha212

lib/android/app/src/main/java/com/reactnativenavigation/utils/Context.kt

@@ -2,14 +2,18 @@ package com.reactnativenavigation.utils
 
 import android.content.Context
 import android.content.res.Configuration
-import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.appcompat.app.AppCompatDelegate
 import com.facebook.react.ReactApplication
 import com.reactnativenavigation.NavigationApplication
 
 fun Context.isDebug(): Boolean {
     return (applicationContext as ReactApplication).reactNativeHost.useDeveloperSupport
 }
 fun isDarkMode() = NavigationApplication.instance.isDarkMode()
-fun Context.isDarkMode(): Boolean =
-    (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES
-fun Configuration.isDarkMode() = (uiMode and Configuration.UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES
+fun Context.isDarkMode(): Boolean = when (AppCompatDelegate.getDefaultNightMode()) {
+    AppCompatDelegate.MODE_NIGHT_YES -> true
+    AppCompatDelegate.MODE_NIGHT_NO -> false
+    else -> resources.configuration.isDarkMode()
+}
+fun Configuration.isDarkMode() =
+    (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES