Skip to content

Commit

Permalink
Merge branch 'main' into poc/roborazzi
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeprubio
jeprubio committed Oct 9, 2023
2 parents 1f4193e + 57c66f0 commit 059380c
Show file tree
Hide file tree
Showing 23 changed files with 87 additions and 8 deletions.
2 changes: 2 additions & 0 deletions ...c/main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object BlauBrandFontSizes {
public val tabsLabelFontSize: TextUnit = 16.sp

public val title2FontSize: TextUnit = 20.sp
}
4 changes: 4 additions & 0 deletions ...main/java/com/telefonica/mistica/compose/theme/brand/BlauBrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object BlauBrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Medium

public val title2FontWeight: FontWeight = FontWeight.Light

public val indicatorFontWeight: FontWeight = FontWeight.Medium

public val navigationBarFontWeight: FontWeight = FontWeight.Medium

public val text5FontWeight: FontWeight = FontWeight.Light

public val text6FontWeight: FontWeight = FontWeight.Light
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object MovistarBrandFontSizes {
public val tabsLabelFontSize: TextUnit = 16.sp

public val title2FontSize: TextUnit = 20.sp
}
4 changes: 4 additions & 0 deletions .../java/com/telefonica/mistica/compose/theme/brand/MovistarBrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object MovistarBrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Medium

public val title2FontWeight: FontWeight = FontWeight.Bold

public val indicatorFontWeight: FontWeight = FontWeight.Medium

public val navigationBarFontWeight: FontWeight = FontWeight.Medium

public val text5FontWeight: FontWeight = FontWeight.Bold

public val text6FontWeight: FontWeight = FontWeight.Bold
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object O2BrandFontSizes {
public val tabsLabelFontSize: TextUnit = 16.sp

public val title2FontSize: TextUnit = 20.sp
}
4 changes: 4 additions & 0 deletions ...c/main/java/com/telefonica/mistica/compose/theme/brand/O2BrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object O2BrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Medium

public val title2FontWeight: FontWeight = FontWeight.Light

public val indicatorFontWeight: FontWeight = FontWeight.Medium

public val navigationBarFontWeight: FontWeight = FontWeight.Medium

public val text5FontWeight: FontWeight = FontWeight.Light

public val text6FontWeight: FontWeight = FontWeight.Light
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandColorsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public object TelefonicaBrandColors {
warningLow = TelefonicaPaletteColor.telefonica_color_ambar10,
errorLow = TelefonicaPaletteColor.telefonica_color_coral10,
promoLow = TelefonicaPaletteColor.telefonica_color_orchid10,
brandLow = TelefonicaPaletteColor.telefonica_color_grey1,
brandLow = TelefonicaPaletteColor.telefonica_color_telefonicaBlue10,
successHigh = TelefonicaPaletteColor.telefonica_color_turquoise70,
warningHigh = TelefonicaPaletteColor.telefonica_color_ambar70,
errorHigh = TelefonicaPaletteColor.telefonica_color_coral70,
Expand Down
2 changes: 2 additions & 0 deletions .../java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object TelefonicaBrandFontSizes {
public val tabsLabelFontSize: TextUnit = 16.sp

public val title2FontSize: TextUnit = 20.sp
}
4 changes: 4 additions & 0 deletions ...ava/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object TelefonicaBrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Medium

public val title2FontWeight: FontWeight = FontWeight.Normal

public val indicatorFontWeight: FontWeight = FontWeight.Medium

public val navigationBarFontWeight: FontWeight = FontWeight.Medium

public val text5FontWeight: FontWeight = FontWeight.Normal

public val text6FontWeight: FontWeight = FontWeight.Normal
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/telefonica/mistica/compose/theme/brand/TelefonicaBrandRadiusAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public object TelefonicaBrandRadius {
inputBorderRadius = 0.dp,
legacyDisplayBorderRadius = 0.dp,
popupBorderRadius = 0.dp,
sheetBorderRadius = 8.dp,)
sheetBorderRadius = 0.dp,)
}
2 changes: 2 additions & 0 deletions ...c/main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object VivoBrandFontSizes {
public val tabsLabelFontSize: TextUnit = 16.sp

public val title2FontSize: TextUnit = 20.sp
}
4 changes: 4 additions & 0 deletions ...main/java/com/telefonica/mistica/compose/theme/brand/VivoBrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object VivoBrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Medium

