react-native-unistyles 2.7.1-rc.1 → 2.7.2-rc.1

package/README.md

@@ -1,4 +1,6 @@
 [<img alt="react-native-unistyles" src="assets/banner.png">](https://reactnativeunistyles.vercel.app/)
+[<img alt="react-native-unistyles-3.0" src="assets/v3.jpg">](https://github.com/jpudysz/react-native-unistyles/discussions/191)
+
 
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/jpudysz/react-native-unistyles?style=for-the-badge)
 [![npm downloads](https://img.shields.io/npm/dm/react-native-unistyles?style=for-the-badge)](https://www.npmjs.com/package/react-native-unistyles)

package/android/src/main/java/com/unistyles/Insets.kt

@@ -87,18 +87,19 @@ class UnistylesInsets(private val reactApplicationContext: ReactApplicationConte
     @Suppress("DEPRECATION")
     private fun getBottomInset(baseInsets: Insets, window: Window): Int {
         val translucentNavigation = hasTranslucentNavigation(window)
+        val fullScreenMode = hasFullScreenMode(window)
 
         // Android 11 has inconsistent FLAG_LAYOUT_NO_LIMITS, which alone does nothing
         // https://stackoverflow.com/questions/64153785/android-11-window-setdecorfitssystemwindow-doesnt-show-screen-behind-status-a
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
-            if ((hasFullScreenMode(window) && translucentNavigation) || translucentNavigation) {
+            if ((fullScreenMode && translucentNavigation) || translucentNavigation) {
                 return baseInsets.bottom
             }
 
             return 0
         }
 
-        return if (hasTranslucentNavigation(window) || hasFullScreenMode(window)) baseInsets.bottom else 0
+        return if (translucentNavigation || fullScreenMode) baseInsets.bottom else 0
     }
 
     private fun forceLandscapeInsets(baseInsets: Insets, window: Window): Boolean {
@@ -133,6 +134,8 @@ class UnistylesInsets(private val reactApplicationContext: ReactApplicationConte
     }
 
     private fun hasFullScreenMode(window: Window): Boolean {
-        return (window.attributes.flags and WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS) == WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+        val decorFitsSystemWindows = window.decorView.fitsSystemWindows
+
+        return (window.attributes.flags and WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS) == WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS || !decorFitsSystemWindows
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.7.1-rc.1",
+  "version": "2.7.2-rc.1",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",