fix Android build paper

software-mansion · Nov 28, 2024 · d6e1597 · d6e1597
1 parent f07b8de
commit d6e1597
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 8 deletions.
diff --git a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt
@@ -22,6 +22,13 @@ abstract class FabricEnabledHeaderConfigViewGroup(
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
     }
+
+    fun updatePaddings(
+        paddingStart: Int,
+        paddingEnd: Int
+    ) {
+        // do nothing
+    }
 
     fun updateHeaderConfigState(
         width: Int,
@@ -49,7 +56,7 @@ abstract class FabricEnabledHeaderConfigViewGroup(
         if (abs(lastWidth - realWidth) < DELTA &&
             abs(lastHeight - realHeight) < DELTA &&
             abs(lastOffsetX - offsetXDip) < DELTA &&
-            abs(lastOffsetY - offsetY) < DELTA
+            abs(lastOffsetY - offsetYDip) < DELTA
         ) {
             return
         }

diff --git a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
@@ -15,7 +15,7 @@ abstract class FabricEnabledHeaderSubviewGroup(context: Context?): ViewGroup(con
         mStateWrapper = wrapper
     }
 
-    fun updateSubviewFrameState(
+    protected fun updateSubviewFrameState(
         width: Int,
         height: Int,
         offsetX: Int,

diff --git a/android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt b/android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt
@@ -67,11 +67,15 @@ open class CustomToolbar(
         b: Int,
     ) {
         super.onLayout(changed, l, t, r, b)
-        val width = r - l;
-        val height = b - t;
 
-        // our children are already laid out
-        val contentInsetStart = if (navigationIcon != null) contentInsetStartWithNavigation else contentInsetStart
-        config.updateHeaderConfigState(width, height, l, t)
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            val width = r - l;
+            val height = b - t;
+            config.updateHeaderConfigState(width, height, l, t)
+        } else {
+            // our children are already laid out
+            val contentInsetStart = if (navigationIcon != null) contentInsetStartWithNavigation else contentInsetStart
+            config.updatePaddings(contentInsetStart, contentInsetEnd)
+        }
     }
 }
diff --git a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderConfigViewGroup.kt
@@ -16,7 +16,16 @@ abstract class FabricEnabledHeaderConfigViewGroup(
 
     fun setStateWrapper(wrapper: StateWrapper?) = Unit
 
-    fun updatePaddingsFabric(
+    fun updateHeaderConfigState(
+        width: Int,
+        height: Int,
+        offsetX: Int,
+        offsetY: Int
+    ) {
+        // do nothing
+    }
+
+    fun updatePaddings(
         paddingStart: Int,
         paddingEnd: Int,
     ) {

diff --git a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
@@ -0,0 +1,21 @@
+package com.swmansion.rnscreens
+
+import android.content.Context
+import android.view.ViewGroup
+import com.facebook.react.uimanager.StateWrapper
+
+abstract class FabricEnabledHeaderSubviewGroup(context: Context?): ViewGroup(context) {
+
+    fun setStateWrapper(wrapper: StateWrapper?) = Unit
+
+    protected fun updateSubviewFrameState(
+        width: Int,
+        height: Int,
+        offsetX: Int,
+        offsetY: Int
+    ) {
+        // do nothing
+    }
+
+
+}