diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Titles.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Titles.kt index 47731cbe0..848bc9393 100644 --- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Titles.kt +++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/compose/components/Titles.kt @@ -1,7 +1,9 @@ package com.telefonica.mistica.catalog.ui.compose.components import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -21,7 +23,8 @@ fun Titles() { .padding(16.dp) ) { DefaultTitles() - TitleStyle.values().forEach { + TitleStyle.entries.forEach { + Spacer(modifier = Modifier.height(24.dp)) TitlesWithStyleOverridden(it) } } diff --git a/catalog/src/main/res/layout/title_catalog.xml b/catalog/src/main/res/layout/title_catalog.xml index fe24f65b9..1e0701106 100644 --- a/catalog/src/main/res/layout/title_catalog.xml +++ b/catalog/src/main/res/layout/title_catalog.xml @@ -14,7 +14,7 @@ android:orientation="vertical"> + + + + + + + app:titleStyle="title2" + app:title="Some title 2 with chevron" /> + + + + + + + + + + + app:titleStyle="title3" + app:title="Some title 3 with chevron" /> - + + + + + + + + + + + + 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 60d820a27..b2d856abb 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 @@ -64,7 +64,7 @@ private fun primary( ), textColor: Color = MisticaTheme.colors.textButtonPrimary, disabledTextColor: Color = textColor.disabled(), - rippleTheme: MisticaRippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonPrimaryBackgroundSelected), + rippleTheme: MisticaRippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonPrimaryBackgroundPressed), ) = ButtonStyleConfig( buttonColors = buttonColors, textColor = textColor, @@ -78,16 +78,16 @@ private fun primaryInverse() = primary( backgroundColor = MisticaTheme.colors.buttonPrimaryBackgroundInverse, disabledBackgroundColor = MisticaTheme.colors.buttonPrimaryBackgroundInverse.disabled() ), - textColor = MisticaTheme.colors.textButtonPrimaryInverseSelected, + textColor = MisticaTheme.colors.textButtonPrimaryInversePressed, disabledTextColor = MisticaTheme.colors.textButtonPrimaryInverse, - rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonPrimaryBackgroundInverseSelected), + rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonPrimaryBackgroundInversePressed), ) @Composable private fun secondary( textColor: Color = MisticaTheme.colors.textButtonSecondary, strokeColor: Color = MisticaTheme.colors.buttonSecondaryBorder, - rippleTheme: MisticaRippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonSecondaryBackgroundSelected) + rippleTheme: MisticaRippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonSecondaryBackgroundPressed) ) = ButtonStyleConfig( buttonColors = ButtonDefaults.outlinedButtonColors( backgroundColor = Color.Transparent, @@ -112,7 +112,7 @@ private fun secondaryInverseConfig() = secondary( textColor = MisticaTheme.colors.textButtonSecondaryInverse, strokeColor = MisticaTheme.colors.buttonSecondaryBorderInverse, - rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonSecondaryBackgroundInverseSelected) + rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonSecondaryBackgroundInversePressed) ) @Composable @@ -121,7 +121,7 @@ private fun danger() = primary( backgroundColor = MisticaTheme.colors.buttonDangerBackground, disabledBackgroundColor = MisticaTheme.colors.buttonDangerBackground.disabled() ), - rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonDangerBackgroundSelected) + rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonDangerBackgroundPressed) ) @Composable @@ -134,7 +134,7 @@ private fun link( ), textColor = textColor, disabledTextColor = textColor.disabled(), - rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonLinkBackgroundSelected), + rippleTheme = MisticaRippleTheme(MisticaTheme.colors.buttonLinkBackgroundPressed), ) @Composable @@ -147,7 +147,7 @@ private fun linkInverse() = link( private fun dangerLink( textColor: Color = MisticaTheme.colors.textLinkDanger, backgroundColor: Color = Color.Transparent, - selectedBackgroundColor: Color = MisticaTheme.colors.buttonLinkDangerBackgroundSelected, + selectedBackgroundColor: Color = MisticaTheme.colors.buttonLinkDangerBackgroundPressed, ) = primary( buttonColors = ButtonDefaults.buttonColors( backgroundColor = backgroundColor, @@ -161,7 +161,7 @@ private fun dangerLink( @Composable private fun dangerLinkInverse() = dangerLink( backgroundColor = MisticaTheme.colors.buttonLinkDangerBackgroundInverse, - selectedBackgroundColor = MisticaTheme.colors.buttonLinkDangerBackgroundInverseSelected, + selectedBackgroundColor = MisticaTheme.colors.buttonLinkDangerBackgroundInversePressed, ) private fun Color.disabled() = diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/MisticaTheme.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/MisticaTheme.kt index facbb7679..6849acc51 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/MisticaTheme.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/MisticaTheme.kt @@ -75,6 +75,9 @@ fun MisticaTheme( presetSmallButtonFontWeight = brand.buttonFontWeight, presetLinkFontWeight = brand.linkFontWeight, presetTitle1FontWeight = brand.title1FontWeight, + presetTitle2FontWeight = brand.title2FontWeight, + presetTitle3FontWeight = brand.title3FontWeight, + presetTitle3FontSize = brand.title3FontSize, presetIndicatorFontWeight = brand.indicatorFontWeight, presetTabsLabelFontWeight = brand.tabsLabelFontWeight, presetTabsLabelFontSize = brand.tabsLabelFontSize, diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrand.kt index 06e1b1bab..9896fd75b 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrand.kt @@ -1,5 +1,7 @@ package com.telefonica.mistica.compose.theme.brand +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.TextUnit import com.telefonica.mistica.R import com.telefonica.mistica.compose.theme.brushes.MisticaBrushes @@ -36,6 +38,12 @@ object BlauBrand : Brand { override val title1FontWeight = BlauBrandFontWeights.title1FontWeight + override val title2FontWeight = BlauBrandFontWeights.title2FontWeight + + override val title3FontWeight = BlauBrandFontWeights.title3FontWeight + + override val title3FontSize = BlauBrandFontSizes.title3FontSize + override val indicatorFontWeight = BlauBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = BlauBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt index d2c762872..55886cf7c 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object BlauBrandColors { coverBackgroundHover = BlauPaletteColor.blau_color_darkModeBlack_25_alpha coverBackgroundPressed = BlauPaletteColor.blau_color_darkModeBlack_35_alpha buttonDangerBackground = BlauPaletteColor.blau_color_blauRed - buttonDangerBackgroundSelected = BlauPaletteColor.blau_color_blauRed70 + buttonDangerBackgroundPressed = BlauPaletteColor.blau_color_blauRed70 buttonDangerBackgroundHover = BlauPaletteColor.blau_color_blauRed70 - buttonLinkDangerBackgroundSelected = BlauPaletteColor.blau_color_blauRed10 + buttonLinkDangerBackgroundPressed = BlauPaletteColor.blau_color_blauRed10 buttonLinkDangerBackgroundInverse = BlauPaletteColor.blau_color_white - buttonLinkDangerBackgroundInverseSelected = BlauPaletteColor.blau_color_blauRed10 - buttonLinkBackgroundSelected = BlauPaletteColor.blau_color_blauPurple10 - buttonLinkBackgroundInverseSelected = BlauPaletteColor.blau_color_white_15_alpha + buttonLinkDangerBackgroundInversePressed = BlauPaletteColor.blau_color_blauRed10 + buttonLinkBackgroundPressed = BlauPaletteColor.blau_color_blauPurple10 + buttonLinkBackgroundInversePressed = BlauPaletteColor.blau_color_white_15_alpha buttonPrimaryBackground = BlauPaletteColor.blau_color_blauBlueSecondary buttonPrimaryBackgroundInverse = BlauPaletteColor.blau_color_white - buttonPrimaryBackgroundSelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + buttonPrimaryBackgroundPressed = BlauPaletteColor.blau_color_blauBlueSecondary60 buttonPrimaryBackgroundHover = BlauPaletteColor.blau_color_blauBlueSecondary60 - buttonPrimaryBackgroundInverseSelected = BlauPaletteColor.blau_color_blauBluePrimary30 + buttonPrimaryBackgroundInversePressed = BlauPaletteColor.blau_color_blauBluePrimary30 buttonSecondaryBorder = BlauPaletteColor.blau_color_blauBlueSecondary - buttonSecondaryBorderSelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + buttonSecondaryBorderPressed = BlauPaletteColor.blau_color_blauBlueSecondary60 buttonSecondaryBorderInverse = BlauPaletteColor.blau_color_white buttonSecondaryBackgroundHover = BlauPaletteColor.blau_color_blauBlueSecondary10 - buttonSecondaryBackgroundSelected = BlauPaletteColor.blau_color_blauBlueSecondary10 - buttonSecondaryBorderInverseSelected = BlauPaletteColor.blau_color_white + buttonSecondaryBackgroundPressed = BlauPaletteColor.blau_color_blauBlueSecondary10 + buttonSecondaryBorderInversePressed = BlauPaletteColor.blau_color_white buttonSecondaryBackgroundInverseHover = BlauPaletteColor.blau_color_white_20_alpha - buttonSecondaryBackgroundInverseSelected = BlauPaletteColor.blau_color_white_20_alpha + buttonSecondaryBackgroundInversePressed = BlauPaletteColor.blau_color_white_20_alpha textButtonPrimary = BlauPaletteColor.blau_color_white textButtonPrimaryInverse = BlauPaletteColor.blau_color_blauBlueSecondary - textButtonPrimaryInverseSelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + textButtonPrimaryInversePressed = BlauPaletteColor.blau_color_blauBlueSecondary60 textButtonSecondary = BlauPaletteColor.blau_color_blauBlueSecondary - textButtonSecondarySelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + textButtonSecondaryPressed = BlauPaletteColor.blau_color_blauBlueSecondary60 textButtonSecondaryInverse = BlauPaletteColor.blau_color_white - textButtonSecondaryInverseSelected = BlauPaletteColor.blau_color_white + textButtonSecondaryInversePressed = BlauPaletteColor.blau_color_white textLink = BlauPaletteColor.blau_color_blauPurple textLinkInverse = BlauPaletteColor.blau_color_white textLinkDanger = BlauPaletteColor.blau_color_blauRed @@ -165,33 +165,33 @@ public object BlauBrandColors { coverBackgroundHover = BlauPaletteColor.blau_color_darkModeBlack_25_alpha coverBackgroundPressed = BlauPaletteColor.blau_color_darkModeBlack_35_alpha buttonDangerBackground = BlauPaletteColor.blau_color_blauRed - buttonDangerBackgroundSelected = BlauPaletteColor.blau_color_blauRed70 + buttonDangerBackgroundPressed = BlauPaletteColor.blau_color_blauRed70 buttonDangerBackgroundHover = BlauPaletteColor.blau_color_blauRed70 - buttonLinkDangerBackgroundSelected = BlauPaletteColor.blau_color_blauPurple_30_alpha + buttonLinkDangerBackgroundPressed = BlauPaletteColor.blau_color_blauPurple_30_alpha buttonLinkDangerBackgroundInverse = BlauPaletteColor.blau_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = BlauPaletteColor.blau_color_blauPurple_30_alpha - buttonLinkBackgroundSelected = BlauPaletteColor.blau_color_blauPurple_30_alpha - buttonLinkBackgroundInverseSelected = BlauPaletteColor.blau_color_blauPurple_30_alpha + buttonLinkDangerBackgroundInversePressed = BlauPaletteColor.blau_color_blauPurple_30_alpha + buttonLinkBackgroundPressed = BlauPaletteColor.blau_color_blauPurple_30_alpha + buttonLinkBackgroundInversePressed = BlauPaletteColor.blau_color_blauPurple_30_alpha buttonPrimaryBackground = BlauPaletteColor.blau_color_blauBlueSecondary buttonPrimaryBackgroundInverse = BlauPaletteColor.blau_color_blauBluePrimary - buttonPrimaryBackgroundSelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + buttonPrimaryBackgroundPressed = BlauPaletteColor.blau_color_blauBlueSecondary60 buttonPrimaryBackgroundHover = BlauPaletteColor.blau_color_blauBlueSecondary60 - buttonPrimaryBackgroundInverseSelected = BlauPaletteColor.blau_color_blauBlueSecondary60 + buttonPrimaryBackgroundInversePressed = BlauPaletteColor.blau_color_blauBlueSecondary60 buttonSecondaryBorder = BlauPaletteColor.blau_color_white - buttonSecondaryBorderSelected = BlauPaletteColor.blau_color_white + buttonSecondaryBorderPressed = BlauPaletteColor.blau_color_white buttonSecondaryBackgroundHover = BlauPaletteColor.blau_color_white_15_alpha - buttonSecondaryBackgroundSelected = BlauPaletteColor.blau_color_white_15_alpha + buttonSecondaryBackgroundPressed = BlauPaletteColor.blau_color_white_15_alpha buttonSecondaryBorderInverse = BlauPaletteColor.blau_color_white - buttonSecondaryBorderInverseSelected = BlauPaletteColor.blau_color_white + buttonSecondaryBorderInversePressed = BlauPaletteColor.blau_color_white buttonSecondaryBackgroundInverseHover = BlauPaletteColor.blau_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = BlauPaletteColor.blau_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = BlauPaletteColor.blau_color_white_15_alpha textButtonPrimary = BlauPaletteColor.blau_color_grey2 textButtonPrimaryInverse = BlauPaletteColor.blau_color_grey2 - textButtonPrimaryInverseSelected = BlauPaletteColor.blau_color_grey2 + textButtonPrimaryInversePressed = BlauPaletteColor.blau_color_grey2 textButtonSecondary = BlauPaletteColor.blau_color_grey2 - textButtonSecondarySelected = BlauPaletteColor.blau_color_grey2 + textButtonSecondaryPressed = BlauPaletteColor.blau_color_grey2 textButtonSecondaryInverse = BlauPaletteColor.blau_color_grey2 - textButtonSecondaryInverseSelected = BlauPaletteColor.blau_color_grey2 + textButtonSecondaryInversePressed = BlauPaletteColor.blau_color_grey2 textLink = BlauPaletteColor.blau_color_blauPurple30 textLinkInverse = BlauPaletteColor.blau_color_blauPurple30 textLinkDanger = BlauPaletteColor.blau_color_blauRed diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontSizesAutogenerated.kt index b5585cbb6..abcd6572b 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object BlauBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontWeightsAutogenerated.kt index c0af520a5..6a21aaa2c 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object BlauBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Light + public val title3FontWeight: FontWeight = FontWeight.Light + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt index bd2139bdf..7c7eef8fb 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt @@ -27,6 +27,9 @@ interface Brand { val buttonFontWeight: FontWeight val linkFontWeight: FontWeight val title1FontWeight: FontWeight + val title2FontWeight: FontWeight + val title3FontWeight: FontWeight + val title3FontSize: TextUnit val indicatorFontWeight: FontWeight val tabsLabelFontWeight: FontWeight val tabsLabelFontSize: TextUnit diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrand.kt index a0a0fa06d..c6d391da7 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrand.kt @@ -38,6 +38,12 @@ object MovistarBrand : Brand { override val title1FontWeight = MovistarBrandFontWeights.title1FontWeight + override val title2FontWeight = MovistarBrandFontWeights.title2FontWeight + + override val title3FontWeight = MovistarBrandFontWeights.title3FontWeight + + override val title3FontSize = MovistarBrandFontSizes.title3FontSize + override val indicatorFontWeight = MovistarBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = MovistarBrandFontWeights.tabsLabelFontWeight @@ -45,7 +51,7 @@ object MovistarBrand : Brand { override val tabsLabelFontSize = MovistarBrandFontSizes.tabsLabelFontSize override val values: MisticaValues - get() = super.values.copy(titleStyle = TitleStyle.TITLE_2) + get() = super.values.copy(titleStyle = TitleStyle.TITLE_3) override val radius = MovistarBrandRadius.radius } diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt index 5142b981f..1e9b36086 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object MovistarBrandColors { coverBackgroundHover = MovistarPaletteColor.movistar_color_black_25_alpha coverBackgroundPressed = MovistarPaletteColor.movistar_color_black_35_alpha buttonDangerBackground = MovistarPaletteColor.movistar_color_pepper55 - buttonDangerBackgroundSelected = MovistarPaletteColor.movistar_color_pepper70 + buttonDangerBackgroundPressed = MovistarPaletteColor.movistar_color_pepper70 buttonDangerBackgroundHover = MovistarPaletteColor.movistar_color_pepper65 - buttonLinkDangerBackgroundSelected = MovistarPaletteColor.movistar_color_pepper10 + buttonLinkDangerBackgroundPressed = MovistarPaletteColor.movistar_color_pepper10 buttonLinkDangerBackgroundInverse = MovistarPaletteColor.movistar_color_white - buttonLinkDangerBackgroundInverseSelected = MovistarPaletteColor.movistar_color_pepper10 - buttonLinkBackgroundSelected = MovistarPaletteColor.movistar_color_movistarBlue10 - buttonLinkBackgroundInverseSelected = MovistarPaletteColor.movistar_color_white_20_alpha + buttonLinkDangerBackgroundInversePressed = MovistarPaletteColor.movistar_color_pepper10 + buttonLinkBackgroundPressed = MovistarPaletteColor.movistar_color_movistarBlue10 + buttonLinkBackgroundInversePressed = MovistarPaletteColor.movistar_color_white_20_alpha buttonPrimaryBackground = MovistarPaletteColor.movistar_color_movistarBlueHC buttonPrimaryBackgroundInverse = MovistarPaletteColor.movistar_color_white - buttonPrimaryBackgroundSelected = MovistarPaletteColor.movistar_color_movistarBlueHC65 + buttonPrimaryBackgroundPressed = MovistarPaletteColor.movistar_color_movistarBlueHC65 buttonPrimaryBackgroundHover = MovistarPaletteColor.movistar_color_movistarBlueHC55 - buttonPrimaryBackgroundInverseSelected = MovistarPaletteColor.movistar_color_movistarBlue10 + buttonPrimaryBackgroundInversePressed = MovistarPaletteColor.movistar_color_movistarBlue10 buttonSecondaryBorder = MovistarPaletteColor.movistar_color_movistarBlueHC - buttonSecondaryBorderSelected = MovistarPaletteColor.movistar_color_movistarBlueHC65 + buttonSecondaryBorderPressed = MovistarPaletteColor.movistar_color_movistarBlueHC65 buttonSecondaryBackgroundHover = MovistarPaletteColor.movistar_color_movistarBlue10 - buttonSecondaryBackgroundSelected = MovistarPaletteColor.movistar_color_movistarBlue15 + buttonSecondaryBackgroundPressed = MovistarPaletteColor.movistar_color_movistarBlue15 buttonSecondaryBorderInverse = MovistarPaletteColor.movistar_color_white - buttonSecondaryBorderInverseSelected = MovistarPaletteColor.movistar_color_white + buttonSecondaryBorderInversePressed = MovistarPaletteColor.movistar_color_white buttonSecondaryBackgroundInverseHover = MovistarPaletteColor.movistar_color_white_20_alpha - buttonSecondaryBackgroundInverseSelected = MovistarPaletteColor.movistar_color_white_30_alpha + buttonSecondaryBackgroundInversePressed = MovistarPaletteColor.movistar_color_white_30_alpha textButtonPrimary = MovistarPaletteColor.movistar_color_white textButtonPrimaryInverse = MovistarPaletteColor.movistar_color_movistarBlueHC - textButtonPrimaryInverseSelected = MovistarPaletteColor.movistar_color_movistarBlueHC + textButtonPrimaryInversePressed = MovistarPaletteColor.movistar_color_movistarBlueHC textButtonSecondary = MovistarPaletteColor.movistar_color_movistarBlueHC - textButtonSecondarySelected = MovistarPaletteColor.movistar_color_movistarBlueHC55 + textButtonSecondaryPressed = MovistarPaletteColor.movistar_color_movistarBlueHC55 textButtonSecondaryInverse = MovistarPaletteColor.movistar_color_white - textButtonSecondaryInverseSelected = MovistarPaletteColor.movistar_color_white + textButtonSecondaryInversePressed = MovistarPaletteColor.movistar_color_white textLink = MovistarPaletteColor.movistar_color_movistarBlueHC textLinkInverse = MovistarPaletteColor.movistar_color_white textLinkDanger = MovistarPaletteColor.movistar_color_pepper60 @@ -165,33 +165,33 @@ public object MovistarBrandColors { coverBackgroundHover = MovistarPaletteColor.movistar_color_darkModeBlack_25_alpha coverBackgroundPressed = MovistarPaletteColor.movistar_color_darkModeBlack_35_alpha buttonDangerBackground = MovistarPaletteColor.movistar_color_pepper55 - buttonDangerBackgroundSelected = MovistarPaletteColor.movistar_color_pepper70 + buttonDangerBackgroundPressed = MovistarPaletteColor.movistar_color_pepper70 buttonDangerBackgroundHover = MovistarPaletteColor.movistar_color_pepper65 - buttonLinkDangerBackgroundSelected = MovistarPaletteColor.movistar_color_white_8_alpha + buttonLinkDangerBackgroundPressed = MovistarPaletteColor.movistar_color_white_8_alpha buttonLinkDangerBackgroundInverse = MovistarPaletteColor.movistar_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = MovistarPaletteColor.movistar_color_white_8_alpha - buttonLinkBackgroundSelected = MovistarPaletteColor.movistar_color_white_8_alpha - buttonLinkBackgroundInverseSelected = MovistarPaletteColor.movistar_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = MovistarPaletteColor.movistar_color_white_8_alpha + buttonLinkBackgroundPressed = MovistarPaletteColor.movistar_color_white_8_alpha + buttonLinkBackgroundInversePressed = MovistarPaletteColor.movistar_color_white_8_alpha buttonPrimaryBackground = MovistarPaletteColor.movistar_color_movistarBlueHC buttonPrimaryBackgroundInverse = MovistarPaletteColor.movistar_color_movistarBlueHC - buttonPrimaryBackgroundSelected = MovistarPaletteColor.movistar_color_movistarBlueHC65 + buttonPrimaryBackgroundPressed = MovistarPaletteColor.movistar_color_movistarBlueHC65 buttonPrimaryBackgroundHover = MovistarPaletteColor.movistar_color_movistarBlueHC55 - buttonPrimaryBackgroundInverseSelected = MovistarPaletteColor.movistar_color_movistarBlueHC65 + buttonPrimaryBackgroundInversePressed = MovistarPaletteColor.movistar_color_movistarBlueHC65 buttonSecondaryBackgroundHover = MovistarPaletteColor.movistar_color_white_15_alpha - buttonSecondaryBackgroundSelected = MovistarPaletteColor.movistar_color_white_25_alpha + buttonSecondaryBackgroundPressed = MovistarPaletteColor.movistar_color_white_25_alpha buttonSecondaryBorder = MovistarPaletteColor.movistar_color_white - buttonSecondaryBorderSelected = MovistarPaletteColor.movistar_color_white + buttonSecondaryBorderPressed = MovistarPaletteColor.movistar_color_white buttonSecondaryBorderInverse = MovistarPaletteColor.movistar_color_darkModeGrey2 - buttonSecondaryBorderInverseSelected = MovistarPaletteColor.movistar_color_darkModeGrey2 + buttonSecondaryBorderInversePressed = MovistarPaletteColor.movistar_color_darkModeGrey2 buttonSecondaryBackgroundInverseHover = MovistarPaletteColor.movistar_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = MovistarPaletteColor.movistar_color_white_25_alpha + buttonSecondaryBackgroundInversePressed = MovistarPaletteColor.movistar_color_white_25_alpha textButtonPrimary = MovistarPaletteColor.movistar_color_white textButtonPrimaryInverse = MovistarPaletteColor.movistar_color_white - textButtonPrimaryInverseSelected = MovistarPaletteColor.movistar_color_white + textButtonPrimaryInversePressed = MovistarPaletteColor.movistar_color_white textButtonSecondary = MovistarPaletteColor.movistar_color_darkModeGrey2 - textButtonSecondarySelected = MovistarPaletteColor.movistar_color_darkModeGrey2 + textButtonSecondaryPressed = MovistarPaletteColor.movistar_color_darkModeGrey2 textButtonSecondaryInverse = MovistarPaletteColor.movistar_color_darkModeGrey2 - textButtonSecondaryInverseSelected = MovistarPaletteColor.movistar_color_darkModeGrey2 + textButtonSecondaryInversePressed = MovistarPaletteColor.movistar_color_darkModeGrey2 textLink = MovistarPaletteColor.movistar_color_movistarBlue textLinkInverse = MovistarPaletteColor.movistar_color_movistarBlue textLinkDanger = MovistarPaletteColor.movistar_color_pepper45 diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontSizesAutogenerated.kt index ec1962196..4362a4b7d 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object MovistarBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontWeightsAutogenerated.kt index 6cf56f9b6..0d5a4f966 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object MovistarBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Bold + public val title3FontWeight: FontWeight = FontWeight.Bold + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2Brand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2Brand.kt index 445f2e402..919c299d0 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2Brand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2Brand.kt @@ -36,6 +36,12 @@ object O2Brand : Brand { override val title1FontWeight = O2BrandFontWeights.title1FontWeight + override val title2FontWeight = O2BrandFontWeights.title2FontWeight + + override val title3FontWeight = O2BrandFontWeights.title3FontWeight + + override val title3FontSize = O2BrandFontSizes.title3FontSize + override val indicatorFontWeight = O2BrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = O2BrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt index 65649c983..2b6344c3a 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object O2BrandColors { coverBackgroundHover = O2PaletteColor.o2_color_darkModeBlack_25_alpha coverBackgroundPressed = O2PaletteColor.o2_color_darkModeBlack_35_alpha buttonDangerBackground = O2PaletteColor.o2_color_pepper - buttonDangerBackgroundSelected = O2PaletteColor.o2_color_pepper60 + buttonDangerBackgroundPressed = O2PaletteColor.o2_color_pepper60 buttonDangerBackgroundHover = O2PaletteColor.o2_color_pepper60 - buttonLinkDangerBackgroundSelected = O2PaletteColor.o2_color_pepper10 + buttonLinkDangerBackgroundPressed = O2PaletteColor.o2_color_pepper10 buttonLinkDangerBackgroundInverse = O2PaletteColor.o2_color_white - buttonLinkDangerBackgroundInverseSelected = O2PaletteColor.o2_color_pepper10 - buttonLinkBackgroundSelected = O2PaletteColor.o2_color_o2BluePrimary10 - buttonLinkBackgroundInverseSelected = O2PaletteColor.o2_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = O2PaletteColor.o2_color_pepper10 + buttonLinkBackgroundPressed = O2PaletteColor.o2_color_o2BluePrimary10 + buttonLinkBackgroundInversePressed = O2PaletteColor.o2_color_white_8_alpha buttonPrimaryBackground = O2PaletteColor.o2_color_o2BluePrimary buttonPrimaryBackgroundInverse = O2PaletteColor.o2_color_white - buttonPrimaryBackgroundSelected = O2PaletteColor.o2_color_o2BluePrimary70 + buttonPrimaryBackgroundPressed = O2PaletteColor.o2_color_o2BluePrimary70 buttonPrimaryBackgroundHover = O2PaletteColor.o2_color_o2BluePrimary70 - buttonPrimaryBackgroundInverseSelected = O2PaletteColor.o2_color_o2BluePrimary30 + buttonPrimaryBackgroundInversePressed = O2PaletteColor.o2_color_o2BluePrimary30 buttonSecondaryBorder = O2PaletteColor.o2_color_o2BluePrimary - buttonSecondaryBorderSelected = O2PaletteColor.o2_color_o2BluePrimary70 + buttonSecondaryBorderPressed = O2PaletteColor.o2_color_o2BluePrimary70 buttonSecondaryBackgroundHover = O2PaletteColor.o2_color_o2BluePrimary10 - buttonSecondaryBackgroundSelected = O2PaletteColor.o2_color_o2BluePrimary10 + buttonSecondaryBackgroundPressed = O2PaletteColor.o2_color_o2BluePrimary10 buttonSecondaryBorderInverse = O2PaletteColor.o2_color_white - buttonSecondaryBorderInverseSelected = O2PaletteColor.o2_color_o2BluePrimary30 + buttonSecondaryBorderInversePressed = O2PaletteColor.o2_color_o2BluePrimary30 buttonSecondaryBackgroundInverseHover = O2PaletteColor.o2_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = O2PaletteColor.o2_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = O2PaletteColor.o2_color_white_15_alpha textButtonPrimary = O2PaletteColor.o2_color_white textButtonPrimaryInverse = O2PaletteColor.o2_color_o2BluePrimary - textButtonPrimaryInverseSelected = O2PaletteColor.o2_color_o2BluePrimary70 + textButtonPrimaryInversePressed = O2PaletteColor.o2_color_o2BluePrimary70 textButtonSecondary = O2PaletteColor.o2_color_o2BluePrimary - textButtonSecondarySelected = O2PaletteColor.o2_color_o2BluePrimary70 + textButtonSecondaryPressed = O2PaletteColor.o2_color_o2BluePrimary70 textButtonSecondaryInverse = O2PaletteColor.o2_color_white - textButtonSecondaryInverseSelected = O2PaletteColor.o2_color_white + textButtonSecondaryInversePressed = O2PaletteColor.o2_color_white textLink = O2PaletteColor.o2_color_o2BluePrimary textLinkInverse = O2PaletteColor.o2_color_white textLinkDanger = O2PaletteColor.o2_color_pepper @@ -165,33 +165,33 @@ public object O2BrandColors { coverBackgroundHover = O2PaletteColor.o2_color_darkModeBlack_25_alpha coverBackgroundPressed = O2PaletteColor.o2_color_darkModeBlack_35_alpha buttonDangerBackground = O2PaletteColor.o2_color_pepper - buttonDangerBackgroundSelected = O2PaletteColor.o2_color_pepper60 + buttonDangerBackgroundPressed = O2PaletteColor.o2_color_pepper60 buttonDangerBackgroundHover = O2PaletteColor.o2_color_pepper60 - buttonLinkDangerBackgroundSelected = O2PaletteColor.o2_color_white_8_alpha + buttonLinkDangerBackgroundPressed = O2PaletteColor.o2_color_white_8_alpha buttonLinkDangerBackgroundInverse = O2PaletteColor.o2_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = O2PaletteColor.o2_color_white_8_alpha - buttonLinkBackgroundSelected = O2PaletteColor.o2_color_white_8_alpha - buttonLinkBackgroundInverseSelected = O2PaletteColor.o2_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = O2PaletteColor.o2_color_white_8_alpha + buttonLinkBackgroundPressed = O2PaletteColor.o2_color_white_8_alpha + buttonLinkBackgroundInversePressed = O2PaletteColor.o2_color_white_8_alpha buttonPrimaryBackground = O2PaletteColor.o2_color_darkModeO2BluePrimary buttonPrimaryBackgroundInverse = O2PaletteColor.o2_color_darkModeO2BluePrimary - buttonPrimaryBackgroundSelected = O2PaletteColor.o2_color_darkModeO2BluePrimaryDark + buttonPrimaryBackgroundPressed = O2PaletteColor.o2_color_darkModeO2BluePrimaryDark buttonPrimaryBackgroundHover = O2PaletteColor.o2_color_darkModeO2BluePrimaryDark - buttonPrimaryBackgroundInverseSelected = O2PaletteColor.o2_color_darkModeO2BluePrimaryDark - buttonSecondaryBackgroundSelected = O2PaletteColor.o2_color_white_15_alpha + buttonPrimaryBackgroundInversePressed = O2PaletteColor.o2_color_darkModeO2BluePrimaryDark + buttonSecondaryBackgroundPressed = O2PaletteColor.o2_color_white_15_alpha buttonSecondaryBorder = O2PaletteColor.o2_color_white - buttonSecondaryBorderSelected = O2PaletteColor.o2_color_white + buttonSecondaryBorderPressed = O2PaletteColor.o2_color_white buttonSecondaryBorderInverse = O2PaletteColor.o2_color_white - buttonSecondaryBorderInverseSelected = O2PaletteColor.o2_color_white + buttonSecondaryBorderInversePressed = O2PaletteColor.o2_color_white buttonSecondaryBackgroundHover = O2PaletteColor.o2_color_white_15_alpha buttonSecondaryBackgroundInverseHover = O2PaletteColor.o2_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = O2PaletteColor.o2_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = O2PaletteColor.o2_color_white_15_alpha textButtonPrimary = O2PaletteColor.o2_color_grey2 textButtonPrimaryInverse = O2PaletteColor.o2_color_grey2 - textButtonPrimaryInverseSelected = O2PaletteColor.o2_color_grey2 + textButtonPrimaryInversePressed = O2PaletteColor.o2_color_grey2 textButtonSecondary = O2PaletteColor.o2_color_grey2 - textButtonSecondarySelected = O2PaletteColor.o2_color_grey2 + textButtonSecondaryPressed = O2PaletteColor.o2_color_grey2 textButtonSecondaryInverse = O2PaletteColor.o2_color_grey2 - textButtonSecondaryInverseSelected = O2PaletteColor.o2_color_grey2 + textButtonSecondaryInversePressed = O2PaletteColor.o2_color_grey2 textLink = O2PaletteColor.o2_color_o2BluePrimary30 textLinkInverse = O2PaletteColor.o2_color_o2BluePrimary30 textLinkDanger = O2PaletteColor.o2_color_pepper diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontSizesAutogenerated.kt index 00f9c4d32..07a11bdb4 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object O2BrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontWeightsAutogenerated.kt index 9d6577099..b3585fd50 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object O2BrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Light + public val title3FontWeight: FontWeight = FontWeight.Light + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrand.kt index 77f9303f0..a61988d29 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrand.kt @@ -36,6 +36,12 @@ object O2NewBrand : Brand { override val title1FontWeight = O2NewBrandFontWeights.title1FontWeight + override val title2FontWeight = O2NewBrandFontWeights.title2FontWeight + + override val title3FontWeight = O2NewBrandFontWeights.title3FontWeight + + override val title3FontSize = O2NewBrandFontSizes.title3FontSize + override val indicatorFontWeight = O2NewBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = O2NewBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandColorsAutogenerated.kt index 636bfef6d..b56c2ec52 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object O2NewBrandColors { coverBackgroundHover = O2NewPaletteColor.o2New_color_darkModeBlack_25_alpha coverBackgroundPressed = O2NewPaletteColor.o2New_color_darkModeBlack_35_alpha buttonDangerBackground = O2NewPaletteColor.o2New_color_o2Red60 - buttonDangerBackgroundSelected = O2NewPaletteColor.o2New_color_o2Red65 + buttonDangerBackgroundPressed = O2NewPaletteColor.o2New_color_o2Red65 buttonDangerBackgroundHover = O2NewPaletteColor.o2New_color_o2Red65 - buttonLinkDangerBackgroundSelected = O2NewPaletteColor.o2New_color_o2Red10 + buttonLinkDangerBackgroundPressed = O2NewPaletteColor.o2New_color_o2Red10 buttonLinkDangerBackgroundInverse = O2NewPaletteColor.o2New_color_white - buttonLinkDangerBackgroundInverseSelected = O2NewPaletteColor.o2New_color_o2Red10 - buttonLinkBackgroundSelected = O2NewPaletteColor.o2New_color_beyondBlue10 - buttonLinkBackgroundInverseSelected = O2NewPaletteColor.o2New_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = O2NewPaletteColor.o2New_color_o2Red10 + buttonLinkBackgroundPressed = O2NewPaletteColor.o2New_color_beyondBlue10 + buttonLinkBackgroundInversePressed = O2NewPaletteColor.o2New_color_white_8_alpha buttonPrimaryBackground = O2NewPaletteColor.o2New_color_beyondBlue buttonPrimaryBackgroundInverse = O2NewPaletteColor.o2New_color_white - buttonPrimaryBackgroundSelected = O2NewPaletteColor.o2New_color_beyondBlue70 + buttonPrimaryBackgroundPressed = O2NewPaletteColor.o2New_color_beyondBlue70 buttonPrimaryBackgroundHover = O2NewPaletteColor.o2New_color_beyondBlue70 - buttonPrimaryBackgroundInverseSelected = O2NewPaletteColor.o2New_color_beyondBlue30 + buttonPrimaryBackgroundInversePressed = O2NewPaletteColor.o2New_color_beyondBlue30 buttonSecondaryBorder = O2NewPaletteColor.o2New_color_beyondBlue - buttonSecondaryBorderSelected = O2NewPaletteColor.o2New_color_beyondBlue70 + buttonSecondaryBorderPressed = O2NewPaletteColor.o2New_color_beyondBlue70 buttonSecondaryBackgroundHover = O2NewPaletteColor.o2New_color_beyondBlue10 - buttonSecondaryBackgroundSelected = O2NewPaletteColor.o2New_color_beyondBlue10 + buttonSecondaryBackgroundPressed = O2NewPaletteColor.o2New_color_beyondBlue10 buttonSecondaryBorderInverse = O2NewPaletteColor.o2New_color_white - buttonSecondaryBorderInverseSelected = O2NewPaletteColor.o2New_color_beyondBlue30 + buttonSecondaryBorderInversePressed = O2NewPaletteColor.o2New_color_beyondBlue30 buttonSecondaryBackgroundInverseHover = O2NewPaletteColor.o2New_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = O2NewPaletteColor.o2New_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = O2NewPaletteColor.o2New_color_white_15_alpha textButtonPrimary = O2NewPaletteColor.o2New_color_white textButtonPrimaryInverse = O2NewPaletteColor.o2New_color_beyondBlue - textButtonPrimaryInverseSelected = O2NewPaletteColor.o2New_color_beyondBlue70 + textButtonPrimaryInversePressed = O2NewPaletteColor.o2New_color_beyondBlue70 textButtonSecondary = O2NewPaletteColor.o2New_color_beyondBlue - textButtonSecondarySelected = O2NewPaletteColor.o2New_color_beyondBlue70 + textButtonSecondaryPressed = O2NewPaletteColor.o2New_color_beyondBlue70 textButtonSecondaryInverse = O2NewPaletteColor.o2New_color_white - textButtonSecondaryInverseSelected = O2NewPaletteColor.o2New_color_white + textButtonSecondaryInversePressed = O2NewPaletteColor.o2New_color_white textLink = O2NewPaletteColor.o2New_color_beyondBlue textLinkInverse = O2NewPaletteColor.o2New_color_white textLinkDanger = O2NewPaletteColor.o2New_color_o2Red65 @@ -165,33 +165,33 @@ public object O2NewBrandColors { coverBackgroundHover = O2NewPaletteColor.o2New_color_darkModeBlack_25_alpha coverBackgroundPressed = O2NewPaletteColor.o2New_color_darkModeBlack_35_alpha buttonDangerBackground = O2NewPaletteColor.o2New_color_o2Red60 - buttonDangerBackgroundSelected = O2NewPaletteColor.o2New_color_o2Red65 + buttonDangerBackgroundPressed = O2NewPaletteColor.o2New_color_o2Red65 buttonDangerBackgroundHover = O2NewPaletteColor.o2New_color_o2Red65 - buttonLinkDangerBackgroundSelected = O2NewPaletteColor.o2New_color_white_8_alpha + buttonLinkDangerBackgroundPressed = O2NewPaletteColor.o2New_color_white_8_alpha buttonLinkDangerBackgroundInverse = O2NewPaletteColor.o2New_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = O2NewPaletteColor.o2New_color_white_8_alpha - buttonLinkBackgroundSelected = O2NewPaletteColor.o2New_color_white_8_alpha - buttonLinkBackgroundInverseSelected = O2NewPaletteColor.o2New_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = O2NewPaletteColor.o2New_color_white_8_alpha + buttonLinkBackgroundPressed = O2NewPaletteColor.o2New_color_white_8_alpha + buttonLinkBackgroundInversePressed = O2NewPaletteColor.o2New_color_white_8_alpha buttonPrimaryBackground = O2NewPaletteColor.o2New_color_darkModeBeyondBlue buttonPrimaryBackgroundInverse = O2NewPaletteColor.o2New_color_darkModeBeyondBlue - buttonPrimaryBackgroundSelected = O2NewPaletteColor.o2New_color_beyondBlue55 + buttonPrimaryBackgroundPressed = O2NewPaletteColor.o2New_color_beyondBlue55 buttonPrimaryBackgroundHover = O2NewPaletteColor.o2New_color_beyondBlue55 - buttonPrimaryBackgroundInverseSelected = O2NewPaletteColor.o2New_color_beyondBlue55 - buttonSecondaryBackgroundSelected = O2NewPaletteColor.o2New_color_white_15_alpha + buttonPrimaryBackgroundInversePressed = O2NewPaletteColor.o2New_color_beyondBlue55 + buttonSecondaryBackgroundPressed = O2NewPaletteColor.o2New_color_white_15_alpha buttonSecondaryBorder = O2NewPaletteColor.o2New_color_white - buttonSecondaryBorderSelected = O2NewPaletteColor.o2New_color_white + buttonSecondaryBorderPressed = O2NewPaletteColor.o2New_color_white buttonSecondaryBorderInverse = O2NewPaletteColor.o2New_color_white - buttonSecondaryBorderInverseSelected = O2NewPaletteColor.o2New_color_white + buttonSecondaryBorderInversePressed = O2NewPaletteColor.o2New_color_white buttonSecondaryBackgroundHover = O2NewPaletteColor.o2New_color_white_15_alpha buttonSecondaryBackgroundInverseHover = O2NewPaletteColor.o2New_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = O2NewPaletteColor.o2New_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = O2NewPaletteColor.o2New_color_white_15_alpha textButtonPrimary = O2NewPaletteColor.o2New_color_white textButtonPrimaryInverse = O2NewPaletteColor.o2New_color_white - textButtonPrimaryInverseSelected = O2NewPaletteColor.o2New_color_white + textButtonPrimaryInversePressed = O2NewPaletteColor.o2New_color_white textButtonSecondary = O2NewPaletteColor.o2New_color_grey30 - textButtonSecondarySelected = O2NewPaletteColor.o2New_color_grey30 + textButtonSecondaryPressed = O2NewPaletteColor.o2New_color_grey30 textButtonSecondaryInverse = O2NewPaletteColor.o2New_color_grey30 - textButtonSecondaryInverseSelected = O2NewPaletteColor.o2New_color_grey30 + textButtonSecondaryInversePressed = O2NewPaletteColor.o2New_color_grey30 textLink = O2NewPaletteColor.o2New_color_beyondBlue40 textLinkInverse = O2NewPaletteColor.o2New_color_beyondBlue40 textLinkDanger = O2NewPaletteColor.o2New_color_o2Red45 diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontSizesAutogenerated.kt index 810d58b39..e86f353b4 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object O2NewBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontWeightsAutogenerated.kt index 47606ac9e..25db356db 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/O2NewBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object O2NewBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Bold + public val title3FontWeight: FontWeight = FontWeight.Bold + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrand.kt index f4f656ffd..455e676e5 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrand.kt @@ -37,6 +37,12 @@ object TelefonicaBrand : Brand { override val title1FontWeight = TelefonicaBrandFontWeights.title1FontWeight + override val title2FontWeight = TelefonicaBrandFontWeights.title2FontWeight + + override val title3FontWeight = TelefonicaBrandFontWeights.title3FontWeight + + override val title3FontSize = TelefonicaBrandFontSizes.title3FontSize + override val indicatorFontWeight = TelefonicaBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = TelefonicaBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt index 685bb2dea..bf63c8fe6 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt @@ -36,35 +36,35 @@ public object TelefonicaBrandColors { coverBackgroundHover = TelefonicaPaletteColor.telefonica_color_darkModeBlack_25_alpha coverBackgroundPressed = TelefonicaPaletteColor.telefonica_color_darkModeBlack_35_alpha buttonDangerBackground = TelefonicaPaletteColor.telefonica_color_coral - buttonDangerBackgroundSelected = TelefonicaPaletteColor.telefonica_color_coral80 + buttonDangerBackgroundPressed = TelefonicaPaletteColor.telefonica_color_coral80 buttonDangerBackgroundHover = TelefonicaPaletteColor.telefonica_color_coral80 - buttonLinkDangerBackgroundSelected = TelefonicaPaletteColor.telefonica_color_coral10 + buttonLinkDangerBackgroundPressed = TelefonicaPaletteColor.telefonica_color_coral10 buttonLinkDangerBackgroundInverse = TelefonicaPaletteColor.telefonica_color_white - buttonLinkDangerBackgroundInverseSelected = TelefonicaPaletteColor.telefonica_color_coral10 - buttonLinkBackgroundSelected = TelefonicaPaletteColor.telefonica_color_grey1 - buttonLinkBackgroundInverseSelected = TelefonicaPaletteColor.telefonica_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_coral10 + buttonLinkBackgroundPressed = TelefonicaPaletteColor.telefonica_color_grey1 + buttonLinkBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_white_8_alpha buttonPrimaryBackground = TelefonicaPaletteColor.telefonica_color_telefonicaBlue buttonPrimaryBackgroundInverse = TelefonicaPaletteColor.telefonica_color_white - buttonPrimaryBackgroundSelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 + buttonPrimaryBackgroundPressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 buttonPrimaryBackgroundHover = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 - buttonPrimaryBackgroundInverseSelected = + buttonPrimaryBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue30 buttonSecondaryBorder = TelefonicaPaletteColor.telefonica_color_telefonicaBlue - buttonSecondaryBorderSelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 + buttonSecondaryBorderPressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 buttonSecondaryBackgroundHover = TelefonicaPaletteColor.telefonica_color_telefonicaBlue10 - buttonSecondaryBackgroundSelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue10 + buttonSecondaryBackgroundPressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue10 buttonSecondaryBorderInverse = TelefonicaPaletteColor.telefonica_color_white - buttonSecondaryBorderInverseSelected = TelefonicaPaletteColor.telefonica_color_white + buttonSecondaryBorderInversePressed = TelefonicaPaletteColor.telefonica_color_white buttonSecondaryBackgroundInverseHover = TelefonicaPaletteColor.telefonica_color_white_10_alpha - buttonSecondaryBackgroundInverseSelected = + buttonSecondaryBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_white_10_alpha textButtonPrimary = TelefonicaPaletteColor.telefonica_color_white textButtonPrimaryInverse = TelefonicaPaletteColor.telefonica_color_telefonicaBlue - textButtonPrimaryInverseSelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue + textButtonPrimaryInversePressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue textButtonSecondary = TelefonicaPaletteColor.telefonica_color_telefonicaBlue - textButtonSecondarySelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 + textButtonSecondaryPressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 textButtonSecondaryInverse = TelefonicaPaletteColor.telefonica_color_white - textButtonSecondaryInverseSelected = TelefonicaPaletteColor.telefonica_color_white + textButtonSecondaryInversePressed = TelefonicaPaletteColor.telefonica_color_white textLink = TelefonicaPaletteColor.telefonica_color_telefonicaBlue textLinkInverse = TelefonicaPaletteColor.telefonica_color_white textLinkDanger = TelefonicaPaletteColor.telefonica_color_coral @@ -168,36 +168,36 @@ public object TelefonicaBrandColors { coverBackgroundHover = TelefonicaPaletteColor.telefonica_color_darkModeBlack_25_alpha coverBackgroundPressed = TelefonicaPaletteColor.telefonica_color_darkModeBlack_35_alpha buttonDangerBackground = TelefonicaPaletteColor.telefonica_color_coral - buttonDangerBackgroundSelected = TelefonicaPaletteColor.telefonica_color_coral80 + buttonDangerBackgroundPressed = TelefonicaPaletteColor.telefonica_color_coral80 buttonDangerBackgroundHover = TelefonicaPaletteColor.telefonica_color_coral80 - buttonLinkDangerBackgroundSelected = TelefonicaPaletteColor.telefonica_color_white_8_alpha + buttonLinkDangerBackgroundPressed = TelefonicaPaletteColor.telefonica_color_white_8_alpha buttonLinkDangerBackgroundInverse = TelefonicaPaletteColor.telefonica_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = + buttonLinkDangerBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_white_8_alpha - buttonLinkBackgroundSelected = TelefonicaPaletteColor.telefonica_color_white_8_alpha - buttonLinkBackgroundInverseSelected = TelefonicaPaletteColor.telefonica_color_white_8_alpha + buttonLinkBackgroundPressed = TelefonicaPaletteColor.telefonica_color_white_8_alpha + buttonLinkBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_white_8_alpha buttonPrimaryBackground = TelefonicaPaletteColor.telefonica_color_telefonicaBlue buttonPrimaryBackgroundInverse = TelefonicaPaletteColor.telefonica_color_telefonicaBlue - buttonPrimaryBackgroundSelected = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 + buttonPrimaryBackgroundPressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 buttonPrimaryBackgroundHover = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 - buttonPrimaryBackgroundInverseSelected = + buttonPrimaryBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_telefonicaBlue70 - buttonSecondaryBackgroundSelected = TelefonicaPaletteColor.telefonica_color_white_15_alpha + buttonSecondaryBackgroundPressed = TelefonicaPaletteColor.telefonica_color_white_15_alpha buttonSecondaryBorder = TelefonicaPaletteColor.telefonica_color_white buttonSecondaryBackgroundHover = TelefonicaPaletteColor.telefonica_color_white_15_alpha - buttonSecondaryBorderSelected = TelefonicaPaletteColor.telefonica_color_white + buttonSecondaryBorderPressed = TelefonicaPaletteColor.telefonica_color_white buttonSecondaryBorderInverse = TelefonicaPaletteColor.telefonica_color_white - buttonSecondaryBorderInverseSelected = TelefonicaPaletteColor.telefonica_color_white + buttonSecondaryBorderInversePressed = TelefonicaPaletteColor.telefonica_color_white buttonSecondaryBackgroundInverseHover = TelefonicaPaletteColor.telefonica_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = + buttonSecondaryBackgroundInversePressed = TelefonicaPaletteColor.telefonica_color_white_15_alpha textButtonPrimary = TelefonicaPaletteColor.telefonica_color_grey2 textButtonPrimaryInverse = TelefonicaPaletteColor.telefonica_color_grey2 - textButtonPrimaryInverseSelected = TelefonicaPaletteColor.telefonica_color_grey2 + textButtonPrimaryInversePressed = TelefonicaPaletteColor.telefonica_color_grey2 textButtonSecondary = TelefonicaPaletteColor.telefonica_color_grey2 - textButtonSecondarySelected = TelefonicaPaletteColor.telefonica_color_grey2 + textButtonSecondaryPressed = TelefonicaPaletteColor.telefonica_color_grey2 textButtonSecondaryInverse = TelefonicaPaletteColor.telefonica_color_grey2 - textButtonSecondaryInverseSelected = TelefonicaPaletteColor.telefonica_color_grey2 + textButtonSecondaryInversePressed = TelefonicaPaletteColor.telefonica_color_grey2 textLink = TelefonicaPaletteColor.telefonica_color_telefonicaBlue textLinkInverse = TelefonicaPaletteColor.telefonica_color_telefonicaBlue textLinkDanger = TelefonicaPaletteColor.telefonica_color_coral diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontSizesAutogenerated.kt index 69cf43f81..533dfcf78 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object TelefonicaBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontWeightsAutogenerated.kt index 19b4a2a7f..947362cdc 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object TelefonicaBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Normal + public val title3FontWeight: FontWeight = FontWeight.Normal + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrand.kt index 634091e26..58913f0be 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrand.kt @@ -39,6 +39,12 @@ object TuBrand : Brand { override val title1FontWeight: FontWeight = TuBrandFontWeights.title1FontWeight + override val title2FontWeight: FontWeight = TuBrandFontWeights.title2FontWeight + + override val title3FontWeight: FontWeight = TuBrandFontWeights.title3FontWeight + + override val title3FontSize: TextUnit = TuBrandFontSizes.title3FontSize + override val indicatorFontWeight: FontWeight = TuBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight: FontWeight = TuBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandColorsAutogenerated.kt index 5d7364f55..07e0aff25 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object TuBrandColors { coverBackgroundHover = TuPaletteColor.tu_color_grey9_25_alpha coverBackgroundPressed = TuPaletteColor.tu_color_grey9_35_alpha buttonDangerBackground = TuPaletteColor.tu_color_red - buttonDangerBackgroundSelected = TuPaletteColor.tu_color_red55 + buttonDangerBackgroundPressed = TuPaletteColor.tu_color_red55 buttonDangerBackgroundHover = TuPaletteColor.tu_color_red55 - buttonLinkDangerBackgroundSelected = TuPaletteColor.tu_color_red10 + buttonLinkDangerBackgroundPressed = TuPaletteColor.tu_color_red10 buttonLinkDangerBackgroundInverse = TuPaletteColor.tu_color_white - buttonLinkDangerBackgroundInverseSelected = TuPaletteColor.tu_color_red10 - buttonLinkBackgroundSelected = TuPaletteColor.tu_color_blue10 - buttonLinkBackgroundInverseSelected = TuPaletteColor.tu_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = TuPaletteColor.tu_color_red10 + buttonLinkBackgroundPressed = TuPaletteColor.tu_color_blue10 + buttonLinkBackgroundInversePressed = TuPaletteColor.tu_color_white_8_alpha buttonPrimaryBackground = TuPaletteColor.tu_color_primary buttonPrimaryBackgroundInverse = TuPaletteColor.tu_color_white - buttonPrimaryBackgroundSelected = TuPaletteColor.tu_color_primary45 + buttonPrimaryBackgroundPressed = TuPaletteColor.tu_color_primary45 buttonPrimaryBackgroundHover = TuPaletteColor.tu_color_primary45 - buttonPrimaryBackgroundInverseSelected = TuPaletteColor.tu_color_white_80_alpha + buttonPrimaryBackgroundInversePressed = TuPaletteColor.tu_color_white_80_alpha buttonSecondaryBorder = TuPaletteColor.tu_color_blue - buttonSecondaryBorderSelected = TuPaletteColor.tu_color_blue70 + buttonSecondaryBorderPressed = TuPaletteColor.tu_color_blue70 buttonSecondaryBackgroundHover = TuPaletteColor.tu_color_blue10 - buttonSecondaryBackgroundSelected = TuPaletteColor.tu_color_blue10 + buttonSecondaryBackgroundPressed = TuPaletteColor.tu_color_blue10 buttonSecondaryBorderInverse = TuPaletteColor.tu_color_white - buttonSecondaryBorderInverseSelected = TuPaletteColor.tu_color_white + buttonSecondaryBorderInversePressed = TuPaletteColor.tu_color_white buttonSecondaryBackgroundInverseHover = TuPaletteColor.tu_color_white_10_alpha - buttonSecondaryBackgroundInverseSelected = TuPaletteColor.tu_color_white_10_alpha + buttonSecondaryBackgroundInversePressed = TuPaletteColor.tu_color_white_10_alpha textButtonPrimary = TuPaletteColor.tu_color_white textButtonPrimaryInverse = TuPaletteColor.tu_color_primary - textButtonPrimaryInverseSelected = TuPaletteColor.tu_color_primary + textButtonPrimaryInversePressed = TuPaletteColor.tu_color_primary textButtonSecondary = TuPaletteColor.tu_color_blue - textButtonSecondarySelected = TuPaletteColor.tu_color_blue70 + textButtonSecondaryPressed = TuPaletteColor.tu_color_blue70 textButtonSecondaryInverse = TuPaletteColor.tu_color_white - textButtonSecondaryInverseSelected = TuPaletteColor.tu_color_white + textButtonSecondaryInversePressed = TuPaletteColor.tu_color_white textLink = TuPaletteColor.tu_color_blue textLinkInverse = TuPaletteColor.tu_color_white textLinkDanger = TuPaletteColor.tu_color_red @@ -165,33 +165,33 @@ public object TuBrandColors { coverBackgroundHover = TuPaletteColor.tu_color_darkModeBlack_25_alpha coverBackgroundPressed = TuPaletteColor.tu_color_darkModeBlack_35_alpha buttonDangerBackground = TuPaletteColor.tu_color_red - buttonDangerBackgroundSelected = TuPaletteColor.tu_color_red80 + buttonDangerBackgroundPressed = TuPaletteColor.tu_color_red80 buttonDangerBackgroundHover = TuPaletteColor.tu_color_red80 - buttonLinkDangerBackgroundSelected = TuPaletteColor.tu_color_red10 + buttonLinkDangerBackgroundPressed = TuPaletteColor.tu_color_red10 buttonLinkDangerBackgroundInverse = TuPaletteColor.tu_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = TuPaletteColor.tu_color_red10 - buttonLinkBackgroundSelected = TuPaletteColor.tu_color_white_8_alpha - buttonLinkBackgroundInverseSelected = TuPaletteColor.tu_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = TuPaletteColor.tu_color_red10 + buttonLinkBackgroundPressed = TuPaletteColor.tu_color_white_8_alpha + buttonLinkBackgroundInversePressed = TuPaletteColor.tu_color_white_8_alpha buttonPrimaryBackground = TuPaletteColor.tu_color_grey2 buttonPrimaryBackgroundInverse = TuPaletteColor.tu_color_grey2 - buttonPrimaryBackgroundSelected = TuPaletteColor.tu_color_grey3 + buttonPrimaryBackgroundPressed = TuPaletteColor.tu_color_grey3 buttonPrimaryBackgroundHover = TuPaletteColor.tu_color_grey3 - buttonPrimaryBackgroundInverseSelected = TuPaletteColor.tu_color_grey3 - buttonSecondaryBackgroundSelected = TuPaletteColor.tu_color_grey2_15_alpha + buttonPrimaryBackgroundInversePressed = TuPaletteColor.tu_color_grey3 + buttonSecondaryBackgroundPressed = TuPaletteColor.tu_color_grey2_15_alpha buttonSecondaryBorder = TuPaletteColor.tu_color_grey2 buttonSecondaryBackgroundHover = TuPaletteColor.tu_color_grey2_15_alpha - buttonSecondaryBorderSelected = TuPaletteColor.tu_color_grey2 + buttonSecondaryBorderPressed = TuPaletteColor.tu_color_grey2 buttonSecondaryBorderInverse = TuPaletteColor.tu_color_grey2 - buttonSecondaryBorderInverseSelected = TuPaletteColor.tu_color_grey2 + buttonSecondaryBorderInversePressed = TuPaletteColor.tu_color_grey2 buttonSecondaryBackgroundInverseHover = TuPaletteColor.tu_color_grey2_15_alpha - buttonSecondaryBackgroundInverseSelected = TuPaletteColor.tu_color_grey2_15_alpha + buttonSecondaryBackgroundInversePressed = TuPaletteColor.tu_color_grey2_15_alpha textButtonPrimary = TuPaletteColor.tu_color_primary textButtonPrimaryInverse = TuPaletteColor.tu_color_primary - textButtonPrimaryInverseSelected = TuPaletteColor.tu_color_primary + textButtonPrimaryInversePressed = TuPaletteColor.tu_color_primary textButtonSecondary = TuPaletteColor.tu_color_grey2 - textButtonSecondarySelected = TuPaletteColor.tu_color_grey2 + textButtonSecondaryPressed = TuPaletteColor.tu_color_grey2 textButtonSecondaryInverse = TuPaletteColor.tu_color_grey2 - textButtonSecondaryInverseSelected = TuPaletteColor.tu_color_grey2 + textButtonSecondaryInversePressed = TuPaletteColor.tu_color_grey2 textLink = TuPaletteColor.tu_color_blue30 textLinkInverse = TuPaletteColor.tu_color_blue30 textLinkDanger = TuPaletteColor.tu_color_red diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontSizesAutogenerated.kt index 3d483f366..7a20b44dd 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object TuBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontWeightsAutogenerated.kt index 2ece364eb..d4a72be7b 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/TuBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object TuBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Medium + public val title3FontWeight: FontWeight = FontWeight.Medium + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrand.kt index 7150dc20f..adc5a909f 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrand.kt @@ -36,6 +36,12 @@ object VivoBrand : Brand { override val title1FontWeight = VivoBrandFontWeights.title1FontWeight + override val title2FontWeight = VivoBrandFontWeights.title2FontWeight + + override val title3FontWeight = VivoBrandFontWeights.title3FontWeight + + override val title3FontSize = VivoBrandFontSizes.title3FontSize + override val indicatorFontWeight = VivoBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = VivoBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt index fc094218f..e606b9919 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandColorsAutogenerated.kt @@ -35,33 +35,33 @@ public object VivoBrandColors { coverBackgroundHover = VivoPaletteColor.vivo_color_darkModeBlack_25_alpha coverBackgroundPressed = VivoPaletteColor.vivo_color_darkModeBlack_35_alpha buttonDangerBackground = VivoPaletteColor.vivo_color_pepper - buttonDangerBackgroundSelected = VivoPaletteColor.vivo_color_pepperDark + buttonDangerBackgroundPressed = VivoPaletteColor.vivo_color_pepperDark buttonDangerBackgroundHover = VivoPaletteColor.vivo_color_pepperDark - buttonLinkDangerBackgroundSelected = VivoPaletteColor.vivo_color_pepperLight10 + buttonLinkDangerBackgroundPressed = VivoPaletteColor.vivo_color_pepperLight10 buttonLinkDangerBackgroundInverse = VivoPaletteColor.vivo_color_white - buttonLinkDangerBackgroundInverseSelected = VivoPaletteColor.vivo_color_pepperLight10 - buttonLinkBackgroundSelected = VivoPaletteColor.vivo_color_vivoPurpleLight10 - buttonLinkBackgroundInverseSelected = VivoPaletteColor.vivo_color_white_10_alpha + buttonLinkDangerBackgroundInversePressed = VivoPaletteColor.vivo_color_pepperLight10 + buttonLinkBackgroundPressed = VivoPaletteColor.vivo_color_vivoPurpleLight10 + buttonLinkBackgroundInversePressed = VivoPaletteColor.vivo_color_white_10_alpha buttonPrimaryBackground = VivoPaletteColor.vivo_color_vivoPurple buttonPrimaryBackgroundInverse = VivoPaletteColor.vivo_color_white - buttonPrimaryBackgroundSelected = VivoPaletteColor.vivo_color_vivoPurpleDark + buttonPrimaryBackgroundPressed = VivoPaletteColor.vivo_color_vivoPurpleDark buttonPrimaryBackgroundHover = VivoPaletteColor.vivo_color_vivoPurpleDark - buttonPrimaryBackgroundInverseSelected = VivoPaletteColor.vivo_color_vivoPurpleLight50 + buttonPrimaryBackgroundInversePressed = VivoPaletteColor.vivo_color_vivoPurpleLight50 buttonSecondaryBorder = VivoPaletteColor.vivo_color_vivoPurple - buttonSecondaryBorderSelected = VivoPaletteColor.vivo_color_vivoPurpleDark + buttonSecondaryBorderPressed = VivoPaletteColor.vivo_color_vivoPurpleDark buttonSecondaryBackgroundHover = VivoPaletteColor.vivo_color_vivoPurpleLight10 - buttonSecondaryBackgroundSelected = VivoPaletteColor.vivo_color_vivoPurpleLight10 + buttonSecondaryBackgroundPressed = VivoPaletteColor.vivo_color_vivoPurpleLight10 buttonSecondaryBorderInverse = VivoPaletteColor.vivo_color_white - buttonSecondaryBorderInverseSelected = VivoPaletteColor.vivo_color_white + buttonSecondaryBorderInversePressed = VivoPaletteColor.vivo_color_white buttonSecondaryBackgroundInverseHover = VivoPaletteColor.vivo_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = VivoPaletteColor.vivo_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = VivoPaletteColor.vivo_color_white_15_alpha textButtonPrimary = VivoPaletteColor.vivo_color_white textButtonPrimaryInverse = VivoPaletteColor.vivo_color_vivoPurple - textButtonPrimaryInverseSelected = VivoPaletteColor.vivo_color_vivoPurple + textButtonPrimaryInversePressed = VivoPaletteColor.vivo_color_vivoPurple textButtonSecondary = VivoPaletteColor.vivo_color_vivoPurple - textButtonSecondarySelected = VivoPaletteColor.vivo_color_vivoPurpleDark + textButtonSecondaryPressed = VivoPaletteColor.vivo_color_vivoPurpleDark textButtonSecondaryInverse = VivoPaletteColor.vivo_color_white - textButtonSecondaryInverseSelected = VivoPaletteColor.vivo_color_white + textButtonSecondaryInversePressed = VivoPaletteColor.vivo_color_white textLink = VivoPaletteColor.vivo_color_vivoPurple textLinkInverse = VivoPaletteColor.vivo_color_white textLinkDanger = VivoPaletteColor.vivo_color_pepper @@ -165,33 +165,33 @@ public object VivoBrandColors { coverBackgroundHover = VivoPaletteColor.vivo_color_darkModeBlack_25_alpha coverBackgroundPressed = VivoPaletteColor.vivo_color_darkModeBlack_35_alpha buttonDangerBackground = VivoPaletteColor.vivo_color_pepper - buttonDangerBackgroundSelected = VivoPaletteColor.vivo_color_pepperDark + buttonDangerBackgroundPressed = VivoPaletteColor.vivo_color_pepperDark buttonDangerBackgroundHover = VivoPaletteColor.vivo_color_pepperDark - buttonLinkDangerBackgroundSelected = VivoPaletteColor.vivo_color_white_8_alpha + buttonLinkDangerBackgroundPressed = VivoPaletteColor.vivo_color_white_8_alpha buttonLinkDangerBackgroundInverse = VivoPaletteColor.vivo_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = VivoPaletteColor.vivo_color_white_8_alpha - buttonLinkBackgroundSelected = VivoPaletteColor.vivo_color_white_8_alpha - buttonLinkBackgroundInverseSelected = VivoPaletteColor.vivo_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = VivoPaletteColor.vivo_color_white_8_alpha + buttonLinkBackgroundPressed = VivoPaletteColor.vivo_color_white_8_alpha + buttonLinkBackgroundInversePressed = VivoPaletteColor.vivo_color_white_8_alpha buttonPrimaryBackground = VivoPaletteColor.vivo_color_vivoPurpleLight80 buttonPrimaryBackgroundInverse = VivoPaletteColor.vivo_color_vivoPurpleLight80 - buttonPrimaryBackgroundSelected = VivoPaletteColor.vivo_color_vivoPurpleDark + buttonPrimaryBackgroundPressed = VivoPaletteColor.vivo_color_vivoPurpleDark buttonPrimaryBackgroundHover = VivoPaletteColor.vivo_color_vivoPurpleDark - buttonPrimaryBackgroundInverseSelected = VivoPaletteColor.vivo_color_vivoPurpleDark + buttonPrimaryBackgroundInversePressed = VivoPaletteColor.vivo_color_vivoPurpleDark buttonSecondaryBackgroundHover = VivoPaletteColor.vivo_color_white_15_alpha - buttonSecondaryBackgroundSelected = VivoPaletteColor.vivo_color_white_15_alpha + buttonSecondaryBackgroundPressed = VivoPaletteColor.vivo_color_white_15_alpha buttonSecondaryBorder = VivoPaletteColor.vivo_color_white - buttonSecondaryBorderSelected = VivoPaletteColor.vivo_color_white + buttonSecondaryBorderPressed = VivoPaletteColor.vivo_color_white buttonSecondaryBorderInverse = VivoPaletteColor.vivo_color_white - buttonSecondaryBorderInverseSelected = VivoPaletteColor.vivo_color_white + buttonSecondaryBorderInversePressed = VivoPaletteColor.vivo_color_white buttonSecondaryBackgroundInverseHover = VivoPaletteColor.vivo_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = VivoPaletteColor.vivo_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = VivoPaletteColor.vivo_color_white_15_alpha textButtonPrimary = VivoPaletteColor.vivo_color_grey2 textButtonPrimaryInverse = VivoPaletteColor.vivo_color_grey2 - textButtonPrimaryInverseSelected = VivoPaletteColor.vivo_color_grey2 + textButtonPrimaryInversePressed = VivoPaletteColor.vivo_color_grey2 textButtonSecondary = VivoPaletteColor.vivo_color_grey2 - textButtonSecondarySelected = VivoPaletteColor.vivo_color_grey2 + textButtonSecondaryPressed = VivoPaletteColor.vivo_color_grey2 textButtonSecondaryInverse = VivoPaletteColor.vivo_color_grey2 - textButtonSecondaryInverseSelected = VivoPaletteColor.vivo_color_grey2 + textButtonSecondaryInversePressed = VivoPaletteColor.vivo_color_grey2 textLink = VivoPaletteColor.vivo_color_vivoPurpleLight50 textLinkInverse = VivoPaletteColor.vivo_color_vivoPurpleLight50 textLinkDanger = VivoPaletteColor.vivo_color_pepper diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontSizesAutogenerated.kt index 52e077364..0795ff6ca 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object VivoBrandFontSizes { public val tabsLabelFontSize: TextUnit = 16.sp - public val title2FontSize: TextUnit = 20.sp + public val title3FontSize: TextUnit = 20.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontWeightsAutogenerated.kt index c4cf17dbc..0212a4823 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object VivoBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Light + public val title3FontWeight: FontWeight = FontWeight.Light + public val indicatorFontWeight: FontWeight = FontWeight.Medium public val navigationBarFontWeight: FontWeight = FontWeight.Medium diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrand.kt index 465b0a486..4934f7bb9 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrand.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrand.kt @@ -36,6 +36,12 @@ object VivoNewBrand : Brand { override val title1FontWeight = VivoNewBrandFontWeights.title1FontWeight + override val title2FontWeight = VivoNewBrandFontWeights.title2FontWeight + + override val title3FontWeight = VivoNewBrandFontWeights.title3FontWeight + + override val title3FontSize = VivoNewBrandFontSizes.title3FontSize + override val indicatorFontWeight = VivoNewBrandFontWeights.indicatorFontWeight override val tabsLabelFontWeight = VivoNewBrandFontWeights.tabsLabelFontWeight diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt index 5fde806dd..c05701df0 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt @@ -21,7 +21,7 @@ public object VivoNewBrandColors { backgroundContainerBrandOverInverse = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark backgroundContainerAlternative = VivoNewPaletteColor.vivoNew_color_grey1 backgroundOverlay = VivoNewPaletteColor.vivoNew_color_grey6_60_alpha - backgroundSkeleton = VivoNewPaletteColor.vivoNew_color_grey4 + backgroundSkeleton = VivoNewPaletteColor.vivoNew_color_grey3 backgroundSkeletonInverse = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark backgroundBrandTop = VivoNewPaletteColor.vivoNew_color_vivoPurple backgroundBrandBottom = VivoNewPaletteColor.vivoNew_color_vivoPurple @@ -35,33 +35,33 @@ public object VivoNewBrandColors { coverBackgroundHover = VivoNewPaletteColor.vivoNew_color_darkModeBlack_25_alpha coverBackgroundPressed = VivoNewPaletteColor.vivoNew_color_darkModeBlack_35_alpha buttonDangerBackground = VivoNewPaletteColor.vivoNew_color_pepper - buttonDangerBackgroundSelected = VivoNewPaletteColor.vivoNew_color_pepperDark + buttonDangerBackgroundPressed = VivoNewPaletteColor.vivoNew_color_pepperDark buttonDangerBackgroundHover = VivoNewPaletteColor.vivoNew_color_pepperDark - buttonLinkDangerBackgroundSelected = VivoNewPaletteColor.vivoNew_color_pepperLight10 + buttonLinkDangerBackgroundPressed = VivoNewPaletteColor.vivoNew_color_pepperLight10 buttonLinkDangerBackgroundInverse = VivoNewPaletteColor.vivoNew_color_white - buttonLinkDangerBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_pepperLight10 - buttonLinkBackgroundSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight10 - buttonLinkBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_white_10_alpha + buttonLinkDangerBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_pepperLight10 + buttonLinkBackgroundPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight10 + buttonLinkBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_white_10_alpha buttonPrimaryBackground = VivoNewPaletteColor.vivoNew_color_vivoPurple buttonPrimaryBackgroundInverse = VivoNewPaletteColor.vivoNew_color_white - buttonPrimaryBackgroundSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark + buttonPrimaryBackgroundPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark buttonPrimaryBackgroundHover = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark - buttonPrimaryBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight50 + buttonPrimaryBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight50 buttonSecondaryBorder = VivoNewPaletteColor.vivoNew_color_vivoPurple - buttonSecondaryBorderSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark + buttonSecondaryBorderPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark buttonSecondaryBackgroundHover = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight10 - buttonSecondaryBackgroundSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight10 + buttonSecondaryBackgroundPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight10 buttonSecondaryBorderInverse = VivoNewPaletteColor.vivoNew_color_white - buttonSecondaryBorderInverseSelected = VivoNewPaletteColor.vivoNew_color_white + buttonSecondaryBorderInversePressed = VivoNewPaletteColor.vivoNew_color_white buttonSecondaryBackgroundInverseHover = VivoNewPaletteColor.vivoNew_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_white_15_alpha textButtonPrimary = VivoNewPaletteColor.vivoNew_color_white textButtonPrimaryInverse = VivoNewPaletteColor.vivoNew_color_vivoPurple - textButtonPrimaryInverseSelected = VivoNewPaletteColor.vivoNew_color_vivoPurple + textButtonPrimaryInversePressed = VivoNewPaletteColor.vivoNew_color_vivoPurple textButtonSecondary = VivoNewPaletteColor.vivoNew_color_vivoPurple - textButtonSecondarySelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark + textButtonSecondaryPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark textButtonSecondaryInverse = VivoNewPaletteColor.vivoNew_color_white - textButtonSecondaryInverseSelected = VivoNewPaletteColor.vivoNew_color_white + textButtonSecondaryInversePressed = VivoNewPaletteColor.vivoNew_color_white textLink = VivoNewPaletteColor.vivoNew_color_vivoPurple textLinkInverse = VivoNewPaletteColor.vivoNew_color_white textLinkDanger = VivoNewPaletteColor.vivoNew_color_pepper @@ -165,33 +165,33 @@ public object VivoNewBrandColors { coverBackgroundHover = VivoNewPaletteColor.vivoNew_color_darkModeBlack_25_alpha coverBackgroundPressed = VivoNewPaletteColor.vivoNew_color_darkModeBlack_35_alpha buttonDangerBackground = VivoNewPaletteColor.vivoNew_color_pepper - buttonDangerBackgroundSelected = VivoNewPaletteColor.vivoNew_color_pepperDark + buttonDangerBackgroundPressed = VivoNewPaletteColor.vivoNew_color_pepperDark buttonDangerBackgroundHover = VivoNewPaletteColor.vivoNew_color_pepperDark - buttonLinkDangerBackgroundSelected = VivoNewPaletteColor.vivoNew_color_white_8_alpha + buttonLinkDangerBackgroundPressed = VivoNewPaletteColor.vivoNew_color_white_8_alpha buttonLinkDangerBackgroundInverse = VivoNewPaletteColor.vivoNew_color_white_0_alpha - buttonLinkDangerBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_white_8_alpha - buttonLinkBackgroundSelected = VivoNewPaletteColor.vivoNew_color_white_8_alpha - buttonLinkBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_white_8_alpha + buttonLinkDangerBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_white_8_alpha + buttonLinkBackgroundPressed = VivoNewPaletteColor.vivoNew_color_white_8_alpha + buttonLinkBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_white_8_alpha buttonPrimaryBackground = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight80 buttonPrimaryBackgroundInverse = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight80 - buttonPrimaryBackgroundSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark + buttonPrimaryBackgroundPressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark buttonPrimaryBackgroundHover = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark - buttonPrimaryBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark + buttonPrimaryBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_vivoPurpleDark buttonSecondaryBackgroundHover = VivoNewPaletteColor.vivoNew_color_white_15_alpha - buttonSecondaryBackgroundSelected = VivoNewPaletteColor.vivoNew_color_white_15_alpha + buttonSecondaryBackgroundPressed = VivoNewPaletteColor.vivoNew_color_white_15_alpha buttonSecondaryBorder = VivoNewPaletteColor.vivoNew_color_white - buttonSecondaryBorderSelected = VivoNewPaletteColor.vivoNew_color_white + buttonSecondaryBorderPressed = VivoNewPaletteColor.vivoNew_color_white buttonSecondaryBorderInverse = VivoNewPaletteColor.vivoNew_color_white - buttonSecondaryBorderInverseSelected = VivoNewPaletteColor.vivoNew_color_white + buttonSecondaryBorderInversePressed = VivoNewPaletteColor.vivoNew_color_white buttonSecondaryBackgroundInverseHover = VivoNewPaletteColor.vivoNew_color_white_15_alpha - buttonSecondaryBackgroundInverseSelected = VivoNewPaletteColor.vivoNew_color_white_15_alpha + buttonSecondaryBackgroundInversePressed = VivoNewPaletteColor.vivoNew_color_white_15_alpha textButtonPrimary = VivoNewPaletteColor.vivoNew_color_grey2 textButtonPrimaryInverse = VivoNewPaletteColor.vivoNew_color_grey2 - textButtonPrimaryInverseSelected = VivoNewPaletteColor.vivoNew_color_grey2 + textButtonPrimaryInversePressed = VivoNewPaletteColor.vivoNew_color_grey2 textButtonSecondary = VivoNewPaletteColor.vivoNew_color_grey2 - textButtonSecondarySelected = VivoNewPaletteColor.vivoNew_color_grey2 + textButtonSecondaryPressed = VivoNewPaletteColor.vivoNew_color_grey2 textButtonSecondaryInverse = VivoNewPaletteColor.vivoNew_color_grey2 - textButtonSecondaryInverseSelected = VivoNewPaletteColor.vivoNew_color_grey2 + textButtonSecondaryInversePressed = VivoNewPaletteColor.vivoNew_color_grey2 textLink = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight50 textLinkInverse = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight50 textLinkDanger = VivoNewPaletteColor.vivoNew_color_pepper diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontSizesAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontSizesAutogenerated.kt index adaadc4c6..b3e6d9fd0 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontSizesAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontSizesAutogenerated.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.sp public object VivoNewBrandFontSizes { public val tabsLabelFontSize: TextUnit = 18.sp - public val title2FontSize: TextUnit = 18.sp + public val title3FontSize: TextUnit = 18.sp public val text1FontSize: TextUnit = 12.sp diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontWeightsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontWeightsAutogenerated.kt index 14ce3b734..631b45102 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontWeightsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontWeightsAutogenerated.kt @@ -16,6 +16,8 @@ public object VivoNewBrandFontWeights { public val title2FontWeight: FontWeight = FontWeight.Normal + public val title3FontWeight: FontWeight = FontWeight.Normal + public val indicatorFontWeight: FontWeight = FontWeight.Normal public val navigationBarFontWeight: FontWeight = FontWeight.Normal diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt index 36d2c72a1..26c729dd0 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/color/MisticaColorsAutogenerated.kt @@ -82,25 +82,25 @@ public class MisticaColors { public var buttonDangerBackground: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonDangerBackgroundSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonDangerBackgroundPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonDangerBackgroundHover: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonLinkDangerBackgroundSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonLinkDangerBackgroundPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonLinkDangerBackgroundInverse: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonLinkDangerBackgroundInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonLinkDangerBackgroundInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonLinkBackgroundSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonLinkBackgroundPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonLinkBackgroundInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonLinkBackgroundInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonPrimaryBackground: Color by mutableStateOf(Color.Unspecified, @@ -109,37 +109,37 @@ public class MisticaColors { public var buttonPrimaryBackgroundInverse: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonPrimaryBackgroundSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonPrimaryBackgroundPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonPrimaryBackgroundHover: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonPrimaryBackgroundInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonPrimaryBackgroundInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonSecondaryBorder: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonSecondaryBorderSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonSecondaryBorderPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonSecondaryBackgroundHover: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonSecondaryBackgroundSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonSecondaryBackgroundPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonSecondaryBorderInverse: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonSecondaryBorderInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonSecondaryBorderInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var buttonSecondaryBackgroundInverseHover: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var buttonSecondaryBackgroundInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var buttonSecondaryBackgroundInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var textButtonPrimary: Color by mutableStateOf(Color.Unspecified, @@ -148,19 +148,19 @@ public class MisticaColors { public var textButtonPrimaryInverse: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var textButtonPrimaryInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var textButtonPrimaryInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var textButtonSecondary: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var textButtonSecondarySelected: Color by mutableStateOf(Color.Unspecified, + public var textButtonSecondaryPressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var textButtonSecondaryInverse: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) - public var textButtonSecondaryInverseSelected: Color by mutableStateOf(Color.Unspecified, + public var textButtonSecondaryInversePressed: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) public var textLink: Color by mutableStateOf(Color.Unspecified, structuralEqualityPolicy()) @@ -368,33 +368,33 @@ public class MisticaColors { coverBackgroundHover = other.coverBackgroundHover coverBackgroundPressed = other.coverBackgroundPressed buttonDangerBackground = other.buttonDangerBackground - buttonDangerBackgroundSelected = other.buttonDangerBackgroundSelected + buttonDangerBackgroundPressed = other.buttonDangerBackgroundPressed buttonDangerBackgroundHover = other.buttonDangerBackgroundHover - buttonLinkDangerBackgroundSelected = other.buttonLinkDangerBackgroundSelected + buttonLinkDangerBackgroundPressed = other.buttonLinkDangerBackgroundPressed buttonLinkDangerBackgroundInverse = other.buttonLinkDangerBackgroundInverse - buttonLinkDangerBackgroundInverseSelected = other.buttonLinkDangerBackgroundInverseSelected - buttonLinkBackgroundSelected = other.buttonLinkBackgroundSelected - buttonLinkBackgroundInverseSelected = other.buttonLinkBackgroundInverseSelected + buttonLinkDangerBackgroundInversePressed = other.buttonLinkDangerBackgroundInversePressed + buttonLinkBackgroundPressed = other.buttonLinkBackgroundPressed + buttonLinkBackgroundInversePressed = other.buttonLinkBackgroundInversePressed buttonPrimaryBackground = other.buttonPrimaryBackground buttonPrimaryBackgroundInverse = other.buttonPrimaryBackgroundInverse - buttonPrimaryBackgroundSelected = other.buttonPrimaryBackgroundSelected + buttonPrimaryBackgroundPressed = other.buttonPrimaryBackgroundPressed buttonPrimaryBackgroundHover = other.buttonPrimaryBackgroundHover - buttonPrimaryBackgroundInverseSelected = other.buttonPrimaryBackgroundInverseSelected + buttonPrimaryBackgroundInversePressed = other.buttonPrimaryBackgroundInversePressed buttonSecondaryBorder = other.buttonSecondaryBorder - buttonSecondaryBorderSelected = other.buttonSecondaryBorderSelected + buttonSecondaryBorderPressed = other.buttonSecondaryBorderPressed buttonSecondaryBackgroundHover = other.buttonSecondaryBackgroundHover - buttonSecondaryBackgroundSelected = other.buttonSecondaryBackgroundSelected + buttonSecondaryBackgroundPressed = other.buttonSecondaryBackgroundPressed buttonSecondaryBorderInverse = other.buttonSecondaryBorderInverse - buttonSecondaryBorderInverseSelected = other.buttonSecondaryBorderInverseSelected + buttonSecondaryBorderInversePressed = other.buttonSecondaryBorderInversePressed buttonSecondaryBackgroundInverseHover = other.buttonSecondaryBackgroundInverseHover - buttonSecondaryBackgroundInverseSelected = other.buttonSecondaryBackgroundInverseSelected + buttonSecondaryBackgroundInversePressed = other.buttonSecondaryBackgroundInversePressed textButtonPrimary = other.textButtonPrimary textButtonPrimaryInverse = other.textButtonPrimaryInverse - textButtonPrimaryInverseSelected = other.textButtonPrimaryInverseSelected + textButtonPrimaryInversePressed = other.textButtonPrimaryInversePressed textButtonSecondary = other.textButtonSecondary - textButtonSecondarySelected = other.textButtonSecondarySelected + textButtonSecondaryPressed = other.textButtonSecondaryPressed textButtonSecondaryInverse = other.textButtonSecondaryInverse - textButtonSecondaryInverseSelected = other.textButtonSecondaryInverseSelected + textButtonSecondaryInversePressed = other.textButtonSecondaryInversePressed textLink = other.textLink textLinkInverse = other.textLinkInverse textLinkDanger = other.textLinkDanger diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/text/MisticaTypography.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/text/MisticaTypography.kt index b64476763..4e488803d 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/theme/text/MisticaTypography.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/theme/text/MisticaTypography.kt @@ -82,6 +82,12 @@ class MisticaTypography( var presetTitle1 by mutableStateOf(buildPresetTitle1(), structuralEqualityPolicy()) private set + var presetTitle2 by mutableStateOf(buildPresetTitle2(), structuralEqualityPolicy()) + private set + + var presetTitle3 by mutableStateOf(buildPresetTitle3(), structuralEqualityPolicy()) + private set + var presetIndicator by mutableStateOf(buildPresetIndicator(), structuralEqualityPolicy()) private set @@ -241,7 +247,21 @@ class MisticaTypography( private fun buildPresetTitle1( fontWeight: FontWeight = FontWeight.Medium, ) = buildPreset1().copy( - fontWeight = fontWeight + fontWeight = fontWeight, + ) + + private fun buildPresetTitle2( + fontWeight: FontWeight = FontWeight.Medium, + ) = buildPreset3().copy( + fontWeight = fontWeight, + ) + + private fun buildPresetTitle3( + fontWeight: FontWeight = FontWeight.Medium, + textSize: TextUnit = 20.sp, + ) = buildPreset5().copy( + fontWeight = fontWeight, + fontSize = textSize, ) private fun buildPresetIndicator( @@ -271,6 +291,9 @@ class MisticaTypography( presetSmallButtonFontWeight: FontWeight, presetLinkFontWeight: FontWeight, presetTitle1FontWeight: FontWeight, + presetTitle2FontWeight: FontWeight, + presetTitle3FontWeight: FontWeight, + presetTitle3FontSize: TextUnit, presetIndicatorFontWeight: FontWeight, presetTabsLabelFontWeight: FontWeight, presetTabsLabelFontSize: TextUnit, @@ -298,6 +321,8 @@ class MisticaTypography( presetSmallButton = buildPresetSmallButton(fontWeight = presetSmallButtonFontWeight) presetLink = buildPresetLink(fontWeight = presetLinkFontWeight) presetTitle1 = buildPresetTitle1(fontWeight = presetTitle1FontWeight) + presetTitle2 = buildPresetTitle2(fontWeight = presetTitle2FontWeight) + presetTitle3 = buildPresetTitle3(fontWeight = presetTitle3FontWeight, textSize = presetTitle3FontSize) presetIndicator = buildPresetIndicator(fontWeight = presetIndicatorFontWeight) presetTabsLabel = buildPresetTabsLabel(fontWeight = presetTabsLabelFontWeight, fontSize = presetTabsLabelFontSize) } diff --git a/library/src/main/java/com/telefonica/mistica/compose/title/Title.kt b/library/src/main/java/com/telefonica/mistica/compose/title/Title.kt index 54a6cb066..c84ec0019 100644 --- a/library/src/main/java/com/telefonica/mistica/compose/title/Title.kt +++ b/library/src/main/java/com/telefonica/mistica/compose/title/Title.kt @@ -84,7 +84,19 @@ private fun TitleText( } TitleStyle.TITLE_2 -> { - preset = MisticaTheme.typography.preset5 + preset = MisticaTheme.typography.presetTitle2 + textColor = MisticaTheme.colors.textPrimary + isAllCaps = false + } + + TitleStyle.TITLE_3 -> { + preset = MisticaTheme.typography.presetTitle3 + textColor = MisticaTheme.colors.textPrimary + isAllCaps = false + } + + TitleStyle.TITLE_4 -> { + preset = MisticaTheme.typography.preset6 textColor = MisticaTheme.colors.textPrimary isAllCaps = false } @@ -132,5 +144,7 @@ private fun Link( enum class TitleStyle { TITLE_1, - TITLE_2 + TITLE_2, + TITLE_3, + TITLE_4, } diff --git a/library/src/main/java/com/telefonica/mistica/list/README.md b/library/src/main/java/com/telefonica/mistica/list/README.md index b5d07d5fd..54e256f22 100644 --- a/library/src/main/java/com/telefonica/mistica/list/README.md +++ b/library/src/main/java/com/telefonica/mistica/list/README.md @@ -76,10 +76,10 @@ Also `com.telefonica.mistica.MisticaRecyclerView` is just a `RecyclerView` that ## Toggleables There is two new sub-components from ListRowView to handle Action Layouts with toggleable views like Switch or CheckBox components. Take a look to the new available sub-components: -* [ListRowViewWithSwitch](https://github.com/Telefonica/mistica-android/blob/ANDROID-14884_list_row_a11y/library/src/main/java/com/telefonica/mistica/list/ListRowViewWithSwitch.kt) -* [ListRowViewWithCheckBox](https://github.com/Telefonica/mistica-android/blob/ANDROID-14884_list_row_a11y/library/src/main/java/com/telefonica/mistica/list/ListRowViewWithCheckBox.kt) +* [ListRowViewWithSwitch](ListRowViewWithSwitch.kt) +* [ListRowViewWithCheckBox](ListRowViewWithCheckBox.kt) -This two new sub-components have been created in order to handle the main accessibility actions according to Google standards with Toggleables views. So +This two new sub-components have been created in order to handle the main accessibility actions according to Google standards with Toggleable views. So please, consider replacing and start using these two new sub-components if you need to use a list element with a Switch or CheckBox view. ### How to use the new sub-components? diff --git a/library/src/main/java/com/telefonica/mistica/title/TitleView.kt b/library/src/main/java/com/telefonica/mistica/title/TitleView.kt index 3b68d1660..474d4d6b7 100644 --- a/library/src/main/java/com/telefonica/mistica/title/TitleView.kt +++ b/library/src/main/java/com/telefonica/mistica/title/TitleView.kt @@ -57,6 +57,8 @@ class TitleView @JvmOverloads constructor( @IntDef( TITLE_1, TITLE_2, + TITLE_3, + TITLE_4, ) annotation class TitleStyle @@ -113,6 +115,8 @@ class TitleView @JvmOverloads constructor( val styleConfig = when (style) { TITLE_1 -> TITLE_1_STYLE_CONFIG TITLE_2 -> TITLE_2_STYLE_CONFIG + TITLE_3 -> TITLE_3_STYLE_CONFIG + TITLE_4 -> TITLE_4_STYLE_CONFIG else -> TITLE_1_STYLE_CONFIG } @@ -143,6 +147,8 @@ class TitleView @JvmOverloads constructor( companion object { const val TITLE_1 = 0 const val TITLE_2 = 1 + const val TITLE_3 = 2 + const val TITLE_4 = 3 private val TITLE_1_STYLE_CONFIG = TitleStyleConfig( preset = R.style.AppTheme_TextAppearance_PresetTitle1, @@ -151,7 +157,19 @@ class TitleView @JvmOverloads constructor( ) private val TITLE_2_STYLE_CONFIG = TitleStyleConfig( - preset = R.style.AppTheme_TextAppearance_Preset5, + preset = R.style.AppTheme_TextAppearance_PresetTitle2, + colorAttrRes = R.attr.colorTextPrimary, + isAllCaps = false, + ) + + private val TITLE_3_STYLE_CONFIG = TitleStyleConfig( + preset = R.style.AppTheme_TextAppearance_PresetTitle3, + colorAttrRes = R.attr.colorTextPrimary, + isAllCaps = false, + ) + + private val TITLE_4_STYLE_CONFIG = TitleStyleConfig( + preset = R.style.AppTheme_TextAppearance_Preset6, colorAttrRes = R.attr.colorTextPrimary, isAllCaps = false, ) diff --git a/library/src/main/res/color/button_secondary_background_inverse_selector.xml b/library/src/main/res/color/button_secondary_background_inverse_selector.xml index fb8393655..a65de3ea1 100644 --- a/library/src/main/res/color/button_secondary_background_inverse_selector.xml +++ b/library/src/main/res/color/button_secondary_background_inverse_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/library/src/main/res/color/button_secondary_border_selector.xml b/library/src/main/res/color/button_secondary_border_selector.xml index a1fdfed52..ed61ecfb2 100644 --- a/library/src/main/res/color/button_secondary_border_selector.xml +++ b/library/src/main/res/color/button_secondary_border_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/library/src/main/res/color/text_button_primary_inverse_selector.xml b/library/src/main/res/color/text_button_primary_inverse_selector.xml index 3a9668947..dbc2bd3de 100644 --- a/library/src/main/res/color/text_button_primary_inverse_selector.xml +++ b/library/src/main/res/color/text_button_primary_inverse_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/library/src/main/res/color/text_button_secondary_inverse_selector.xml b/library/src/main/res/color/text_button_secondary_inverse_selector.xml index 2b09c5eb0..0d5d06726 100644 --- a/library/src/main/res/color/text_button_secondary_inverse_selector.xml +++ b/library/src/main/res/color/text_button_secondary_inverse_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/library/src/main/res/color/text_button_secondary_selector.xml b/library/src/main/res/color/text_button_secondary_selector.xml index 24913f11e..0ed0aebce 100644 --- a/library/src/main/res/color/text_button_secondary_selector.xml +++ b/library/src/main/res/color/text_button_secondary_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/library/src/main/res/values-night/themes_blau_autogenerated.xml b/library/src/main/res/values-night/themes_blau_autogenerated.xml index fc803ed25..48c3ee3a0 100644 --- a/library/src/main/res/values-night/themes_blau_autogenerated.xml +++ b/library/src/main/res/values-night/themes_blau_autogenerated.xml @@ -30,33 +30,33 @@ @color/blau_color_darkModeBlack_25_alpha @color/blau_color_darkModeBlack_35_alpha @color/blau_color_blauRed - @color/blau_color_blauRed70 + @color/blau_color_blauRed70 @color/blau_color_blauRed70 - @color/blau_color_blauPurple_30_alpha + @color/blau_color_blauPurple_30_alpha @color/blau_color_white_0_alpha - @color/blau_color_blauPurple_30_alpha - @color/blau_color_blauPurple_30_alpha - @color/blau_color_blauPurple_30_alpha + @color/blau_color_blauPurple_30_alpha + @color/blau_color_blauPurple_30_alpha + @color/blau_color_blauPurple_30_alpha @color/blau_color_blauBlueSecondary @color/blau_color_blauBluePrimary - @color/blau_color_blauBlueSecondary60 + @color/blau_color_blauBlueSecondary60 @color/blau_color_blauBlueSecondary60 - @color/blau_color_blauBlueSecondary60 + @color/blau_color_blauBlueSecondary60 @color/blau_color_white - @color/blau_color_white + @color/blau_color_white @color/blau_color_white_15_alpha - @color/blau_color_white_15_alpha + @color/blau_color_white_15_alpha @color/blau_color_white - @color/blau_color_white + @color/blau_color_white @color/blau_color_white_15_alpha - @color/blau_color_white_15_alpha + @color/blau_color_white_15_alpha @color/blau_color_grey2 @color/blau_color_grey2 - @color/blau_color_grey2 + @color/blau_color_grey2 @color/blau_color_grey2 - @color/blau_color_grey2 + @color/blau_color_grey2 @color/blau_color_grey2 - @color/blau_color_grey2 + @color/blau_color_grey2 @color/blau_color_blauPurple30 @color/blau_color_blauPurple30 @color/blau_color_blauRed diff --git a/library/src/main/res/values-night/themes_movistar_autogenerated.xml b/library/src/main/res/values-night/themes_movistar_autogenerated.xml index 4602262fc..4ea1e8f51 100644 --- a/library/src/main/res/values-night/themes_movistar_autogenerated.xml +++ b/library/src/main/res/values-night/themes_movistar_autogenerated.xml @@ -30,33 +30,33 @@ @color/movistar_color_darkModeBlack_25_alpha @color/movistar_color_darkModeBlack_35_alpha @color/movistar_color_pepper55 - @color/movistar_color_pepper70 + @color/movistar_color_pepper70 @color/movistar_color_pepper65 - @color/movistar_color_white_8_alpha + @color/movistar_color_white_8_alpha @color/movistar_color_white_0_alpha - @color/movistar_color_white_8_alpha - @color/movistar_color_white_8_alpha - @color/movistar_color_white_8_alpha + @color/movistar_color_white_8_alpha + @color/movistar_color_white_8_alpha + @color/movistar_color_white_8_alpha @color/movistar_color_movistarBlueHC @color/movistar_color_movistarBlueHC - @color/movistar_color_movistarBlueHC65 + @color/movistar_color_movistarBlueHC65 @color/movistar_color_movistarBlueHC55 - @color/movistar_color_movistarBlueHC65 + @color/movistar_color_movistarBlueHC65 @color/movistar_color_white_15_alpha - @color/movistar_color_white_25_alpha + @color/movistar_color_white_25_alpha @color/movistar_color_white - @color/movistar_color_white + @color/movistar_color_white @color/movistar_color_darkModeGrey2 - @color/movistar_color_darkModeGrey2 + @color/movistar_color_darkModeGrey2 @color/movistar_color_white_15_alpha - @color/movistar_color_white_25_alpha + @color/movistar_color_white_25_alpha @color/movistar_color_white @color/movistar_color_white - @color/movistar_color_white + @color/movistar_color_white @color/movistar_color_darkModeGrey2 - @color/movistar_color_darkModeGrey2 + @color/movistar_color_darkModeGrey2 @color/movistar_color_darkModeGrey2 - @color/movistar_color_darkModeGrey2 + @color/movistar_color_darkModeGrey2 @color/movistar_color_movistarBlue @color/movistar_color_movistarBlue @color/movistar_color_pepper45 diff --git a/library/src/main/res/values-night/themes_o2New_autogenerated.xml b/library/src/main/res/values-night/themes_o2New_autogenerated.xml index e5dbfe608..0507bb1ae 100644 --- a/library/src/main/res/values-night/themes_o2New_autogenerated.xml +++ b/library/src/main/res/values-night/themes_o2New_autogenerated.xml @@ -30,33 +30,33 @@ @color/o2New_color_darkModeBlack_25_alpha @color/o2New_color_darkModeBlack_35_alpha @color/o2New_color_o2Red60 - @color/o2New_color_o2Red65 + @color/o2New_color_o2Red65 @color/o2New_color_o2Red65 - @color/o2New_color_white_8_alpha + @color/o2New_color_white_8_alpha @color/o2New_color_white_0_alpha - @color/o2New_color_white_8_alpha - @color/o2New_color_white_8_alpha - @color/o2New_color_white_8_alpha + @color/o2New_color_white_8_alpha + @color/o2New_color_white_8_alpha + @color/o2New_color_white_8_alpha @color/o2New_color_darkModeBeyondBlue @color/o2New_color_darkModeBeyondBlue - @color/o2New_color_beyondBlue55 + @color/o2New_color_beyondBlue55 @color/o2New_color_beyondBlue55 - @color/o2New_color_beyondBlue55 - @color/o2New_color_white_15_alpha + @color/o2New_color_beyondBlue55 + @color/o2New_color_white_15_alpha @color/o2New_color_white - @color/o2New_color_white + @color/o2New_color_white @color/o2New_color_white - @color/o2New_color_white + @color/o2New_color_white @color/o2New_color_white_15_alpha @color/o2New_color_white_15_alpha - @color/o2New_color_white_15_alpha + @color/o2New_color_white_15_alpha @color/o2New_color_white @color/o2New_color_white - @color/o2New_color_white + @color/o2New_color_white @color/o2New_color_grey30 - @color/o2New_color_grey30 + @color/o2New_color_grey30 @color/o2New_color_grey30 - @color/o2New_color_grey30 + @color/o2New_color_grey30 @color/o2New_color_beyondBlue40 @color/o2New_color_beyondBlue40 @color/o2New_color_o2Red45 diff --git a/library/src/main/res/values-night/themes_o2_autogenerated.xml b/library/src/main/res/values-night/themes_o2_autogenerated.xml index cd02d0d0e..57fb48573 100644 --- a/library/src/main/res/values-night/themes_o2_autogenerated.xml +++ b/library/src/main/res/values-night/themes_o2_autogenerated.xml @@ -30,33 +30,33 @@ @color/o2_color_darkModeBlack_25_alpha @color/o2_color_darkModeBlack_35_alpha @color/o2_color_pepper - @color/o2_color_pepper60 + @color/o2_color_pepper60 @color/o2_color_pepper60 - @color/o2_color_white_8_alpha + @color/o2_color_white_8_alpha @color/o2_color_white_0_alpha - @color/o2_color_white_8_alpha - @color/o2_color_white_8_alpha - @color/o2_color_white_8_alpha + @color/o2_color_white_8_alpha + @color/o2_color_white_8_alpha + @color/o2_color_white_8_alpha @color/o2_color_darkModeO2BluePrimary @color/o2_color_darkModeO2BluePrimary - @color/o2_color_darkModeO2BluePrimaryDark + @color/o2_color_darkModeO2BluePrimaryDark @color/o2_color_darkModeO2BluePrimaryDark - @color/o2_color_darkModeO2BluePrimaryDark - @color/o2_color_white_15_alpha + @color/o2_color_darkModeO2BluePrimaryDark + @color/o2_color_white_15_alpha @color/o2_color_white - @color/o2_color_white + @color/o2_color_white @color/o2_color_white - @color/o2_color_white + @color/o2_color_white @color/o2_color_white_15_alpha @color/o2_color_white_15_alpha - @color/o2_color_white_15_alpha + @color/o2_color_white_15_alpha @color/o2_color_grey2 @color/o2_color_grey2 - @color/o2_color_grey2 + @color/o2_color_grey2 @color/o2_color_grey2 - @color/o2_color_grey2 + @color/o2_color_grey2 @color/o2_color_grey2 - @color/o2_color_grey2 + @color/o2_color_grey2 @color/o2_color_o2BluePrimary30 @color/o2_color_o2BluePrimary30 @color/o2_color_pepper diff --git a/library/src/main/res/values-night/themes_telefonica_autogenerated.xml b/library/src/main/res/values-night/themes_telefonica_autogenerated.xml index 0d80fd232..58f53f1a1 100644 --- a/library/src/main/res/values-night/themes_telefonica_autogenerated.xml +++ b/library/src/main/res/values-night/themes_telefonica_autogenerated.xml @@ -30,33 +30,33 @@ @color/telefonica_color_darkModeBlack_25_alpha @color/telefonica_color_darkModeBlack_35_alpha @color/telefonica_color_coral - @color/telefonica_color_coral80 + @color/telefonica_color_coral80 @color/telefonica_color_coral80 - @color/telefonica_color_white_8_alpha + @color/telefonica_color_white_8_alpha @color/telefonica_color_white_0_alpha - @color/telefonica_color_white_8_alpha - @color/telefonica_color_white_8_alpha - @color/telefonica_color_white_8_alpha + @color/telefonica_color_white_8_alpha + @color/telefonica_color_white_8_alpha + @color/telefonica_color_white_8_alpha @color/telefonica_color_telefonicaBlue @color/telefonica_color_telefonicaBlue - @color/telefonica_color_telefonicaBlue70 + @color/telefonica_color_telefonicaBlue70 @color/telefonica_color_telefonicaBlue70 - @color/telefonica_color_telefonicaBlue70 - @color/telefonica_color_white_15_alpha + @color/telefonica_color_telefonicaBlue70 + @color/telefonica_color_white_15_alpha @color/telefonica_color_white @color/telefonica_color_white_15_alpha - @color/telefonica_color_white + @color/telefonica_color_white @color/telefonica_color_white - @color/telefonica_color_white + @color/telefonica_color_white @color/telefonica_color_white_15_alpha - @color/telefonica_color_white_15_alpha + @color/telefonica_color_white_15_alpha @color/telefonica_color_grey2 @color/telefonica_color_grey2 - @color/telefonica_color_grey2 + @color/telefonica_color_grey2 @color/telefonica_color_grey2 - @color/telefonica_color_grey2 + @color/telefonica_color_grey2 @color/telefonica_color_grey2 - @color/telefonica_color_grey2 + @color/telefonica_color_grey2 @color/telefonica_color_telefonicaBlue @color/telefonica_color_telefonicaBlue @color/telefonica_color_coral diff --git a/library/src/main/res/values-night/themes_tu_autogenerated.xml b/library/src/main/res/values-night/themes_tu_autogenerated.xml index dddd3365d..50e344117 100644 --- a/library/src/main/res/values-night/themes_tu_autogenerated.xml +++ b/library/src/main/res/values-night/themes_tu_autogenerated.xml @@ -30,33 +30,33 @@ @color/tu_color_darkModeBlack_25_alpha @color/tu_color_darkModeBlack_35_alpha @color/tu_color_red - @color/tu_color_red80 + @color/tu_color_red80 @color/tu_color_red80 - @color/tu_color_red10 + @color/tu_color_red10 @color/tu_color_white_0_alpha - @color/tu_color_red10 - @color/tu_color_white_8_alpha - @color/tu_color_white_8_alpha + @color/tu_color_red10 + @color/tu_color_white_8_alpha + @color/tu_color_white_8_alpha @color/tu_color_grey2 @color/tu_color_grey2 - @color/tu_color_grey3 + @color/tu_color_grey3 @color/tu_color_grey3 - @color/tu_color_grey3 - @color/tu_color_grey2_15_alpha + @color/tu_color_grey3 + @color/tu_color_grey2_15_alpha @color/tu_color_grey2 @color/tu_color_grey2_15_alpha - @color/tu_color_grey2 + @color/tu_color_grey2 @color/tu_color_grey2 - @color/tu_color_grey2 + @color/tu_color_grey2 @color/tu_color_grey2_15_alpha - @color/tu_color_grey2_15_alpha + @color/tu_color_grey2_15_alpha @color/tu_color_primary @color/tu_color_primary - @color/tu_color_primary + @color/tu_color_primary @color/tu_color_grey2 - @color/tu_color_grey2 + @color/tu_color_grey2 @color/tu_color_grey2 - @color/tu_color_grey2 + @color/tu_color_grey2 @color/tu_color_blue30 @color/tu_color_blue30 @color/tu_color_red diff --git a/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml b/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml index 7f0fa3aff..982ec5a1b 100644 --- a/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml +++ b/library/src/main/res/values-night/themes_vivoNew_autogenerated.xml @@ -30,33 +30,33 @@ @color/vivoNew_color_darkModeBlack_25_alpha @color/vivoNew_color_darkModeBlack_35_alpha @color/vivoNew_color_pepper - @color/vivoNew_color_pepperDark + @color/vivoNew_color_pepperDark @color/vivoNew_color_pepperDark - @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha @color/vivoNew_color_white_0_alpha - @color/vivoNew_color_white_8_alpha - @color/vivoNew_color_white_8_alpha - @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha @color/vivoNew_color_vivoPurpleLight80 @color/vivoNew_color_vivoPurpleLight80 - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleDark - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_pepper @@ -162,33 +162,33 @@ @color/vivoNew_color_darkModeBlack_25_alpha @color/vivoNew_color_darkModeBlack_35_alpha @color/vivoNew_color_pepper - @color/vivoNew_color_pepperDark + @color/vivoNew_color_pepperDark @color/vivoNew_color_pepperDark - @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha @color/vivoNew_color_white_0_alpha - @color/vivoNew_color_white_8_alpha - @color/vivoNew_color_white_8_alpha - @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha + @color/vivoNew_color_white_8_alpha @color/vivoNew_color_vivoPurpleLight80 @color/vivoNew_color_vivoPurpleLight80 - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleDark - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_grey2 - @color/vivoNew_color_grey2 + @color/vivoNew_color_grey2 @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_pepper diff --git a/library/src/main/res/values-night/themes_vivo_autogenerated.xml b/library/src/main/res/values-night/themes_vivo_autogenerated.xml index a1a9c6de0..d19ad62c0 100644 --- a/library/src/main/res/values-night/themes_vivo_autogenerated.xml +++ b/library/src/main/res/values-night/themes_vivo_autogenerated.xml @@ -30,33 +30,33 @@ @color/vivo_color_darkModeBlack_25_alpha @color/vivo_color_darkModeBlack_35_alpha @color/vivo_color_pepper - @color/vivo_color_pepperDark + @color/vivo_color_pepperDark @color/vivo_color_pepperDark - @color/vivo_color_white_8_alpha + @color/vivo_color_white_8_alpha @color/vivo_color_white_0_alpha - @color/vivo_color_white_8_alpha - @color/vivo_color_white_8_alpha - @color/vivo_color_white_8_alpha + @color/vivo_color_white_8_alpha + @color/vivo_color_white_8_alpha + @color/vivo_color_white_8_alpha @color/vivo_color_vivoPurpleLight80 @color/vivo_color_vivoPurpleLight80 - @color/vivo_color_vivoPurpleDark + @color/vivo_color_vivoPurpleDark @color/vivo_color_vivoPurpleDark - @color/vivo_color_vivoPurpleDark + @color/vivo_color_vivoPurpleDark @color/vivo_color_white_15_alpha - @color/vivo_color_white_15_alpha + @color/vivo_color_white_15_alpha @color/vivo_color_white - @color/vivo_color_white + @color/vivo_color_white @color/vivo_color_white - @color/vivo_color_white + @color/vivo_color_white @color/vivo_color_white_15_alpha - @color/vivo_color_white_15_alpha + @color/vivo_color_white_15_alpha @color/vivo_color_grey2 @color/vivo_color_grey2 - @color/vivo_color_grey2 + @color/vivo_color_grey2 @color/vivo_color_grey2 - @color/vivo_color_grey2 + @color/vivo_color_grey2 @color/vivo_color_grey2 - @color/vivo_color_grey2 + @color/vivo_color_grey2 @color/vivo_color_vivoPurpleLight50 @color/vivo_color_vivoPurpleLight50 @color/vivo_color_pepper diff --git a/library/src/main/res/values/attrs_autogenerated.xml b/library/src/main/res/values/attrs_autogenerated.xml index ac5d2f847..15d27f85b 100644 --- a/library/src/main/res/values/attrs_autogenerated.xml +++ b/library/src/main/res/values/attrs_autogenerated.xml @@ -28,33 +28,33 @@ - + - + - - - + + + - + - + - + - + - + - + - + - + - + @@ -156,6 +156,7 @@ + @@ -200,6 +201,11 @@ + + + + + @@ -243,7 +249,7 @@ - + diff --git a/library/src/main/res/values/attrs_components.xml b/library/src/main/res/values/attrs_components.xml index 9bfb972c7..1b5ea7bd3 100755 --- a/library/src/main/res/values/attrs_components.xml +++ b/library/src/main/res/values/attrs_components.xml @@ -132,6 +132,8 @@ + + diff --git a/library/src/main/res/values/styles_buttons.xml b/library/src/main/res/values/styles_buttons.xml index 5fea85fb7..c43b2a5eb 100644 --- a/library/src/main/res/values/styles_buttons.xml +++ b/library/src/main/res/values/styles_buttons.xml @@ -53,7 +53,7 @@ @color/button_primary_background_selector @color/button_primary_text_selector @color/button_primary_text_selector - ?attr/colorButtonPrimaryBackgroundSelected + ?attr/colorButtonPrimaryBackgroundPressed + + + + diff --git a/library/src/main/res/values/themes_movistar_autogenerated.xml b/library/src/main/res/values/themes_movistar_autogenerated.xml index d964236a1..1c1217495 100644 --- a/library/src/main/res/values/themes_movistar_autogenerated.xml +++ b/library/src/main/res/values/themes_movistar_autogenerated.xml @@ -31,33 +31,33 @@ @color/movistar_color_black_25_alpha @color/movistar_color_black_35_alpha @color/movistar_color_pepper55 - @color/movistar_color_pepper70 + @color/movistar_color_pepper70 @color/movistar_color_pepper65 - @color/movistar_color_pepper10 + @color/movistar_color_pepper10 @color/movistar_color_white - @color/movistar_color_pepper10 - @color/movistar_color_movistarBlue10 - @color/movistar_color_white_20_alpha + @color/movistar_color_pepper10 + @color/movistar_color_movistarBlue10 + @color/movistar_color_white_20_alpha @color/movistar_color_movistarBlueHC @color/movistar_color_white - @color/movistar_color_movistarBlueHC65 + @color/movistar_color_movistarBlueHC65 @color/movistar_color_movistarBlueHC55 - @color/movistar_color_movistarBlue10 + @color/movistar_color_movistarBlue10 @color/movistar_color_movistarBlueHC - @color/movistar_color_movistarBlueHC65 + @color/movistar_color_movistarBlueHC65 @color/movistar_color_movistarBlue10 - @color/movistar_color_movistarBlue15 + @color/movistar_color_movistarBlue15 @color/movistar_color_white - @color/movistar_color_white + @color/movistar_color_white @color/movistar_color_white_20_alpha - @color/movistar_color_white_30_alpha + @color/movistar_color_white_30_alpha @color/movistar_color_white @color/movistar_color_movistarBlueHC - @color/movistar_color_movistarBlueHC + @color/movistar_color_movistarBlueHC @color/movistar_color_movistarBlueHC - @color/movistar_color_movistarBlueHC55 + @color/movistar_color_movistarBlueHC55 @color/movistar_color_white - @color/movistar_color_white + @color/movistar_color_white @color/movistar_color_movistarBlueHC @color/movistar_color_white @color/movistar_color_pepper60 @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_regular + ?font_family_regular ?font_family_medium ?font_family_medium ?font_family_regular @@ -167,6 +168,7 @@ normal normal bold + bold normal normal bold @@ -177,7 +179,7 @@ bold 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_o2New_autogenerated.xml b/library/src/main/res/values/themes_o2New_autogenerated.xml index 6a6b0c915..896b4e1a0 100644 --- a/library/src/main/res/values/themes_o2New_autogenerated.xml +++ b/library/src/main/res/values/themes_o2New_autogenerated.xml @@ -31,33 +31,33 @@ @color/o2New_color_darkModeBlack_25_alpha @color/o2New_color_darkModeBlack_35_alpha @color/o2New_color_o2Red60 - @color/o2New_color_o2Red65 + @color/o2New_color_o2Red65 @color/o2New_color_o2Red65 - @color/o2New_color_o2Red10 + @color/o2New_color_o2Red10 @color/o2New_color_white - @color/o2New_color_o2Red10 - @color/o2New_color_beyondBlue10 - @color/o2New_color_white_8_alpha + @color/o2New_color_o2Red10 + @color/o2New_color_beyondBlue10 + @color/o2New_color_white_8_alpha @color/o2New_color_beyondBlue @color/o2New_color_white - @color/o2New_color_beyondBlue70 + @color/o2New_color_beyondBlue70 @color/o2New_color_beyondBlue70 - @color/o2New_color_beyondBlue30 + @color/o2New_color_beyondBlue30 @color/o2New_color_beyondBlue - @color/o2New_color_beyondBlue70 + @color/o2New_color_beyondBlue70 @color/o2New_color_beyondBlue10 - @color/o2New_color_beyondBlue10 + @color/o2New_color_beyondBlue10 @color/o2New_color_white - @color/o2New_color_beyondBlue30 + @color/o2New_color_beyondBlue30 @color/o2New_color_white_15_alpha - @color/o2New_color_white_15_alpha + @color/o2New_color_white_15_alpha @color/o2New_color_white @color/o2New_color_beyondBlue - @color/o2New_color_beyondBlue70 + @color/o2New_color_beyondBlue70 @color/o2New_color_beyondBlue - @color/o2New_color_beyondBlue70 + @color/o2New_color_beyondBlue70 @color/o2New_color_white - @color/o2New_color_white + @color/o2New_color_white @color/o2New_color_beyondBlue @color/o2New_color_white @color/o2New_color_o2Red65 @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_regular + ?font_family_regular ?font_family_medium ?font_family_medium ?font_family_regular @@ -167,6 +168,7 @@ normal normal bold + bold normal normal bold @@ -177,7 +179,7 @@ bold 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_o2_autogenerated.xml b/library/src/main/res/values/themes_o2_autogenerated.xml index 9919362c1..b284b5f29 100644 --- a/library/src/main/res/values/themes_o2_autogenerated.xml +++ b/library/src/main/res/values/themes_o2_autogenerated.xml @@ -31,33 +31,33 @@ @color/o2_color_darkModeBlack_25_alpha @color/o2_color_darkModeBlack_35_alpha @color/o2_color_pepper - @color/o2_color_pepper60 + @color/o2_color_pepper60 @color/o2_color_pepper60 - @color/o2_color_pepper10 + @color/o2_color_pepper10 @color/o2_color_white - @color/o2_color_pepper10 - @color/o2_color_o2BluePrimary10 - @color/o2_color_white_8_alpha + @color/o2_color_pepper10 + @color/o2_color_o2BluePrimary10 + @color/o2_color_white_8_alpha @color/o2_color_o2BluePrimary @color/o2_color_white - @color/o2_color_o2BluePrimary70 + @color/o2_color_o2BluePrimary70 @color/o2_color_o2BluePrimary70 - @color/o2_color_o2BluePrimary30 + @color/o2_color_o2BluePrimary30 @color/o2_color_o2BluePrimary - @color/o2_color_o2BluePrimary70 + @color/o2_color_o2BluePrimary70 @color/o2_color_o2BluePrimary10 - @color/o2_color_o2BluePrimary10 + @color/o2_color_o2BluePrimary10 @color/o2_color_white - @color/o2_color_o2BluePrimary30 + @color/o2_color_o2BluePrimary30 @color/o2_color_white_15_alpha - @color/o2_color_white_15_alpha + @color/o2_color_white_15_alpha @color/o2_color_white @color/o2_color_o2BluePrimary - @color/o2_color_o2BluePrimary70 + @color/o2_color_o2BluePrimary70 @color/o2_color_o2BluePrimary - @color/o2_color_o2BluePrimary70 + @color/o2_color_o2BluePrimary70 @color/o2_color_white - @color/o2_color_white + @color/o2_color_white @color/o2_color_o2BluePrimary @color/o2_color_white @color/o2_color_pepper @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_light + ?font_family_light ?font_family_medium ?font_family_medium ?font_family_light @@ -167,6 +168,7 @@ normal normal normal + normal normal normal normal @@ -177,7 +179,7 @@ normal 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_telefonica_autogenerated.xml b/library/src/main/res/values/themes_telefonica_autogenerated.xml index 1e6a37ad6..eeac0a59c 100644 --- a/library/src/main/res/values/themes_telefonica_autogenerated.xml +++ b/library/src/main/res/values/themes_telefonica_autogenerated.xml @@ -31,33 +31,33 @@ @color/telefonica_color_darkModeBlack_25_alpha @color/telefonica_color_darkModeBlack_35_alpha @color/telefonica_color_coral - @color/telefonica_color_coral80 + @color/telefonica_color_coral80 @color/telefonica_color_coral80 - @color/telefonica_color_coral10 + @color/telefonica_color_coral10 @color/telefonica_color_white - @color/telefonica_color_coral10 - @color/telefonica_color_grey1 - @color/telefonica_color_white_8_alpha + @color/telefonica_color_coral10 + @color/telefonica_color_grey1 + @color/telefonica_color_white_8_alpha @color/telefonica_color_telefonicaBlue @color/telefonica_color_white - @color/telefonica_color_telefonicaBlue70 + @color/telefonica_color_telefonicaBlue70 @color/telefonica_color_telefonicaBlue70 - @color/telefonica_color_telefonicaBlue30 + @color/telefonica_color_telefonicaBlue30 @color/telefonica_color_telefonicaBlue - @color/telefonica_color_telefonicaBlue70 + @color/telefonica_color_telefonicaBlue70 @color/telefonica_color_telefonicaBlue10 - @color/telefonica_color_telefonicaBlue10 + @color/telefonica_color_telefonicaBlue10 @color/telefonica_color_white - @color/telefonica_color_white + @color/telefonica_color_white @color/telefonica_color_white_10_alpha - @color/telefonica_color_white_10_alpha + @color/telefonica_color_white_10_alpha @color/telefonica_color_white @color/telefonica_color_telefonicaBlue - @color/telefonica_color_telefonicaBlue + @color/telefonica_color_telefonicaBlue @color/telefonica_color_telefonicaBlue - @color/telefonica_color_telefonicaBlue70 + @color/telefonica_color_telefonicaBlue70 @color/telefonica_color_white - @color/telefonica_color_white + @color/telefonica_color_white @color/telefonica_color_telefonicaBlue @color/telefonica_color_white @color/telefonica_color_coral @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_regular + ?font_family_regular ?font_family_medium ?font_family_medium ?font_family_regular @@ -167,6 +168,7 @@ normal normal normal + normal normal normal normal @@ -177,7 +179,7 @@ normal 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_tu_autogenerated.xml b/library/src/main/res/values/themes_tu_autogenerated.xml index a6d0aab18..fa40ff702 100644 --- a/library/src/main/res/values/themes_tu_autogenerated.xml +++ b/library/src/main/res/values/themes_tu_autogenerated.xml @@ -31,33 +31,33 @@ @color/tu_color_grey9_25_alpha @color/tu_color_grey9_35_alpha @color/tu_color_red - @color/tu_color_red55 + @color/tu_color_red55 @color/tu_color_red55 - @color/tu_color_red10 + @color/tu_color_red10 @color/tu_color_white - @color/tu_color_red10 - @color/tu_color_blue10 - @color/tu_color_white_8_alpha + @color/tu_color_red10 + @color/tu_color_blue10 + @color/tu_color_white_8_alpha @color/tu_color_primary @color/tu_color_white - @color/tu_color_primary45 + @color/tu_color_primary45 @color/tu_color_primary45 - @color/tu_color_white_80_alpha + @color/tu_color_white_80_alpha @color/tu_color_blue - @color/tu_color_blue70 + @color/tu_color_blue70 @color/tu_color_blue10 - @color/tu_color_blue10 + @color/tu_color_blue10 @color/tu_color_white - @color/tu_color_white + @color/tu_color_white @color/tu_color_white_10_alpha - @color/tu_color_white_10_alpha + @color/tu_color_white_10_alpha @color/tu_color_white @color/tu_color_primary - @color/tu_color_primary + @color/tu_color_primary @color/tu_color_blue - @color/tu_color_blue70 + @color/tu_color_blue70 @color/tu_color_white - @color/tu_color_white + @color/tu_color_white @color/tu_color_blue @color/tu_color_white @color/tu_color_red @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_medium + ?font_family_medium ?font_family_medium ?font_family_medium ?font_family_medium @@ -167,6 +168,7 @@ normal normal normal + normal normal normal normal @@ -177,7 +179,7 @@ normal 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_vivoNew_autogenerated.xml b/library/src/main/res/values/themes_vivoNew_autogenerated.xml index 5c50e1479..fc753f4a5 100644 --- a/library/src/main/res/values/themes_vivoNew_autogenerated.xml +++ b/library/src/main/res/values/themes_vivoNew_autogenerated.xml @@ -17,7 +17,7 @@ @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_grey1 @color/vivoNew_color_grey6_60_alpha - @color/vivoNew_color_grey4 + @color/vivoNew_color_grey3 @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurple @color/vivoNew_color_vivoPurple @@ -31,33 +31,33 @@ @color/vivoNew_color_darkModeBlack_25_alpha @color/vivoNew_color_darkModeBlack_35_alpha @color/vivoNew_color_pepper - @color/vivoNew_color_pepperDark + @color/vivoNew_color_pepperDark @color/vivoNew_color_pepperDark - @color/vivoNew_color_pepperLight10 + @color/vivoNew_color_pepperLight10 @color/vivoNew_color_white - @color/vivoNew_color_pepperLight10 - @color/vivoNew_color_vivoPurpleLight10 - @color/vivoNew_color_white_10_alpha + @color/vivoNew_color_pepperLight10 + @color/vivoNew_color_vivoPurpleLight10 + @color/vivoNew_color_white_10_alpha @color/vivoNew_color_vivoPurple @color/vivoNew_color_white - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleDark - @color/vivoNew_color_vivoPurpleLight50 + @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleLight10 - @color/vivoNew_color_vivoPurpleLight10 + @color/vivoNew_color_vivoPurpleLight10 @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_white @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurple + @color/vivoNew_color_vivoPurple @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_vivoPurple @color/vivoNew_color_white @color/vivoNew_color_pepper @@ -152,6 +152,7 @@ ?font_family_regular ?font_family_regular ?font_family_regular + ?font_family_regular ?font_family_regular ?font_family_regular ?font_family_regular @@ -167,6 +168,7 @@ normal normal normal + normal normal normal normal @@ -177,7 +179,7 @@ normal 18sp - 18sp + 18sp 12sp 14sp 16sp @@ -205,7 +207,7 @@ @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_grey1 @color/vivoNew_color_grey6_60_alpha - @color/vivoNew_color_grey4 + @color/vivoNew_color_grey3 @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurple @color/vivoNew_color_vivoPurple @@ -219,33 +221,33 @@ @color/vivoNew_color_darkModeBlack_25_alpha @color/vivoNew_color_darkModeBlack_35_alpha @color/vivoNew_color_pepper - @color/vivoNew_color_pepperDark + @color/vivoNew_color_pepperDark @color/vivoNew_color_pepperDark - @color/vivoNew_color_pepperLight10 + @color/vivoNew_color_pepperLight10 @color/vivoNew_color_white - @color/vivoNew_color_pepperLight10 - @color/vivoNew_color_vivoPurpleLight10 - @color/vivoNew_color_white_10_alpha + @color/vivoNew_color_pepperLight10 + @color/vivoNew_color_vivoPurpleLight10 + @color/vivoNew_color_white_10_alpha @color/vivoNew_color_vivoPurple @color/vivoNew_color_white - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleDark - @color/vivoNew_color_vivoPurpleLight50 + @color/vivoNew_color_vivoPurpleLight50 @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_vivoPurpleLight10 - @color/vivoNew_color_vivoPurpleLight10 + @color/vivoNew_color_vivoPurpleLight10 @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_white_15_alpha - @color/vivoNew_color_white_15_alpha + @color/vivoNew_color_white_15_alpha @color/vivoNew_color_white @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurple + @color/vivoNew_color_vivoPurple @color/vivoNew_color_vivoPurple - @color/vivoNew_color_vivoPurpleDark + @color/vivoNew_color_vivoPurpleDark @color/vivoNew_color_white - @color/vivoNew_color_white + @color/vivoNew_color_white @color/vivoNew_color_vivoPurple @color/vivoNew_color_white @color/vivoNew_color_pepper @@ -340,6 +342,7 @@ ?font_family_regular ?font_family_regular ?font_family_regular + ?font_family_regular ?font_family_regular ?font_family_regular ?font_family_regular @@ -355,6 +358,7 @@ normal normal normal + normal normal normal normal @@ -365,7 +369,7 @@ normal 18sp - 18sp + 18sp 12sp 14sp 16sp diff --git a/library/src/main/res/values/themes_vivo_autogenerated.xml b/library/src/main/res/values/themes_vivo_autogenerated.xml index 4cbeb11eb..e5efc9b5d 100644 --- a/library/src/main/res/values/themes_vivo_autogenerated.xml +++ b/library/src/main/res/values/themes_vivo_autogenerated.xml @@ -31,33 +31,33 @@ @color/vivo_color_darkModeBlack_25_alpha @color/vivo_color_darkModeBlack_35_alpha @color/vivo_color_pepper - @color/vivo_color_pepperDark + @color/vivo_color_pepperDark @color/vivo_color_pepperDark - @color/vivo_color_pepperLight10 + @color/vivo_color_pepperLight10 @color/vivo_color_white - @color/vivo_color_pepperLight10 - @color/vivo_color_vivoPurpleLight10 - @color/vivo_color_white_10_alpha + @color/vivo_color_pepperLight10 + @color/vivo_color_vivoPurpleLight10 + @color/vivo_color_white_10_alpha @color/vivo_color_vivoPurple @color/vivo_color_white - @color/vivo_color_vivoPurpleDark + @color/vivo_color_vivoPurpleDark @color/vivo_color_vivoPurpleDark - @color/vivo_color_vivoPurpleLight50 + @color/vivo_color_vivoPurpleLight50 @color/vivo_color_vivoPurple - @color/vivo_color_vivoPurpleDark + @color/vivo_color_vivoPurpleDark @color/vivo_color_vivoPurpleLight10 - @color/vivo_color_vivoPurpleLight10 + @color/vivo_color_vivoPurpleLight10 @color/vivo_color_white - @color/vivo_color_white + @color/vivo_color_white @color/vivo_color_white_15_alpha - @color/vivo_color_white_15_alpha + @color/vivo_color_white_15_alpha @color/vivo_color_white @color/vivo_color_vivoPurple - @color/vivo_color_vivoPurple + @color/vivo_color_vivoPurple @color/vivo_color_vivoPurple - @color/vivo_color_vivoPurpleDark + @color/vivo_color_vivoPurpleDark @color/vivo_color_white - @color/vivo_color_white + @color/vivo_color_white @color/vivo_color_vivoPurple @color/vivo_color_white @color/vivo_color_pepper @@ -152,6 +152,7 @@ ?font_family_medium ?font_family_medium ?font_family_light + ?font_family_light ?font_family_medium ?font_family_medium ?font_family_light @@ -167,6 +168,7 @@ normal normal normal + normal normal normal normal @@ -177,7 +179,7 @@ normal 16sp - 20sp + 20sp 12sp 14sp 16sp diff --git a/tokens/src/test/java/com/telefonica/mistica/tokens/common/GetColorsWithAlphaTest.kt b/tokens/src/test/java/com/telefonica/mistica/tokens/common/GetColorsWithAlphaTest.kt index 325c8c8f8..388a07b9a 100644 --- a/tokens/src/test/java/com/telefonica/mistica/tokens/common/GetColorsWithAlphaTest.kt +++ b/tokens/src/test/java/com/telefonica/mistica/tokens/common/GetColorsWithAlphaTest.kt @@ -41,11 +41,11 @@ class GetColorsWithAlphaTest { ) ), dark = mapOf( - "textButtonSecondarySelected" to BrushDTO.SolidColorDTO( + "textButtonSecondaryPressed" to BrushDTO.SolidColorDTO( value = "{palette.grey2}", description = "anyDescription" ), - "buttonLinkBackgroundSelected" to BrushDTO.SolidColorDTO( + "buttonLinkBackgroundPressed" to BrushDTO.SolidColorDTO( value = "rgba({palette.blauPurple}, 0.3)", description = "anyDescription" ),