pytech-ui 1.0.30 → 1.0.32

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

@@ -1,36 +1,36 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-
-import expo.modules.pytechui.theme.ExtendedTheme
-import expo.modules.pytechui.theme.tokens.ListTokens
-
-
-
-/* Crea el divider segun el leadingWidth */
-
-@Composable
-internal fun ListItemDivider(leadingWidth: Dp) {
-	val leadingInset = if (leadingWidth > 0.dp) {
-		leadingWidth + ListTokens.ItemBetweenSpace + 4.dp // +4.dp porque tiene que dar 16.dp
-	} else {
-		0.dp
-	}
-
-	HorizontalDivider(
-		modifier = Modifier
-		.fillMaxWidth()
-		.padding(
-			start = ListTokens.DividerLeadingSpace + leadingInset,
-			end = ListTokens.DividerTrailingSpace,
-		),
-		color = ExtendedTheme.colorScheme.separator.copy(alpha = 0.4f),
-		thickness = 1.dp,
-	)
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+import expo.modules.pytechui.theme.ExtendedTheme
+import expo.modules.pytechui.theme.tokens.ListTokens
+
+
+
+/* Crea el divider segun el leadingWidth */
+
+@Composable
+internal fun ListItemDivider(leadingWidth: Dp) {
+	val leadingInset = if (leadingWidth > 0.dp) {
+		leadingWidth + ListTokens.ItemBetweenSpace + 4.dp // +4.dp porque tiene que dar 16.dp
+	} else {
+		0.dp
+	}
+
+	HorizontalDivider(
+		modifier = Modifier
+		.fillMaxWidth()
+		.padding(
+			start = ListTokens.DividerLeadingSpace + leadingInset,
+			end = ListTokens.DividerTrailingSpace,
+		),
+		color = ExtendedTheme.colorScheme.separator.copy(alpha = 0.4f),
+		thickness = 1.dp,
+	)
+}

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

@@ -1,19 +1,19 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.ui.unit.dp
-
-import expo.modules.pytechui.theme.tokens.ShapeTokens
-
-
-
-private val GroupCornerRadius = ShapeTokens.CornerValueExtraLarge
-
-internal fun itemClipShape(isFirst: Boolean, isLast: Boolean): RoundedCornerShape {
-	return RoundedCornerShape(
-		topStart = if (isFirst) GroupCornerRadius else 0.dp,
-		topEnd = if (isFirst) GroupCornerRadius else 0.dp,
-		bottomStart = if (isLast) GroupCornerRadius else 0.dp,
-		bottomEnd = if (isLast) GroupCornerRadius else 0.dp,
-	)
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.unit.dp
+
+import expo.modules.pytechui.theme.tokens.ShapeTokens
+
+
+
+private val GroupCornerRadius = ShapeTokens.CornerValueExtraLarge
+
+internal fun itemClipShape(isFirst: Boolean, isLast: Boolean): RoundedCornerShape {
+	return RoundedCornerShape(
+		topStart = if (isFirst) GroupCornerRadius else 0.dp,
+		topEnd = if (isFirst) GroupCornerRadius else 0.dp,
+		bottomStart = if (isLast) GroupCornerRadius else 0.dp,
+		bottomEnd = if (isLast) GroupCornerRadius else 0.dp,
+	)
+}

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

@@ -1,163 +1,163 @@
-package expo.modules.pytechui.ListItem
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowForwardIos
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem as ListItemMaterial
-import androidx.compose.material3.ListItemDefaults
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Color as ComposeColor
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import expo.modules.ui.composeOrNull
-
-import expo.modules.pytechui.TypographySlot.SlotTypography
-import expo.modules.pytechui.theme.ExtendedTheme
-
-
-
-/*
-
-ListItemDynamic es el componente que se encarga de la logica interna del ListItem
-
-Se encarga de poner visualmente:
-
-- LeadingContent
-- HeadlineContent
-- TrailingContent
-- OverlineContent
-- SupportingContent
-
-*/
-
-@Composable
-internal fun ListItemDynamic(
-	props: ListItemProps = ListItemProps(),
-	modifier: Modifier = Modifier,
-	innerProps: ListItemInnerProps = ListItemInnerProps(),
-	leadingContent: (@Composable () -> Unit)? = null,
-	headlineContent: (@Composable () -> Unit)? = null,
-	trailingContent: (@Composable () -> Unit)? = null,
-	overlineContent: (@Composable () -> Unit)? = null,
-	supportingContent: (@Composable () -> Unit)? = null,
-) {
-	val density = LocalDensity.current
-
-	val colors = listItemColors(props)
-
-	ListItemMaterial(
-		modifier = modifier,
-		colors = colors,
-		tonalElevation = props.tonalElevation?.dp ?: ListItemDefaults.Elevation,
-		shadowElevation = props.shadowElevation?.dp ?: ListItemDefaults.Elevation,
-		supportingContent = supportingContent?.let { content ->
-			{ StyledSlotContent("supportingcontent", colors.supportingContentColor, content) }
-		},
-		leadingContent = leadingContent?.let { content ->
-			{
-				val styledContent: @Composable () -> Unit = {
-					StyledSlotContent("leadingcontent", colors.leadingContentColor, content)
-				}
-				val onLeadingWidthChanged = innerProps.onLeadingWidthChanged
-				if (onLeadingWidthChanged != null) {
-					Box(
-						modifier = Modifier.onSizeChanged { size ->
-						onLeadingWidthChanged(with(density) { size.width.toDp() })
-						},
-					) {
-						styledContent()
-					}
-				} else {
-					styledContent()
-				}
-			}
-		},
-		overlineContent = overlineContent?.let { content ->
-			{ StyledSlotContent("overlinecontent", colors.overlineContentColor, content) }
-		},
-		headlineContent = {
-			when {
-				headlineContent == null && trailingContent == null -> Unit
-				trailingContent == null -> {
-					Box(modifier = Modifier.fillMaxWidth()) {
-						headlineContent?.let { content ->
-							StyledSlotContent("headlinecontent", colors.contentColor, content)
-						}
-					}
-				}
-				headlineContent == null -> {
-					Box(
-						modifier = Modifier.fillMaxWidth(),
-						contentAlignment = Alignment.CenterEnd,
-					) {
-						StyledSlotContent("trailingcontent", colors.trailingContentColor, trailingContent)
-					}
-				}
-				else -> {
-					DynamicRow(
-						first = { StyledSlotContent("headlinecontent", colors.contentColor, headlineContent) },
-						second = { StyledSlotContent("trailingcontent", colors.trailingContentColor, trailingContent) },
-					)
-				}
-			}
-		},
-		trailingContent = if (props.hasNavigationLink == true) {
-			{
-				Icon(
-					imageVector = Icons.Rounded.ArrowForwardIos,
-					contentDescription = null,
-					tint = ExtendedTheme.colorScheme.tertiaryLabel,
-					modifier = Modifier.size(17.dp),
-				)
-			}
-		} else {
-			null
-		},
-	)
-}
-
-
-@Composable
-internal fun listItemColors(props: ListItemProps) = ListItemDefaults.colors(
-	containerColor = props.colors?.containerColor.composeOrNull ?: ComposeColor.Transparent,
-	contentColor = props.colors?.contentColor.composeOrNull ?: ExtendedTheme.colorScheme.label,
-	leadingContentColor = props.colors?.leadingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.link,
-	trailingContentColor = props.colors?.trailingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
-	supportingContentColor = props.colors?.supportingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
-	overlineContentColor = props.colors?.overlineContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
-)
-
-@Composable
-private fun SlotContentColor(
-	contentColor: Color?,
-	content: @Composable () -> Unit,
-) {
-	if (contentColor != null) {
-		Surface(color = Color.Transparent, contentColor = contentColor) {
-			content()
-		}
-	} else {
-		content()
-	}
-}
-
-@Composable
-private fun StyledSlotContent(
-	slotName: String,
-	contentColor: Color?,
-	content: @Composable () -> Unit,
-) {
-	SlotContentColor(contentColor) {
-		SlotTypography(slotName) {
-			content()
-		}
-	}
-}
+package expo.modules.pytechui.ListItem
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ArrowForwardIos
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem as ListItemMaterial
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Color as ComposeColor
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import expo.modules.ui.composeOrNull
+
+import expo.modules.pytechui.TypographySlot.SlotTypography
+import expo.modules.pytechui.theme.ExtendedTheme
+
+
+
+/*
+
+ListItemDynamic es el componente que se encarga de la logica interna del ListItem
+
+Se encarga de poner visualmente:
+
+- LeadingContent
+- HeadlineContent
+- TrailingContent
+- OverlineContent
+- SupportingContent
+
+*/
+
+@Composable
+internal fun ListItemDynamic(
+	props: ListItemProps = ListItemProps(),
+	modifier: Modifier = Modifier,
+	innerProps: ListItemInnerProps = ListItemInnerProps(),
+	leadingContent: (@Composable () -> Unit)? = null,
+	headlineContent: (@Composable () -> Unit)? = null,
+	trailingContent: (@Composable () -> Unit)? = null,
+	overlineContent: (@Composable () -> Unit)? = null,
+	supportingContent: (@Composable () -> Unit)? = null,
+) {
+	val density = LocalDensity.current
+
+	val colors = listItemColors(props)
+
+	ListItemMaterial(
+		modifier = modifier,
+		colors = colors,
+		tonalElevation = props.tonalElevation?.dp ?: ListItemDefaults.Elevation,
+		shadowElevation = props.shadowElevation?.dp ?: ListItemDefaults.Elevation,
+		supportingContent = supportingContent?.let { content ->
+			{ StyledSlotContent("supportingcontent", colors.supportingContentColor, content) }
+		},
+		leadingContent = leadingContent?.let { content ->
+			{
+				val styledContent: @Composable () -> Unit = {
+					StyledSlotContent("leadingcontent", colors.leadingContentColor, content)
+				}
+				val onLeadingWidthChanged = innerProps.onLeadingWidthChanged
+				if (onLeadingWidthChanged != null) {
+					Box(
+						modifier = Modifier.onSizeChanged { size ->
+						onLeadingWidthChanged(with(density) { size.width.toDp() })
+						},
+					) {
+						styledContent()
+					}
+				} else {
+					styledContent()
+				}
+			}
+		},
+		overlineContent = overlineContent?.let { content ->
+			{ StyledSlotContent("overlinecontent", colors.overlineContentColor, content) }
+		},
+		headlineContent = {
+			when {
+				headlineContent == null && trailingContent == null -> Unit
+				trailingContent == null -> {
+					Box(modifier = Modifier.fillMaxWidth()) {
+						headlineContent?.let { content ->
+							StyledSlotContent("headlinecontent", colors.contentColor, content)
+						}
+					}
+				}
+				headlineContent == null -> {
+					Box(
+						modifier = Modifier.fillMaxWidth(),
+						contentAlignment = Alignment.CenterEnd,
+					) {
+						StyledSlotContent("trailingcontent", colors.trailingContentColor, trailingContent)
+					}
+				}
+				else -> {
+					DynamicRow(
+						first = { StyledSlotContent("headlinecontent", colors.contentColor, headlineContent) },
+						second = { StyledSlotContent("trailingcontent", colors.trailingContentColor, trailingContent) },
+					)
+				}
+			}
+		},
+		trailingContent = if (props.hasNavigationLink == true) {
+			{
+				Icon(
+					imageVector = Icons.Rounded.ArrowForwardIos,
+					contentDescription = null,
+					tint = ExtendedTheme.colorScheme.tertiaryLabel,
+					modifier = Modifier.size(17.dp),
+				)
+			}
+		} else {
+			null
+		},
+	)
+}
+
+
+@Composable
+internal fun listItemColors(props: ListItemProps) = ListItemDefaults.colors(
+	containerColor = props.colors?.containerColor.composeOrNull ?: ComposeColor.Transparent,
+	contentColor = props.colors?.contentColor.composeOrNull ?: ExtendedTheme.colorScheme.label,
+	leadingContentColor = props.colors?.leadingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.link,
+	trailingContentColor = props.colors?.trailingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
+	supportingContentColor = props.colors?.supportingContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
+	overlineContentColor = props.colors?.overlineContentColor.composeOrNull ?: ExtendedTheme.colorScheme.secondaryLabel,
+)
+
+@Composable
+private fun SlotContentColor(
+	contentColor: Color?,
+	content: @Composable () -> Unit,
+) {
+	if (contentColor != null) {
+		Surface(color = Color.Transparent, contentColor = contentColor) {
+			content()
+		}
+	} else {
+		content()
+	}
+}
+
+@Composable
+private fun StyledSlotContent(
+	slotName: String,
+	contentColor: Color?,
+	content: @Composable () -> Unit,
+) {
+	SlotContentColor(contentColor) {
+		SlotTypography(slotName) {
+			content()
+		}
+	}
+}