react-native-unistyles 2.5.2 → 2.5.4

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

@@ -19,7 +19,7 @@ class UnistylesInsets(private val reactApplicationContext: ReactApplicationConte
 
     private fun getCurrentInsets(): Insets {
         val baseInsets = this.getBaseInsets()
-        val statusBarTranslucent = this.hasTranslucentStatusBar(baseInsets) ?: return baseInsets
+        val statusBarTranslucent = this.hasTranslucentStatusBar() ?: return baseInsets
         val window = reactApplicationContext.currentActivity?.window ?: return baseInsets
         val shouldModifyLandscapeInsets = this.forceLandscapeInsets(baseInsets, window)
 
@@ -48,7 +48,7 @@ class UnistylesInsets(private val reactApplicationContext: ReactApplicationConte
 
         // available from Android 6.0
         val window = reactApplicationContext.currentActivity?.window ?: return Insets(0, 0, 0, 0)
-        val systemInsets = window.decorView.rootWindowInsets
+        val systemInsets = window.decorView.rootWindowInsets ?: return Insets(0, 0, 0, 0)
 
         val top = (systemInsets.systemWindowInsetTop / density).roundToInt()
         val bottom = (systemInsets.systemWindowInsetBottom / density).roundToInt()
@@ -59,7 +59,7 @@ class UnistylesInsets(private val reactApplicationContext: ReactApplicationConte
     }
 
     // this function helps to detect statusBar translucent, as React Native is using weird API instead of windows flags
-    private fun hasTranslucentStatusBar(baseInsets: Insets): Boolean? {
+    private fun hasTranslucentStatusBar(): Boolean? {
         val window = reactApplicationContext.currentActivity?.window ?: return null
         val contentView = window.decorView.findViewById<View>(android.R.id.content) ?: return null
         val decorViewLocation = IntArray(2)

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

@@ -52,6 +52,7 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     //region Lifecycle
     init {
         reactApplicationContext.registerReceiver(configurationChangeReceiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
+        reactApplicationContext.addLifecycleEventListener(this)
     }
 
     private fun setupLayoutListener() {
@@ -59,14 +60,21 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
         activity.window.decorView.rootView.viewTreeObserver.addOnGlobalLayoutListener(layoutListener)
     }
 
-    @Deprecated("Deprecated in Java")
-    override fun onCatalystInstanceDestroy() {
+    private fun stopLayoutListener() {
         val activity = currentActivity ?: return
-
         activity.window.decorView.rootView.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun onCatalystInstanceDestroy() {
+        this.stopLayoutListener()
         reactApplicationContext.unregisterReceiver(configurationChangeReceiver)
         runnable?.let { drawHandler.removeCallbacks(it) }
-        this.nativeDestroy()
+        reactApplicationContext.removeLifecycleEventListener(this)
+
+        if (this.isCxxReady) {
+            this.nativeDestroy()
+        }
     }
 
     //endregion
@@ -118,7 +126,6 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
             val config = platform.getConfig()
             val layoutConfig = platform.getLayoutConfig()
 
-            this.setupLayoutListener()
             this.reactApplicationContext.javaScriptContextHolder?.let {
                 this.nativeInstall(
                     it.get(),
@@ -138,7 +145,9 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
 
             false
         } catch (e: Exception) {
-            false
+            this.isCxxReady = false
+
+            return false
         }
     }
 
@@ -232,11 +241,16 @@ class UnistylesModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     @ReactMethod
     fun removeListeners(count: Double) = Unit
     override fun onHostResume() {
-        this.onConfigChange()
-        this.onLayoutConfigChange()
+        if (isCxxReady) {
+            this.onConfigChange()
+        }
+
+        this.setupLayoutListener()
     }
 
-    override fun onHostPause() {}
+    override fun onHostPause() {
+        this.stopLayoutListener()
+    }
 
     override fun onHostDestroy() {}
     //endregion

package/package.json

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