dhonti/ANDROID-15405-postercard: Apply some corrections from PR @jepr…

…ubio
Telefonica · Dec 2, 2024 · f78acfa · f78acfa
1 parent 3ada235
commit f78acfa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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),