pytech-ui 1.0.30 → 1.0.32

package/android/src/main/java/expo/modules/pytechui/ListItem/_shared/Dynamic/Row.kt

@@ -1,136 +1,136 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.SubcomposeLayout
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
-import kotlin.math.max
-
-import expo.modules.pytechui.theme.tokens.ListTokens
-
-
-
-/**
- * Headline + trailing en una fila.
- *
- * - Caben con ancho natural: headline al inicio, trailing al final.
- * - No caben: el que no supera la mitad queda en su ancho natural; el otro ocupa el resto.
- * - Si ambos superan la mitad: reparto 50/50.
- */
-
-@Composable
-internal fun DynamicRow(
-	modifier: Modifier = Modifier,
-	spacing: Dp = ListTokens.ItemBetweenSpace,
-	first: @Composable () -> Unit,
-	second: @Composable () -> Unit,
-) {
-	SubcomposeLayout(
-		modifier = modifier.fillMaxWidth(),
-	) { constraints ->
-		val spacingPx = spacing.roundToPx()
-		val maxWidth = constraints.maxWidth
-
-		val naturalConstraints = Constraints(
-			minWidth = 0,
-			maxWidth = maxWidth,
-			minHeight = 0,
-			maxHeight = constraints.maxHeight,
-		)
-
-		val firstNatural = subcompose(Slot.FirstMeasure) {
-			Box(Modifier.wrapContentWidth(Alignment.Start)) { first() }
-		}.first().measure(naturalConstraints)
-
-		val secondNatural = subcompose(Slot.SecondMeasure) {
-			Box(Modifier.wrapContentWidth(Alignment.End)) { second() }
-		}.first().measure(naturalConstraints)
-
-		val needsSplit = firstNatural.width + spacingPx + secondNatural.width > maxWidth
-
-		if (needsSplit) {
-			val available = max(0, maxWidth - spacingPx)
-			val halfWidth = available / 2
-			val firstExceedsHalf = firstNatural.width > halfWidth
-			val secondExceedsHalf = secondNatural.width > halfWidth
-
-			val firstWidth: Int
-			val secondWidth: Int
-			when {
-				firstExceedsHalf && !secondExceedsHalf -> {
-					secondWidth = secondNatural.width
-					firstWidth = available - secondWidth
-				}
-				secondExceedsHalf && !firstExceedsHalf -> {
-					firstWidth = firstNatural.width
-					secondWidth = available - firstWidth
-				}
-				else -> {
-					firstWidth = halfWidth
-					secondWidth = halfWidth
-				}
-			}
-
-			val firstConstraints = Constraints(
-				minWidth = firstWidth,
-				maxWidth = firstWidth,
-				minHeight = 0,
-				maxHeight = constraints.maxHeight,
-			)
-			val secondConstraints = Constraints(
-				minWidth = secondWidth,
-				maxWidth = secondWidth,
-				minHeight = 0,
-				maxHeight = constraints.maxHeight,
-			)
-
-			val firstSplit = subcompose(Slot.FirstSplit) {
-				Box(
-					modifier = Modifier.fillMaxWidth(),
-					contentAlignment = Alignment.CenterStart,
-				) {
-					first()
-				}
-			}.first().measure(firstConstraints)
-
-			val secondSplit = subcompose(Slot.SecondSplit) {
-				Box(
-					modifier = Modifier.fillMaxWidth(),
-					contentAlignment = Alignment.CenterEnd,
-				) {
-					second()
-				}
-			}.first().measure(secondConstraints)
-
-			val height = max(firstSplit.height, secondSplit.height).coerceAtLeast(constraints.minHeight)
-
-			layout(maxWidth, height) {
-				val firstY = (height - firstSplit.height) / 2
-				val secondY = (height - secondSplit.height) / 2
-				firstSplit.placeRelative(0, firstY)
-				secondSplit.placeRelative(firstWidth + spacingPx, secondY)
-			}
-		} else {
-			val height = max(firstNatural.height, secondNatural.height).coerceAtLeast(constraints.minHeight)
-
-			layout(maxWidth, height) {
-				val firstY = (height - firstNatural.height) / 2
-				val secondY = (height - secondNatural.height) / 2
-				firstNatural.placeRelative(0, firstY)
-				secondNatural.placeRelative(maxWidth - secondNatural.width, secondY)
-			}
-		}
-	}
-}
-
-private enum class Slot {
-  FirstMeasure,
-  SecondMeasure,
-  FirstSplit,
-  SecondSplit,
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.SubcomposeLayout
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import kotlin.math.max
+
+import expo.modules.pytechui.theme.tokens.ListTokens
+
+
+
+/**
+ * Headline + trailing en una fila.
+ *
+ * - Caben con ancho natural: headline al inicio, trailing al final.
+ * - No caben: el que no supera la mitad queda en su ancho natural; el otro ocupa el resto.
+ * - Si ambos superan la mitad: reparto 50/50.
+ */
+
+@Composable
+internal fun DynamicRow(
+	modifier: Modifier = Modifier,
+	spacing: Dp = ListTokens.ItemBetweenSpace,
+	first: @Composable () -> Unit,
+	second: @Composable () -> Unit,
+) {
+	SubcomposeLayout(
+		modifier = modifier.fillMaxWidth(),
+	) { constraints ->
+		val spacingPx = spacing.roundToPx()
+		val maxWidth = constraints.maxWidth
+
+		val naturalConstraints = Constraints(
+			minWidth = 0,
+			maxWidth = maxWidth,
+			minHeight = 0,
+			maxHeight = constraints.maxHeight,
+		)
+
+		val firstNatural = subcompose(Slot.FirstMeasure) {
+			Box(Modifier.wrapContentWidth(Alignment.Start)) { first() }
+		}.first().measure(naturalConstraints)
+
+		val secondNatural = subcompose(Slot.SecondMeasure) {
+			Box(Modifier.wrapContentWidth(Alignment.End)) { second() }
+		}.first().measure(naturalConstraints)
+
+		val needsSplit = firstNatural.width + spacingPx + secondNatural.width > maxWidth
+
+		if (needsSplit) {
+			val available = max(0, maxWidth - spacingPx)
+			val halfWidth = available / 2
+			val firstExceedsHalf = firstNatural.width > halfWidth
+			val secondExceedsHalf = secondNatural.width > halfWidth
+
+			val firstWidth: Int
+			val secondWidth: Int
+			when {
+				firstExceedsHalf && !secondExceedsHalf -> {
+					secondWidth = secondNatural.width
+					firstWidth = available - secondWidth
+				}
+				secondExceedsHalf && !firstExceedsHalf -> {
+					firstWidth = firstNatural.width
+					secondWidth = available - firstWidth
+				}
+				else -> {
+					firstWidth = halfWidth
+					secondWidth = halfWidth
+				}
+			}
+
+			val firstConstraints = Constraints(
+				minWidth = firstWidth,
+				maxWidth = firstWidth,
+				minHeight = 0,
+				maxHeight = constraints.maxHeight,
+			)
+			val secondConstraints = Constraints(
+				minWidth = secondWidth,
+				maxWidth = secondWidth,
+				minHeight = 0,
+				maxHeight = constraints.maxHeight,
+			)
+
+			val firstSplit = subcompose(Slot.FirstSplit) {
+				Box(
+					modifier = Modifier.fillMaxWidth(),
+					contentAlignment = Alignment.CenterStart,
+				) {
+					first()
+				}
+			}.first().measure(firstConstraints)
+
+			val secondSplit = subcompose(Slot.SecondSplit) {
+				Box(
+					modifier = Modifier.fillMaxWidth(),
+					contentAlignment = Alignment.CenterEnd,
+				) {
+					second()
+				}
+			}.first().measure(secondConstraints)
+
+			val height = max(firstSplit.height, secondSplit.height).coerceAtLeast(constraints.minHeight)
+
+			layout(maxWidth, height) {
+				val firstY = (height - firstSplit.height) / 2
+				val secondY = (height - secondSplit.height) / 2
+				firstSplit.placeRelative(0, firstY)
+				secondSplit.placeRelative(firstWidth + spacingPx, secondY)
+			}
+		} else {
+			val height = max(firstNatural.height, secondNatural.height).coerceAtLeast(constraints.minHeight)
+
+			layout(maxWidth, height) {
+				val firstY = (height - firstNatural.height) / 2
+				val secondY = (height - secondNatural.height) / 2
+				firstNatural.placeRelative(0, firstY)
+				secondNatural.placeRelative(maxWidth - secondNatural.width, secondY)
+			}
+		}
+	}
+}
+
+private enum class Slot {
+  FirstMeasure,
+  SecondMeasure,
+  FirstSplit,
+  SecondSplit,
+}

package/android/src/main/java/expo/modules/pytechui/Navigation/NavigationWrapperView.kt

@@ -0,0 +1,80 @@
+package expo.modules.pytechui.navigation
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import expo.modules.kotlin.views.ComposeProps
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.pytechui.findChildBySlotName
+import expo.modules.ui.SlotView
+
+object PytechRoutes {
+  const val SCREEN_A = "screen_A"
+  const val SCREEN_B = "screen_B"
+}
+
+/**
+ * Referencia global al NavController del wrapper activo.
+ * Se setea al montar `NavigationWrapperView` y se limpia al desmontarlo.
+ * Debe usarse sólo desde el hilo principal.
+ */
+object PytechNavigation {
+  var navController: NavHostController? = null
+    internal set
+
+  fun navigate(route: String) {
+    navController?.navigate(route)
+  }
+
+  fun goBack(): Boolean = navController?.popBackStack() ?: false
+}
+
+/** Disponible para cualquier composable renderizado dentro del wrapper. */
+val LocalPytechNavController = staticCompositionLocalOf<NavHostController?> { null }
+
+data class NavigationWrapperProps(
+  val startDestination: String = PytechRoutes.SCREEN_A,
+) : ComposeProps
+
+@Composable
+internal fun FunctionalComposableScope.NavigationWrapperViewContent(props: NavigationWrapperProps) {
+  val navController = rememberNavController()
+
+  DisposableEffect(navController) {
+    PytechNavigation.navController = navController
+    onDispose {
+      if (PytechNavigation.navController === navController) {
+        PytechNavigation.navController = null
+      }
+    }
+  }
+
+  val screenA = findChildBySlotName(PytechRoutes.SCREEN_A)
+  val screenB = findChildBySlotName(PytechRoutes.SCREEN_B)
+
+  CompositionLocalProvider(LocalPytechNavController provides navController) {
+    NavHost(
+      navController = navController,
+      startDestination = props.startDestination,
+      modifier = Modifier.fillMaxSize(),
+    ) {
+      composable(PytechRoutes.SCREEN_A) { RenderScreen(screenA) }
+      composable(PytechRoutes.SCREEN_B) { RenderScreen(screenB) }
+    }
+  }
+}
+
+@Composable
+private fun FunctionalComposableScope.RenderScreen(slot: SlotView?) {
+  slot ?: return
+  with(composableScope) {
+    with(slot) { Content() }
+  }
+}

package/android/src/main/java/expo/modules/pytechui/PytechUiModifiers.kt

@@ -1,94 +1,94 @@
-package expo.modules.pytechui
-
-import android.graphics.Color as AndroidColor
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color as ComposeColor
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import expo.modules.ui.ModifierRegistry
-import expo.modules.ui.columnScope
-import expo.modules.ui.rowScope
-
-private fun normalizeColorString(s: String): String {
-	val t = s.trim()
-	return if (t.startsWith("#")) t else "#$t"
-}
-
-/**
- * Registra modificadores extra para Jetpack Compose (p. ej. degradados con [Brush]).
- * Debe llamarse al crear el módulo nativo; [ModifierRegistry] es el mismo que usa @expo/ui.
- */
-fun registerModifiers() {
-	
-	// --------------------------- backgroundLinearGradient---------------------------
-
-	ModifierRegistry.register("backgroundLinearGradient") { map, _, _, _ ->
-		val raw = map["colors"] as? List<*> ?: return@register Modifier
-		val composeColors = raw.mapNotNull { item ->
-			val hex = (item as? String)?.trim()?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
-			runCatching {
-				val argb = AndroidColor.parseColor(normalizeColorString(hex))
-				ComposeColor(argb)
-			}.getOrNull()
-		}
-		if (composeColors.size < 2) return@register Modifier
-
-		val sx = (map["startX"] as? Number)?.toFloat() ?: 0f
-		val sy = (map["startY"] as? Number)?.toFloat() ?: 0f
-		val ex = (map["endX"] as? Number)?.toFloat() ?: 0f
-		val ey = (map["endY"] as? Number)?.toFloat() ?: 1f
-
-		Modifier.drawBehind {
-			val brush = Brush.linearGradient(
-				colors = composeColors,
-				start = Offset(size.width * sx, size.height * sy),
-				end = Offset(size.width * ex, size.height * ey)
-			)
-			drawRect(brush = brush, size = size)
-		}
-	}
-
-	// --------------------------- heightIn ------------------------------------------
-
-	ModifierRegistry.register("heightIn") { map, _, _, _ ->
-		val minDp = (map["min"] as? Number)?.toFloat()
-		val maxDp = (map["max"] as? Number)?.toFloat()
-		val minFraction = (map["minFraction"] as? Number)?.toFloat()
-		val maxFraction = (map["maxFraction"] as? Number)?.toFloat()
-
-		val screenHeightDp = LocalConfiguration.current.screenHeightDp.toFloat()
-
-		val resolvedMin = when {
-			minDp != null -> minDp.dp
-			minFraction != null -> (screenHeightDp * minFraction).dp
-			else -> Dp.Unspecified
-		}
-		val resolvedMax = when {
-			maxFraction != null -> (screenHeightDp * maxFraction).dp
-			maxDp != null -> maxDp.dp
-			else -> Dp.Unspecified
-		}
-
-		Modifier.heightIn(min = resolvedMin, max = resolvedMax)
-	}
-
-	// --------------------------- flexWeight ----------------------------------------
-
-	ModifierRegistry.register("flexWeight") { map, scope, _, _ ->
-		val weight = (map["weight"] as? Number)?.toFloat() ?: 1f
-		val fill = map["fill"] as? Boolean ?: false
-
-		scope?.rowScope?.run {
-			Modifier.weight(weight, fill = fill)
-		} ?: scope?.columnScope?.run {
-			Modifier.weight(weight, fill = fill)
-		} ?: Modifier
-	}
-
-	// -------------------------------------------------------------------------------
+package expo.modules.pytechui
+
+import android.graphics.Color as AndroidColor
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color as ComposeColor
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import expo.modules.ui.ModifierRegistry
+import expo.modules.ui.columnScope
+import expo.modules.ui.rowScope
+
+private fun normalizeColorString(s: String): String {
+	val t = s.trim()
+	return if (t.startsWith("#")) t else "#$t"
+}
+
+/**
+ * Registra modificadores extra para Jetpack Compose (p. ej. degradados con [Brush]).
+ * Debe llamarse al crear el módulo nativo; [ModifierRegistry] es el mismo que usa @expo/ui.
+ */
+fun registerModifiers() {
+	
+	// --------------------------- backgroundLinearGradient---------------------------
+
+	ModifierRegistry.register("backgroundLinearGradient") { map, _, _, _ ->
+		val raw = map["colors"] as? List<*> ?: return@register Modifier
+		val composeColors = raw.mapNotNull { item ->
+			val hex = (item as? String)?.trim()?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
+			runCatching {
+				val argb = AndroidColor.parseColor(normalizeColorString(hex))
+				ComposeColor(argb)
+			}.getOrNull()
+		}
+		if (composeColors.size < 2) return@register Modifier
+
+		val sx = (map["startX"] as? Number)?.toFloat() ?: 0f
+		val sy = (map["startY"] as? Number)?.toFloat() ?: 0f
+		val ex = (map["endX"] as? Number)?.toFloat() ?: 0f
+		val ey = (map["endY"] as? Number)?.toFloat() ?: 1f
+
+		Modifier.drawBehind {
+			val brush = Brush.linearGradient(
+				colors = composeColors,
+				start = Offset(size.width * sx, size.height * sy),
+				end = Offset(size.width * ex, size.height * ey)
+			)
+			drawRect(brush = brush, size = size)
+		}
+	}
+
+	// --------------------------- heightIn ------------------------------------------
+
+	ModifierRegistry.register("heightIn") { map, _, _, _ ->
+		val minDp = (map["min"] as? Number)?.toFloat()
+		val maxDp = (map["max"] as? Number)?.toFloat()
+		val minFraction = (map["minFraction"] as? Number)?.toFloat()
+		val maxFraction = (map["maxFraction"] as? Number)?.toFloat()
+
+		val screenHeightDp = LocalConfiguration.current.screenHeightDp.toFloat()
+
+		val resolvedMin = when {
+			minDp != null -> minDp.dp
+			minFraction != null -> (screenHeightDp * minFraction).dp
+			else -> Dp.Unspecified
+		}
+		val resolvedMax = when {
+			maxFraction != null -> (screenHeightDp * maxFraction).dp
+			maxDp != null -> maxDp.dp
+			else -> Dp.Unspecified
+		}
+
+		Modifier.heightIn(min = resolvedMin, max = resolvedMax)
+	}
+
+	// --------------------------- flexWeight ----------------------------------------
+
+	ModifierRegistry.register("flexWeight") { map, scope, _, _ ->
+		val weight = (map["weight"] as? Number)?.toFloat() ?: 1f
+		val fill = map["fill"] as? Boolean ?: false
+
+		scope?.rowScope?.run {
+			Modifier.weight(weight, fill = fill)
+		} ?: scope?.columnScope?.run {
+			Modifier.weight(weight, fill = fill)
+		} ?: Modifier
+	}
+
+	// -------------------------------------------------------------------------------
 }