diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDown.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDownCompose.kt similarity index 98% rename from catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDown.kt rename to catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDownCompose.kt index 446353a41..2f96eae57 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDown.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/common/DropDownCompose.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.unit.dp @Composable -inline fun > DropDown( +inline fun > DropDownCompose( modifier: Modifier, selectedValue: T, crossinline onValueChanged: (newSelectedValue: T) -> Unit, diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Callouts.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Callouts.kt index d84495551..747e01e77 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Callouts.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Callouts.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.telefonica.mistica.callout.CalloutViewImageConfig import com.telefonica.mistica.catalog.R -import com.telefonica.mistica.catalog.ui.compose.common.DropDown +import com.telefonica.mistica.catalog.ui.compose.common.DropDownCompose import com.telefonica.mistica.compose.button.Button import com.telefonica.mistica.compose.callout.Callout import com.telefonica.mistica.compose.callout.CalloutButtonConfig @@ -102,7 +102,7 @@ fun Callouts() { ) var buttonConfig by remember { mutableStateOf(CalloutButtonConfig.PRIMARY) } - DropDown( + DropDownCompose( modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp), diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateCards.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateCards.kt index 378afba21..3d94479ae 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateCards.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateCards.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.telefonica.mistica.catalog.R -import com.telefonica.mistica.catalog.ui.compose.common.DropDown +import com.telefonica.mistica.catalog.ui.compose.common.DropDownCompose import com.telefonica.mistica.compose.emptystate.card.EmptyStateCard import com.telefonica.mistica.compose.theme.MisticaTheme import kotlinx.coroutines.delay @@ -51,7 +51,7 @@ fun EmptyStateCards() { color = MisticaTheme.colors.textSecondary, ) - DropDown( + DropDownCompose( modifier = Modifier.padding(top = 8.dp), selectedValue = imageSize, onValueChanged = { imageSize = it } @@ -68,7 +68,7 @@ fun EmptyStateCards() { onValueChange = { subtitle = it }, label = { Text("Subtitle") } ) - DropDown( + DropDownCompose( modifier = Modifier.padding(top = 8.dp), selectedValue = buttonConfig, onValueChanged = { buttonConfig = it } diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateScreens.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateScreens.kt index 3b3c7d5d7..3122fe64c 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateScreens.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/EmptyStateScreens.kt @@ -17,7 +17,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.telefonica.mistica.catalog.R -import com.telefonica.mistica.catalog.ui.compose.common.DropDown +import com.telefonica.mistica.catalog.ui.compose.common.DropDownCompose import com.telefonica.mistica.catalog.ui.compose.common.OnBackPressedHandler import com.telefonica.mistica.compose.button.Button import com.telefonica.mistica.compose.emptystate.screen.EmptyStateScreen @@ -83,7 +83,7 @@ fun EmptyStateScreens() { color = MisticaTheme.colors.textSecondary, ) - DropDown( + DropDownCompose( modifier = Modifier.padding(top = 8.dp), selectedValue = imageSize, onValueChanged = { imageSize = it } @@ -100,7 +100,7 @@ fun EmptyStateScreens() { onValueChange = { subtitle = it }, label = { Text("Subtitle") } ) - DropDown( + DropDownCompose( modifier = Modifier.padding(top = 8.dp), selectedValue = buttonConfig, onValueChanged = { buttonConfig = it } diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/HighLightedCards.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/HighLightedCards.kt index 84601d621..0e15ccc79 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/HighLightedCards.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/HighLightedCards.kt @@ -268,13 +268,13 @@ fun HighLightedCardButtonType(buttonConfig: HighLightCardButtonSettings, onButto Row( modifier = Modifier .fillMaxWidth() - .clickable { onButtonTypeSelected(buttonConfig.copy(buttonStyle = ButtonStyle.PRIMARY)) }, + .clickable { onButtonTypeSelected(buttonConfig.copy(buttonStyle = ButtonStyle.PRIMARY_MAIN)) }, verticalAlignment = Alignment.CenterVertically ) { RadioButton( - selected = buttonConfig.buttonStyle == ButtonStyle.PRIMARY, + selected = buttonConfig.buttonStyle == ButtonStyle.PRIMARY_MAIN, onClick = { - onButtonTypeSelected(buttonConfig.copy(buttonStyle = ButtonStyle.PRIMARY)) + onButtonTypeSelected(buttonConfig.copy(buttonStyle = ButtonStyle.PRIMARY_MAIN)) } ) Text(text = "Primary") diff --git a/library/src/main/java/com/telefonica/mistica/button2/Button.kt b/library/src/main/java/com/telefonica/mistica/button2/Button.kt index cc355bb91..619c6a522 100644 --- a/library/src/main/java/com/telefonica/mistica/button2/Button.kt +++ b/library/src/main/java/com/telefonica/mistica/button2/Button.kt @@ -23,7 +23,7 @@ class Button @JvmOverloads constructor( private var loadingText: String by mutableStateOf("") private var isLoading: Boolean by mutableStateOf(false) - private var style: ButtonStyle by mutableStateOf(ButtonStyle.PRIMARY) + private var style: ButtonStyle by mutableStateOf(ButtonStyle.PRIMARY_MAIN) private var isEnable: Boolean by mutableStateOf(true) private var onClick: () -> Unit by mutableStateOf({}) private var invalidatePaddings: Boolean by mutableStateOf(false) @@ -99,7 +99,7 @@ class Button @JvmOverloads constructor( @Suppress("CyclomaticComplexMethod") private fun Int?.toButtonStyle(): ButtonStyle = when (this) { - 0 -> ButtonStyle.PRIMARY + 0 -> ButtonStyle.PRIMARY_MAIN 1 -> ButtonStyle.PRIMARY_SMALL 2 -> ButtonStyle.SECONDARY 3 -> ButtonStyle.SECONDARY_SMALL @@ -117,5 +117,5 @@ private fun Int?.toButtonStyle(): ButtonStyle = when (this) { 15 -> ButtonStyle.DANGER_LINK_INVERSE 16 -> ButtonStyle.DANGER_LINK_SMALL 17 -> ButtonStyle.DANGER_LINK_SMALL_INVERSE - else -> ButtonStyle.PRIMARY + else -> ButtonStyle.PRIMARY_MAIN } diff --git a/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt b/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt index 4946f0039..5a1d68553 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt @@ -63,7 +63,7 @@ fun Button( text: String, contentDescription: String? = null, loadingText: String = "", - buttonStyle: ButtonStyle = ButtonStyle.PRIMARY, + buttonStyle: ButtonStyle = ButtonStyle.PRIMARY_MAIN, isLoading: Boolean = false, enabled: Boolean = true, @DrawableRes icon: Int? = null, @@ -224,7 +224,7 @@ private fun Modifier.applyWidth(originalWidth: Dp?): Modifier = originalWidth?.let { width(it) } ?: this enum class ButtonStyle { - PRIMARY, + PRIMARY_MAIN, PRIMARY_SMALL, SECONDARY, SECONDARY_SMALL, diff --git a/library/src/main/java/com/telefonica/mistica/compose/button/ButtonStyles.kt b/library/src/main/java/com/telefonica/mistica/compose/button/ButtonStyles.kt index b1930af3d..8d53427ae 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/button/ButtonStyles.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/button/ButtonStyles.kt @@ -32,7 +32,7 @@ private fun getMisticaRippleConfiguration(color: Color, alpha: RippleAlpha? = nu @Composable @Suppress("CyclomaticComplexMethod") internal fun ButtonStyle.getButtonStyleCompose(): ButtonStyleConfig = when (this) { - ButtonStyle.PRIMARY -> primary() + ButtonStyle.PRIMARY_MAIN -> primary() ButtonStyle.PRIMARY_INVERSE -> primaryInverse() ButtonStyle.PRIMARY_SMALL -> primary() ButtonStyle.PRIMARY_SMALL_INVERSE -> primaryInverse() diff --git a/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCard.kt b/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCard.kt index 9de42c078..1306d0ac1 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCard.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCard.kt @@ -261,7 +261,7 @@ data class HighLightCardButtonSettings( style } else { when (style){ - ButtonStyle.PRIMARY -> ButtonStyle.PRIMARY_INVERSE + ButtonStyle.PRIMARY_MAIN -> ButtonStyle.PRIMARY_INVERSE ButtonStyle.PRIMARY_SMALL -> ButtonStyle.PRIMARY_SMALL_INVERSE ButtonStyle.SECONDARY -> ButtonStyle.SECONDARY_INVERSE ButtonStyle.SECONDARY_SMALL -> ButtonStyle.SECONDARY_SMALL_INVERSE diff --git a/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCardsPreviews.kt b/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCardsPreviews.kt index 8ca6741e1..fdb9d25cf 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCardsPreviews.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/card/highlightedcard/HighLightedCardsPreviews.kt @@ -62,7 +62,7 @@ private fun PreviewHighLightedCardTitleTextCloseButtonAndButtonPrimary() { title = "Solve Technical issue", content = "use our tools to solve technical issue", showCloseButton = true, - button = HighLightCardButtonSettings("Start tests", ButtonStyle.PRIMARY) + button = HighLightCardButtonSettings("Start tests", ButtonStyle.PRIMARY_MAIN) ) } } @@ -83,7 +83,7 @@ private fun PreviewInverseHighLightedCardTitleTextCloseButtonAndButtonPrimary() content = "use our tools to solve technical issue", showCloseButton = true, inverseDisplay = true, - button = HighLightCardButtonSettings("Start tests", ButtonStyle.PRIMARY) + button = HighLightCardButtonSettings("Start tests", ButtonStyle.PRIMARY_MAIN) ) } } diff --git a/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt b/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt index 5fb654a75..f1b887217 100644 --- a/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt +++ b/library/src/test/java/com/telefonica/mistica/button/ButtonTest.kt @@ -104,7 +104,7 @@ internal class ButtonTest( @LayoutRes @Suppress("CyclomaticComplexMethod") private fun ButtonStyle.getButtonLayout(): Int = when (this) { - ButtonStyle.PRIMARY -> R.layout.primary_button + ButtonStyle.PRIMARY_MAIN -> R.layout.primary_button ButtonStyle.PRIMARY_SMALL -> R.layout.primary_button_small ButtonStyle.SECONDARY -> R.layout.secondary_button ButtonStyle.SECONDARY_SMALL -> R.layout.secondary_button_small