pytech-ui 1.0.29 → 1.0.31

package/android/src/main/java/expo/modules/pytechui/ListItem/Data/ListItemFromData.kt

@@ -1,127 +1,127 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import expo.modules.kotlin.views.FunctionalComposableScope
-import expo.modules.pytechui.TypographySlot.Typographies
-import expo.modules.pytechui.gradient.GradientCircle
-import expo.modules.pytechui.components.Icon.parseIconSource
-import expo.modules.pytechui.getModifier
-import expo.modules.pytechui.theme.ExtendedTheme
-import expo.modules.pytechui.theme.tokens.ListTokens
-import expo.modules.ui.TextOverflowType
-import expo.modules.ui.compose
-
-@Composable
-internal fun FunctionalComposableScope.ListItemFromData(
-	props: ListItemProps,
-	content: ListItemContentRecord,
-	onPress: (() -> Unit)?,
-) {
-	val isFirst = props.isFirst ?: true
-	val isLast = props.isLast ?: true
-	val pressModifier = if (onPress != null) Modifier.clickable(onClick = onPress) else Modifier
-
-	Decorator(
-		isFirst = isFirst,
-		isLast = isLast,
-		showDivider = props.showDivider,
-		modifier = getModifier(props.modifiers).then(pressModifier),
-	) { innerProps ->
-		ListItemDynamic(
-			props = props,
-			modifier = Modifier.fillMaxWidth(),
-			innerProps = innerProps,
-			leadingContent = content.leadingContent?.let { slot ->
-				{ RenderSlotContent("leadingcontent", slot) }
-			},
-			overlineContent = content.overlineContent?.let { slot ->
-				{ RenderSlotContent("overlinecontent", slot) }
-			},
-			supportingContent = content.supportingContent?.let { slot ->
-				{ RenderSlotContent("supportingcontent", slot) }
-			},
-			headlineContent = content.headlineContent?.let { slot ->
-				{ RenderSlotContent("headlinecontent", slot) }
-			},
-			trailingContent = content.trailingContent?.let { slot ->
-				{ RenderSlotContent("trailingcontent", slot) }
-			},
-		)
-	}
-}
-
-@Composable
-private fun FunctionalComposableScope.RenderSlotContent(
-	slotName: String,
-	content: ListItemSlotContentRecord,
-) {
-	val slotProps = content.props ?: return
-
-	when (content.type) {
-		"gradient" -> GradientSlotContent(slotProps)
-		"icon" -> IconSlotContent(slotProps)
-		else -> TextSlotContent(slotName, slotProps)
-	}
-}
-
-@Composable
-private fun FunctionalComposableScope.IconSlotContent(props: ListItemSlotPropsRecord) {
-	val imageVector = parseIconSource(props.source) ?: return
-	val sizeModifier = props.size?.toFloat()?.dp?.let { Modifier.size(it) }
-		?: Modifier.size(ListTokens.ItemLeadingIconSize)
-
-	Icon(
-		imageVector = imageVector,
-		contentDescription = props.contentDescription,
-		tint = props.tint?.compose ?: ExtendedTheme.colorScheme.link,
-		modifier = getModifier(props.modifiers).then(sizeModifier),
-	)
-}
-
-@Composable
-private fun GradientSlotContent(props: ListItemSlotPropsRecord) {
-	GradientCircle(
-		text = props.text,
-		fontSize = props.fontSize,
-		sizeDp = props.size?.toFloat(),
-		lightColor = props.colors?.light?.compose,
-		darkColor = props.colors?.dark?.compose,
-		source = props.source,
-		iconSize = props.iconSize?.toFloat(),
-	)
-}
-
-@Composable
-private fun FunctionalComposableScope.TextSlotContent(
-	slotName: String,
-	props: ListItemSlotPropsRecord,
-) {
-	val text = props.text ?: return
-	val spec = Typographies.specs[slotName.lowercase()]
-
-	Text(
-		text = text,
-		modifier = getModifier(props.modifiers).then(
-			if (slotName == "headlinecontent") Modifier.fillMaxWidth() else Modifier
-		),
-		maxLines = props.maxLines ?: spec?.maxLines ?: Int.MAX_VALUE,
-		overflow = props.overflow?.toComposeTextOverflow()
-			?: spec?.overflow?.toComposeTextOverflow()
-			?: TextOverflow.Clip,
-	)
-}
-
-private fun String.toComposeTextOverflow(): TextOverflow? = when (lowercase()) {
-	"clip" -> TextOverflow.Clip
-	"ellipsis" -> TextOverflow.Ellipsis
-	"visible" -> TextOverflow.Visible
-	else -> null
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.pytechui.TypographySlot.Typographies
+import expo.modules.pytechui.gradient.GradientCircle
+import expo.modules.pytechui.components.Icon.parseIconSource
+import expo.modules.pytechui.getModifier
+import expo.modules.pytechui.theme.ExtendedTheme
+import expo.modules.pytechui.theme.tokens.ListTokens
+import expo.modules.ui.TextOverflowType
+import expo.modules.ui.compose
+
+@Composable
+internal fun FunctionalComposableScope.ListItemFromData(
+	props: ListItemProps,
+	content: ListItemContentRecord,
+	onPress: (() -> Unit)?,
+) {
+	val isFirst = props.isFirst ?: true
+	val isLast = props.isLast ?: true
+	val pressModifier = if (onPress != null) Modifier.clickable(onClick = onPress) else Modifier
+
+	Decorator(
+		isFirst = isFirst,
+		isLast = isLast,
+		showDivider = props.showDivider,
+		modifier = getModifier(props.modifiers).then(pressModifier),
+	) { innerProps ->
+		ListItemDynamic(
+			props = props,
+			modifier = Modifier.fillMaxWidth(),
+			innerProps = innerProps,
+			leadingContent = content.leadingContent?.let { slot ->
+				{ RenderSlotContent("leadingcontent", slot) }
+			},
+			overlineContent = content.overlineContent?.let { slot ->
+				{ RenderSlotContent("overlinecontent", slot) }
+			},
+			supportingContent = content.supportingContent?.let { slot ->
+				{ RenderSlotContent("supportingcontent", slot) }
+			},
+			headlineContent = content.headlineContent?.let { slot ->
+				{ RenderSlotContent("headlinecontent", slot) }
+			},
+			trailingContent = content.trailingContent?.let { slot ->
+				{ RenderSlotContent("trailingcontent", slot) }
+			},
+		)
+	}
+}
+
+@Composable
+private fun FunctionalComposableScope.RenderSlotContent(
+	slotName: String,
+	content: ListItemSlotContentRecord,
+) {
+	val slotProps = content.props ?: return
+
+	when (content.type) {
+		"gradient" -> GradientSlotContent(slotProps)
+		"icon" -> IconSlotContent(slotProps)
+		else -> TextSlotContent(slotName, slotProps)
+	}
+}
+
+@Composable
+private fun FunctionalComposableScope.IconSlotContent(props: ListItemSlotPropsRecord) {
+	val imageVector = parseIconSource(props.source) ?: return
+	val sizeModifier = props.size?.toFloat()?.dp?.let { Modifier.size(it) }
+		?: Modifier.size(ListTokens.ItemLeadingIconSize)
+
+	Icon(
+		imageVector = imageVector,
+		contentDescription = props.contentDescription,
+		tint = props.tint?.compose ?: ExtendedTheme.colorScheme.link,
+		modifier = getModifier(props.modifiers).then(sizeModifier),
+	)
+}
+
+@Composable
+private fun GradientSlotContent(props: ListItemSlotPropsRecord) {
+	GradientCircle(
+		text = props.text,
+		fontSize = props.fontSize,
+		sizeDp = props.size?.toFloat(),
+		lightColor = props.colors?.light?.compose,
+		darkColor = props.colors?.dark?.compose,
+		source = props.source,
+		iconSize = props.iconSize?.toFloat(),
+	)
+}
+
+@Composable
+private fun FunctionalComposableScope.TextSlotContent(
+	slotName: String,
+	props: ListItemSlotPropsRecord,
+) {
+	val text = props.text ?: return
+	val spec = Typographies.specs[slotName.lowercase()]
+
+	Text(
+		text = text,
+		modifier = getModifier(props.modifiers).then(
+			if (slotName == "headlinecontent") Modifier.fillMaxWidth() else Modifier
+		),
+		maxLines = props.maxLines ?: spec?.maxLines ?: Int.MAX_VALUE,
+		overflow = props.overflow?.toComposeTextOverflow()
+			?: spec?.overflow?.toComposeTextOverflow()
+			?: TextOverflow.Clip,
+	)
+}
+
+private fun String.toComposeTextOverflow(): TextOverflow? = when (lowercase()) {
+	"clip" -> TextOverflow.Clip
+	"ellipsis" -> TextOverflow.Ellipsis
+	"visible" -> TextOverflow.Visible
+	else -> null
+}

package/android/src/main/java/expo/modules/pytechui/ListItem/Slots/ListItemFromSlots.kt

@@ -1,60 +1,60 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import expo.modules.kotlin.views.ExpoComposeView
-import expo.modules.kotlin.views.FunctionalComposableScope
-import expo.modules.ui.SlotView
-
-import expo.modules.pytechui.getModifier
-import expo.modules.pytechui.section.sectionItemPosition
-import expo.modules.pytechui.ListItem.ListItemDynamic
-import expo.modules.pytechui.ListItem.Decorator
-import expo.modules.pytechui.ListItem.RenderSlot
-import expo.modules.pytechui.findChildBySlotName
-
-
-
-
-// Crea el ListItem desde los slots
-
-@Composable
-internal fun FunctionalComposableScope.ListItemFromSlots(props: ListItemProps) {
-	val composeView = view as ExpoComposeView<*>
-	val sectionPosition = composeView.sectionItemPosition(props)
-
-	val isFirst = sectionPosition?.isFirst ?: (props.isFirst ?: true)
-	val isLast = sectionPosition?.isLast ?: (props.isLast ?: true)
-
-	val headlineSlot = findChildBySlotName("headlineContent")
-	val overlineSlot = findChildBySlotName("overlineContent")
-	val supportingSlot = findChildBySlotName("supportingContent")
-	val leadingSlot = findChildBySlotName("leadingContent")
-	val trailingSlot = findChildBySlotName("trailingContent")
-	Decorator(
-		isFirst = isFirst,
-		isLast = isLast,
-		showDivider = props.showDivider,
-		modifier = getModifier(props.modifiers),
-	) { innerProps ->
-		ListItemDynamic(
-			props = props,
-			modifier = Modifier.fillMaxWidth(),
-			innerProps = innerProps,
-			leadingContent = leadingSlot?.let { slot -> { RenderSlot(slot) } },
-			overlineContent = overlineSlot?.let { slot -> { RenderSlot(slot) } },
-			supportingContent = supportingSlot?.let { slot -> { RenderSlot(slot) } },
-			headlineContent = headlineSlot?.let { slot -> { RenderSlot(slot) } },
-			trailingContent = trailingSlot?.let { slot -> { RenderSlot(slot) } },
-		)
-	}
-}
-
-
-@Composable
-internal fun FunctionalComposableScope.RenderSlot(slot: SlotView) {
-	with(composableScope) {
-		with(slot) { Content() }
-	}
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import expo.modules.kotlin.views.ExpoComposeView
+import expo.modules.kotlin.views.FunctionalComposableScope
+import expo.modules.ui.SlotView
+
+import expo.modules.pytechui.getModifier
+import expo.modules.pytechui.section.sectionItemPosition
+import expo.modules.pytechui.ListItem.ListItemDynamic
+import expo.modules.pytechui.ListItem.Decorator
+import expo.modules.pytechui.ListItem.RenderSlot
+import expo.modules.pytechui.findChildBySlotName
+
+
+
+
+// Crea el ListItem desde los slots
+
+@Composable
+internal fun FunctionalComposableScope.ListItemFromSlots(props: ListItemProps) {
+	val composeView = view as ExpoComposeView<*>
+	val sectionPosition = composeView.sectionItemPosition(props)
+
+	val isFirst = sectionPosition?.isFirst ?: (props.isFirst ?: true)
+	val isLast = sectionPosition?.isLast ?: (props.isLast ?: true)
+
+	val headlineSlot = findChildBySlotName("headlineContent")
+	val overlineSlot = findChildBySlotName("overlineContent")
+	val supportingSlot = findChildBySlotName("supportingContent")
+	val leadingSlot = findChildBySlotName("leadingContent")
+	val trailingSlot = findChildBySlotName("trailingContent")
+	Decorator(
+		isFirst = isFirst,
+		isLast = isLast,
+		showDivider = props.showDivider,
+		modifier = getModifier(props.modifiers),
+	) { innerProps ->
+		ListItemDynamic(
+			props = props,
+			modifier = Modifier.fillMaxWidth(),
+			innerProps = innerProps,
+			leadingContent = leadingSlot?.let { slot -> { RenderSlot(slot) } },
+			overlineContent = overlineSlot?.let { slot -> { RenderSlot(slot) } },
+			supportingContent = supportingSlot?.let { slot -> { RenderSlot(slot) } },
+			headlineContent = headlineSlot?.let { slot -> { RenderSlot(slot) } },
+			trailingContent = trailingSlot?.let { slot -> { RenderSlot(slot) } },
+		)
+	}
+}
+
+
+@Composable
+internal fun FunctionalComposableScope.RenderSlot(slot: SlotView) {
+	with(composableScope) {
+		with(slot) { Content() }
+	}
+}

package/android/src/main/java/expo/modules/pytechui/ListItem/Slots/types.kt

@@ -1,42 +1,42 @@
-package expo.modules.pytechui.ListItem
-
-import android.graphics.Color
-import androidx.compose.ui.unit.Dp
-import expo.modules.kotlin.records.Field
-import expo.modules.kotlin.records.Record
-import expo.modules.kotlin.types.OptimizedRecord
-import expo.modules.kotlin.views.ComposeProps
-import expo.modules.kotlin.views.OptimizedComposeProps
-import expo.modules.ui.ModifierList
-
-
-
-@OptimizedRecord
-data class ListItemColorsRecord(
-  @Field val containerColor: Color? = null,
-  @Field val contentColor: Color? = null,
-  @Field val leadingContentColor: Color? = null,
-  @Field val trailingContentColor: Color? = null,
-  @Field val supportingContentColor: Color? = null,
-  @Field val overlineContentColor: Color? = null,
-) : Record
-
-@OptimizedComposeProps
-data class ListItemProps(
-
-  val showDivider: Boolean = true,
-  val isFirst: Boolean? = null,
-  val isLast: Boolean? = null,
-  val hasNavigationLink: Boolean? = null,
-
-  val tonalElevation: Float? = null,
-  val shadowElevation: Float? = null,
-  val colors: ListItemColorsRecord? = null,
-  val modifiers: ModifierList = emptyList(),
-  
-) : ComposeProps
-
-/** Props internas de Kotlin; el callback no puede venir del bridge JS. */
-internal data class ListItemInnerProps(
-  val onLeadingWidthChanged: ((Dp) -> Unit)? = null,
-)
+package expo.modules.pytechui.ListItem
+
+import android.graphics.Color
+import androidx.compose.ui.unit.Dp
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import expo.modules.kotlin.types.OptimizedRecord
+import expo.modules.kotlin.views.ComposeProps
+import expo.modules.kotlin.views.OptimizedComposeProps
+import expo.modules.ui.ModifierList
+
+
+
+@OptimizedRecord
+data class ListItemColorsRecord(
+  @Field val containerColor: Color? = null,
+  @Field val contentColor: Color? = null,
+  @Field val leadingContentColor: Color? = null,
+  @Field val trailingContentColor: Color? = null,
+  @Field val supportingContentColor: Color? = null,
+  @Field val overlineContentColor: Color? = null,
+) : Record
+
+@OptimizedComposeProps
+data class ListItemProps(
+
+  val showDivider: Boolean = true,
+  val isFirst: Boolean? = null,
+  val isLast: Boolean? = null,
+  val hasNavigationLink: Boolean? = null,
+
+  val tonalElevation: Float? = null,
+  val shadowElevation: Float? = null,
+  val colors: ListItemColorsRecord? = null,
+  val modifiers: ModifierList = emptyList(),
+  
+) : ComposeProps
+
+/** Props internas de Kotlin; el callback no puede venir del bridge JS. */
+internal data class ListItemInnerProps(
+  val onLeadingWidthChanged: ((Dp) -> Unit)? = null,
+)

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

@@ -1,79 +1,79 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-
-import expo.modules.pytechui.theme.ExtendedTheme
-
-
-
-/*
-
-Decorator para el ListItem
-
-Agrega:
-
-- Background
-- Shape
-- Divider
-
-Tiene la logica interna del LeadingWidth
-
-*/
-
-@Composable
-internal fun Decorator(
-	isFirst: Boolean,
-	isLast: Boolean,
-	showDivider: Boolean = true,
-	modifier: Modifier = Modifier,
-	content: @Composable (ListItemInnerProps) -> Unit,
-
-) {
-
-	val shouldShowDivider = showDivider && !isLast
-	val backgroundColor = ExtendedTheme.colorScheme.secondarySystemGroupedBackground
-	val shape = 
-		if (isFirst || isLast) {
-			itemClipShape(isFirst, isLast)
-		} else {
-			null
-		}
-
-	var leadingWidth by remember { mutableStateOf(0.dp) }
-	val shapeModifier = if (shape != null) {
-		Modifier.clip(shape).background(backgroundColor, shape)
-	} else {
-		Modifier.background(backgroundColor)
-	}
-
-	// clickable debe ir después de clip para que el ripple respete las esquinas
-	val rowModifier = Modifier
-		.fillMaxWidth()
-		.then(shapeModifier)
-		.then(modifier)
-
-	Column(modifier = rowModifier) {
-		content(
-			ListItemInnerProps(
-				onLeadingWidthChanged =
-					if (shouldShowDivider) {
-						{ width -> if (width != leadingWidth) { leadingWidth = width } }
-					} else {
-						null
-					},
-			),
-		)
-
-		if (shouldShowDivider) { ListItemDivider(leadingWidth = leadingWidth) }
-	}
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+
+import expo.modules.pytechui.theme.ExtendedTheme
+
+
+
+/*
+
+Decorator para el ListItem
+
+Agrega:
+
+- Background
+- Shape
+- Divider
+
+Tiene la logica interna del LeadingWidth
+
+*/
+
+@Composable
+internal fun Decorator(
+	isFirst: Boolean,
+	isLast: Boolean,
+	showDivider: Boolean = true,
+	modifier: Modifier = Modifier,
+	content: @Composable (ListItemInnerProps) -> Unit,
+
+) {
+
+	val shouldShowDivider = showDivider && !isLast
+	val backgroundColor = ExtendedTheme.colorScheme.secondarySystemGroupedBackground
+	val shape = 
+		if (isFirst || isLast) {
+			itemClipShape(isFirst, isLast)
+		} else {
+			null
+		}
+
+	var leadingWidth by remember { mutableStateOf(0.dp) }
+	val shapeModifier = if (shape != null) {
+		Modifier.clip(shape).background(backgroundColor, shape)
+	} else {
+		Modifier.background(backgroundColor)
+	}
+
+	// clickable debe ir después de clip para que el ripple respete las esquinas
+	val rowModifier = Modifier
+		.fillMaxWidth()
+		.then(shapeModifier)
+		.then(modifier)
+
+	Column(modifier = rowModifier) {
+		content(
+			ListItemInnerProps(
+				onLeadingWidthChanged =
+					if (shouldShowDivider) {
+						{ width -> if (width != leadingWidth) { leadingWidth = width } }
+					} else {
+						null
+					},
+			),
+		)
+
+		if (shouldShowDivider) { ListItemDivider(leadingWidth = leadingWidth) }
+	}
+}