public val title2FontWeight: FontWeight = FontWeight.Light

public val indicatorFontWeight: FontWeight = FontWeight.Medium

public val navigationBarFontWeight: FontWeight = FontWeight.Medium

public val text5FontWeight: FontWeight = FontWeight.Light

public val text6FontWeight: FontWeight = FontWeight.Light
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandColorsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public object VivoNewBrandColors {
VivoNewPaletteColor.vivoNew_color_white,
backgroundAlternative = VivoNewPaletteColor.vivoNew_color_grey1,
backgroundBrand = VivoNewPaletteColor.vivoNew_color_vivoPurple,
backgroundBrandSecondary = VivoNewPaletteColor.vivoNew_color_vivoPurple,
backgroundBrandSecondary = VivoNewPaletteColor.vivoNew_color_vivoPurpleLight90,
backgroundContainer = VivoNewPaletteColor.vivoNew_color_white,
backgroundContainerHover = VivoNewPaletteColor.vivoNew_color_darkModeBlack_3_alpha,
backgroundContainerPressed = VivoNewPaletteColor.vivoNew_color_darkModeBlack_5_alpha,
Expand Down Expand Up @@ -115,7 +115,7 @@ public object VivoNewBrandColors {

public val darkColors: MisticaColors = MisticaColors(background =
VivoNewPaletteColor.vivoNew_color_darkModeBlack,
backgroundAlternative = VivoNewPaletteColor.vivoNew_color_darkModeGrey,
backgroundAlternative = VivoNewPaletteColor.vivoNew_color_darkModeBlack,
backgroundBrand = VivoNewPaletteColor.vivoNew_color_darkModeBlack,
backgroundBrandSecondary = VivoNewPaletteColor.vivoNew_color_darkModeBlack,
backgroundContainer = VivoNewPaletteColor.vivoNew_color_darkModeGrey,
Expand Down
2 changes: 2 additions & 0 deletions ...ain/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontSizesAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ import androidx.compose.ui.unit.sp

public object VivoNewBrandFontSizes {
public val tabsLabelFontSize: TextUnit = 18.sp

public val title2FontSize: TextUnit = 18.sp
}
4 changes: 4 additions & 0 deletions ...n/java/com/telefonica/mistica/compose/theme/brand/VivoNewBrandFontWeightsAutogenerated.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ public object VivoNewBrandFontWeights {

public val title1FontWeight: FontWeight = FontWeight.Normal

public val title2FontWeight: FontWeight = FontWeight.Normal

public val indicatorFontWeight: FontWeight = FontWeight.Normal

public val navigationBarFontWeight: FontWeight = FontWeight.Normal

public val text5FontWeight: FontWeight = FontWeight.Normal

public val text6FontWeight: FontWeight = FontWeight.Normal
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values-night/themes_vivoNew_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Code generated automatically, DO NOT EDIT manually. Use Import design tokens GitHub Action. -->
<style name="MisticaTheme.VivoNew" parent="MisticaTheme.VivoNew_Customizations">
<item name="colorBackground">@color/vivoNew_color_darkModeBlack</item>
<item name="colorBackgroundAlternative">@color/vivoNew_color_darkModeGrey</item>
<item name="colorBackgroundAlternative">@color/vivoNew_color_darkModeBlack</item>
<item name="colorBackgroundBrand">@color/vivoNew_color_darkModeBlack</item>
<item name="colorBackgroundBrandSecondary">@color/vivoNew_color_darkModeBlack</item>
<item name="colorBackgroundContainer">@color/vivoNew_color_darkModeGrey</item>
Expand Down
13 changes: 13 additions & 0 deletions library/src/main/res/values/attrs_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@
<attr name="tabsLabelFont" format="string"/>
<attr name="linkFont" format="string"/>
<attr name="title1Font" format="string"/>
<attr name="title2Font" format="string"/>
<attr name="indicatorFont" format="string"/>
<attr name="navigationBarFont" format="string"/>
<attr name="text5Font" format="string"/>
<attr name="text6Font" format="string"/>
<attr name="text7Font" format="string"/>
Expand Down Expand Up @@ -173,11 +175,21 @@
<flag name="bold" value="1"/>
<flag name="italic" value="2"/>
</attr>
<attr name="title2TextStyle" format="reference">
<flag name="normal" value="0"/>
<flag name="bold" value="1"/>
<flag name="italic" value="2"/>
</attr>
<attr name="indicatorTextStyle" format="reference">
<flag name="normal" value="0"/>
<flag name="bold" value="1"/>
<flag name="italic" value="2"/>
</attr>
<attr name="navigationBarTextStyle" format="reference">
<flag name="normal" value="0"/>
<flag name="bold" value="1"/>
<flag name="italic" value="2"/>
</attr>
<attr name="text5TextStyle" format="reference">
<flag name="normal" value="0"/>
<flag name="bold" value="1"/>
Expand Down Expand Up @@ -211,5 +223,6 @@
</declare-styleable>
<declare-styleable name="PresetSizes">
<attr name="tabsLabelTextSize" format="dimension"/>
<attr name="title2TextSize" format="dimension"/>
</declare-styleable>
</resources>
5 changes: 5 additions & 0 deletions library/src/main/res/values/themes_blau_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@
<item name="tabsLabelFont">?font_family_medium</item>
<item name="linkFont">?font_family_medium</item>
<item name="title1Font">?font_family_medium</item>
<item name="title2Font">?font_family_light</item>
<item name="indicatorFont">?font_family_medium</item>
<item name="navigationBarFont">?font_family_medium</item>
<item name="text5Font">?font_family_light</item>
<item name="text6Font">?font_family_light</item>
<item name="text7Font">?font_family_light</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">normal</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">normal</item>
<item name="text6TextStyle">normal</item>
<item name="text7TextStyle">normal</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">normal</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">16sp</item>
<item name="title2TextSize">20sp</item>
</style>
</resources>
5 changes: 5 additions & 0 deletions library/src/main/res/values/themes_movistar_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@
<item name="tabsLabelFont">?font_family_medium</item>
<item name="linkFont">?font_family_medium</item>
<item name="title1Font">?font_family_medium</item>
<item name="title2Font">?font_family_regular</item>
<item name="indicatorFont">?font_family_medium</item>
<item name="navigationBarFont">?font_family_medium</item>
<item name="text5Font">?font_family_regular</item>
<item name="text6Font">?font_family_regular</item>
<item name="text7Font">?font_family_regular</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">bold</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">bold</item>
<item name="text6TextStyle">bold</item>
<item name="text7TextStyle">bold</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">bold</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">16sp</item>
<item name="title2TextSize">20sp</item>
</style>
</resources>
5 changes: 5 additions & 0 deletions library/src/main/res/values/themes_o2_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@
<item name="tabsLabelFont">?font_family_medium</item>
<item name="linkFont">?font_family_medium</item>
<item name="title1Font">?font_family_medium</item>
<item name="title2Font">?font_family_light</item>
<item name="indicatorFont">?font_family_medium</item>
<item name="navigationBarFont">?font_family_medium</item>
<item name="text5Font">?font_family_light</item>
<item name="text6Font">?font_family_light</item>
<item name="text7Font">?font_family_light</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">normal</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">normal</item>
<item name="text6TextStyle">normal</item>
<item name="text7TextStyle">normal</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">normal</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">16sp</item>
<item name="title2TextSize">20sp</item>
</style>
</resources>
9 changes: 7 additions & 2 deletions library/src/main/res/values/themes_telefonica_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<item name="colorWarningLow">@color/telefonica_color_ambar10</item>
<item name="colorErrorLow">@color/telefonica_color_coral10</item>
<item name="colorPromoLow">@color/telefonica_color_orchid10</item>
<item name="colorBrandLow">@color/telefonica_color_grey1</item>
<item name="colorBrandLow">@color/telefonica_color_telefonicaBlue10</item>
<item name="colorSuccessHigh">@color/telefonica_color_turquoise70</item>
<item name="colorWarningHigh">@color/telefonica_color_ambar70</item>
<item name="colorErrorHigh">@color/telefonica_color_coral70</item>
Expand All @@ -118,14 +118,16 @@
<item name="inputBorderRadius">0dp</item>
<item name="legacyDisplayBorderRadius">0dp</item>
<item name="popupBorderRadius">0dp</item>
<item name="sheetBorderRadius">8dp</item>
<item name="sheetBorderRadius">0dp</item>
<!-- Preset fonts -->
<item name="cardTitleFont">?font_family_regular</item>
<item name="buttonFont">?font_family_medium</item>
<item name="tabsLabelFont">?font_family_medium</item>
<item name="linkFont">?font_family_medium</item>
<item name="title1Font">?font_family_medium</item>
<item name="title2Font">?font_family_regular</item>
<item name="indicatorFont">?font_family_medium</item>
<item name="navigationBarFont">?font_family_medium</item>
<item name="text5Font">?font_family_regular</item>
<item name="text6Font">?font_family_regular</item>
<item name="text7Font">?font_family_regular</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">normal</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">normal</item>
<item name="text6TextStyle">normal</item>
<item name="text7TextStyle">normal</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">normal</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">16sp</item>
<item name="title2TextSize">20sp</item>
</style>
</resources>
7 changes: 6 additions & 1 deletion library/src/main/res/values/themes_vivoNew_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<item name="colorBackground">@color/vivoNew_color_white</item>
<item name="colorBackgroundAlternative">@color/vivoNew_color_grey1</item>
<item name="colorBackgroundBrand">@color/vivoNew_color_vivoPurple</item>
<item name="colorBackgroundBrandSecondary">@color/vivoNew_color_vivoPurple</item>
<item name="colorBackgroundBrandSecondary">@color/vivoNew_color_vivoPurpleLight90</item>
<item name="colorBackgroundContainer">@color/vivoNew_color_white</item>
<item name="colorBackgroundContainerHover">@color/vivoNew_color_darkModeBlack_3_alpha</item>
<item name="colorBackgroundContainerPressed">@color/vivoNew_color_darkModeBlack_5_alpha</item>
Expand Down Expand Up @@ -125,7 +125,9 @@
<item name="tabsLabelFont">?font_family_regular</item>
<item name="linkFont">?font_family_regular</item>
<item name="title1Font">?font_family_regular</item>
<item name="title2Font">?font_family_regular</item>
<item name="indicatorFont">?font_family_regular</item>
<item name="navigationBarFont">?font_family_regular</item>
<item name="text5Font">?font_family_regular</item>
<item name="text6Font">?font_family_regular</item>
<item name="text7Font">?font_family_regular</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">normal</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">normal</item>
<item name="text6TextStyle">normal</item>
<item name="text7TextStyle">normal</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">normal</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">18sp</item>
<item name="title2TextSize">18sp</item>
</style>
</resources>
5 changes: 5 additions & 0 deletions library/src/main/res/values/themes_vivo_autogenerated.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@
<item name="tabsLabelFont">?font_family_medium</item>
<item name="linkFont">?font_family_medium</item>
<item name="title1Font">?font_family_medium</item>
<item name="title2Font">?font_family_light</item>
<item name="indicatorFont">?font_family_medium</item>
<item name="navigationBarFont">?font_family_medium</item>
<item name="text5Font">?font_family_light</item>
<item name="text6Font">?font_family_light</item>
<item name="text7Font">?font_family_light</item>
Expand All @@ -138,7 +140,9 @@
<item name="tabsLabelTextStyle">normal</item>
<item name="linkTextStyle">normal</item>
<item name="title1TextStyle">normal</item>
<item name="title2TextStyle">normal</item>
<item name="indicatorTextStyle">normal</item>
<item name="navigationBarTextStyle">normal</item>
<item name="text5TextStyle">normal</item>
<item name="text6TextStyle">normal</item>
<item name="text7TextStyle">normal</item>
Expand All @@ -147,5 +151,6 @@
<item name="text10TextStyle">normal</item>
<!-- Preset sizes -->
<item name="tabsLabelTextSize">16sp</item>
<item name="title2TextSize">20sp</item>
</style>
</resources>

0 comments on commit 059380c

Please sign in to comment.