diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 4118a337203..51d10e65e46 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -2411,21 +2411,6 @@ public final class com/facebook/react/fabric/events/FabricEventEmitter : com/fac public fun receiveTouches (Ljava/lang/String;Lcom/facebook/react/bridge/WritableArray;Lcom/facebook/react/bridge/WritableArray;)V } -public abstract interface class com/facebook/react/fabric/mounting/LayoutMetricsConversions { - public static final field Companion Lcom/facebook/react/fabric/mounting/LayoutMetricsConversions$Companion; - public static fun getMaxSize (I)F - public static fun getMinSize (I)F - public static fun getYogaMeasureMode (FF)Lcom/facebook/yoga/YogaMeasureMode; - public static fun getYogaSize (FF)F -} - -public final class com/facebook/react/fabric/mounting/LayoutMetricsConversions$Companion { - public final fun getMaxSize (I)F - public final fun getMinSize (I)F - public final fun getYogaMeasureMode (FF)Lcom/facebook/yoga/YogaMeasureMode; - public final fun getYogaSize (FF)F -} - public class com/facebook/react/fabric/mounting/MountItemDispatcher { public fun (Lcom/facebook/react/fabric/mounting/MountingManager;Lcom/facebook/react/fabric/mounting/MountItemDispatcher$ItemDispatchListener;)V public fun addMountItem (Lcom/facebook/react/fabric/mounting/mountitems/MountItem;)V diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.kt index 18def1f5e0a..e99eed1c439 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/LayoutMetricsConversions.kt @@ -11,18 +11,18 @@ import android.view.View.MeasureSpec import com.facebook.react.uimanager.PixelUtil.dpToPx import com.facebook.yoga.YogaMeasureMode -public interface LayoutMetricsConversions { +internal interface LayoutMetricsConversions { - public companion object { + companion object { @JvmStatic - public fun getMinSize(viewMeasureSpec: Int): Float { + fun getMinSize(viewMeasureSpec: Int): Float { val mode = MeasureSpec.getMode(viewMeasureSpec) val size = MeasureSpec.getSize(viewMeasureSpec) return if (mode == MeasureSpec.EXACTLY) size.toFloat() else 0f } @JvmStatic - public fun getMaxSize(viewMeasureSpec: Int): Float { + fun getMaxSize(viewMeasureSpec: Int): Float { val mode = MeasureSpec.getMode(viewMeasureSpec) val size = MeasureSpec.getSize(viewMeasureSpec) @@ -31,7 +31,7 @@ public interface LayoutMetricsConversions { } @JvmStatic - public fun getYogaSize(minSize: Float, maxSize: Float): Float = + fun getYogaSize(minSize: Float, maxSize: Float): Float = if (minSize == maxSize) { maxSize.dpToPx() } else if (maxSize.isInfinite()) { @@ -41,7 +41,7 @@ public interface LayoutMetricsConversions { } @JvmStatic - public fun getYogaMeasureMode(minSize: Float, maxSize: Float): YogaMeasureMode = + fun getYogaMeasureMode(minSize: Float, maxSize: Float): YogaMeasureMode = if (minSize == maxSize) { YogaMeasureMode.EXACTLY } else if (maxSize.isInfinite()) {