diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/PosterCards.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/PosterCards.kt index 95da4ba73..2faeef6ca 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/PosterCards.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/PosterCards.kt @@ -50,14 +50,14 @@ fun PosterCards() { var inverseDisplay: Boolean by remember { mutableStateOf(true) } var backgroundType: BackgroundType by remember { mutableStateOf(BackgroundType.IMAGE) } - var topActionsType: TopActionsType by remember { mutableStateOf(TopActionsType.TWO_ACTIONS) } + var topActionsType: TopActionsType by remember { mutableStateOf(TopActionsType.NONE) } var preTitle: String by remember { mutableStateOf("Pretitle") } var title: String by remember { mutableStateOf("Title") } var subtitle: String by remember { mutableStateOf("Subtitle") } var description: String by remember { mutableStateOf("Description") } - var withAdditionalContent: Boolean by remember { mutableStateOf(true) } + var withAdditionalContent: Boolean by remember { mutableStateOf(false) } Column( diff --git a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCard.kt b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCard.kt index 004823e9f..5bfb683c7 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCard.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCard.kt @@ -22,9 +22,9 @@ import com.telefonica.mistica.compose.theme.MisticaTheme @Composable fun PosterCard( - modifier: Modifier = Modifier, aspectRatio: PosterCardAspectRatio, backgroundType: PosterCardBackgroundType, + modifier: Modifier = Modifier, headline: Tag? = null, preTitle: String? = null, title: String? = null, @@ -51,9 +51,7 @@ fun PosterCard( max = Dp.Infinity ) ) { - PosterCardBackground( - backgroundType = backgroundType - ) { + PosterCardBackground(backgroundType = backgroundType) { Column( modifier = Modifier.align(alignment = Alignment.BottomCenter), verticalArrangement = Arrangement.Bottom diff --git a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardBackground.kt b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardBackground.kt index 6692fb4c5..29552eca1 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardBackground.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardBackground.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.res.painterResource @Composable internal fun PosterCardBackground( - modifier: Modifier = Modifier, backgroundType: PosterCardBackgroundType, content: @Composable BoxScope.() -> Unit ) { @@ -26,7 +25,6 @@ internal fun PosterCardBackground( SolidColor(Color.Transparent) }, ) - .then(modifier) ) { if (backgroundType is PosterCardBackgroundType.Image) { Image( diff --git a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardTopActions.kt b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardTopActions.kt index 06277b18c..e6e495b27 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardTopActions.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/card/postercard/PosterCardTopActions.kt @@ -22,8 +22,6 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.traversalIndex import androidx.compose.ui.unit.dp import com.telefonica.mistica.compose.theme.MisticaTheme @@ -41,22 +39,19 @@ internal fun PosterCardTopActions( verticalAlignment = Alignment.CenterVertically ) { firstTopAction?.let { - TopAction(topActionData = it, modifier = Modifier.semantics { traversalIndex = 7f }) + TopAction(topActionData = it) } secondTopAction?.let { if (firstTopAction != null) { Spacer(modifier = Modifier.width(16.dp)) } - TopAction(topActionData = it, modifier = Modifier.semantics { traversalIndex = 8f }) + TopAction(topActionData = it) } } } @Composable -internal fun TopAction( - modifier: Modifier = Modifier, - topActionData: TopActionData -) { +internal fun TopAction(topActionData: TopActionData) { with(topActionData) { Box( modifier = Modifier @@ -72,7 +67,6 @@ internal fun TopAction( } ) .wrapContentSize(align = Alignment.Center) - .then(modifier) ) { Image( painter = painterResource(id = iconRes),