From 657b34a40cb58cfdd74ad05c0fb6559bac69ffd9 Mon Sep 17 00:00:00 2001
From: Marina Romanova <36896406+MarinaRomanova@users.noreply.github.com>
Date: Mon, 31 Jul 2023 10:53:37 +0200
Subject: [PATCH] fix: Refactor color tokens (#561)
---
.../com/adevinta/spark/catalog/CatalogApp.kt | 2 +-
.../spark/catalog/backdrop/Backdrop.kt | 2 +-
.../catalog/showkase/ComponentDetailScreen.kt | 2 +-
.../spark/catalog/themes/SegmentedButton.kt | 4 +-
.../themes/themeprovider/leboncoin/Color.kt | 200 +++--
.../spark/lint/stubs/SparkComponentsStub.kt | 4 +-
...preview_tests_appbar_bottomappbar_dark.png | 4 +-
...review_tests_appbar_bottomappbar_light.png | 4 +-
...review_tests_appbar_navigationbar_dark.png | 4 +-
...eview_tests_appbar_navigationbar_light.png | 4 +-
...ts_preview_tests_appbar_topappbar_dark.png | 4 +-
...s_preview_tests_appbar_topappbar_light.png | 4 +-
...iew_tests_badge_badgedboxnostroke_dark.png | 4 +-
...ew_tests_badge_badgedboxnostroke_light.png | 4 +-
...w_tests_badge_badgedboxwithstroke_dark.png | 4 +-
..._tests_badge_badgedboxwithstroke_light.png | 4 +-
...preview_tests_badge_badgenostroke_dark.png | 4 +-
...review_tests_badge_badgenostroke_light.png | 4 +-
...eview_tests_badge_badgewithstroke_dark.png | 4 +-
...view_tests_badge_badgewithstroke_light.png | 4 +-
..._tests_bottomsheet_bottomsheetscaffold.png | 4 +-
...iew_tests_bottomsheet_modalbottomsheet.png | 4 +-
...view_tests_buttons_buttoncontrast_dark.png | 4 +-
...iew_tests_buttons_buttoncontrast_light.png | 4 +-
...sts_buttons_buttoncontrastintents_dark.png | 4 +-
...ts_buttons_buttoncontrastintents_light.png | 4 +-
...review_tests_buttons_buttonfilled_dark.png | 4 +-
...eview_tests_buttons_buttonfilled_light.png | 4 +-
...tests_buttons_buttonfilledintents_dark.png | 4 +-
...ests_buttons_buttonfilledintents_light.png | 4 +-
...preview_tests_buttons_buttonghost_dark.png | 4 +-
...review_tests_buttons_buttonghost_light.png | 4 +-
..._tests_buttons_buttonghostintents_dark.png | 4 +-
...tests_buttons_buttonghostintents_light.png | 4 +-
...view_tests_buttons_buttonoutlined_dark.png | 4 +-
...iew_tests_buttons_buttonoutlined_light.png | 4 +-
...sts_buttons_buttonoutlinedintents_dark.png | 4 +-
...ts_buttons_buttonoutlinedintents_light.png | 4 +-
...preview_tests_buttons_buttonsizes_dark.png | 4 +-
...review_tests_buttons_buttonsizes_light.png | 4 +-
...review_tests_buttons_buttontinted_dark.png | 4 +-
...eview_tests_buttons_buttontinted_light.png | 4 +-
...tests_buttons_buttontintedintents_dark.png | 4 +-
...ests_buttons_buttontintedintents_light.png | 4 +-
...review_tests_buttons_dropdownmenu_dark.png | 4 +-
...eview_tests_buttons_dropdownmenu_light.png | 4 +-
...hotTests_preview_tests_cards_card_dark.png | 4 +-
...otTests_preview_tests_cards_card_light.png | 4 +-
..._preview_tests_cards_elevatedcard_dark.png | 4 +-
...preview_tests_cards_elevatedcard_light.png | 4 +-
..._preview_tests_cards_outlinedcard_dark.png | 4 +-
...preview_tests_cards_outlinedcard_light.png | 4 +-
...otTests_preview_tests_chips_chips_dark.png | 4 +-
...tTests_preview_tests_chips_chips_light.png | 4 +-
...s_preview_tests_chips_chipsdashed_dark.png | 4 +-
..._preview_tests_chips_chipsdashed_light.png | 4 +-
...s_preview_tests_chips_chipsfilled_dark.png | 4 +-
..._preview_tests_chips_chipsfilled_light.png | 4 +-
...preview_tests_chips_chipsoutlined_dark.png | 4 +-
...review_tests_chips_chipsoutlined_light.png | 4 +-
...s_preview_tests_chips_chipstinted_dark.png | 4 +-
..._preview_tests_chips_chipstinted_light.png | 4 +-
...ts_defaultgroup_previewdraghandle_dark.png | 4 +-
...s_defaultgroup_previewdraghandle_light.png | 4 +-
..._preview_tests_dialog_alertdialog_dark.png | 4 +-
...preview_tests_dialog_alertdialog_light.png | 4 +-
...sts_drawer_dismissibledrawersheet_dark.png | 4 +-
...ts_drawer_dismissibledrawersheet_light.png | 4 +-
...rawer_dismissiblenavigationdrawer_dark.png | 4 +-
...awer_dismissiblenavigationdrawer_light.png | 4 +-
...iew_tests_drawer_modaldrawersheet_dark.png | 4 +-
...ew_tests_drawer_modaldrawersheet_light.png | 4 +-
...ests_drawer_modalnavigationdrawer_dark.png | 4 +-
...sts_drawer_modalnavigationdrawer_light.png | 4 +-
...shotTests_preview_tests_icon_icon_dark.png | 4 +-
...hotTests_preview_tests_icon_icon_light.png | 4 +-
...s_preview_tests_icons_iconbuttons_dark.png | 4 +-
..._preview_tests_icons_iconbuttons_light.png | 4 +-
...iew_tests_icons_icontogglebuttons_dark.png | 4 +-
...ew_tests_icons_icontogglebuttons_light.png | 4 +-
...preview_tests_images_illustration_dark.png | 4 +-
...review_tests_images_illustration_light.png | 4 +-
...tTests_preview_tests_images_image_dark.png | 4 +-
...Tests_preview_tests_images_image_light.png | 4 +-
...s_preview_tests_images_useravatar_dark.png | 4 +-
..._preview_tests_images_useravatar_light.png | 4 +-
...Tests_preview_tests_list_listitem_dark.png | 4 +-
...ests_preview_tests_list_listitem_light.png | 4 +-
...s_preview_tests_menu_dropdownmenu_dark.png | 4 +-
..._preview_tests_menu_dropdownmenu_light.png | 4 +-
...ondraweritem_navigationdraweritem_dark.png | 4 +-
...ndraweritem_navigationdraweritem_light.png | 4 +-
...sts_navigationrail_navigationrail_dark.png | 4 +-
...ts_navigationrail_navigationrail_light.png | 4 +-
...gationrailitem_navigationrailitem_dark.png | 4 +-
...ationrailitem_navigationrailitem_light.png | 4 +-
...tdrawersheet_permanentdrawersheet_dark.png | 4 +-
...drawersheet_permanentdrawersheet_light.png | 4 +-
...ndrawer_permanentnavigationdrawer_dark.png | 4 +-
...drawer_permanentnavigationdrawer_light.png | 4 +-
...dicator_circularprogressindicator_dark.png | 4 +-
...icator_circularprogressindicator_light.png | 4 +-
...indicator_linearprogressindicator_dark.png | 4 +-
...ndicator_linearprogressindicator_light.png | 4 +-
...earprogressindicatorindeterminate_dark.png | 4 +-
...arprogressindicatorindeterminate_light.png | 4 +-
...iew_tests_rangeslider_rangeslider_dark.png | 4 +-
...ew_tests_rangeslider_rangeslider_light.png | 4 +-
...ew_tests_ratings_ratingcompressed_dark.png | 4 +-
...w_tests_ratings_ratingcompressed_light.png | 4 +-
..._preview_tests_ratings_ratingfull_dark.png | 4 +-
...preview_tests_ratings_ratingfull_light.png | 4 +-
...preview_tests_ratings_ratingnaked_dark.png | 4 +-
...review_tests_ratings_ratingnaked_light.png | 4 +-
...preview_tests_ratings_ratingsmall_dark.png | 4 +-
...review_tests_ratings_ratingsmall_light.png | 4 +-
...s_preview_tests_separator_divider_dark.png | 4 +-
..._preview_tests_separator_divider_light.png | 4 +-
...Tests_preview_tests_slider_slider_dark.png | 4 +-
...ests_preview_tests_slider_slider_light.png | 4 +-
...eview_tests_spinner_spinnermedium_dark.png | 4 +-
...view_tests_spinner_spinnermedium_light.png | 4 +-
...review_tests_spinner_spinnersmall_dark.png | 4 +-
...eview_tests_spinner_spinnersmall_light.png | 4 +-
...preview_tests_tabs_leadingicontab_dark.png | 4 +-
...review_tests_tabs_leadingicontab_light.png | 4 +-
...nshotTests_preview_tests_tabs_tab_dark.png | 4 +-
...shotTests_preview_tests_tabs_tab_light.png | 4 +-
...otTests_preview_tests_tabs_tabrow_dark.png | 4 +-
...tTests_preview_tests_tabs_tabrow_light.png | 4 +-
...eview_tests_tags_tagfilledpreview_dark.png | 4 +-
...view_tests_tags_tagfilledpreview_light.png | 4 +-
...iew_tests_tags_tagoutlinedpreview_dark.png | 4 +-
...ew_tests_tags_tagoutlinedpreview_light.png | 4 +-
...review_tests_tags_tagtonalpreview_dark.png | 4 +-
...eview_tests_tags_tagtonalpreview_light.png | 4 +-
...tfields_multilinetextfieldintents_dark.png | 4 +-
...fields_multilinetextfieldintents_light.png | 4 +-
...ds_multilinetextfieldintentsalert_dark.png | 4 +-
...s_multilinetextfieldintentsalert_light.png | 4 +-
...ds_multilinetextfieldintentserror_dark.png | 4 +-
...s_multilinetextfieldintentserror_light.png | 4 +-
..._multilinetextfieldintentssuccess_dark.png | 4 +-
...multilinetextfieldintentssuccess_light.png | 4 +-
...textfields_selecttextfieldintents_dark.png | 4 +-
...extfields_selecttextfieldintents_light.png | 4 +-
...ields_selecttextfieldintentsalert_dark.png | 4 +-
...elds_selecttextfieldintentsalert_light.png | 4 +-
...ields_selecttextfieldintentserror_dark.png | 4 +-
...elds_selecttextfieldintentserror_light.png | 4 +-
...lds_selecttextfieldintentssuccess_dark.png | 4 +-
...ds_selecttextfieldintentssuccess_light.png | 4 +-
...tests_textfields_textfieldintents_dark.png | 4 +-
...ests_textfields_textfieldintents_light.png | 4 +-
..._textfields_textfieldintentsalert_dark.png | 4 +-
...textfields_textfieldintentsalert_light.png | 4 +-
..._textfields_textfieldintentserror_dark.png | 4 +-
...textfields_textfieldintentserror_light.png | 4 +-
...extfields_textfieldintentssuccess_dark.png | 4 +-
...xtfields_textfieldintentssuccess_light.png | 4 +-
...review_tests_textfields_textfieldslots.png | 4 +-
...ts_preview_tests_toggles_checkbox_dark.png | 4 +-
...s_preview_tests_toggles_checkbox_light.png | 4 +-
...ew_tests_toggles_checkboxlabelled_dark.png | 4 +-
...w_tests_toggles_checkboxlabelled_light.png | 4 +-
...sts_preview_tests_toggles_labelledslot.png | 4 +-
...preview_tests_toggles_radiobutton_dark.png | 4 +-
...review_tests_toggles_radiobutton_light.png | 4 +-
...tests_toggles_radiobuttonlabelled_dark.png | 4 +-
...ests_toggles_radiobuttonlabelled_light.png | 4 +-
...ests_preview_tests_toggles_switch_dark.png | 4 +-
...sts_preview_tests_toggles_switch_light.png | 4 +-
...view_tests_toggles_switchlabelled_dark.png | 4 +-
...iew_tests_toggles_switchlabelled_light.png | 4 +-
...hotTests_preview_tests_tokens_dim_dark.png | 4 +-
...otTests_preview_tests_tokens_dim_light.png | 4 +-
...sts_preview_tests_tokens_emphasis_dark.png | 4 +-
...ts_preview_tests_tokens_emphasis_light.png | 4 +-
..._preview_tests_tokens_placeholder_dark.png | 4 +-
...preview_tests_tokens_placeholder_light.png | 4 +-
...Tests_preview_tests_tokens_shapes_dark.png | 4 +-
...ests_preview_tests_tokens_shapes_light.png | 4 +-
.../adevinta/spark/components/IntentColor.kt | 138 ++++
.../spark/components/appbar/BottomAppBar.kt | 4 +-
.../spark/components/appbar/NavigationBar.kt | 6 +-
.../adevinta/spark/components/badge/Badge.md | 16 +-
.../spark/components/badge/BadgeIntent.kt | 79 +-
.../scaffold/BottomSheetScaffold.kt | 2 +-
.../components/buttons/ButtonContrast.kt | 6 +-
.../spark/components/buttons/ButtonFilled.kt | 12 +-
.../spark/components/buttons/ButtonGhost.kt | 6 +-
.../spark/components/buttons/ButtonIntent.kt | 93 ++-
.../components/buttons/ButtonOutlined.kt | 16 +-
.../spark/components/buttons/ButtonTinted.kt | 6 +-
.../spark/components/buttons/Buttons.md | 16 +-
.../buttons/FloatingActionButton.kt | 14 +-
.../spark/components/chips/AssistChip.kt | 4 +-
.../adevinta/spark/components/chips/Chip.kt | 34 +-
.../adevinta/spark/components/chips/Chip.md | 12 +-
.../spark/components/chips/ChipDashed.kt | 10 +-
.../spark/components/chips/ChipFilled.kt | 19 +-
.../spark/components/chips/ChipIntent.kt | 79 +-
.../spark/components/chips/ChipOutlined.kt | 16 +-
.../spark/components/chips/ChipTinted.kt | 10 +-
.../spark/components/chips/FilterChip.kt | 4 +-
.../spark/components/chips/InputChip.kt | 2 +-
.../spark/components/chips/SuggestionChip.kt | 2 +-
.../spark/components/dialog/AlertDialog.kt | 2 +-
.../dialog/ModalFullScreenScaffold.kt | 54 +-
.../drawer/DismissibleDrawerSheet.kt | 2 +-
.../components/drawer/ModalDrawerSheet.kt | 2 +-
.../adevinta/spark/components/icons/Icon.md | 22 +
.../spark/components/icons/IconButton.kt | 2 +-
.../spark/components/icons/IconDefaults.kt | 2 +-
.../icons/{IconTints.kt => IconIntent.kt} | 28 +-
.../components/icons/IconToggleButton.kt | 4 +-
.../adevinta/spark/components/icons/Icons.kt | 16 +-
.../navigation/NavigationDrawerItem.kt | 6 +-
.../components/navigation/NavigationRail.kt | 2 +-
.../navigation/NavigationRailItem.kt | 6 +-
.../progress/LinearProgressIndicator.kt | 2 +-
.../spark/components/progress/Spinner.kt | 2 +-
.../spark/components/progress/Spinner.md | 7 +-
.../components/progress/SpinnerIntent.kt | 89 +-
.../spark/components/rating/RatingStar.kt | 2 +-
.../spark/components/slider/SliderDefaults.kt | 6 +-
.../components/snackbars/SnackbarColors.kt | 2 +-
.../spark/components/tab/TabRowDefaults.kt | 14 +-
.../com/adevinta/spark/components/tags/Tag.kt | 2 +-
.../com/adevinta/spark/components/tags/Tag.md | 2 +-
.../spark/components/tags/TagFilled.kt | 6 +-
.../spark/components/tags/TagIntent.kt | 93 ++-
.../spark/components/tags/TagOutlined.kt | 18 +-
.../spark/components/tags/TagTonal.kt | 14 +-
.../spark/components/toggles/RadioButton.md | 2 +-
.../components/toggles/SwitchDefaults.kt | 8 +-
.../spark/res/SparkStringAnnotations.kt | 4 +-
.../kotlin/com/adevinta/spark/tokens/Color.kt | 758 +++++++++++-------
.../com/adevinta/spark/tokens/Layout.kt | 4 +-
.../adevinta/spark/tokens/PaletteTokens.kt | 72 +-
spark/src/main/res/values-fr/strings.xml | 4 +-
spark/src/main/res/values/strings.xml | 6 +-
242 files changed, 1585 insertions(+), 1204 deletions(-)
rename spark/src/main/kotlin/com/adevinta/spark/components/icons/{IconTints.kt => IconIntent.kt} (81%)
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/CatalogApp.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/CatalogApp.kt
index c1faa3963..f919e69cf 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/CatalogApp.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/CatalogApp.kt
@@ -145,7 +145,7 @@ internal fun CatalogApp(
.calculateBottomPadding(),
peekHeight = BackdropScaffoldDefaults.PeekHeight + WindowInsets.statusBars.asPaddingValues()
.calculateTopPadding(),
- backLayerBackgroundColor = SparkTheme.colors.primaryContainer,
+ backLayerBackgroundColor = SparkTheme.colors.mainContainer,
appBar = {
HomeTabBar(
modifier = Modifier.statusBarsPadding(),
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/backdrop/Backdrop.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/backdrop/Backdrop.kt
index cebb8092b..990282688 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/backdrop/Backdrop.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/backdrop/Backdrop.kt
@@ -278,7 +278,7 @@ public fun BackdropScaffold(
headerHeight: Dp = BackdropScaffoldDefaults.HeaderHeight,
persistentAppBar: Boolean = true,
stickyFrontLayer: Boolean = true,
- backLayerBackgroundColor: Color = SparkTheme.colors.primary,
+ backLayerBackgroundColor: Color = SparkTheme.colors.main,
backLayerContentColor: Color = contentColorFor(backLayerBackgroundColor),
frontLayerShape: Shape = BackdropScaffoldDefaults.frontLayerShape,
frontLayerElevation: Dp = BackdropScaffoldDefaults.FrontLayerElevation,
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/showkase/ComponentDetailScreen.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/showkase/ComponentDetailScreen.kt
index 93e0f53c0..f7fd1e1de 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/showkase/ComponentDetailScreen.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/showkase/ComponentDetailScreen.kt
@@ -143,7 +143,7 @@ private fun DocumentationPanel(kDoc: String) {
ProvideTextStyle(value = SparkTheme.typography.callout) {
Text(
text = buttonText,
- color = SparkTheme.colors.primary,
+ color = SparkTheme.colors.main,
)
}
Icon(sparkIcon = icon, contentDescription = buttonText)
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/SegmentedButton.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/SegmentedButton.kt
index 8e96a9597..8ccb6f828 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/SegmentedButton.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/SegmentedButton.kt
@@ -66,7 +66,7 @@ internal fun SegmentedButton(
selectedOption: String,
onOptionSelect: (String) -> Unit,
modifier: Modifier = Modifier,
- selectedColor: Color = SparkTheme.colors.onSecondaryContainer,
+ selectedColor: Color = SparkTheme.colors.onSupportContainer,
unSelectedColor: Color = LocalContentColor.current,
) {
require(options.size >= 2) { "This composable requires at least 2 options" }
@@ -135,7 +135,7 @@ internal fun SegmentedButton(
bottomEndPercent = endCornerShape,
),
)
- .background(SparkTheme.colors.secondaryContainer),
+ .background(SparkTheme.colors.supportContainer),
)
},
) { measurables, constraints ->
diff --git a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
index 8a3c5fb9c..4b8cbccae 100644
--- a/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
+++ b/catalog/src/main/kotlin/com/adevinta/spark/catalog/themes/themeprovider/leboncoin/Color.kt
@@ -48,8 +48,8 @@ internal val BrikkeGreyLight = Color(0xFFE6EBEF) // Highlight Surface
internal val BrikkeGreyMedium = Color(0xFFCAD1D9) // Disabled Content
internal val BrikkeGrey = Color(0xFFA8B4C0) // Quarternary Content
internal val BrikkeGreyDark = Color(0xFF8191A0) // Tertiary Content
-internal val BrikkeBlack = Color(0xFF1A1A1A) // Action Secondary / Primary Content
-internal val BrikkeWhite = Color(0xFFFFFFFF) // Secondary Content / Primary Surface
+internal val BrikkeBlack = Color(0xFF1A1A1A) // Action Support / Main Content
+internal val BrikkeWhite = Color(0xFFFFFFFF) // Support Content / Main Surface
internal val BrikkeOpacityBlack = Color(0xFF707070) // Dark Surface Hilight
internal val BrikkeRed = Color(0xFFDB4437) // Content Error
internal val BrikkeRedLight = Color(0xFFE2695F) // Content Error Light
@@ -59,12 +59,12 @@ internal val BrikkeGreen = Color(0xFF4E9850) // Content Valid
internal val BrikkeGreenLight = Color(0xFF71AC73) // Content Valid Light
internal val BrikkeGreenDark = Color(0xFF3E7940) // Content Valid Dark
internal val BrikkeGreenSurface = Color(0xFFEEF9EF) // Surface Valid
-internal val BrikkeBlue = Color(0xFF4183D7) // Primary Pro Action / Content / Surface
-internal val BrikkeBlueDark = Color(0xFF336999) // Primary Pro Action Dark
-internal val BrikkeBlueSurface = Color(0xFFD9E6F7) // Primary Action Light
-internal val BrikkeOrange = Color(0xFFFF6E14) // Primary Action / Content / Surface
-internal val BrikkeOrangeDark = Color(0xFFCB570F) // Primary Action Dark
-internal val BrikkeOrangeSurface = Color(0xFFFEF0E9) // Primary Action Light
+internal val BrikkeBlue = Color(0xFF4183D7) // Main Pro Action / Content / Surface
+internal val BrikkeBlueDark = Color(0xFF336999) // Main Pro Action Dark
+internal val BrikkeBlueSurface = Color(0xFFD9E6F7) // Main Action Light
+internal val BrikkeOrange = Color(0xFFFF6E14) // Main Action / Content / Surface
+internal val BrikkeOrangeDark = Color(0xFFCB570F) // Main Action Dark
+internal val BrikkeOrangeSurface = Color(0xFFFEF0E9) // Main Action Light
// endregion
// region Clementin colors
@@ -193,18 +193,28 @@ internal val GreyBlue95 = Color(0xFFe6f2ff)
internal val GreyBlue99 = Color(0xFFfcfcff)
internal val LeboncoinColorPartLightLegacy: SparkColors = lightSparkColors(
- primary = BrikkeOrange,
- onPrimary = Color.White,
- primaryContainer = BrikkeOrangeSurface,
- onPrimaryContainer = Clementin900,
- primaryVariant = BrikkeOrangeDark,
- onPrimaryVariant = Color.White,
- secondary = BrikkeBlack,
- onSecondary = Color.White,
- secondaryContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
- onSecondaryContainer = Blueberry900,
- secondaryVariant = BrikkeGreyDark, // tertiary => neutral / Dim 1
- onSecondaryVariant = Grey10,
+ accent = BrikkeOrange,
+ onAccent = Color.White,
+ accentContainer = BrikkeOrangeSurface,
+ onAccentContainer = Clementin900,
+ accentVariant = BrikkeOrangeDark,
+ onAccentVariant = Color.White,
+ basic = BrikkeBlack,
+ onBasic = Color.White,
+ basicContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
+ onBasicContainer = Blueberry900,
+ main = BrikkeOrange,
+ onMain = Color.White,
+ mainContainer = BrikkeOrangeSurface,
+ onMainContainer = Clementin900,
+ mainVariant = BrikkeOrangeDark,
+ onMainVariant = Color.White,
+ support = BrikkeBlack,
+ onSupport = Color.White,
+ supportContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
+ onSupportContainer = Blueberry900,
+ supportVariant = BrikkeGreyDark, // tertiary => neutral / Dim 1
+ onSupportVariant = Grey10,
tertiary = BrikkeGrey,
onTertiary = GreyBlue99,
tertiaryContainer = BrikkeGreyExtraLight,
@@ -248,18 +258,28 @@ internal val LeboncoinColorPartLightLegacy: SparkColors = lightSparkColors(
)
internal val LeboncoinColorProLightLegacy: SparkColors = lightSparkColors(
- primary = BrikkeBlue,
- onPrimary = Color.White,
- primaryContainer = BrikkeBlueSurface,
- onPrimaryContainer = Blueberry900,
- primaryVariant = BrikkeBlueDark,
- onPrimaryVariant = Color.White,
- secondary = BrikkeBlack,
- onSecondary = Color.White,
- secondaryContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
- onSecondaryContainer = Blueberry900,
- secondaryVariant = BrikkeGreyDark, // tertiary => neutral / Dim 1
- onSecondaryVariant = Grey10,
+ accent = BrikkeBlue,
+ onAccent = Color.White,
+ accentContainer = BrikkeBlueSurface,
+ onAccentContainer = Blueberry900,
+ accentVariant = BrikkeBlueDark,
+ onAccentVariant = Color.White,
+ basic = BrikkeBlack,
+ onBasic = Color.White,
+ basicContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
+ onBasicContainer = Blueberry900,
+ main = BrikkeBlue,
+ onMain = Color.White,
+ mainContainer = BrikkeBlueSurface,
+ onMainContainer = Blueberry900,
+ mainVariant = BrikkeBlueDark,
+ onMainVariant = Color.White,
+ support = BrikkeBlack,
+ onSupport = Color.White,
+ supportContainer = BrikkeGreyLight, // Highlight Surface => backgroundVariant
+ onSupportContainer = Blueberry900,
+ supportVariant = BrikkeGreyDark, // tertiary => neutral / Dim 1
+ onSupportVariant = Grey10,
tertiary = BrikkeGrey,
onTertiary = GreyBlue99,
tertiaryContainer = BrikkeGreyExtraLight,
@@ -303,18 +323,28 @@ internal val LeboncoinColorProLightLegacy: SparkColors = lightSparkColors(
)
internal val LeboncoinColorPartLight: SparkColors = lightSparkColors(
- primary = Clementin500,
- onPrimary = Color.White,
- primaryContainer = Clementin50,
- onPrimaryContainer = Clementin700,
- primaryVariant = Clementin600,
- onPrimaryVariant = Color.White,
- secondary = Blueberry900,
- onSecondary = Color.White,
- secondaryContainer = Blueberry50,
- onSecondaryContainer = Blueberry900,
- secondaryVariant = NightShade600, // tertiary => neutral / Dim 1
- onSecondaryVariant = Color.White,
+ accent = Plum500,
+ onAccent = Color.White,
+ accentContainer = Plum100,
+ onAccentContainer = Plum700,
+ accentVariant = Plum600,
+ onAccentVariant = Color.White,
+ basic = Blueberry900,
+ onBasic = Color.White,
+ basicContainer = Blueberry50,
+ onBasicContainer = Blueberry900,
+ main = Clementin500,
+ onMain = Color.White,
+ mainContainer = Clementin50,
+ onMainContainer = Clementin700,
+ mainVariant = Clementin600,
+ onMainVariant = Color.White,
+ support = Blueberry900,
+ onSupport = Color.White,
+ supportContainer = Blueberry50,
+ onSupportContainer = Blueberry900,
+ supportVariant = NightShade600, // tertiary => neutral / Dim 1
+ onSupportVariant = Color.White,
tertiary = Color.Magenta,
onTertiary = Color.Blue,
tertiaryContainer = Color.Magenta,
@@ -353,18 +383,28 @@ internal val LeboncoinColorPartLight: SparkColors = lightSparkColors(
)
internal val LeboncoinColorProLight: SparkColors = lightSparkColors(
- primary = Blueberry600,
- onPrimary = Color.White,
- primaryContainer = Blueberry50,
- onPrimaryContainer = Blueberry700,
- primaryVariant = Blueberry700,
- onPrimaryVariant = Color.White,
- secondary = Blueberry900,
- onSecondary = Color.White,
- secondaryContainer = Blueberry50,
- onSecondaryContainer = Blueberry900,
- secondaryVariant = NightShade600, // tertiary => neutral / Dim 1
- onSecondaryVariant = Color.White,
+ accent = Plum500,
+ onAccent = Color.White,
+ accentContainer = Plum50,
+ onAccentContainer = Plum700,
+ accentVariant = Plum600,
+ onAccentVariant = Color.White,
+ basic = Blueberry900,
+ onBasic = Color.White,
+ basicContainer = Blueberry50,
+ onBasicContainer = Blueberry900,
+ main = Blueberry600,
+ onMain = Color.White,
+ mainContainer = Blueberry50,
+ onMainContainer = Blueberry700,
+ mainVariant = Blueberry700,
+ onMainVariant = Color.White,
+ support = Blueberry900,
+ onSupport = Color.White,
+ supportContainer = Blueberry50,
+ onSupportContainer = Blueberry900,
+ supportVariant = NightShade600, // tertiary => neutral / Dim 1
+ onSupportVariant = Color.White,
tertiary = Color.Magenta,
onTertiary = Color.Blue,
tertiaryContainer = Color.Magenta,
@@ -403,18 +443,18 @@ internal val LeboncoinColorProLight: SparkColors = lightSparkColors(
)
internal val LeboncoinColorPartDark: SparkColors = darkSparkColors(
- primary = Clementin400,
- onPrimary = NightShade900,
- primaryContainer = Clementin800,
- onPrimaryContainer = Clementin100,
- primaryVariant = Clementin200,
- onPrimaryVariant = NightShade900,
- secondary = NightShade50,
- onSecondary = NightShade900,
- secondaryContainer = NightShade800,
- onSecondaryContainer = NightShade100,
- secondaryVariant = NightShade200,
- onSecondaryVariant = NightShade900,
+ main = Clementin400,
+ onMain = NightShade900,
+ mainContainer = Clementin800,
+ onMainContainer = Clementin100,
+ mainVariant = Clementin200,
+ onMainVariant = NightShade900,
+ support = NightShade50,
+ onSupport = NightShade900,
+ supportContainer = NightShade800,
+ onSupportContainer = NightShade100,
+ supportVariant = NightShade200,
+ onSupportVariant = NightShade900,
success = Avocado400,
onSuccess = NightShade900,
successContainer = Avocado800,
@@ -454,18 +494,18 @@ internal val LeboncoinColorPartDark: SparkColors = darkSparkColors(
)
internal val LeboncoinColorProDark: SparkColors = darkSparkColors(
- primary = Blueberry400,
- onPrimary = NightShade900,
- primaryContainer = Blueberry800,
- onPrimaryContainer = Blueberry100,
- primaryVariant = Blueberry200,
- onPrimaryVariant = NightShade900,
- secondary = NightShade50,
- onSecondary = NightShade900,
- secondaryContainer = NightShade800,
- onSecondaryContainer = NightShade100,
- secondaryVariant = NightShade200,
- onSecondaryVariant = NightShade900,
+ main = Blueberry400,
+ onMain = NightShade900,
+ mainContainer = Blueberry800,
+ onMainContainer = Blueberry100,
+ mainVariant = Blueberry200,
+ onMainVariant = NightShade900,
+ support = NightShade50,
+ onSupport = NightShade900,
+ supportContainer = NightShade800,
+ onSupportContainer = NightShade100,
+ supportVariant = NightShade200,
+ onSupportVariant = NightShade900,
success = Avocado400,
onSuccess = NightShade900,
successContainer = Avocado800,
diff --git a/spark-lint/src/test/kotlin/com/adevinta/spark/lint/stubs/SparkComponentsStub.kt b/spark-lint/src/test/kotlin/com/adevinta/spark/lint/stubs/SparkComponentsStub.kt
index 8a9d57db1..96648c666 100644
--- a/spark-lint/src/test/kotlin/com/adevinta/spark/lint/stubs/SparkComponentsStub.kt
+++ b/spark-lint/src/test/kotlin/com/adevinta/spark/lint/stubs/SparkComponentsStub.kt
@@ -30,10 +30,10 @@ internal val SparkComponentsStub = kotlin(
import androidx.compose.runtime.Composable
@Composable
- fun PrimaryButton() {}
+ fun MainButton() {}
@Composable
- fun SecondaryButton() {}
+ fun SupportButton() {}
@Composable
fun TextButton() {}
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png
index f04593f92..5c64a28b5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1cf5300d1f7642d42eeacea58594670f3e1630cfbd1978aada2ae975741b58e3
-size 12757
+oid sha256:960fa60010c58f82593b9c4f4cd388cc3ec512632227c64af0eda70079096310
+size 12739
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png
index a0c297127..c59be9772 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7e807840e68c623d04b3f8a209ff06f551671e209da942b8b0e5a27187cfc654
-size 12421
+oid sha256:073e6e3be249569b53ec0d0ea7283e7c5c0b038d4de4b4fe83945c0d7bfd50de
+size 12338
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png
index 2be0e348f..d87236179 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:47dbde1c9e4784c012e052f3ce4cf187a6682ac577a3482779e6b6935ea537ad
-size 15835
+oid sha256:74975f5b72dc1102600674a15b369a6d34f510ba59ca50f165051132869048db
+size 16118
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png
index 20d78cd97..c404362a1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2fe1c84de30ee8fb2d63230eab1ebbd8a54d033b91c83f88d75414e01854eec0
-size 15278
+oid sha256:628451fe951b9b571e7a69bb4e648a56331496d2d3c061bcde99b6a58ec9d0ac
+size 15215
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png
index 2c17ba3b2..68ff96463 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f10f2d25dcf4f6eb12c333fb80bd68fbe62d7331c3f75dcd49e9b550cc42814d
-size 46279
+oid sha256:ee270c28268bd2d5846bdd6dd1133af08335c79649c6fdeb9a80cba98d58207b
+size 50258
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png
index b7ec87b4a..c301cba87 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:db8486e9acc8c8e0d408b2b6845093fe53265d8ec381a390e9b6731f0357b918
-size 45506
+oid sha256:331a42f6fde8e6f370228c58708197ee6b2d6987900bf98f3f91b03c8821bfc3
+size 50213
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png
index e1238fa9b..4423effcd 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ec42001fc5927acaa5ac2ec5429456af894a7ac3ac873575f877494e293422b8
-size 97202
+oid sha256:2c968098ea0ffb59ffbc3e23fdba4dce3f883c142252ae2e74cf9811b1f8d559
+size 109054
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png
index c3ba3f208..a04381b0d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:67f7fb99e28ce4db8f3fcdd1862e979ccd9b67c2a72ee2848c788bcc0000d1b6
-size 94909
+oid sha256:64fa3a3b7e570cb27f00dc44d5445a2bd1e9bbc41b45ac954b6585495b1aeec0
+size 107910
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png
index 01883cbbd..e694238a9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3f3786ca5c8142530bebd7670482a9f1a12fee86882b69fe21c63a038221737b
-size 100616
+oid sha256:ebd289d71bf721476a8fa5fc063f1a131001308385e112bbc9104eb791a1eeb2
+size 117829
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png
index 4482342fe..d180de9d9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:28e56ada6eda08e15eb0272b064e9d8b80b37068182ab6ed9fb9431fe60b67e7
-size 101413
+oid sha256:866a7067fb2f56f3fb82277fc8b54022db88f5ee3bd8fb4068df78cd6207447f
+size 120189
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png
index e69e60d5d..7d2fef2d1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:566428f56b79df52e65395313c3cf8432834c57956f8522d23e6f3491cc318d1
-size 96314
+oid sha256:f4ac007a08d6db75fb9887bedb301994db06fda3e33197853e2f3de040242b63
+size 101289
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png
index 7f07e8580..556d187d9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9fc44349149911884cef44687f7a5ad2ee18e46a43865511c687d63d5f6758ef
-size 94660
+oid sha256:de6d34690bd73138025dab89f81beeabe0f4cf735cf280f536dc2577363387af
+size 104072
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png
index d854f51e0..3a59f0f00 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:89c16ecb84cfbee645d64cde3b9d090ea44d363730eba535b6a017bb1e20863e
-size 145985
+oid sha256:9e611b4ec3fd3f142ca75a9ace39c1aa91df6b11ce0c6d024f2e03eac93769fe
+size 124173
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png
index 8a4021b8c..ad7f00135 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:28760c5a0a180d73caae860bb9a918682a5259617d77720bfc6cf5e8e15b722b
-size 135372
+oid sha256:98f86684777d6bb4078f822feef9a34c2945e6f622648afabd723519750c9695
+size 134274
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_bottomsheetscaffold.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_bottomsheetscaffold.png
index 64747372a..45f28298f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_bottomsheetscaffold.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_bottomsheetscaffold.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0c116a622ab86d5379d11fb0f98c826e3f5ab5e8ee3942b9f2fb4f3844599000
-size 8942
+oid sha256:ae195fb3c6065f35e5be2c523a282deacf052909027d04c66a56f85f4889ff7f
+size 9669
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_modalbottomsheet.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_modalbottomsheet.png
index 9d4a2902a..940b4cde6 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_modalbottomsheet.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_bottomsheet_modalbottomsheet.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c5cccf12510bcc6d77a74d727e6eef8397f103549bfd73fe952e308e799cc679
-size 13243
+oid sha256:672c1de147c25479f9bf181e44b37f48b71a2e748a38487586cf402ec2625493
+size 13427
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_dark.png
index ca8ed799b..0fc6fb16e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8de2a3b80ef517a3e715ca28aaf071172edd4b5e51ab986494437e024bf75c18
-size 21368
+oid sha256:32f4fffdc627351c1276be22fd5e7b067e3b8772413f17d84f68e316af6b42c8
+size 18182
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_light.png
index 9ba086847..640ee337c 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrast_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d26feba0bcff5cbfaa1a72698e111ca420a32f203670eeced05aa21c8c9a3723
-size 19699
+oid sha256:3660ba347d7e3131d7fc3de5475ee532dd9303427d3225225fa1373d6b720141
+size 16303
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_dark.png
index 8cae26b9f..c5a8e4c72 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6959b045534eb04c670e31d997723ae1812b82b53e3b96d9c5368d7a285f2333
-size 38859
+oid sha256:d0ba81e3d43a24fa68f66724057cae9c527c2e8e38d6d2d676cc4a10c99067b0
+size 31568
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_light.png
index 9769ef644..d3ff6ed74 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttoncontrastintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b854ea326c0f0ffead0c940289a831b7a4415cccb5e4fe3e6e75ef3a176bb1a9
-size 33217
+oid sha256:c94f770f882b430f2c320347cce0fd727638a227a4248b2d8dec398a1f5bd7fa
+size 26858
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_dark.png
index b5aa732b4..fbc04b27e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1b0278f6cf7c744a207311083969473ac0ecd02aabe2fb5bf67e4caac44da0c1
-size 21764
+oid sha256:7b478ff8a3f86c07826b11307aae8ad20bba34d10e6d683e7dcfc2e006edf839
+size 18041
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_light.png
index 3f8305d3a..64605d58b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilled_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4381f2431336dc410cf516cee946bce0db1f9c13e62b78809b0da571f8241f7e
-size 21022
+oid sha256:92088b6738fdfdffc9058c9d3125d6794806967e9b46defc44fecebdce090f92
+size 16948
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_dark.png
index 8f2dfb106..f11e6d5a3 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:502bf5811ab59ee9ee1631e68e3be12ed66d38821503f4aa8c7683bd16bc3609
-size 45163
+oid sha256:e1b3affa3e01a4883452a5ae91d0fcaa6585fef4dcd395994be47dc993c6c096
+size 35383
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_light.png
index 467cfa722..f2b3a13fa 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonfilledintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f887e4216c02171ba7d306480935cfbda3a778c39c0b41fa88b26d0aea61e82f
-size 43545
+oid sha256:2359abf3dc9cc728e0bbac662d411fcfdd790ce555254101fa5ed90bac11364c
+size 33855
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_dark.png
index b8009687b..bddbe4029 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cdafe0245f1f91622ab9a542dc8dd75a92d61b6cb842cc4cf6cf86e8ec50eda7
-size 17154
+oid sha256:8ccfb336732bd521222ab58f3bd3f41886ea3b1d8086ed1b16d72bcfb1b08e4d
+size 13421
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_light.png
index d05dbae62..3a8ad5cd6 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghost_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7d180ef39853d55db265a48baaaf3653c25132231929562f98149d3838ae1a21
-size 16657
+oid sha256:8258a22ec7a28745c5ed444f8ae32b70b1ed51f306fe4dcce671c5656ee6b785
+size 12879
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_dark.png
index edd5039f0..add0609b1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7ca38ab72250c1b6a02dee4343449478e8d74ccd5a2bfd22235e7104a8c03301
-size 29811
+oid sha256:a38c4ec3364f1c394db882e485dacc23acca0689fd6702a1903210e237eee8d4
+size 24307
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_light.png
index 72898c3d1..1ef777cc7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonghostintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:09dd39ea5a59fd518e423b1f868538ecdcadc3e7183df870701ca812306eaf0d
-size 28829
+oid sha256:7de849110d547064f2ad712b7a4ae76a34c46da50ddf41ab86a0c7f76f7bd692
+size 22192
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_dark.png
index 71f0642a1..7bbbef064 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b6f0a33a4ff12dfc9d164ea5df26187f70027692d14103c964566517d7569b9e
-size 28375
+oid sha256:c7c430004dc6bceaecd042b0bc1f33a7af2972f3010c1690c8b8726ed4e755fa
+size 23771
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_light.png
index 27b7e77f2..eb892e7d1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlined_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:19d4ae4a8d638cd23f07c73b1ac0a7691b7c43cb677639decdc0da12a8ff686b
-size 26538
+oid sha256:16845a1b9e5316551dcae45e08123d5b8b2d00e3b91a86e77c8e2f1e3720da6d
+size 23637
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_dark.png
index e50b29a09..28f41228b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c2e4f30dbd527bf1638c8406a449efba6888fa4f3de5edeb7872d3bd38cd7428
-size 50204
+oid sha256:592f5b66b38e6a1fd1586a2387f1e179d61761b77be2bae9323f3c627e200718
+size 39941
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_light.png
index 38266875d..a8e6fa545 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonoutlinedintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3aa219dafd099c61fac75ad591aa44f84508f53f85a596ac436b2054b885b597
-size 48093
+oid sha256:dd3e5158f3e1340d39a131f159154faec1ed6ee1f7454e9b3d421aa0c98bbddd
+size 36710
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_dark.png
index 89ab4c44d..0cfe5ad44 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:413d97801ffac4b120fa67e9d8d5b10632763411c97829488902863fe224bebc
-size 15449
+oid sha256:4a6caae7a7be2bc1919dd01a1ece5eed7bac5752ef2d4ac9652ef26369cf86b5
+size 15269
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_light.png
index 9599d3832..7e77cb7c0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttonsizes_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5a1e998ef81b00e3ce54e85b4e5e90c7f8fc530ec5bc0f1b2b0f309a4a230f47
-size 15188
+oid sha256:467552c659427fda08944e34c014315cb786bfe9887421da820dbf923f5ec1ad
+size 14512
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_dark.png
index e3e282df0..d82eb6c84 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a7240c40a75c1ec0bedd9e03ded1813dbd47a0d0318509cb806dcccc162ca789
-size 21264
+oid sha256:dce7e8f7408f5abbe9d12a14c9a447c8281443b60f6b5fd8e366de465761ac88
+size 17894
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_light.png
index ac9230687..ea25efd38 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontinted_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:08eac7abb5fbfa834827ffe1fdbe4ec4de5b824b0888b40449662af5be4e6b20
-size 20594
+oid sha256:80bcb8c609f4f8e126203105fd8af36d9022c919dde4530c776cf903181a5e80
+size 17381
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_dark.png
index 6086608f2..ae7aa3fc0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2401da06d9b91def54d0341c3955b9ca7a04aad3ddf3f1c6b77ed2dd1dbd4284
-size 41250
+oid sha256:c673f89e6aa2bb036d09284c2f92f30f06f9a7d80d7e91ab6c3e742f4009f584
+size 35234
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_light.png
index 038149238..8e604bf02 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_buttontintedintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:56e2100214df8820dbd159270c52f1cd007446b48e18645c80cc463e9fb4aaa8
-size 40181
+oid sha256:9d52ecb75d116412010b30df64677ac2f00c3d5fe636a5d47d47b8b239092f7c
+size 32023
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_dark.png
index b88936515..23584098d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6c2ac342e0d9e2cd71834ba9b92e736eb6e4a3e7f488a8f26de7ba3b0156eeb2
-size 42893
+oid sha256:3bb196bdaf16ac383aec163e1eb0a560daebe5df4e793c2d306a6bbcc00052ec
+size 45513
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_light.png
index 0fb112888..e6cea5c1e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_buttons_dropdownmenu_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0fca93dc5ec05398655d4a7410e80f40eebfcdb5b2b9371ee8ad4cd7cc1d2a17
-size 40861
+oid sha256:a33e7678ff9c75e839a7ecda01dbf18ce36c669c34940642a079a6fe1863540d
+size 44059
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_dark.png
index a6d5987c9..03c0f6c7a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:15613cc449fc214bb119b3cf154183595febad3dfbd4d88e64eafee09fcc46c2
-size 6486
+oid sha256:5dacd97a2d5d368c5c35fe13a17ea0cb0f23a9903e3a1da91822b732b3e3003f
+size 6128
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_light.png
index ebae5b8f1..b8aad2412 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_card_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:005528a49b97bd154fd753821cd11758d4edadb88e181260378049bba6a9c1e5
-size 6007
+oid sha256:3b133b2e8b45078f001e8b07c90a355d9c4324912b872bfb85fe7b2a38fa139e
+size 6079
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_dark.png
index a6d5987c9..03c0f6c7a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:15613cc449fc214bb119b3cf154183595febad3dfbd4d88e64eafee09fcc46c2
-size 6486
+oid sha256:5dacd97a2d5d368c5c35fe13a17ea0cb0f23a9903e3a1da91822b732b3e3003f
+size 6128
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_light.png
index ebae5b8f1..b8aad2412 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_elevatedcard_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:005528a49b97bd154fd753821cd11758d4edadb88e181260378049bba6a9c1e5
-size 6007
+oid sha256:3b133b2e8b45078f001e8b07c90a355d9c4324912b872bfb85fe7b2a38fa139e
+size 6079
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_dark.png
index 47137158b..6926867c0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4af801e419aaeb041f66c0df141b673ab48a02d52b9cf7d106cba789d2206aa9
-size 6928
+oid sha256:1dd1b6984afbda62abe33435aa71ca90248920557cbab3077e6af97c251ca561
+size 6860
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_light.png
index 026abee70..57f005761 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_cards_outlinedcard_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cd0f540cc1589417b12b9342a5b1bf8e69030d3c8a0e6442782c1510137e2015
-size 6984
+oid sha256:27fa7c5453d8dd4dbab6fb5b97584bdb86e9bc2d8a6167fd8a22a116811ef232
+size 6029
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_dark.png
index 0060f7c6f..7d37a5f6b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:76d3999321ebc86ff33c646f2d4f1d9e7c4af9f86b800c048024caf8f4963f57
-size 85123
+oid sha256:97af901c40dbb76f9f02b825f06fcd09958983cbdfc6825eb40349f219900272
+size 84261
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_light.png
index d301e2dd7..8a9fb34f8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chips_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7b7d44dfb6d916a2a827e0c796aac24d23fce44247f26249d1685d15e501c818
-size 83205
+oid sha256:7cc3d26e501ab30d33b9f5c08ba0b0a8da68937f3991624a4b053951831f4121
+size 78777
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_dark.png
index 2debbb7f6..32eb874d5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6295c1f1a5fcc7989ec386faab87a8197cbe8415c84b6b1792fbcadcfe0f5ca8
-size 113535
+oid sha256:c5096de5824a4aedf4e40eca0e2bc61e5262ad687bee4fd17d9f05e5e0fc29a2
+size 104849
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_light.png
index 7127b7318..3c08cef9b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsdashed_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a29db30e439e43797450b5a1de9f513d85ebdc49036908ceac44257ac144d238
-size 107876
+oid sha256:e963fc0e8a6392d730f0c90f194ed80792673c8d9cd4fcf5ec0caa275aa30108
+size 100383
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_dark.png
index cfe46cc7b..384d27028 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0a81657d877fdde1aa8e7dbec024c39b894943b0f86c253067e42c72d3897e20
-size 95151
+oid sha256:ebc3d99536a0966f039f465fb7af21a1af9603d635724a710f3eb1e7a90e2a4e
+size 88399
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_light.png
index bb257b351..89e81bc52 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsfilled_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:505f06e04c4355602d5890d331b6f7d91fdafc759ec1f26f4bcb62ac231420ff
-size 93182
+oid sha256:b729adbd3bc5860b9980f24be0620772d531699443fc80fa7ee6dc88467205cc
+size 90193
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_dark.png
index 663f35c3b..d9707559a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:23f0a45c5750185661a888d1e9834791d6c75cf65a12f44668afacadc9285973
-size 105988
+oid sha256:9993817dc7b48724f32bff79acde7705b92607e0c73d81259d99236f22d545f9
+size 98491
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_light.png
index fd84749c7..f276cafc9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipsoutlined_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5510d1e274c967341d9f05a6c65a691b6f9847513b31c8dfba1b8fe2ad401ecc
-size 99807
+oid sha256:e55657354adb17dccb2372af662c45c27b086cb2633f77fb3b24cd0b9187b4a6
+size 94130
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_dark.png
index f3ace7ad7..be1a0aa09 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9965473d9427295f405f010786dac708c061ce950b6fda90d3c9f60ca852e430
-size 94219
+oid sha256:8e081fb3c34f7f9eaaab7fc084cb127afd73ffed0a31747b98229093955ca729
+size 90504
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_light.png
index 4b3528926..b1f85b633 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_chips_chipstinted_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:47e1303494332a4d652fec39892d68faf50835c489f086b79639bbaac286af7e
-size 89364
+oid sha256:11afbff7e06c67abffc93bd4ca01d2ae74eafde28b563d5be035cb99a5164793
+size 85448
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_dark.png
index cd5156cc6..0f780d0fd 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4a57f4648d36d1b4dc40757c178ff5d1f2fac95993a11f0b358dc4b99209e82a
-size 532
+oid sha256:9a15d4a181bc1cdcbf9b26708a4e54afc5891cd70ee1abf674062c4115a53006
+size 612
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_light.png
index 497e3ef47..4ae788c9b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_defaultgroup_previewdraghandle_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e9f0cccde7eb99757fe81cf7eae78cf9592a181613a29d9ed3054322cafc8005
-size 603
+oid sha256:f4aeb812efcfa3e8dca6019a1010310bdc683ef1c589be2b507c78336d863e29
+size 614
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_dark.png
index cb9ccc96e..ea1e8e105 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c5d2dd6d85f6b57aca9650f95814804dde2110bca62bbb29d9d1847d39eb8ecb
-size 1167
+oid sha256:51b6260d38de6b3a9677a5308d48d1ded1da9820edc9b427bdad2981430541ec
+size 1142
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_light.png
index 8916c3f33..aa3371841 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_dialog_alertdialog_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:38fb0e158f6ee5c82d2662a14d8d5148428d3ab7a1d74f2218ec3b16b8e9384d
-size 1067
+oid sha256:a5d6405e0170f74487ac077f245c250816a1700634e612d01fcdba4d3bd0a0ee
+size 1121
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_dark.png
index 922efad8d..958464f6f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:39817b810dd70265e4e9efe034ba76cb593ed7b34be00856676e418eb444ef0a
-size 12400
+oid sha256:e2af9cef3d661b4885e305ece91e8560da7b155d4de87ebe4bd7db0fa1d1e707
+size 12578
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_light.png
index c7e94392a..625796fe1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissibledrawersheet_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:602b410a97b66c4456711da57e4991afe2314fc56dd96a69bffbc0ee57f3d326
-size 11868
+oid sha256:d176520d9ba49979964739206f330c854e27322b2e91f1fc69ad350d38c76d3b
+size 12408
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_dark.png
index ad2e018a9..588cd6864 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0e74db8a238cc75d58a302be4e42e18eaf6f0191bfa9ec13ae4c2f7cf031bd44
-size 9436
+oid sha256:265a594eb589a8dcb8ae12f298bb91a138637c56e0ca1a51efda5d4c38044e6d
+size 9479
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_light.png
index cdd6c3735..fc6cbf510 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_dismissiblenavigationdrawer_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d4722c473d5c839a9ba921a1fad83722d66ec82e842b8990967e6c09156ccd33
-size 9355
+oid sha256:8b51a126b5f623676f4ee3cb9eb1bd9c021cf4a3511c9a1cd0f4eea060df894a
+size 9242
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_dark.png
index b3f4ca9da..9b75ebea9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:56143013c0cbf2f6da6ddcb0fb2eeeeab90f206cf38ff574af83d84092f3924b
-size 13559
+oid sha256:e8653160b3af2226190a1e4f394c44cd5b7f35ba37a54fb3d2556bf641aab54f
+size 13232
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_light.png
index 6e27d76e5..28df017e2 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modaldrawersheet_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7903759f2e38606bfafc70e4a2fc653052ff8bf660031b986d3237c49bda8e4c
-size 13119
+oid sha256:2d955333bc97c9096d1ae0b5ee0a8ffff8ab02830d1b3ed81254d690579c2767
+size 12785
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_dark.png
index ad2e018a9..588cd6864 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0e74db8a238cc75d58a302be4e42e18eaf6f0191bfa9ec13ae4c2f7cf031bd44
-size 9436
+oid sha256:265a594eb589a8dcb8ae12f298bb91a138637c56e0ca1a51efda5d4c38044e6d
+size 9479
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_light.png
index cdd6c3735..fc6cbf510 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_drawer_modalnavigationdrawer_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d4722c473d5c839a9ba921a1fad83722d66ec82e842b8990967e6c09156ccd33
-size 9355
+oid sha256:8b51a126b5f623676f4ee3cb9eb1bd9c021cf4a3511c9a1cd0f4eea060df894a
+size 9242
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_dark.png
index 41ccd1a25..e22eabab6 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f72a9cd1bfa0bbf71bd68ebf1ea9a79ccd46d92894f26b07f470d7e8d98b0dc8
-size 50323
+oid sha256:95b6edb00ed4da588d3f02a7eed65c535d94cd86d176474d7b526872e125f1cd
+size 59610
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_light.png
index e672d6c52..f0a9d1022 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icon_icon_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5abd512b7fa163b4873203397c7799fbc8712064df85b73cad121a17023542e4
-size 51746
+oid sha256:01a21e9ddf6fea3f22c9cac26d4ec33dd11519f30fd835b6f1a6f344fcdc85f0
+size 58955
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_dark.png
index 57ba8e0f3..33ec895b7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:02e2dcd4f77c858154c3e79ce5f8f88b4645b24d7019ff277151fd512708d4dc
-size 45053
+oid sha256:b56705cfd9e34cda79024a002a56f588c351e1ae85deb89b66cf217458d0a0dc
+size 48114
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_light.png
index a758003ac..3ff13decf 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_iconbuttons_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a93ec9e0a19f47eb361c2c57a454d11934bc3d3badf59960e9db7618262efca1
-size 43637
+oid sha256:c14e412d2298b731f3936376f8a39a824f6c2e84ccbaf7fbac0cccc9dc8cdf3b
+size 46880
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_dark.png
index 5cf6d307a..1e9937075 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a9c6ad2328be8adf22a143e76640b54cc5b2c31418d63da9c74655b445865806
-size 56618
+oid sha256:f3a932aaa66203e16785096877139587cb86fa1981b22957f2988b5bed799b2a
+size 59824
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_light.png
index 61d75a388..611790697 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_icons_icontogglebuttons_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f576b0c1ed508c0e80faac303038520244fd8ff6f2e6325901f7c177ea18f078
-size 53655
+oid sha256:15376488ffb43fd87533faa0717d547c809fc77f7389eb71548bc6f5d5fafc63
+size 56548
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_dark.png
index facdf162c..e47510891 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bfaf3a7abc05e57fe0acd2afaa9dba0a238ce9b2402b254f8194ca8162e17ab1
-size 1264
+oid sha256:76e7de3de2cb12a25efeeea0256d6de7daeb96adc5bed76a3d3028fbb9d4471f
+size 4862
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_light.png
index b0f657e09..26db38e60 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_illustration_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f5eb16d9b25cd1b51b33d91d80df75f282e4ff403fb430870902deda1ad6e723
-size 4937
+oid sha256:2b88373b18f621e138e0f13207c73bfe18bc8d977f083373f41f7d48bbceef1a
+size 4935
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_dark.png
index f95baa0d7..01b8551bc 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6a593d209e54888b789c02bc5df484cb857d81916b8c2b372ca33bd0ea2f1377
-size 17976
+oid sha256:da1928de864a525619713a7fff886e03231a1321e91b822aa586521d6e1d78cf
+size 20277
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_light.png
index 6db339e97..9e3868f08 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_image_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4f2c748cb3f965fc5f9fa8ca17717febc45711faebbab63e522a7bb710a8850d
-size 20148
+oid sha256:c3328ea0096e11772b03952b9094e8395cbeef66db5168d3714667243704a7b7
+size 20701
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_dark.png
index 69788a838..0ad444fed 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f226f74bbda4889ca9f70e1d66e4b930efbb0e21704fa0260d686eabe4c43cbc
-size 12998
+oid sha256:c556eb4ca084def9c05a610a1deb1bd93dd5ebf22d2881ea3916bb6531528afd
+size 13052
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_light.png
index 7ab962b2b..a2d2d58a7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_images_useravatar_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5dafb98cbf36792adf53c2342971a0cd314090c33fd817dee018cf0275256cbe
-size 13976
+oid sha256:9ff4f3529ce4916b5eadc2f292e4da565c3004c8030a41ba2a2b819768a666c7
+size 14437
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_dark.png
index 645465e4b..5d7683923 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:71280eb73bd242af82c32213b393f1ed7e1427f6ca785e24f9cb7560fdd27c44
-size 7479
+oid sha256:5e8409d0fdc52aec00036ec79189f885d1000d28c74f5f84fad7d7bbebdd0340
+size 8170
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_light.png
index b8edab019..a2ce824ed 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_list_listitem_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:15a99edf9ad61d321f16019f76a5572aef31f3fc77ee6a75b32e2fe58109b297
-size 7269
+oid sha256:80a8aebc9886736364c5be4696de224d1427c7a47142054750d93e46469ccd5e
+size 8071
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_dark.png
index 03fd17dbd..fdc5ec48a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cc7161d2ec81610f5e6aafc193920cdad20e7381df51a2c4973f0cdeb72488b3
-size 4000
+oid sha256:49eaf16968d9af53419dbcb263c271e1072b83cf68810d1e794c751466fef72f
+size 4276
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_light.png
index b3b27fbb6..df5690a8e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_menu_dropdownmenu_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:93b048573c90e006395df9e0906a8c5ce99d6b4fd46b9990081a18db31f75014
-size 4235
+oid sha256:098c712a335768b023902f49a9199f738b3aecd64758c0d6fdc919a5b39a63bf
+size 4262
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_dark.png
index e63c537fe..387f35733 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:340aaaac5f1a2c131295677cd8b078b4922c09efd030c6bc357fe094054b724c
-size 30151
+oid sha256:468eb47e8ededa6f67165c1d443b35f70d2044a72c879de896f3cc8c4a9b6aeb
+size 29788
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_light.png
index 31ed397ac..4272a503e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationdraweritem_navigationdraweritem_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c3fdae0085b80406ee63dd2d55277aa146ab5a9bbd60f82af053f3767d2a716e
-size 28603
+oid sha256:5047f6c9e08ea444ed21c92ced5cd1c22780deaea858e97c6a444edbbf97f67c
+size 29772
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_dark.png
index 467cb5113..cfe04b6c6 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:468932fc82236353ebf47808864bf31327dfe442e5b3f3754600d996d5ebdffd
-size 8314
+oid sha256:89f50d0cffd9d20276467548593feaa050b70c6d221ffc6c9012a0aa0d79fed6
+size 8094
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_light.png
index b5e278bc8..771837554 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrail_navigationrail_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c782159667f55e9d172827147d2c541eb1fa1e758235b9fc66691a430593cc3a
-size 7428
+oid sha256:4943b5fa2172b9f1f64542cbaf4019fb53dabdee262d7c18ad0d5b892419364a
+size 7709
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_dark.png
index 4558c841f..b7d440ec5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:da519e077d9169560d03710ef05474130bb147746a225cc65e975a4c639543a3
-size 26243
+oid sha256:5020971dbab56b5a478f1dee5cb47d39b37d66e9f17383b9b680096a3e8d1226
+size 26320
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_light.png
index 2135bdba2..17d69b78c 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_navigationrailitem_navigationrailitem_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f39e97ed702ed5afc55dff3d9573fcc9dab99f9e0bf02738a591979df3273bd
-size 22981
+oid sha256:a133ec4cd5ab273a62ff71e5e5e0f8edd0990ebe69a041cb053a05102dd1bb2a
+size 24282
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_dark.png
index 7ce499fb5..e6ad83108 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:69795c8a74221a39debb1cc6e506b01c82af837040af992459fa48de3c25543c
-size 7399
+oid sha256:d8f3ac47aaaa70d1d65115d95b5dede705d4b19e23c7d835450704c57b69999a
+size 7435
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_light.png
index b836ed285..05d565101 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentdrawersheet_permanentdrawersheet_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:77bfce84cf28861fbdcee8ed670ea8a303b31704084738771a9dc481be170fbb
-size 7037
+oid sha256:0262f0732bda96b41f5e2c3768be4c885b6f5f42f2c78d09242dd7d8a711cad4
+size 7219
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_dark.png
index 615735763..f7dbcec3a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8ecaa3e7511fb4a38dc377ef68f908f3a54ea2f8972150ed86c601f668c1502e
-size 14866
+oid sha256:3a9acfde086eb5f5e16ab55553b104fe9967bd21b12169bdd92c9d4e7b652b65
+size 14294
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_light.png
index 1129ad6ae..666349727 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_permanentnavigationdrawer_permanentnavigationdrawer_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2ba0cfd7511b813254affd2444ba4ee2ba0fa36de0b6459cb2df573d7e104a0a
-size 14067
+oid sha256:aade272cde2ccda839ba817f3651fc248a1736368d3a525529ff3faef15ae7dd
+size 14485
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_dark.png
index 8355f659b..b21a80785 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8d1739a8db8437e8569daa809e183961aa1a5a83d7dbbab73f2098b653f42229
-size 8250
+oid sha256:1de77002f9f168b9d326c320b591a741863f03e548c9ba0a4886205875ecddfa
+size 7867
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_light.png
index 65cd6c0a5..1fd639735 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_circularprogressindicator_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a62cd5e6446546ba724af255e8e952c3af813b0012d9271a6e4f08746a3e67d1
-size 7929
+oid sha256:c02bb627a4ceec5b2d39a83ea0ca513da0c17c310e557b97d9f4346ce8976540
+size 7510
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_dark.png
index dcb883e5e..cc288a274 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b176fadcd823dc6036dfa9a83f47c63ab27ec30a66c929d08b4bc17862fdfc80
-size 1524
+oid sha256:955607f6ffccb6e10c876141525f7ab9a8f3ad3d7ac7a7121f9f0facd8a70399
+size 1543
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_light.png
index 474fb50e2..81e9c4029 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicator_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e9353b57b3246c62aaf35d25a559b7768b0124efd26ab20b03822e7086d38c9d
-size 1615
+oid sha256:7251483078fbfc54eb04a0f2431895820f7528d365e366486e3da4d2a536cf39
+size 1609
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_dark.png
index aed8b138a..5421dd09d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab3ce074f231a9db751b1d87500b7fdba2269474dad8ceceb1e5aac415cd347d
-size 696
+oid sha256:7acc3ce593e7d75061132bc5df94590f27cdaa677b45fb05a553d4eedf04be58
+size 722
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_light.png
index df62ee82c..71627638d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_progressindicator_linearprogressindicatorindeterminate_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:edd343daa3464e4db375836b3b6dac75c7af2eb6bb9dda4e4d6d7fc7a6e5624b
-size 735
+oid sha256:05d4055fb6536d87c32a3220200f819d0c7ff6a8ce69c537c41fa4ea0f35386c
+size 737
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_dark.png
index 68e2c039c..5aaeeae4d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2fda715e7fd80ecf97c5bd9323fb2cd5a5b7074a7c147a2085ecb51a8b4b172c
-size 9003
+oid sha256:69de6b77ffae2d1cb6c53f51b0ec0cf2d85ffbd76a7b48cc086381bf72cccef1
+size 8879
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_light.png
index 570887551..655b56477 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_rangeslider_rangeslider_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c0fa704bca57ca8d94ae2e000c471d987bdd16ace43bafd541e82efbce19eb17
-size 8923
+oid sha256:212054acac11827891cfc12a4572993ae8cb3186b3fa032319d06074aa7da0c3
+size 8817
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_dark.png
index 4e87172e8..d804d2374 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6d63dbda3ff9a8b013f0fda424f846ea9c57407ae2da144e5ac49703601a01a3
-size 10293
+oid sha256:48d462ad27dcd4ee479b563ea4700212749ae91fa61f3a92ca17992320366c4b
+size 10222
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_light.png
index ef88d70d4..52927da58 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingcompressed_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3a056352dadc6dc121056791b753c5989e3606ba871eca81ec475a087091c233
-size 10091
+oid sha256:bd2008f5ea1e40bfce20903443da671a3a05a9c1c764bbd6503162f1a896329f
+size 10027
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_dark.png
index 17407e3f7..a69163743 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9e9c9f9e588032cf86970fe3a7b2119190f77a537f9006f4cb060f9c46f23b20
-size 11546
+oid sha256:7bb754322953bf6b982915ac2c564fee0c1c26e3730aa8e884e3dfc230cdb2a9
+size 11483
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_light.png
index 54cd69d17..2af936a77 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingfull_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:27b1c7803e2d1fd40432333974799c870e8bde3ed92a1a35ba13de4bd1a4f555
-size 11386
+oid sha256:b382f07db7d7ecfd92a3aeaccae88e13d4ed8bc85ba0f1320685ba12ab24d67d
+size 11337
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_dark.png
index 9abfffe8a..3619085b0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b23b12db0bf467e2d41c8e6bdfc5f23f07f7afb5dbad279218d4b80a5cb2b9b7
-size 5727
+oid sha256:82f0c9d6cf3a8344844b1ca792d30b27a6062596e5a797c3a30ff2bc6e7d5b31
+size 5743
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_light.png
index 9278f7149..b2e910c0c 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingnaked_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:16137a53ae903e49ebeaa84ec6a489f55a1ccb1380c31993a3f84e4b294d72be
-size 5740
+oid sha256:4eb1701cdfddc9b9938d8dca19222b66d813315dc4dbfed85e666e7e4776c9f5
+size 5668
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_dark.png
index f75e115db..a3b485177 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d601a8a12de98b5855c557fb87c034fb4a538cb185c2c0295dfec076e0e5d830
-size 8298
+oid sha256:643d16f2bded0c1eef2489ae8965557ab1d5bc0c928bbabe4071a67f4f0f7e5f
+size 8340
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_light.png
index b748a0658..14675ab48 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_ratings_ratingsmall_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:367b0f4b528893bf91e97143573cb591fb93ab6988e1305561f4881893a87ad7
-size 8044
+oid sha256:cfab655b964f9e11b73b8b5364b3e32acdda3348f66be0b755eca9bedc718720
+size 8082
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_dark.png
index be6fd8066..c5a6734d8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f1a07862dd8606243ce8727dded5d9473f69419c6e80379887631796bc16d506
-size 924
+oid sha256:8608238027c793a2a878d552b70e41cd54c5dbc85a12df4295bf02afb5c8cf33
+size 970
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_light.png
index 3339781be..e28b3a7b3 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_separator_divider_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:81730a030c6b85a4a962fe650cad1586dd9dd5e0b5f884f6a2db08621f7f886e
-size 971
+oid sha256:e9abe46429cf1a9247072f6892565f3e5d51266b7fd6f7ae8ff1f5fdafb87905
+size 983
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_dark.png
index 0345a45b1..70e23caec 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab5b6254ad7388864e63a38de1a1bc41bcd885144012fd9dfe0ff5507323bdea
-size 6354
+oid sha256:f9fde90dd9fdd65f3ef7485201933dbf5699374896b5c2b18491f86c548b3949
+size 6189
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_light.png
index 7315cddfc..958df48fa 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_slider_slider_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:569976615a911740fb21a9eac89975bd77cdc3f01b1ca95ced84226ca1f7c8c2
-size 6415
+oid sha256:13d557b2b55ecbf2e4c49957a1ea6b44084ed924e4e1684320d9d6b634397943
+size 6204
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_dark.png
index 7c8910597..d05c044d7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:800dd3c3b0c0a306adfbde7272896b7625f37d8a732e582adb41943050bef900
-size 41853
+oid sha256:ee62e18cee8999163e482e43c7517878e14893211b96cd940e2d826addc02c08
+size 30072
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_light.png
index cfc75f709..9df1ff3c1 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnermedium_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:977114944292a18f455b8ad0c092964117efe5a3c289a9451cd13c90b21eaa58
-size 36006
+oid sha256:6c84faf96c89a5b45d3fe6729becda3d41d85dabab7628a321cc1de7b9fc7049
+size 27295
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_dark.png
index b0607612b..ec803f9bd 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b94ad4af963282dca9181262386751ed0326c431721075aeb61a31d4a5eb0613
-size 14149
+oid sha256:d9ac6eb594eecc883a848fa319356058095f27e506d5e22c7b0b43dc63921d0b
+size 31737
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_light.png
index 758901a61..28ea747b9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_spinner_spinnersmall_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e4b0f96cbb1fb2d87187af5fa69b9b61d4fab27035552da961d2f6c9d16d4940
-size 13389
+oid sha256:23809ed18a6d056e2cf46efa768e56ff67f2f2aa4f9f365cf8690bdbec852f59
+size 28227
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_dark.png
index 0e10d79a3..7f1df803e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0d990779a281b10b6000a1aedb19c81c4bd4a8c3b703775d40f46e08992958d2
-size 12550
+oid sha256:e1eba60c745da8d31eedb6814293ef30089368766e0fc9adc7d59e2f0494af2b
+size 11921
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_light.png
index 0fe2cb2bb..5daf6737f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_leadingicontab_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:be70d96291bf0f53dbd6f32477ffd156d7c8b91273fe7e74147176e49cf06caa
-size 12365
+oid sha256:236dbabbccf75770f4101330df18f141f05543d3ae28c4690149bb26a355be2c
+size 11280
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_dark.png
index 92aa27840..fd7f45efb 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e04095168bd76ec04e9947ef35b4ee95f85ede54cbbded21112139581b9e975f
-size 23212
+oid sha256:038e681e4201bc43fe81042733de4a3ba69041025ecdb4d326e9dd5143d1ba86
+size 25814
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_light.png
index ea86c5a30..b9971a1fb 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tab_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3e65addec1111ba8d4e57c68b677dfb75f97cec05285901db77777dabcbbcae0
-size 22546
+oid sha256:8d3f191156b3f1356a0b530eaf00466fff2a1cf341567d9cc8ecb6a97c6ed793
+size 25265
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_dark.png
index fa2eb47aa..7ae09c94f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f95b3c1c5403854582cd75c7da69d589290aa18b7b63e8120d34d9b64436ddf7
-size 14497
+oid sha256:10bd761f9c1468dbe063e7151a392f0afd9c109e919476d1c7524beeabb11e42
+size 13957
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_light.png
index dc1217ab7..4289ff016 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tabs_tabrow_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:da428976bc714b4f5f257c8194b62e9a5786b9f96ba106b3afa0ee7c33681a67
-size 14148
+oid sha256:f0985093ec644be4241a18d3e592022e65e437716e0451769f7c622014852b4e
+size 13044
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_dark.png
index 8f345b963..d9d1af8e4 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3e0d56eccd5cefe11c4c869010c7c3929f1cda225115c8d9f4a5f019c5d26c89
-size 30087
+oid sha256:1ff74ef54cf376572cede8c3549bca4ca25af2b990ebab8b0677dfb0c66e2271
+size 60696
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_light.png
index d547223b0..9d01ec51b 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagfilledpreview_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2e109698a3fc86ab1086ea897a7054028665d010d43c89375df89c660c85dba4
-size 30049
+oid sha256:59823cf9208f3efdc5cd00d461a68e956c84816a49021430578855ec61fc4fd2
+size 61975
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_dark.png
index ae3ce1301..6c019da16 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e85d7de4980962039e6dfe2233fa751ac8bdd0310f3615c526ca05e6748a4381
-size 33031
+oid sha256:6475e05204b62e443b2cd8ff004e6c8106c80c660ad5f8b41df5e02c528370dc
+size 59980
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_light.png
index a1b127e38..745daec4d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagoutlinedpreview_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3952f23ec65ab8f4b3f64a19827099446296fb824a2538de4440aa6b6633da98
-size 31746
+oid sha256:727680949322137f6468d561903f6d9e9e1bf38604b73b25cdaf12518b2d2273
+size 58487
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_dark.png
index 8a085ee40..216b67eff 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6cb26f19a20d66d00d7f2a679e6f10ecc43cbf450a64527e0b9134f6e036e35a
-size 28395
+oid sha256:aad5cb76c246f8c2f91602b31156f3a1c56c0974cf375ea39512a51b90e7ffcf
+size 54298
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_light.png
index 1fd2ea63c..2bb8e025a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tags_tagtonalpreview_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:df077cb19834903ba33244bdcb521ca962557eb993336ab935cf0e50305e0967
-size 27324
+oid sha256:5798efe4b9570650d62a748d1de236489ebe53e46ce9b48ac008b4b856c15364
+size 52310
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_dark.png
index bccab6140..1480969d9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b22b50c76c94f3fc1b31c649c77bc7dd63cb4741a8be1548ee6f1a3fd09c661c
-size 58104
+oid sha256:97e3d45b171e8dc6e92bd9ab17e97b5d50ac99e70e39d6c2236af71cf837f51c
+size 61803
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_light.png
index 6ce276717..ff7565f3d 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cbe24ecea8138c676646c259a711f436a984eb577fdbb265509b37aad38e0ea5
-size 55560
+oid sha256:5d3a10cbc7165e6cdba1bea786fd62b6fe2137733401dbce760ed212fe01a0a9
+size 59566
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_dark.png
index c95e1f242..b923ac4fc 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3f77d8b0fd587fa887e9c2b7c314620f9f725b29b3960f873630fceb2a4b6c81
-size 65139
+oid sha256:1260df4e0125d89915740c3872fb5b12dc7f88b42f309d6ad53f7f785d739595
+size 66159
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_light.png
index 4c00ce8c7..d21888bc5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentsalert_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:747aff40c609a5c08cf61eb2acda086bf1ddacc9b9809bf03de4b53d995ca08c
-size 59966
+oid sha256:8fee1beb1ce825e28be9529e52cb5ee9879c1c44fe4e28c2295ebeed401eea00
+size 62314
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_dark.png
index d16edd4db..e7f3fe5d2 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:39a87e6916f7c73599ca83fc71339b6b96ec6f04daff2489385e067d8a491180
-size 64034
+oid sha256:caf128903e8f320f90369fd4274bd237befafadfc6e6202e6c004ef45826ab16
+size 65370
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_light.png
index 564f309ea..1b1b42841 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentserror_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6e91c319eb421d0207b5fe28f94728880461bd65356b22be57ed6c98ed2b3438
-size 61062
+oid sha256:168608fd81ab17f22c5c28d83548b0d678837ed8535d6be232b9af1f25ff9482
+size 63519
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_dark.png
index 3cc17af8f..1e0dd7433 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:37394046ba63991dc27781cbcf2fda5554a34ebf0396dc0752074572ad49292a
-size 64259
+oid sha256:764fafb2c4e899be2720a8da441d9b7d158d11c88737c563d9bfd086e8410397
+size 65380
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_light.png
index c0c841e4a..16035d27f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_multilinetextfieldintentssuccess_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cd24d8604972334f7bb2cc28866b7a67f0281650e7b4f40caf678c4663491aa3
-size 63246
+oid sha256:18e208dc10f1877cc2291ba50ff487b53c423933521e54e4e535b79445c2db0c
+size 65828
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_dark.png
index 534d24d78..faba5dc1f 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:207295f0f44daa129756fb568ff0d32ab27c05b505ece07e22eaf80f1dba1a7a
-size 66212
+oid sha256:93806f83e5d2039e1e7ae63907f592fa0ba0af76850b41809b226c83e006bd2c
+size 70992
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_light.png
index 4ba94e204..342708cec 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2de5fc591bbc6b12138f5ebb4ba2550f82ef7da2103c721e681a87f19a9b174f
-size 63329
+oid sha256:a04556b08ca0d232415f2c3ba23857b4e7a33758f3cc20a576d6673df78df3ee
+size 68553
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_dark.png
index 1eefb0bcb..13c3a2526 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1f53fa4f8a680c5224eb7c7f285180d86cd8b6898b67a17075f8707804459b95
-size 74381
+oid sha256:aecf8a99b9b77f5d8823c58b65256007cfb4c6a3f5054be5f29f98e56fe6f2f5
+size 75801
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_light.png
index 02739f3fc..63ef0cb07 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentsalert_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c116acd140d7ea8e214a9eab3de24a2bc7648b06b0099853a12ccff00fbb9b0d
-size 68764
+oid sha256:5f566b514d9efa260d63831209cb07c7723d218861ec6e44db453d69e021d465
+size 71820
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_dark.png
index 33e207ab3..d4f8ecfac 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3fe2e21c127d508f1de376469a36e020f98397525fa47fd328f3ea3ccc29c997
-size 73390
+oid sha256:79d86ab2227e5058f66b50970ca8c9ed5049206ede4433a3c2db03c1f079e4d3
+size 74770
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_light.png
index 6162bf046..f1eb33471 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentserror_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:733fa23a09435886585092b92de3a716ecbeebea5a67952704f7fb3fbe140fcf
-size 69851
+oid sha256:6d9d8aaff9267de2595cf9f5b410f87090f81ffe98b8e41b85ccedbfa0883bff
+size 72855
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_dark.png
index 5b7daca1e..26775d7e8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:56b61ccb3f94823ed6f3207793c03c5f2a745d7630ae5f3d2e1ccdec106b7e88
-size 73623
+oid sha256:0a7ef9682bf1ee1360261ace772c44993ed69acd62d90c3e1804b07481c4f6aa
+size 75110
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_light.png
index 7c6057d29..a8ba472b8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_selecttextfieldintentssuccess_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bbd7bed5a89a45ce81a58fa57b4ffbaba63021d77997247b846f8baa84353ddc
-size 72733
+oid sha256:c6115021652ac2289d298d921440498a3d2abedd59d360be82d4ced760607e65
+size 75873
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_dark.png
index 9f562464e..282e64897 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:db52b9a19bdf6424e72a23308ea5c46bb04462396f2940b6bc5a0be5837f8cb4
-size 66537
+oid sha256:7e7938b3fbace1b7cc68275917e12dafc5619b5e2b41b1649d7463448d14baa5
+size 71287
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_light.png
index e79dc618a..3935b4ad9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintents_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a978109fc4c34be9a9ed4395522b84376531b920a41685245e514a53d5124b42
-size 63659
+oid sha256:5c9b572ab121c888e3fd8b4e576ac8aaaf119077a61b02b191530abdb77dd3a0
+size 68812
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_dark.png
index 1eefb0bcb..13c3a2526 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1f53fa4f8a680c5224eb7c7f285180d86cd8b6898b67a17075f8707804459b95
-size 74381
+oid sha256:aecf8a99b9b77f5d8823c58b65256007cfb4c6a3f5054be5f29f98e56fe6f2f5
+size 75801
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_light.png
index 02739f3fc..63ef0cb07 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentsalert_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c116acd140d7ea8e214a9eab3de24a2bc7648b06b0099853a12ccff00fbb9b0d
-size 68764
+oid sha256:5f566b514d9efa260d63831209cb07c7723d218861ec6e44db453d69e021d465
+size 71820
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_dark.png
index 33e207ab3..d4f8ecfac 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3fe2e21c127d508f1de376469a36e020f98397525fa47fd328f3ea3ccc29c997
-size 73390
+oid sha256:79d86ab2227e5058f66b50970ca8c9ed5049206ede4433a3c2db03c1f079e4d3
+size 74770
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_light.png
index 6162bf046..f1eb33471 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentserror_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:733fa23a09435886585092b92de3a716ecbeebea5a67952704f7fb3fbe140fcf
-size 69851
+oid sha256:6d9d8aaff9267de2595cf9f5b410f87090f81ffe98b8e41b85ccedbfa0883bff
+size 72855
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_dark.png
index 5b7daca1e..26775d7e8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:56b61ccb3f94823ed6f3207793c03c5f2a745d7630ae5f3d2e1ccdec106b7e88
-size 73623
+oid sha256:0a7ef9682bf1ee1360261ace772c44993ed69acd62d90c3e1804b07481c4f6aa
+size 75110
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_light.png
index 7c6057d29..a8ba472b8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldintentssuccess_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bbd7bed5a89a45ce81a58fa57b4ffbaba63021d77997247b846f8baa84353ddc
-size 72733
+oid sha256:c6115021652ac2289d298d921440498a3d2abedd59d360be82d4ced760607e65
+size 75873
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldslots.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldslots.png
index e2fb25133..388f9f915 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldslots.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_textfields_textfieldslots.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:171823fc6267aef551b33fe0eeee414a1a1229f88996e103fb659abe463e1ddd
-size 29010
+oid sha256:0be8fedf3278ebe8a36c337ca2e61dff5f551c9282405c66b2a333ee6f7663df
+size 28552
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_dark.png
index d05e5df56..9354cd455 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e2ab3199c32f2a526657b8e5c266cc8dce75a8b6d2fe8849ab600c718b216e04
-size 4735
+oid sha256:889fd3f85484e5da6e74a8df29cc284eded4c489442d9d384261a63c4d790311
+size 4755
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_light.png
index da7e64398..8ca02f27a 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkbox_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a1521010642ebb652e3e03ad6553919510e9449d192f84e1ed19c9d653c486cf
-size 4539
+oid sha256:fa134216353106036a6a7d7c825fee542911fe53712bb9d1019eaaf570d027d8
+size 4533
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_dark.png
index 252c59488..de5ef8b10 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:840cc3614cb6f955e0662033a44b2f3f5e4986863462b9fdbcbdebfe56d9f73b
-size 53646
+oid sha256:c01221dcf58185554d2a3a704b372e56c7d59a6e3f924b06d53843647311fc9f
+size 60033
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_light.png
index ec6852919..08d75a571 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_checkboxlabelled_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4636068a1750bd3c16167720e2cbcbee937b0b32dd6f0f66d5fd58615c29e58a
-size 52992
+oid sha256:083957649c7c39965e6ec983475d00db09a4fe0f41a788f258ca8c67274361a6
+size 59181
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_labelledslot.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_labelledslot.png
index ce1568f47..37471646c 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_labelledslot.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_labelledslot.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c75a64e92cb03987b1046379744955000f60bd54ba526533745eaafbeada55d3
-size 7514
+oid sha256:8de7eb38ec3120b2898d2cc09ae6dbfd1457403504bb668b1ea56804a0393d22
+size 7439
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_dark.png
index d887dc4de..d90ed57f3 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c0affd7ea94d3c00b79c9663bfacea3c9d5963eb4630853064374dae8bfafad0
-size 5053
+oid sha256:4a7bec5e684a5a94242843719997516452bc99ce73d6409a3163bd134002c52e
+size 5049
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_light.png
index 61a7e2f15..a5f810c3e 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobutton_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ddb4b15867eda34083846b686308c4a58eb79e56f9b160739ee4e9b4492cf3eb
-size 4971
+oid sha256:e183a3b2e83b2578e1d32e911d2e4be4c71320326c1438fd032525411b1feaaa
+size 5004
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_dark.png
index f690b72d0..34f5dc436 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cb2b47e8169d263e8070e7090c33c25905e8c78aceb572f9414c086a36845584
-size 27270
+oid sha256:dd5c1c8511fd48e79854846dbc9cf573144cb48ba86dcc6350e3d3c5a4bc9536
+size 26951
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_light.png
index 118905df4..2cab3faec 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_radiobuttonlabelled_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ea24035dde2918401cd45b6b6354753239b3d0620aa492fadcb6d3ee9b5c0d54
-size 26512
+oid sha256:cf82ca89c9c9791d48ef1d85d4b13140291892c1e8648b66994a5ef1e7156f71
+size 26543
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_dark.png
index 2505e3980..e4efce301 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0cbf1992a81d113aaaaca9a086e5ee2f5a1b59d04ffa9574a13c5c43c6c55fa5
-size 33696
+oid sha256:04639cd516b9268957d268b7ddc4b43a17df70933518deb85f1ac0d4d22411c6
+size 32481
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_light.png
index 2d6c02ce6..197749112 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switch_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5f8e4969e85a9d3d06b8072d2fbbbd11de05883eb331bd5c0ed6d6e799ef0675
-size 31003
+oid sha256:380c248585bdec34f68dfe5b43e55e50cdcc78217562d615dadc0854632af2f2
+size 30616
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_dark.png
index b99899d9d..1b4b175d5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:53efb143b05422234e4e7167e91166acf8fd1e7ca19808ea513359e14c240500
-size 101578
+oid sha256:1e4e88dc286889827f329f2a5630f8137069052cca3ec6ba89a0d3cd11956a22
+size 111587
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_light.png
index ca622ee80..374da98d9 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_toggles_switchlabelled_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9a39532769c791b57aaafb520787deafbb1afe673a9d13b2d60f37dffc110388
-size 98067
+oid sha256:9ba56bc69df21aa119fdc73ac5639a35baa21f3fe6f609b67f03cbd8cd1f4e4a
+size 109285
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_dark.png
index d22e73341..1151d64c2 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e2999e9e3028e842e2d2b05a7d3851788f8c388121023a0a20c7eb8e3e691ab3
-size 32013
+oid sha256:4a627df8cd64fd6265ee082ac38e1c7aa83cf75e21ebe83c1fd4900b6d7664a5
+size 32642
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_light.png
index 9e72174ba..a28e72093 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_dim_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:648a5e10d15be0749d50d1528b90552a1dfe8111174694cddb707bcfa0729231
-size 31002
+oid sha256:10d728b47c92e2618b7067b2da77311e6d21aed559da8779f3869ab3b52e1ca0
+size 31689
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_dark.png
index 30cd18746..5443befe5 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1f0b410405c4dabe42fcb0e049030af8e540e33de606b408f4e8c199702aa8b9
-size 32680
+oid sha256:8b7e9a3cce6b8dc7b5ff7ccb41f2f6b33844d3901a17440ebc1f96687190f882
+size 33260
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_light.png
index 57e406ebf..4dd972366 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_emphasis_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:da92f60f529eb392361326e6f2c461c5b2f7e1eede43a384e8a1fa47d5b796b9
-size 31641
+oid sha256:2bbcec5b16f99e8cd418d00ca9f4a8a32bd7325a06318e6d6b815dc66e252a8f
+size 32378
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_dark.png
index a9710f4f2..f08a03ea7 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6903310eb3cab2028d94e30aad308c036c55798193a13b74bfe8078e3cc49711
-size 38979
+oid sha256:e8174f96a8842cb6758a3ceb5fd04b4653f41171eba19ab659b82c7104250f1f
+size 41798
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_light.png
index b3a460a5f..b2fae2cf0 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_placeholder_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:aeaafdd0e958a375f89431ccef55fa6dc1647abde5ae28020b45aa85560cd5ef
-size 38851
+oid sha256:d6977135c077956055b114152ec89f2c2ef310f1b09400d6c626e9b8e06a7634
+size 42094
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_dark.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_dark.png
index 1d781c2b5..cb50df3d8 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_dark.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_dark.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ef08bb6f20a748f97c84c0c212e409b0c45e1a152cdb0d3d98a4774b6c15588f
-size 34120
+oid sha256:314b61c7aaa75721a8e3bf3799701617ef0f18b35a2b680aaac77adb1bcd9571
+size 31880
diff --git a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_light.png b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_light.png
index 9f13fef41..9dd6901db 100644
--- a/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_light.png
+++ b/spark-screenshot-testing/src/test/snapshots/images/com.adevinta.spark_PreviewScreenshotTests_preview_tests_tokens_shapes_light.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:40c9296bd9fb60e6786436494eb3211bb53620fce9cc268333a0898e1570ec0d
-size 31300
+oid sha256:52296f62119aaec6c08b7f8dcda76c2797bb5e20aa504955cdb2d01a0d8ee4af
+size 31855
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/IntentColor.kt b/spark/src/main/kotlin/com/adevinta/spark/components/IntentColor.kt
index aee6f6010..5a2509714 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/IntentColor.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/IntentColor.kt
@@ -21,7 +21,9 @@
*/
package com.adevinta.spark.components
+import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
+import com.adevinta.spark.SparkTheme
internal data class IntentColor(
val color: Color,
@@ -29,3 +31,139 @@ internal data class IntentColor(
val containerColor: Color,
val onContainerColor: Color,
)
+
+internal enum class IntentColors {
+ /**
+ * Used to match default color of such UI controls as toggles, Slider, etc.
+ */
+ Basic {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.basic,
+ onColor = SparkTheme.colors.onBasic,
+ containerColor = SparkTheme.colors.basicContainer,
+ onContainerColor = SparkTheme.colors.onBasicContainer,
+ )
+ },
+
+ /**
+ * Used to make UI component visually accentuated.
+ */
+ Accent {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.accent,
+ onColor = SparkTheme.colors.onAccent,
+ containerColor = SparkTheme.colors.accentContainer,
+ onContainerColor = SparkTheme.colors.onAccentContainer,
+ )
+ },
+
+ /**
+ * Used for the most important information.
+ */
+ Main {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.main,
+ onColor = SparkTheme.colors.onMain,
+ containerColor = SparkTheme.colors.mainContainer,
+ onContainerColor = SparkTheme.colors.onMainContainer,
+ )
+ },
+
+ /**
+ * Used to highlight information.
+ */
+ Support {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.support,
+ onColor = SparkTheme.colors.onSupport,
+ containerColor = SparkTheme.colors.supportContainer,
+ onContainerColor = SparkTheme.colors.onSupportContainer,
+ )
+ },
+
+ /**
+ * Used for feedbacks that are positive.
+ */
+ Success {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.success,
+ onColor = SparkTheme.colors.onSuccess,
+ containerColor = SparkTheme.colors.successContainer,
+ onContainerColor = SparkTheme.colors.onSuccessContainer,
+ )
+ },
+
+ /**
+ * Used for feedbacks that are negative.
+ */
+ Alert {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.alert,
+ onColor = SparkTheme.colors.onAlert,
+ containerColor = SparkTheme.colors.alertContainer,
+ onContainerColor = SparkTheme.colors.onAlertContainer,
+ )
+ },
+
+ /**
+ * Used for first level information
+ */
+ Danger {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.error,
+ onColor = SparkTheme.colors.onError,
+ containerColor = SparkTheme.colors.errorContainer,
+ onContainerColor = SparkTheme.colors.onErrorContainer,
+ )
+ },
+
+ /**
+ * Used to give information with no emphasis
+ */
+ Info {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.info,
+ onColor = SparkTheme.colors.onInfo,
+ containerColor = SparkTheme.colors.infoContainer,
+ onContainerColor = SparkTheme.colors.onInfoContainer,
+ )
+ },
+
+ /**
+ * Used for feedbacks that are neutral.
+ */
+ Neutral {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.neutral,
+ onColor = SparkTheme.colors.onNeutral,
+ containerColor = SparkTheme.colors.neutralContainer,
+ onContainerColor = SparkTheme.colors.onNeutralContainer,
+ )
+ },
+
+ /**
+ * Badge on a color / image panel without on intent color.
+ */
+ Surface {
+ @Composable
+ override fun colors() = IntentColor(
+ color = SparkTheme.colors.surface,
+ onColor = SparkTheme.colors.onSurface,
+ containerColor = SparkTheme.colors.surface,
+ onContainerColor = SparkTheme.colors.onSurface,
+ )
+ },
+ ;
+
+ @Composable
+ internal abstract fun colors(): IntentColor
+}
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/appbar/BottomAppBar.kt b/spark/src/main/kotlin/com/adevinta/spark/components/appbar/BottomAppBar.kt
index d6646bcb2..c9e1e2da5 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/appbar/BottomAppBar.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/appbar/BottomAppBar.kt
@@ -73,7 +73,7 @@ import androidx.compose.material3.BottomAppBar as MaterialBottomAppBar
* @param contentColor the preferred color for content inside this BottomAppBar. Defaults to either
* the matching content color for [containerColor], or to the current [LocalContentColor] if
* [containerColor] is not a color from the theme.
- * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent primary color
+ * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent main color
* overlay is applied on top of the container. A higher tonal elevation value will result in a
* darker color in light theme and lighter color in dark theme. See also: [Surface].
* @param contentPadding the padding applied to the content of this BottomAppBar
@@ -119,7 +119,7 @@ public fun BottomAppBar(
* @param contentColor the preferred color for content inside this BottomAppBar. Defaults to either
* the matching content color for [containerColor], or to the current [LocalContentColor] if
* [containerColor] is not a color from the theme.
- * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent primary color
+ * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent main color
* overlay is applied on top of the container. A higher tonal elevation value will result in a
* darker color in light theme and lighter color in dark theme. See also: [Surface].
* @param contentPadding the padding applied to the content of this BottomAppBar
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/appbar/NavigationBar.kt b/spark/src/main/kotlin/com/adevinta/spark/components/appbar/NavigationBar.kt
index b75220cb9..0b9726bb2 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/appbar/NavigationBar.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/appbar/NavigationBar.kt
@@ -81,7 +81,7 @@ internal fun SparkNavigationBar(
/**
* Material Design bottom navigation bar.
*
- * Navigation bars offer a persistent and convenient way to switch between primary destinations in
+ * Navigation bars offer a persistent and convenient way to switch between main destinations in
* an app.
*
* 
@@ -94,7 +94,7 @@ internal fun SparkNavigationBar(
* [NavigationBar] component.
*
* @param modifier the [Modifier] to be applied to this navigation bar
- * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent primary color
+ * @param tonalElevation when [containerColor] is [ColorScheme.surface], a translucent main color
* overlay is applied on top of the container. A higher tonal elevation value will result in a
* darker color in light theme and lighter color in dark theme. See also: [Surface].
* @param windowInsets a window insets of the navigation bar.
@@ -119,7 +119,7 @@ public fun NavigationBar(
/**
* Material Design navigation bar item.
*
- * Navigation bars offer a persistent and convenient way to switch between primary destinations in
+ * Navigation bars offer a persistent and convenient way to switch between main destinations in
* an app.
*
* The recommended configuration for a [NavigationBarItem] depends on how many items there are
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/badge/Badge.md b/spark/src/main/kotlin/com/adevinta/spark/components/badge/Badge.md
index bae0295e3..7480dcdf4 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/badge/Badge.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/badge/Badge.md
@@ -38,10 +38,18 @@ If no content is passed, an empty badge is drawn.
A 2px stroke is displayed by default. But it can be removed if needed.
When no count is displayed in the badge, the badge is smaller but still round.
-Badge accepts 2 colors defined :
-
-- Danger: First level information
-- Info: Give info with no emphasis
+Badge accepts the following [BadgeIntent](BadgeIntent.kt)s :
+
+- Basic
+- Accent
+- Main
+- Support
+- Success
+- Alert
+- Danger (by default)
+- Info
+- Neutral
+- Surface
Badge has two styles that defines its size and content padding. `BadgeStyle.MEDIUM` is used by
default.
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/badge/BadgeIntent.kt b/spark/src/main/kotlin/com/adevinta/spark/components/badge/BadgeIntent.kt
index 71a919eb2..40dbfda30 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/badge/BadgeIntent.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/badge/BadgeIntent.kt
@@ -22,37 +22,44 @@
package com.adevinta.spark.components.badge
import androidx.compose.runtime.Composable
-import com.adevinta.spark.SparkTheme
import com.adevinta.spark.components.IntentColor
+import com.adevinta.spark.components.IntentColors
/**
* BadgeIntent is used to define the intent of the badge.
*/
+
public enum class BadgeIntent {
+ /**
+ * Used to match default color of such UI controls as toggles, Slider, etc.
+ */
+ Basic {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Basic.colors()
+ },
+
+ /**
+ * Used to make UI component visually accentuated.
+ */
+ Accent {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Accent.colors()
+ },
+
/**
* Used for the most important information.
*/
- Primary {
+ Main {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.primary,
- onColor = SparkTheme.colors.onPrimary,
- containerColor = SparkTheme.colors.primaryContainer,
- onContainerColor = SparkTheme.colors.onPrimaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Main.colors()
},
/**
* Used to highlight information.
*/
- Secondary {
+ Support {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.secondary,
- onColor = SparkTheme.colors.onSecondary,
- containerColor = SparkTheme.colors.secondaryContainer,
- onContainerColor = SparkTheme.colors.onSecondaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
/**
@@ -60,12 +67,7 @@ public enum class BadgeIntent {
*/
Success {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.success,
- onColor = SparkTheme.colors.onSuccess,
- containerColor = SparkTheme.colors.successContainer,
- onContainerColor = SparkTheme.colors.onSuccessContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Success.colors()
},
/**
@@ -73,12 +75,7 @@ public enum class BadgeIntent {
*/
Alert {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.alert,
- onColor = SparkTheme.colors.onAlert,
- containerColor = SparkTheme.colors.alertContainer,
- onContainerColor = SparkTheme.colors.onAlertContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Alert.colors()
},
/**
@@ -86,12 +83,7 @@ public enum class BadgeIntent {
*/
Danger {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.error,
- onColor = SparkTheme.colors.onError,
- containerColor = SparkTheme.colors.errorContainer,
- onContainerColor = SparkTheme.colors.onErrorContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Danger.colors()
},
/**
@@ -99,12 +91,7 @@ public enum class BadgeIntent {
*/
Info {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.info,
- onColor = SparkTheme.colors.onInfo,
- containerColor = SparkTheme.colors.infoContainer,
- onContainerColor = SparkTheme.colors.onInfoContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Info.colors()
},
/**
@@ -112,12 +99,7 @@ public enum class BadgeIntent {
*/
Neutral {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.neutral,
- onColor = SparkTheme.colors.onNeutral,
- containerColor = SparkTheme.colors.neutralContainer,
- onContainerColor = SparkTheme.colors.onNeutralContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Neutral.colors()
},
/**
@@ -125,12 +107,7 @@ public enum class BadgeIntent {
*/
Surface {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.surface,
- onColor = SparkTheme.colors.onSurface,
- containerColor = SparkTheme.colors.surface,
- onContainerColor = SparkTheme.colors.onSurface,
- )
+ override fun colors(): IntentColor = IntentColors.Surface.colors()
},
;
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/bottomsheet/scaffold/BottomSheetScaffold.kt b/spark/src/main/kotlin/com/adevinta/spark/components/bottomsheet/scaffold/BottomSheetScaffold.kt
index 4999d0fa9..3da149940 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/bottomsheet/scaffold/BottomSheetScaffold.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/bottomsheet/scaffold/BottomSheetScaffold.kt
@@ -81,7 +81,7 @@ import kotlin.math.roundToInt
*
* Standard bottom sheets co-exist with the screen’s main UI region and allow for simultaneously
* viewing and interacting with both regions. They are commonly used to keep a feature or
- * secondary content visible on screen when content in main UI region is frequently scrolled or
+ * support content visible on screen when content in main UI region is frequently scrolled or
* panned.
*
* 
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonContrast.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonContrast.kt
index 5571b9e18..5cd971798 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonContrast.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonContrast.kt
@@ -70,7 +70,7 @@ public fun ButtonContrast(
text: String,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -129,7 +129,7 @@ public fun ButtonContrast(
text: AnnotatedString,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -177,7 +177,7 @@ internal fun ButtonContrastPreview(
) {
val icon = SparkIcons.Link
var isLoading by remember { mutableStateOf(false) }
- val buttonText = "Primary Button"
+ val buttonText = "Main Button"
ButtonContrast(
onClick = {
isLoading = !isLoading
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonFilled.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonFilled.kt
index 7712e7a4c..def1f4b29 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonFilled.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonFilled.kt
@@ -73,7 +73,7 @@ public fun ButtonFilled(
text: String,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -136,7 +136,7 @@ public fun ButtonFilled(
text: AnnotatedString,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -171,7 +171,7 @@ public fun ButtonFilled(
}
/**
- * The primary button should only be used once per view (not including a modal dialog),
+ * The main button should only be used once per view (not including a modal dialog),
* these buttons have the most emphasis.
*
* The minimal usage of the component is the text of the button but you can add an icon or indicate a loading state
@@ -190,7 +190,7 @@ public fun ButtonFilled(
* these buttons have the most emphasis.
*/
@Deprecated(
- "Use ButtonFilled instead with Primary intent",
+ "Use ButtonFilled instead with Main intent",
ReplaceWith("ButtonFilled(onClick, text, modifier, intent, enabled, icon, iconSide, isLoading)"),
)
@Composable
@@ -230,13 +230,13 @@ public fun PrimaryButton(
name = "Button Filled",
)
@Composable
-internal fun PrimaryButtonPreview(
+internal fun MainButtonPreview(
@PreviewParameter(ThemeProvider::class) theme: ThemeVariant,
) {
PreviewTheme(theme) {
val icon = SparkIcons.IdentityOutline
var isLoading by remember { mutableStateOf(false) }
- val buttonText = "Primary Button"
+ val buttonText = "Main Button"
ButtonFilled(
onClick = {
isLoading = !isLoading
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonGhost.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonGhost.kt
index 86cbe599c..3288d9f17 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonGhost.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonGhost.kt
@@ -76,7 +76,7 @@ public fun ButtonGhost(
text: String,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -138,7 +138,7 @@ public fun ButtonGhost(
text: AnnotatedString,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -246,7 +246,7 @@ internal fun ButtonGhostPreview(
PreviewTheme(theme) {
val icon = SparkIcons.Link
var isLoading by remember { mutableStateOf(false) }
- val buttonText = "Primary Button"
+ val buttonText = "Main Button"
ButtonGhost(
onClick = {
isLoading = !isLoading
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonIntent.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonIntent.kt
index d1f78a9b3..41226054d 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonIntent.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonIntent.kt
@@ -22,37 +22,43 @@
package com.adevinta.spark.components.buttons
import androidx.compose.runtime.Composable
-import com.adevinta.spark.SparkTheme
import com.adevinta.spark.components.IntentColor
+import com.adevinta.spark.components.IntentColors
/**
* ButtonIntent is used to define the intent of the buttons.
*/
public enum class ButtonIntent {
/**
- * Primary buttons are used for the most important actions.
+ * Used to match default color of such UI controls as toggles, Slider, etc.
*/
- Primary {
+ Basic {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.primary,
- onColor = SparkTheme.colors.onPrimary,
- containerColor = SparkTheme.colors.primaryContainer,
- onContainerColor = SparkTheme.colors.onPrimaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Basic.colors()
},
/**
- * Secondary buttons are used to highlight/accentuate actions.
+ * Used to make button visually accentuated.
*/
- Secondary {
+ Accent {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Accent.colors()
+ },
+
+ /**
+ * Main buttons are used for the most important actions.
+ */
+ Main {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Main.colors()
+ },
+
+ /**
+ * Support buttons are used to highlight/accentuate actions.
+ */
+ Support {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.secondary,
- onColor = SparkTheme.colors.onSecondary,
- containerColor = SparkTheme.colors.secondaryContainer,
- onContainerColor = SparkTheme.colors.onSecondaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
/**
@@ -60,12 +66,7 @@ public enum class ButtonIntent {
*/
Surface {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.surface,
- onColor = SparkTheme.colors.onSurface,
- containerColor = SparkTheme.colors.surface,
- onContainerColor = SparkTheme.colors.onSurface,
- )
+ override fun colors(): IntentColor = IntentColors.Surface.colors()
},
/**
@@ -73,12 +74,7 @@ public enum class ButtonIntent {
*/
Success {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.success,
- onColor = SparkTheme.colors.onSuccess,
- containerColor = SparkTheme.colors.successContainer,
- onContainerColor = SparkTheme.colors.onSuccessContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Success.colors()
},
/**
@@ -86,12 +82,7 @@ public enum class ButtonIntent {
*/
Alert {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.alert,
- onColor = SparkTheme.colors.onAlert,
- containerColor = SparkTheme.colors.alertContainer,
- onContainerColor = SparkTheme.colors.onAlertContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Alert.colors()
},
/**
@@ -99,12 +90,7 @@ public enum class ButtonIntent {
*/
Danger {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.error,
- onColor = SparkTheme.colors.onError,
- containerColor = SparkTheme.colors.errorContainer,
- onContainerColor = SparkTheme.colors.onErrorContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Danger.colors()
},
/**
@@ -112,12 +98,25 @@ public enum class ButtonIntent {
*/
Neutral {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.neutral,
- onColor = SparkTheme.colors.onNeutral,
- containerColor = SparkTheme.colors.neutralContainer,
- onContainerColor = SparkTheme.colors.onNeutralContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Neutral.colors()
+ },
+
+ @Deprecated(
+ "Primary is replaced with Main Intent",
+ replaceWith = ReplaceWith("Main"),
+ )
+ Primary {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Main.colors()
+ },
+
+ @Deprecated(
+ "Secondary is replaced with Support Intent",
+ replaceWith = ReplaceWith("Support"),
+ )
+ Secondary {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
;
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonOutlined.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonOutlined.kt
index 5455a1959..7b0eb7fa1 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonOutlined.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonOutlined.kt
@@ -44,7 +44,7 @@ import com.adevinta.spark.tools.preview.ThemeProvider
import com.adevinta.spark.tools.preview.ThemeVariant
/**
- * Outlined buttons are used for secondary actions. The outlined styling places less emphasis on these actions that are important but not the primary ones.
+ * Outlined buttons are used for support actions. The outlined styling places less emphasis on these actions that are important but not the main ones.
* It is recommended to pair it with a button wit more emphasis like the filled button or the tinted button.
*
* Be aware that it's not advised to use it on top of images since it will be hard to see.
@@ -69,7 +69,7 @@ public fun ButtonOutlined(
text: String,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Secondary,
+ intent: ButtonIntent = ButtonIntent.Support,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -104,7 +104,7 @@ public fun ButtonOutlined(
/**
*
- * Outlined buttons are used for secondary actions. The outlined styling places less emphasis on these actions that are important but not the primary ones.
+ * Outlined buttons are used for support actions. The outlined styling places less emphasis on these actions that are important but not the main ones.
* It is recommended to pair it with a button wit more emphasis like the filled button or the tinted button.
*
* Be aware that it's not advised to use it on top of images since it will be hard to see.
@@ -129,7 +129,7 @@ public fun ButtonOutlined(
text: AnnotatedString,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Secondary,
+ intent: ButtonIntent = ButtonIntent.Support,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -160,7 +160,7 @@ public fun ButtonOutlined(
}
/**
- * The secondary button is the standard button for most use cases. The outlined styling
+ * The support button is the standard button for most use cases. The outlined styling
* places less emphasis on these buttons
*
* The minimal usage of the component is the text of the button but you can add an icon or indicate a loading state
@@ -179,9 +179,9 @@ public fun ButtonOutlined(
* these buttons have the most emphasis.
*/
@Deprecated(
- "Use ButtonOutlined instead with secondary intent",
+ "Use ButtonOutlined instead with support intent",
ReplaceWith(
- "ButtonOutlined(onClick, text, modifier, ButtonIntent.Secondary, enabled, icon, iconSide, isLoading)",
+ "ButtonOutlined(onClick, text, modifier, ButtonIntent.Support, enabled, icon, iconSide, isLoading)",
"com.adevinta.spark.components.buttons.ButtonIntent",
),
)
@@ -229,7 +229,7 @@ internal fun ButtonOutlinedPreview(
) {
PreviewTheme(theme) {
val icon = SparkIcons.CameraFill
- val buttonText = "Secondary Button"
+ val buttonText = "Support Button"
ButtonOutlined(
onClick = {},
text = buttonText,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonTinted.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonTinted.kt
index f6426c275..56bfc9506 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonTinted.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/ButtonTinted.kt
@@ -70,7 +70,7 @@ public fun ButtonTinted(
text: String,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -133,7 +133,7 @@ public fun ButtonTinted(
text: AnnotatedString,
modifier: Modifier = Modifier,
size: ButtonSize = ButtonSize.Medium,
- intent: ButtonIntent = ButtonIntent.Primary,
+ intent: ButtonIntent = ButtonIntent.Main,
enabled: Boolean = true,
icon: SparkIcon? = null,
iconSide: IconSide = IconSide.START,
@@ -170,7 +170,7 @@ internal fun ButtonTintedPreview(
PreviewTheme(theme) {
val icon = SparkIcons.IdentityOutline
var isLoading by remember { mutableStateOf(false) }
- val buttonText = "Primary Button"
+ val buttonText = "Main Button"
ButtonTinted(
onClick = {
isLoading = !isLoading
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/Buttons.md b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/Buttons.md
index 0caf278fe..2830f19e4 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/Buttons.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/Buttons.md
@@ -24,7 +24,7 @@ The minimal usage of the component is the text and the click action.
```kotlin
ButtonFilled(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
@@ -45,7 +45,7 @@ emphasis and should be used for important, final actions.
```kotlin
ButtonFilled(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
@@ -56,8 +56,8 @@ ButtonFilled(
#### ButtonOutlined
-Outlined buttons are used for secondary actions. The outlined styling places less emphasis on these
-actions that are important but not the primary ones.
+Outlined buttons are used for support actions. The outlined styling places less emphasis on these
+actions that are important but not the main ones.
It is recommended to pair it with a button with more emphasis like the filled button or the tinted
button.
@@ -65,7 +65,7 @@ Be aware that it's not advised to use it on top of images since it will be hard
```kotlin
ButtonOutlined(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
@@ -85,7 +85,7 @@ It's best paired with either a filled button or an outlined button.
```kotlin
ButtonTinted(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
@@ -104,7 +104,7 @@ This button style is often used inside other components like snackbars, dialogs,
```kotlin
ButtonGhost(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
@@ -120,7 +120,7 @@ an image or a video.
```kotlin
ButtonContrast(
- text = "Primary",
+ text = "Main",
onClick = { /*Click event*/ },
)
```
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/FloatingActionButton.kt b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/FloatingActionButton.kt
index 6987fdbc4..bcb3cdbb2 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/buttons/FloatingActionButton.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/buttons/FloatingActionButton.kt
@@ -80,7 +80,7 @@ import androidx.compose.material3.SmallFloatingActionButton as MaterialSmallFloa
* [containerColor] is not a color from the theme.
* @param elevation [FloatingActionButtonElevation] used to resolve the elevation for this FAB in
* different states. This controls the size of the shadow below the FAB. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See also: [Surface].
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
* for this FAB. You can create and pass in your own `remember`ed instance to observe [Interaction]s
@@ -134,7 +134,7 @@ public fun FloatingActionButton(
* [containerColor] is not a color from the theme.
* @param elevation [FloatingActionButtonElevation] used to resolve the elevation for this FAB in
* different states. This controls the size of the shadow below the FAB. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See also: [Surface].
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
* for this FAB. You can create and pass in your own `remember`ed instance to observe [Interaction]s
@@ -188,7 +188,7 @@ public fun SmallFloatingActionButton(
* [containerColor] is not a color from the theme.
* @param elevation [FloatingActionButtonElevation] used to resolve the elevation for this FAB in
* different states. This controls the size of the shadow below the FAB. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See also: [Surface].
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
* for this FAB. You can create and pass in your own `remember`ed instance to observe [Interaction]s
@@ -227,7 +227,7 @@ public fun LargeFloatingActionButton(
/**
* Material Design extended floating action button.
*
- * Extended FABs help people take primary actions. They're wider than FABs to accommodate a text
+ * Extended FABs help people take main actions. They're wider than FABs to accommodate a text
* label and larger target area.
*
* 
@@ -244,7 +244,7 @@ public fun LargeFloatingActionButton(
* [containerColor] is not a color from the theme.
* @param elevation [FloatingActionButtonElevation] used to resolve the elevation for this FAB in
* different states. This controls the size of the shadow below the FAB. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See also: [Surface].
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
* for this FAB. You can create and pass in your own `remember`ed instance to observe [Interaction]s
@@ -277,7 +277,7 @@ public fun ExtendedFloatingActionButton(
/**
* Material Design extended floating action button.
*
- * Extended FABs help people take primary actions. They're wider than FABs to accommodate a text
+ * Extended FABs help people take main actions. They're wider than FABs to accommodate a text
* label and larger target area.
*
* 
@@ -301,7 +301,7 @@ public fun ExtendedFloatingActionButton(
* [containerColor] is not a color from the theme.
* @param elevation [FloatingActionButtonElevation] used to resolve the elevation for this FAB in
* different states. This controls the size of the shadow below the FAB. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See also: [Surface].
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
* for this FAB. You can create and pass in your own `remember`ed instance to observe [Interaction]s
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/AssistChip.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/AssistChip.kt
index e2e769dbf..376c13f62 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/AssistChip.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/AssistChip.kt
@@ -70,7 +70,7 @@ import androidx.compose.material3.ElevatedAssistChip as MaterialElevatedAssistCh
* different states. See [AssistChipDefaults.assistChipColors].
* @param elevation [ChipElevation] used to resolve the elevation for this chip in different states.
* This controls the size of the shadow below the chip. Additionally, when the container color is
- * [ColorScheme.surface], this controls the amount of primary color applied as an overlay. See
+ * [ColorScheme.surface], this controls the amount of main color applied as an overlay. See
* [AssistChipDefaults.assistChipElevation].
* @param border the border to draw around the container of this chip. Pass `null` for no border.
* See [AssistChipDefaults.assistChipBorder].
@@ -147,7 +147,7 @@ public fun AssistChip(
* different states. See [AssistChipDefaults.elevatedAssistChipColors].
* @param elevation [ChipElevation] used to resolve the elevation for this chip in different states.
* This controls the size of the shadow below the chip. Additionally, when the container color is
- * [ColorScheme.surface], this controls the amount of primary color applied as an overlay. See
+ * [ColorScheme.surface], this controls the amount of main color applied as an overlay. See
* [AssistChipDefaults.elevatedAssistChipElevation].
* @param border the border to draw around the container of this chip
* @param interactionSource the [MutableInteractionSource] representing the stream of [Interaction]s
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.kt
index 0b2fd8cce..37b1ab0d5 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.kt
@@ -235,30 +235,30 @@ internal fun ChipPreview(
@PreviewParameter(ThemeProvider::class) theme: ThemeVariant,
) {
PreviewTheme(theme) {
- val intent = ChipIntent.Primary
+ val intent = ChipIntent.Main
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- ChipOutlined("outlined", intent, leadingIcon = SparkIcons.OfferOutline)
- ChipFilled("filled", intent, leadingIcon = SparkIcons.OfferOutline)
- ChipTinted("tinted", intent, leadingIcon = SparkIcons.OfferOutline)
- ChipDashed("dashed", intent, leadingIcon = SparkIcons.OfferOutline)
+ ChipOutlined("outlined", intent = intent, leadingIcon = SparkIcons.OfferOutline)
+ ChipFilled("filled", intent = intent, leadingIcon = SparkIcons.OfferOutline)
+ ChipTinted("tinted", intent = intent, leadingIcon = SparkIcons.OfferOutline)
+ ChipDashed("dashed", intent = intent, leadingIcon = SparkIcons.OfferOutline)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- ChipOutlined("outlined", intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
- ChipFilled("filled", intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
- ChipTinted("tinted", intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
- ChipDashed("dashed", intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
+ ChipOutlined("outlined", intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
+ ChipFilled("filled", intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
+ ChipTinted("tinted", intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
+ ChipDashed("dashed", intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = false)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- ChipOutlined("outlined", intent)
- ChipFilled("filled", intent)
- ChipTinted("tinted", intent)
- ChipDashed("dashed", intent)
+ ChipOutlined("outlined", intent = intent)
+ ChipFilled("filled", intent = intent)
+ ChipTinted("tinted", intent = intent)
+ ChipDashed("dashed", intent = intent)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- ChipOutlined("outlined", intent, enabled = false)
- ChipFilled("filled", intent, enabled = false)
- ChipTinted("tinted", intent, enabled = false)
- ChipDashed("dashed", intent, enabled = false)
+ ChipOutlined("outlined", intent = intent, enabled = false)
+ ChipFilled("filled", intent = intent, enabled = false)
+ ChipTinted("tinted", intent = intent, enabled = false)
+ ChipDashed("dashed", intent = intent, enabled = false)
}
}
}
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.md b/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.md
index e5eb43a7b..d507f2ac3 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/Chip.md
@@ -19,8 +19,10 @@ The chip can have one of the [ChipStyles](ChipStyles.kt):
- [Dashed](ChipDashed.kt) - using a dashed border and no background
The color is set using one of the [ChipIntent](ChipIntent.kt)s:
-- Primary
-- Secondary
+- Basic (default color)
+- Accent
+- Main
+- Support
- Success
- Alert
- Danger
@@ -40,8 +42,8 @@ To draw a chip with an optional leading icon and text.
```kotlin
fun ChipOutlined(
text: String,
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
leadingIcon: SparkIcon? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -54,7 +56,7 @@ To draw a chip that only contains an icon:
```kotlin
fun ChipOutlined(
icon: SparkIcon,
- intent: ChipIntent,
+ intent: ChipIntent = ChipIntent.Basic,
contentDescription: String,
modifier: Modifier = Modifier,
enabled: Boolean = true,
@@ -67,7 +69,7 @@ To pass a custom content:
```kotlin
fun ChipOutlined(
- intent: ChipIntent,
+ intent: ChipIntent = ChipIntent.Basic,
modifier: Modifier = Modifier,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipDashed.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipDashed.kt
index 0bf382221..b72049900 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipDashed.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipDashed.kt
@@ -61,8 +61,8 @@ import com.adevinta.spark.tools.preview.ThemeVariant
*/
@Composable
public fun ChipDashed(
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -97,8 +97,8 @@ public fun ChipDashed(
@Composable
public fun ChipDashed(
text: String,
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
leadingIcon: SparkIcon? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -137,9 +137,9 @@ public fun ChipDashed(
@Composable
public fun ChipDashed(
icon: SparkIcon,
- intent: ChipIntent,
contentDescription: String,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -179,8 +179,8 @@ internal fun ChipDashedPreview(
Text("Chip")
Badge(hasStroke = false, count = 1)
}
- ChipDashed(intent.name, intent, leadingIcon = SparkIcons.OfferOutline, enabled = enabled)
- ChipDashed(intent.name, intent, enabled = enabled)
+ ChipDashed(intent.name, intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = enabled)
+ ChipDashed(intent.name, intent = intent, enabled = enabled)
ChipDashed(
contentDescription = intent.name,
intent = intent,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipFilled.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipFilled.kt
index 8a038d014..3518a2a26 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipFilled.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipFilled.kt
@@ -63,8 +63,8 @@ import com.adevinta.spark.tools.preview.ThemeVariant
@Composable
public fun ChipFilled(
text: String,
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
leadingIcon: SparkIcon? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -103,9 +103,9 @@ public fun ChipFilled(
@Composable
public fun ChipFilled(
icon: SparkIcon,
- intent: ChipIntent,
contentDescription: String,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -139,8 +139,8 @@ public fun ChipFilled(
*/
@Composable
public fun ChipFilled(
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -179,8 +179,17 @@ internal fun ChipFilledPreview(
Text("Chip")
Badge(hasStroke = false, count = 1)
}
- ChipFilled(intent.name, intent, leadingIcon = SparkIcons.OfferOutline, enabled = enabled)
- ChipFilled(intent.name, intent, enabled = enabled)
+ ChipFilled(
+ text = intent.name,
+ intent = intent,
+ leadingIcon = SparkIcons.OfferOutline,
+ enabled = enabled,
+ )
+ ChipFilled(
+ text = intent.name,
+ intent = intent,
+ enabled = enabled,
+ )
ChipFilled(
contentDescription = intent.name,
intent = intent,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipIntent.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipIntent.kt
index 22e739ccc..a0abb77f3 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipIntent.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipIntent.kt
@@ -22,37 +22,44 @@
package com.adevinta.spark.components.chips
import androidx.compose.runtime.Composable
-import com.adevinta.spark.SparkTheme
import com.adevinta.spark.components.IntentColor
+import com.adevinta.spark.components.IntentColors
/**
* ChipIntent is used to define the intent of the chip.
*/
public enum class ChipIntent {
+ /**
+ * Used to match default color of such UI controls as toggles, Slider, etc.
+ */
+ Basic {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Basic.colors()
+ },
+
+ /**
+ * Used to make chips visually accentuated.
+ */
+ Accent {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Accent.colors()
+ },
+
/**
* Used for the most important information.
*/
- Primary {
+
+ Main {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.primary,
- onColor = SparkTheme.colors.onPrimary,
- containerColor = SparkTheme.colors.primaryContainer,
- onContainerColor = SparkTheme.colors.onPrimaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Main.colors()
},
/**
* Used to highlight information.
*/
- Secondary {
+ Support {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.secondary,
- onColor = SparkTheme.colors.onSecondary,
- containerColor = SparkTheme.colors.secondaryContainer,
- onContainerColor = SparkTheme.colors.onSecondaryContainer,
- )
+ override fun colors() = IntentColors.Support.colors()
},
/**
@@ -60,12 +67,7 @@ public enum class ChipIntent {
*/
Success {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.success,
- onColor = SparkTheme.colors.onSuccess,
- containerColor = SparkTheme.colors.successContainer,
- onContainerColor = SparkTheme.colors.onSuccessContainer,
- )
+ override fun colors() = IntentColors.Success.colors()
},
/**
@@ -73,12 +75,7 @@ public enum class ChipIntent {
*/
Alert {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.alert,
- onColor = SparkTheme.colors.onAlert,
- containerColor = SparkTheme.colors.alertContainer,
- onContainerColor = SparkTheme.colors.onAlertContainer,
- )
+ override fun colors() = IntentColors.Alert.colors()
},
/**
@@ -86,12 +83,7 @@ public enum class ChipIntent {
*/
Danger {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.error,
- onColor = SparkTheme.colors.onError,
- containerColor = SparkTheme.colors.errorContainer,
- onContainerColor = SparkTheme.colors.onErrorContainer,
- )
+ override fun colors() = IntentColors.Danger.colors()
},
/**
@@ -99,12 +91,7 @@ public enum class ChipIntent {
*/
Info {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.info,
- onColor = SparkTheme.colors.onInfo,
- containerColor = SparkTheme.colors.infoContainer,
- onContainerColor = SparkTheme.colors.onInfoContainer,
- )
+ override fun colors() = IntentColors.Info.colors()
},
/**
@@ -112,12 +99,7 @@ public enum class ChipIntent {
*/
Neutral {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.neutral,
- onColor = SparkTheme.colors.onNeutral,
- containerColor = SparkTheme.colors.neutralContainer,
- onContainerColor = SparkTheme.colors.onNeutralContainer,
- )
+ override fun colors() = IntentColors.Neutral.colors()
},
/**
@@ -125,12 +107,7 @@ public enum class ChipIntent {
*/
Surface {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.surface,
- onColor = SparkTheme.colors.onSurface,
- containerColor = SparkTheme.colors.surface,
- onContainerColor = SparkTheme.colors.onSurface,
- )
+ override fun colors() = IntentColors.Surface.colors()
},
;
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipOutlined.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipOutlined.kt
index a45474a02..7a2608004 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipOutlined.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipOutlined.kt
@@ -63,8 +63,8 @@ import com.adevinta.spark.tools.preview.ThemeVariant
@Composable
public fun ChipOutlined(
text: String,
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
leadingIcon: SparkIcon? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -103,9 +103,9 @@ public fun ChipOutlined(
@Composable
public fun ChipOutlined(
icon: SparkIcon,
- intent: ChipIntent,
contentDescription: String,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -139,8 +139,8 @@ public fun ChipOutlined(
*/
@Composable
public fun ChipOutlined(
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -180,12 +180,16 @@ internal fun ChipOutlinedPreview(
Badge(hasStroke = false, count = 1)
}
ChipOutlined(
- intent.name,
- intent,
+ text = intent.name,
+ intent = intent,
leadingIcon = SparkIcons.OfferOutline,
enabled = enabled,
)
- ChipOutlined(intent.name, intent, enabled = enabled)
+ ChipOutlined(
+ text = intent.name,
+ intent = intent,
+ enabled = enabled,
+ )
ChipOutlined(
contentDescription = intent.name,
intent = intent,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipTinted.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipTinted.kt
index db7bbd318..580590570 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipTinted.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/ChipTinted.kt
@@ -63,8 +63,8 @@ import com.adevinta.spark.tools.preview.ThemeVariant
@Composable
public fun ChipTinted(
text: String,
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
leadingIcon: SparkIcon? = null,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -103,9 +103,9 @@ public fun ChipTinted(
@Composable
public fun ChipTinted(
icon: SparkIcon,
- intent: ChipIntent,
contentDescription: String,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -139,8 +139,8 @@ public fun ChipTinted(
*/
@Composable
public fun ChipTinted(
- intent: ChipIntent,
modifier: Modifier = Modifier,
+ intent: ChipIntent = ChipIntent.Basic,
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
onClick: () -> Unit = {},
@@ -179,8 +179,8 @@ internal fun ChipTintedPreview(
Text("Chip")
Badge(hasStroke = false, count = 1)
}
- ChipTinted(intent.name, intent, leadingIcon = SparkIcons.OfferOutline, enabled = enabled)
- ChipTinted(intent.name, intent, enabled = enabled)
+ ChipTinted(intent.name, intent = intent, leadingIcon = SparkIcons.OfferOutline, enabled = enabled)
+ ChipTinted(intent.name, intent = intent, enabled = enabled)
ChipTinted(
contentDescription = intent.name,
intent = intent,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/FilterChip.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/FilterChip.kt
index 0352a46d7..c5fe0ddfa 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/FilterChip.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/FilterChip.kt
@@ -75,7 +75,7 @@ import androidx.compose.material3.FilterChip as MaterialFilterChip
* in different states. See [FilterChipDefaults.filterChipColors].
* @param elevation [SelectableChipElevation] used to resolve the elevation for this chip in
* different states. This controls the size of the shadow below the chip. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See [FilterChipDefaults.filterChipElevation].
* @param border the border to draw around the container of this chip. Pass `null` for no border.
* See [FilterChipDefaults.filterChipBorder].
@@ -157,7 +157,7 @@ public fun FilterChip(
* in different states. See [FilterChipDefaults.elevatedFilterChipColors].
* @param elevation [SelectableChipElevation] used to resolve the elevation for this chip in
* different states. This controls the size of the shadow below the chip. Additionally, when the
- * container color is [ColorScheme.surface], this controls the amount of primary color applied as an
+ * container color is [ColorScheme.surface], this controls the amount of main color applied as an
* overlay. See [FilterChipDefaults.filterChipElevation].
* @param border the border to draw around the container of this chip. Pass `null` for no border.
* See [FilterChipDefaults.filterChipBorder].
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/InputChip.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/InputChip.kt
index 1d4a772da..1e81924fc 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/InputChip.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/InputChip.kt
@@ -72,7 +72,7 @@ import androidx.compose.material3.InputChip as MaterialInputChip
* different states. See [InputChipDefaults.inputChipColors].
* @param elevation [ChipElevation] used to resolve the elevation for this chip in different states.
* This controls the size of the shadow below the chip. Additionally, when the container color is
- * [ColorScheme.surface], this controls the amount of primary color applied as an overlay. See
+ * [ColorScheme.surface], this controls the amount of main color applied as an overlay. See
* [InputChipDefaults.inputChipElevation].
* @param border the border to draw around the container of this chip. Pass `null` for no border.
* See [InputChipDefaults.inputChipBorder].
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/chips/SuggestionChip.kt b/spark/src/main/kotlin/com/adevinta/spark/components/chips/SuggestionChip.kt
index 2c4810779..51409b2f8 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/chips/SuggestionChip.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/chips/SuggestionChip.kt
@@ -66,7 +66,7 @@ import androidx.compose.material3.SuggestionChip as MaterialSuggestionChip
* different states. See [SuggestionChipDefaults.suggestionChipColors].
* @param elevation [ChipElevation] used to resolve the elevation for this chip in different states.
* This controls the size of the shadow below the chip. Additionally, when the container color is
- * [ColorScheme.surface], this controls the amount of primary color applied as an overlay. See
+ * [ColorScheme.surface], this controls the amount of main color applied as an overlay. See
* [SuggestionChipDefaults.suggestionChipElevation].
* @param border the border to draw around the container of this chip. Pass `null` for no border.
* See [SuggestionChipDefaults.suggestionChipBorder].
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/dialog/AlertDialog.kt b/spark/src/main/kotlin/com/adevinta/spark/components/dialog/AlertDialog.kt
index 58e0b2423..1826bb6dd 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/dialog/AlertDialog.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/dialog/AlertDialog.kt
@@ -101,7 +101,7 @@ internal fun SparkAlertDialog(
* @param iconContentColor the content color used for the icon.
* @param titleContentColor the content color used for the title.
* @param textContentColor the content color used for the text.
- * @param tonalElevation when containerColor is ColorScheme.surface, a translucent primary color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
+ * @param tonalElevation when containerColor is ColorScheme.surface, a translucent main color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
* @param properties typically platform specific properties to further configure the dialog.
*/
@ExperimentalSparkApi
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/dialog/ModalFullScreenScaffold.kt b/spark/src/main/kotlin/com/adevinta/spark/components/dialog/ModalFullScreenScaffold.kt
index 5b3e12c66..03cb61e08 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/dialog/ModalFullScreenScaffold.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/dialog/ModalFullScreenScaffold.kt
@@ -76,8 +76,8 @@ import com.adevinta.spark.tools.preview.DevicePreviews
* @param snackbarHost Component to host Snackbars that are pushed to be shown
* @param modifier applied to the root Scaffold
* @param illustration whether the modal display a close icon, and its corresponding action
- * @param primaryButton the main actions for this modal (should be a [ButtonFilled])
- * @param secondaryButton the secondary or alternative actions for this modal (should any other button than [ButtonFilled])
+ * @param mainButton the main actions for this modal (should be a [ButtonFilled])
+ * @param supportButton the support or alternative actions for this modal (should any other button than [ButtonFilled])
* @param content the center custom Composable for modal content
*/
@ExperimentalSparkApi
@@ -87,8 +87,8 @@ public fun ModalFullScreenScaffold(
modifier: Modifier = Modifier,
snackbarHost: @Composable () -> Unit = {},
@DrawableRes illustration: Int? = null,
- primaryButton: @Composable (Modifier) -> Unit = {},
- secondaryButton: @Composable (Modifier) -> Unit = {},
+ mainButton: @Composable (Modifier) -> Unit = {},
+ supportButton: @Composable (Modifier) -> Unit = {},
content: @Composable (PaddingValues) -> Unit,
) {
val size = Layout.windowSize
@@ -104,8 +104,8 @@ public fun ModalFullScreenScaffold(
onClose = onClose,
snackbarHost = snackbarHost,
illustration = illustration,
- primaryButton = primaryButton,
- secondaryButton = secondaryButton,
+ mainButton = mainButton,
+ supportButton = supportButton,
content = content,
)
}
@@ -115,8 +115,8 @@ public fun ModalFullScreenScaffold(
modifier = modifier,
onClose = onClose,
illustration = illustration,
- primaryButton = primaryButton,
- secondaryButton = secondaryButton,
+ mainButton = mainButton,
+ supportButton = supportButton,
content = content,
)
}
@@ -124,8 +124,8 @@ public fun ModalFullScreenScaffold(
modifier = modifier,
onClose = onClose,
illustration = illustration,
- primaryButton = primaryButton,
- secondaryButton = secondaryButton,
+ mainButton = mainButton,
+ supportButton = supportButton,
content = content,
)
}
@@ -138,8 +138,8 @@ private fun ModalScaffold(
modifier: Modifier = Modifier,
snackbarHost: @Composable () -> Unit = {},
@DrawableRes illustration: Int? = null,
- primaryButton: @Composable (Modifier) -> Unit = {},
- secondaryButton: @Composable (Modifier) -> Unit = {},
+ mainButton: @Composable (Modifier) -> Unit = {},
+ supportButton: @Composable (Modifier) -> Unit = {},
content: @Composable (PaddingValues) -> Unit,
) {
Dialog(
@@ -177,8 +177,8 @@ private fun ModalScaffold(
.padding(top = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
) {
- secondaryButton(Modifier)
- primaryButton(Modifier)
+ supportButton(Modifier)
+ mainButton(Modifier)
}
}
}
@@ -192,8 +192,8 @@ private fun PhonePortraitModalScaffold(
modifier: Modifier = Modifier,
snackbarHost: @Composable () -> Unit = {},
@DrawableRes illustration: Int? = null,
- primaryButton: @Composable (Modifier) -> Unit = {},
- secondaryButton: @Composable (Modifier) -> Unit = {},
+ mainButton: @Composable (Modifier) -> Unit = {},
+ supportButton: @Composable (Modifier) -> Unit = {},
content: @Composable (PaddingValues) -> Unit,
) {
Scaffold(
@@ -221,8 +221,8 @@ private fun PhonePortraitModalScaffold(
.padding(bottom = 16.dp),
) {
val buttonModifier = Modifier.fillMaxWidth()
- secondaryButton(buttonModifier)
- primaryButton(buttonModifier)
+ supportButton(buttonModifier)
+ mainButton(buttonModifier)
}
} else {
Row(
@@ -232,8 +232,8 @@ private fun PhonePortraitModalScaffold(
.padding(bottom = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End),
) {
- secondaryButton(Modifier)
- primaryButton(Modifier)
+ supportButton(Modifier)
+ mainButton(Modifier)
}
}
},
@@ -266,8 +266,8 @@ private fun PhoneLandscapeModalScaffold(
modifier: Modifier = Modifier,
snackbarHost: @Composable () -> Unit = {},
@DrawableRes illustration: Int? = null,
- primaryButton: @Composable (Modifier) -> Unit = {},
- secondaryButton: @Composable (Modifier) -> Unit = {},
+ mainButton: @Composable (Modifier) -> Unit = {},
+ supportButton: @Composable (Modifier) -> Unit = {},
content: @Composable (PaddingValues) -> Unit,
) {
Scaffold(
@@ -322,8 +322,8 @@ private fun PhoneLandscapeModalScaffold(
horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.End),
) {
val buttonModifier = Modifier.weight(1f)
- secondaryButton(buttonModifier)
- primaryButton(buttonModifier)
+ supportButton(buttonModifier)
+ mainButton(buttonModifier)
}
}
}
@@ -352,10 +352,10 @@ private fun ModalPreview() {
ModalFullScreenScaffold(
onClose = { /*TODO*/ },
illustration = SparkIcons.BicycleType.drawableId,
- primaryButton = {
- ButtonFilled(modifier = it, onClick = { /*TODO*/ }, text = "Primary Action")
+ mainButton = {
+ ButtonFilled(modifier = it, onClick = { /*TODO*/ }, text = "Main Action")
},
- secondaryButton = {
+ supportButton = {
ButtonGhost(modifier = it, onClick = { /*TODO*/ }, text = "Alternative Action")
},
) { innerPadding ->
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/drawer/DismissibleDrawerSheet.kt b/spark/src/main/kotlin/com/adevinta/spark/components/drawer/DismissibleDrawerSheet.kt
index aee723eb1..7c00e37aa 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/drawer/DismissibleDrawerSheet.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/drawer/DismissibleDrawerSheet.kt
@@ -87,7 +87,7 @@ internal fun SparkDismissibleDrawerSheet(
* @param drawerShape defines the shape of this drawer's container
* @param drawerContainerColor the color used for the background of this drawer. Use Color.Transparent to have no color.
* @param drawerContentColor the preferred color for content inside this drawer. Defaults to either the matching content color for drawerContainerColor, or to the current LocalContentColor if drawerContainerColor is not a color from the theme.
- * @param drawerTonalElevation when drawerContainerColor is ColorScheme.surface, a translucent primary color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
+ * @param drawerTonalElevation when drawerContainerColor is ColorScheme.surface, a translucent main color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
* @param windowInsets a window insets for the sheet.
* @param content content inside of a dismissible navigation drawer
*/
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/drawer/ModalDrawerSheet.kt b/spark/src/main/kotlin/com/adevinta/spark/components/drawer/ModalDrawerSheet.kt
index e7be6ef39..05c64a82e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/drawer/ModalDrawerSheet.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/drawer/ModalDrawerSheet.kt
@@ -86,7 +86,7 @@ internal fun SparkModalDrawerSheet(
* @param drawerShape defines the shape of this drawer's container
* @param drawerContainerColor the color used for the background of this drawer. Use Color.Transparent to have no color.
* @param drawerContentColor the preferred color for content inside this drawer. Defaults to either the matching content color for drawerContainerColor, or to the current LocalContentColor if drawerContainerColor is not a color from the theme.
- * @param drawerTonalElevation when drawerContainerColor is ColorScheme.surface, a translucent primary color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
+ * @param drawerTonalElevation when drawerContainerColor is ColorScheme.surface, a translucent main color overlay is applied on top of the container. A higher tonal elevation value will result in a darker color in light theme and lighter color in dark theme. See also: Surface.
* @param windowInsets a window insets for the sheet.
* @param content content inside of a modal navigation drawer
*/
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icon.md b/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icon.md
index 0798fd545..cd1cff4ae 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icon.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icon.md
@@ -16,6 +16,28 @@ the following values ([IconSize](IconDefaults.kt)):
- Large (32.dp)
- ExtraLarge (40.dp)
+Use [IconIntent](IconIntent.kt) to pass one of the accepted intents:
+- Basic
+- Accent
+- Main
+- Support
+- Surface
+- Success
+- Alert
+- Danger
+- Neutral
+- Current
+- Unspecified
+
+```kotlin
+Icon(
+ sparkIcon = SparkIcons.CheckFill,
+ tint = IconIntent.Main,
+ contentDescription = "Done",
+ size = IconSize.Large,
+)
+```
+
| | Colors and sizes |
|-------|-----------------------------------------------------------------------------------------------|
| Light |  |
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconButton.kt b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconButton.kt
index e6ecbe887..2a098fb2e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconButton.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconButton.kt
@@ -179,7 +179,7 @@ public fun FilledTonalIconButton(
enabled: Boolean = true,
shape: Shape = SparkTheme.shapes.full,
colors: IconButtonColors = IconButtonDefaults.filledTonalIconButtonColors(
- containerColor = SparkTheme.colors.primaryContainer,
+ containerColor = SparkTheme.colors.mainContainer,
),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
content: @Composable () -> Unit,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconDefaults.kt b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconDefaults.kt
index 68badf3d9..4f6247555 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconDefaults.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconDefaults.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp
public object IconDefaults {
public val size: IconSize = IconSize.Medium
- public val color: IconTints = IconTints.Current
+ public val intent: IconIntent = IconIntent.Current
}
public enum class IconSize(public val size: Dp) {
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconTints.kt b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconIntent.kt
similarity index 81%
rename from spark/src/main/kotlin/com/adevinta/spark/components/icons/IconTints.kt
rename to spark/src/main/kotlin/com/adevinta/spark/components/icons/IconIntent.kt
index c68c0f098..e4ad7b0ec 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconTints.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconIntent.kt
@@ -26,21 +26,37 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import com.adevinta.spark.SparkTheme
-public enum class IconTints {
+public enum class IconIntent {
+ /**
+ * Used to match default color of such UI controls as toggles, Slider, etc.
+ */
+ Basic {
+ @Composable
+ override fun color(): Color = SparkTheme.colors.basic
+ },
+
+ /**
+ * Used to make icons visually accentuated.
+ */
+ Accent {
+ @Composable
+ override fun color(): Color = SparkTheme.colors.accent
+ },
+
/**
* Used for the most important information.
*/
- Primary {
+ Main {
@Composable
- override fun color(): Color = SparkTheme.colors.primary
+ override fun color(): Color = SparkTheme.colors.main
},
/**
* Used to highlight/accentuate.
*/
- Secondary {
+ Support {
@Composable
- override fun color(): Color = SparkTheme.colors.secondary
+ override fun color(): Color = SparkTheme.colors.support
},
/**
@@ -92,7 +108,7 @@ public enum class IconTints {
},
/**
- * Used for low importance information.
+ * To apply no tint and use original icon tint.
*/
Unspecified {
@Composable
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconToggleButton.kt b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconToggleButton.kt
index c9054ea01..2ac59891e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconToggleButton.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/IconToggleButton.kt
@@ -189,8 +189,8 @@ public fun FilledTonalIconToggleButton(
enabled: Boolean = true,
shape: Shape = SparkTheme.shapes.full,
colors: IconToggleButtonColors = IconButtonDefaults.filledTonalIconToggleButtonColors(
- checkedContainerColor = SparkTheme.colors.primaryContainer,
- checkedContentColor = contentColorFor(backgroundColor = SparkTheme.colors.primaryContainer),
+ checkedContainerColor = SparkTheme.colors.mainContainer,
+ checkedContentColor = contentColorFor(backgroundColor = SparkTheme.colors.mainContainer),
),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
content: @Composable () -> Unit,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icons.kt b/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icons.kt
index 988ec7f49..61fb93183 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icons.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/icons/Icons.kt
@@ -69,7 +69,7 @@ public fun Icon(
sparkIcon: SparkIcon,
contentDescription: String?,
modifier: Modifier = Modifier,
- tint: Color = IconDefaults.color.color(),
+ tint: Color = IconDefaults.intent.color(),
size: IconSize = IconDefaults.size,
) {
MaterialIcon(
@@ -101,7 +101,7 @@ public fun Icon(
imageVector: ImageVector,
contentDescription: String?,
modifier: Modifier = Modifier,
- tint: Color = IconDefaults.color.color(),
+ tint: Color = IconDefaults.intent.color(),
size: IconSize = IconDefaults.size,
) {
MaterialIcon(
@@ -133,7 +133,7 @@ public fun Icon(
bitmap: ImageBitmap,
contentDescription: String?,
modifier: Modifier = Modifier,
- tint: Color = IconDefaults.color.color(),
+ tint: Color = IconDefaults.intent.color(),
size: IconSize = IconDefaults.size,
) {
MaterialIcon(
@@ -165,7 +165,7 @@ public fun Icon(
painter: Painter,
contentDescription: String?,
modifier: Modifier = Modifier,
- tint: Color = IconDefaults.color.color(),
+ tint: Color = IconDefaults.intent.color(),
size: IconSize = IconDefaults.size,
) {
MaterialIcon(
@@ -193,19 +193,19 @@ internal fun IconPreview(
@PreviewParameter(ThemeProvider::class) theme: ThemeVariant,
) {
PreviewTheme(theme) {
- IconSize.values().map { it to IconTints.values() }.forEach { (size, tints) ->
+ IconSize.values().map { it to IconIntent.values() }.forEach { (size, intents) ->
LazyRow {
items(
- tints.count(),
+ intents.count(),
itemContent = { index ->
Box(
- modifier = Modifier.ifTrue(tints[index] == IconTints.Surface) {
+ modifier = Modifier.ifTrue(intents[index] == IconIntent.Surface) {
background(SparkTheme.colors.neutralContainer)
},
) {
Icon(
sparkIcon = SparkIcons.CheckFill,
- tint = tints[index].color(),
+ tint = intents[index].color(),
contentDescription = "Done",
size = size,
)
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationDrawerItem.kt b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationDrawerItem.kt
index ec23700d3..4fef93660 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationDrawerItem.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationDrawerItem.kt
@@ -137,11 +137,11 @@ private object NavigationDrawerItemDefaults {
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun colors(
- selectedContainerColor: Color = SparkTheme.colors.secondaryContainer,
+ selectedContainerColor: Color = SparkTheme.colors.supportContainer,
unselectedContainerColor: Color = SparkTheme.colors.surface,
- selectedIconColor: Color = SparkTheme.colors.onSecondaryContainer,
+ selectedIconColor: Color = SparkTheme.colors.onSupportContainer,
unselectedIconColor: Color = SparkTheme.colors.neutral,
- selectedTextColor: Color = SparkTheme.colors.onSecondaryContainer,
+ selectedTextColor: Color = SparkTheme.colors.onSupportContainer,
unselectedTextColor: Color = SparkTheme.colors.neutral,
selectedBadgeColor: Color = selectedTextColor,
unselectedBadgeColor: Color = unselectedTextColor,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRail.kt b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRail.kt
index e46d20138..84e260f93 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRail.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRail.kt
@@ -64,7 +64,7 @@ internal fun SparkNavigationRail(
/**
* Spark bottom navigation rail.
- * Navigation rails provide access to primary destinations in apps when using tablet and desktop screens.
+ * Navigation rails provide access to main destinations in apps when using tablet and desktop screens.
*
* The navigation rail should be used to display three to seven app destinations and, optionally,
* a FloatingActionButton or a logo header.
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRailItem.kt b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRailItem.kt
index be6015b40..aad29fe1d 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRailItem.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/navigation/NavigationRailItem.kt
@@ -85,7 +85,7 @@ internal fun SparkNavigationRailItem(
*
* A [NavigationRailItem] represents a destination within a [NavigationRail].
*
- * Navigation rails provide access to primary destinations in apps when using tablet and desktop
+ * Navigation rails provide access to main destinations in apps when using tablet and desktop
* screens.
*
* The text label is always shown (if it exists) when selected. Showing text labels if not selected
@@ -136,9 +136,9 @@ public fun NavigationRailItem(
public object NavigationRailItemDefaults {
@Composable
public fun colors(
- selectedIconColor: Color = SparkTheme.colors.onSecondaryContainer,
+ selectedIconColor: Color = SparkTheme.colors.onSupportContainer,
selectedTextColor: Color = SparkTheme.colors.onSurface,
- indicatorColor: Color = SparkTheme.colors.secondaryContainer,
+ indicatorColor: Color = SparkTheme.colors.supportContainer,
unselectedIconColor: Color = SparkTheme.colors.neutral,
unselectedTextColor: Color = SparkTheme.colors.neutral,
): NavigationRailItemColors = MaterialNavigationRailItemDefaults.colors(
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/progress/LinearProgressIndicator.kt b/spark/src/main/kotlin/com/adevinta/spark/components/progress/LinearProgressIndicator.kt
index 77c6fd410..8ab80dc65 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/progress/LinearProgressIndicator.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/progress/LinearProgressIndicator.kt
@@ -45,7 +45,7 @@ internal fun SparkLinearProgressIndicator(
isIndeterminate: Boolean,
modifier: Modifier = Modifier,
) {
- val color = ProgressIndicatorDefaults.linearColor // Primary
+ val color = ProgressIndicatorDefaults.linearColor // Main
val trackColor = SparkTheme.colors.neutralContainer
if (isIndeterminate) {
MaterialLinearProgressIndicator(
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.kt b/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.kt
index 110b690bc..109749426 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.kt
@@ -134,8 +134,8 @@ private fun DrawScope.drawCircularIndicator(
*/
@Composable
public fun Spinner(
- intent: SpinnerIntent,
modifier: Modifier = Modifier,
+ intent: SpinnerIntent = SpinnerIntent.Current,
size: SpinnerSize = SpinnerDefaults.Size,
isBackgroundVisible: Boolean = false,
) {
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.md b/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.md
index f2c9b09bf..e59be62f0 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/progress/Spinner.md
@@ -17,14 +17,17 @@ A visible background may be added to display a background behind the spinner.
All intents from Spark are available for this component ([SpinnerIntent](SpinnerIntent.kt)).
-- Primary
-- Secondary
+- Basic
+- Accent
+- Main
+- Support
- Surface
- Success
- Alert
- Danger
- Info
- Neutral
+- Current (default)
The spinner has two sizes ([SpinnerSize](SpinnerDefaults.kt)):
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/progress/SpinnerIntent.kt b/spark/src/main/kotlin/com/adevinta/spark/components/progress/SpinnerIntent.kt
index da527d304..6e0ba37f8 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/progress/SpinnerIntent.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/progress/SpinnerIntent.kt
@@ -21,38 +21,46 @@
*/
package com.adevinta.spark.components.progress
+import androidx.compose.material3.LocalContentColor
import androidx.compose.runtime.Composable
-import com.adevinta.spark.SparkTheme
+import androidx.compose.ui.graphics.Color
import com.adevinta.spark.components.IntentColor
+import com.adevinta.spark.components.IntentColors
/**
* SpinnerIntent is used to define the intent of the chip.
*/
public enum class SpinnerIntent {
+ /**
+ * Used to match default color of such UI controls as toggles, Slider, etc.
+ */
+ Basic {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Basic.colors()
+ },
+
+ /**
+ * Used to make UI component visually accentuated.
+ */
+ Accent {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Accent.colors()
+ },
+
/**
* Used for the most important information.
*/
- Primary {
+ Main {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.primary,
- onColor = SparkTheme.colors.onPrimary,
- containerColor = SparkTheme.colors.primaryContainer,
- onContainerColor = SparkTheme.colors.onPrimaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Main.colors()
},
/**
* Used to highlight information.
*/
- Secondary {
+ Support {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.secondary,
- onColor = SparkTheme.colors.onSecondary,
- containerColor = SparkTheme.colors.secondaryContainer,
- onContainerColor = SparkTheme.colors.onSecondaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
/**
@@ -60,12 +68,7 @@ public enum class SpinnerIntent {
*/
Success {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.success,
- onColor = SparkTheme.colors.onSuccess,
- containerColor = SparkTheme.colors.successContainer,
- onContainerColor = SparkTheme.colors.onSuccessContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Success.colors()
},
/**
@@ -73,12 +76,7 @@ public enum class SpinnerIntent {
*/
Alert {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.alert,
- onColor = SparkTheme.colors.onAlert,
- containerColor = SparkTheme.colors.alertContainer,
- onContainerColor = SparkTheme.colors.onAlertContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Alert.colors()
},
/**
@@ -86,12 +84,7 @@ public enum class SpinnerIntent {
*/
Danger {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.error,
- onColor = SparkTheme.colors.onError,
- containerColor = SparkTheme.colors.errorContainer,
- onContainerColor = SparkTheme.colors.onErrorContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Danger.colors()
},
/**
@@ -99,12 +92,7 @@ public enum class SpinnerIntent {
*/
Info {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.info,
- onColor = SparkTheme.colors.onInfo,
- containerColor = SparkTheme.colors.infoContainer,
- onContainerColor = SparkTheme.colors.onInfoContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Info.colors()
},
/**
@@ -112,24 +100,27 @@ public enum class SpinnerIntent {
*/
Neutral {
@Composable
- override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.neutral,
- onColor = SparkTheme.colors.onNeutral,
- containerColor = SparkTheme.colors.neutralContainer,
- onContainerColor = SparkTheme.colors.onNeutralContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Neutral.colors()
},
/**
* Spinner on a color / image panel without on intent color.
*/
Surface {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Surface.colors()
+ },
+
+ /**
+ * Spinner taking color of LocalContentColor set by the nearest CompositionLocalProvider
+ */
+ Current {
@Composable
override fun colors(): IntentColor = IntentColor(
- color = SparkTheme.colors.surface,
- onColor = SparkTheme.colors.onSurface,
- containerColor = SparkTheme.colors.surface,
- onContainerColor = SparkTheme.colors.onSurface,
+ color = LocalContentColor.current,
+ onColor = Color.Transparent,
+ containerColor = Color.Transparent,
+ onContainerColor = Color.Transparent,
)
},
;
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/rating/RatingStar.kt b/spark/src/main/kotlin/com/adevinta/spark/components/rating/RatingStar.kt
index 8b555b878..e1c09632e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/rating/RatingStar.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/rating/RatingStar.kt
@@ -54,7 +54,7 @@ internal fun SparkRatingStar(
) {
val color by animateColorAsState(
targetValue = if (enabled) {
- SparkTheme.colors.primary
+ SparkTheme.colors.main
} else {
SparkTheme.colors.onSurface.copy(DisabledAlpha)
},
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/slider/SliderDefaults.kt b/spark/src/main/kotlin/com/adevinta/spark/components/slider/SliderDefaults.kt
index db11c79cf..5638c01ca 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/slider/SliderDefaults.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/slider/SliderDefaults.kt
@@ -35,9 +35,9 @@ public object SliderDefaults {
@Composable
public fun colors(
- thumbColor: Color = SparkTheme.colors.primary,
- activeTrackColor: Color = SparkTheme.colors.primary,
- activeTickColor: Color = SparkTheme.colors.onPrimary.copy(alpha = TickMarksContainerOpacity),
+ thumbColor: Color = SparkTheme.colors.main,
+ activeTrackColor: Color = SparkTheme.colors.main,
+ activeTickColor: Color = SparkTheme.colors.onMain.copy(alpha = TickMarksContainerOpacity),
inactiveTrackColor: Color = SparkTheme.colors.neutralContainer,
inactiveTickColor: Color = SparkTheme.colors.onNeutralContainer.copy(alpha = TickMarksContainerOpacity),
disabledThumbColor: Color = SparkTheme.colors.onSurface
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/snackbars/SnackbarColors.kt b/spark/src/main/kotlin/com/adevinta/spark/components/snackbars/SnackbarColors.kt
index 7226e4f00..1b367576c 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/snackbars/SnackbarColors.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/snackbars/SnackbarColors.kt
@@ -33,7 +33,7 @@ public sealed class SnackbarColors {
public object Default : SnackbarColors() {
override val baseColor: Color
@Composable get() {
- return SparkTheme.colors.secondaryContainer
+ return SparkTheme.colors.supportContainer
}
}
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tab/TabRowDefaults.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tab/TabRowDefaults.kt
index dae435e70..88cb56c90 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tab/TabRowDefaults.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tab/TabRowDefaults.kt
@@ -38,12 +38,12 @@ public object TabRowDefaults {
/** Default container color of a tab row. */
public val containerColor: Color
- @Composable get() = PrimaryNavigationTabTokens.ContainerColor
+ @Composable get() = MainNavigationTabTokens.ContainerColor
/** Default content color of a tab row. */
public val contentColor: Color
@Composable get() =
- PrimaryNavigationTabTokens.ActiveLabelTextColor
+ MainNavigationTabTokens.ActiveLabelTextColor
/**
* Default indicator, which will be positioned at the bottom of the [TabRow], on top of the
@@ -56,8 +56,8 @@ public object TabRowDefaults {
@Composable
public fun Indicator(
modifier: Modifier = Modifier,
- height: Dp = PrimaryNavigationTabTokens.ActiveIndicatorHeight,
- color: Color = PrimaryNavigationTabTokens.ActiveIndicatorColor,
+ height: Dp = MainNavigationTabTokens.ActiveIndicatorHeight,
+ color: Color = MainNavigationTabTokens.ActiveIndicatorColor,
) {
Box(
modifier
@@ -68,12 +68,12 @@ public object TabRowDefaults {
}
}
-internal object PrimaryNavigationTabTokens {
+internal object MainNavigationTabTokens {
val ContainerColor
@Composable get() = SparkTheme.colors.surface
val ActiveLabelTextColor
- @Composable get() = SparkTheme.colors.primary
+ @Composable get() = SparkTheme.colors.main
val ActiveIndicatorHeight = 3.0.dp
val ActiveIndicatorColor
- @Composable get() = SparkTheme.colors.primary
+ @Composable get() = SparkTheme.colors.main
}
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.kt
index ebf935805..061abcea9 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.kt
@@ -182,7 +182,7 @@ public object TagDefaults {
@Composable
internal fun filledColors(
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
): TagColors {
val backgroundColor = intent.colors().color
return TagColors(
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.md b/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.md
index 8262e8c6e..496daaee5 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/Tag.md
@@ -10,7 +10,7 @@
The minimal usage of the component is the text.
```kotlin
-TagFilled(text = "Primary")
+TagFilled(text = "Main")
```
The tags can also have a decorative start icon to better identify the context of the tag.
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagFilled.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagFilled.kt
index 39ec19c8a..3cee7d77e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagFilled.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagFilled.kt
@@ -49,7 +49,7 @@ import com.adevinta.spark.tools.preview.ThemeVariant
public fun TagFilled(
text: String,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -72,7 +72,7 @@ public fun TagFilled(
public fun TagFilled(
text: AnnotatedString,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -93,7 +93,7 @@ public fun TagFilled(
@Composable
public fun TagFilled(
modifier: Modifier = Modifier,
- colors: TagColors = TagDefaults.filledColors(TagIntent.Primary),
+ colors: TagColors = TagDefaults.filledColors(TagIntent.Main),
leadingIcon: SparkIcon? = null,
tint: Color? = null,
content: @Composable RowScope.() -> Unit,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagIntent.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagIntent.kt
index 2da8c922d..36efe9346 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagIntent.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagIntent.kt
@@ -22,37 +22,43 @@
package com.adevinta.spark.components.tags
import androidx.compose.runtime.Composable
-import com.adevinta.spark.SparkTheme
import com.adevinta.spark.components.IntentColor
+import com.adevinta.spark.components.IntentColors
/**
* TagIntent is used to define the intent of the tag.
*/
public enum class TagIntent {
/**
- * Primary tags are used for the most important information.
+ * Used to match default color of such UI controls as toggles, Slider, etc.
*/
- Primary {
+ Basic {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.primary,
- onColor = SparkTheme.colors.onPrimary,
- containerColor = SparkTheme.colors.primaryContainer,
- onContainerColor = SparkTheme.colors.onPrimaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Basic.colors()
},
/**
- * Secondary tags are used to highlight information.
+ * Used to make UI component visually accentuated.
*/
- Secondary {
+ Accent {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Accent.colors()
+ },
+
+ /**
+ * Main tags are used for the most important information.
+ */
+ Main {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Main.colors()
+ },
+
+ /**
+ * Support tags are used to highlight information.
+ */
+ Support {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.secondary,
- onColor = SparkTheme.colors.onSecondary,
- containerColor = SparkTheme.colors.secondaryContainer,
- onContainerColor = SparkTheme.colors.onSecondaryContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
/**
@@ -60,12 +66,7 @@ public enum class TagIntent {
*/
Success {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.success,
- onColor = SparkTheme.colors.onSuccess,
- containerColor = SparkTheme.colors.successContainer,
- onContainerColor = SparkTheme.colors.onSuccessContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Success.colors()
},
/**
@@ -73,12 +74,7 @@ public enum class TagIntent {
*/
Alert {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.alert,
- onColor = SparkTheme.colors.onAlert,
- containerColor = SparkTheme.colors.alertContainer,
- onContainerColor = SparkTheme.colors.onAlertContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Alert.colors()
},
/**
@@ -86,12 +82,7 @@ public enum class TagIntent {
*/
Danger {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.error,
- onColor = SparkTheme.colors.onError,
- containerColor = SparkTheme.colors.errorContainer,
- onContainerColor = SparkTheme.colors.onErrorContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Danger.colors()
},
/**
@@ -99,12 +90,7 @@ public enum class TagIntent {
*/
Info {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.info,
- onColor = SparkTheme.colors.onInfo,
- containerColor = SparkTheme.colors.infoContainer,
- onContainerColor = SparkTheme.colors.onInfoContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Info.colors()
},
/**
@@ -112,12 +98,25 @@ public enum class TagIntent {
*/
Neutral {
@Composable
- override fun colors() = IntentColor(
- color = SparkTheme.colors.neutral,
- onColor = SparkTheme.colors.onNeutral,
- containerColor = SparkTheme.colors.neutralContainer,
- onContainerColor = SparkTheme.colors.onNeutralContainer,
- )
+ override fun colors(): IntentColor = IntentColors.Neutral.colors()
+ },
+
+ @Deprecated(
+ "Primary is replaced with Main Intent",
+ replaceWith = ReplaceWith("Main"),
+ )
+ Primary {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Main.colors()
+ },
+
+ @Deprecated(
+ "Secondary is replaced with Support Intent",
+ replaceWith = ReplaceWith("Support"),
+ )
+ Secondary {
+ @Composable
+ override fun colors(): IntentColor = IntentColors.Support.colors()
},
;
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagOutlined.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagOutlined.kt
index d0dec67fe..09ddfcc25 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagOutlined.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagOutlined.kt
@@ -37,7 +37,7 @@ import com.adevinta.spark.tools.preview.ThemeProvider
import com.adevinta.spark.tools.preview.ThemeVariant
/**
- * Outlined tag represent secondary information
+ * Outlined tag represent support information
* @param text The item label
* @param modifier The [Modifier] to be applied to the component
* @param intent The [TagIntent] color to use
@@ -48,7 +48,7 @@ import com.adevinta.spark.tools.preview.ThemeVariant
public fun TagOutlined(
text: String,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -67,7 +67,7 @@ public fun TagOutlined(
}
/**
- * Outlined tag represent secondary information
+ * Outlined tag represent support information
* @param text The item label
* @param modifier The [Modifier] to be applied to the component
* @param intent The [TagIntent] color to use
@@ -78,7 +78,7 @@ public fun TagOutlined(
public fun TagOutlined(
text: AnnotatedString,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -103,7 +103,7 @@ public fun TagOutlined(
@Composable
public fun TagOutlined(
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
content: @Composable RowScope.() -> Unit,
@@ -139,7 +139,7 @@ public fun TagPromote(
}
@Deprecated(
- "Use TagOutlined with primary intent instead",
+ "Use TagOutlined with main intent instead",
ReplaceWith("TagOutlined(text, modifier, intent, leadingIcon, tint)"),
)
@Composable
@@ -149,13 +149,13 @@ public fun TagUrgent(
) {
TagOutlined(
modifier = modifier,
- intent = TagIntent.Primary,
+ intent = TagIntent.Main,
content = content,
)
}
@Deprecated(
- "Use TagOutlined with secondary intent instead",
+ "Use TagOutlined with support intent instead",
ReplaceWith("TagOutlined(text, modifier, intent, leadingIcon, tint)"),
)
@Composable
@@ -165,7 +165,7 @@ public fun TagPro(
) {
TagOutlined(
modifier = modifier,
- intent = TagIntent.Secondary,
+ intent = TagIntent.Support,
content = content,
)
}
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagTonal.kt b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagTonal.kt
index 445d394e6..e0583500e 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagTonal.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/tags/TagTonal.kt
@@ -36,7 +36,7 @@ import com.adevinta.spark.tools.preview.ThemeProvider
import com.adevinta.spark.tools.preview.ThemeVariant
/**
- * Tinted tag represent secondary information like `OutlinedTag`
+ * Tinted tag represent support information like `OutlinedTag`
* @param text The item label
* @param modifier The [Modifier] to be applied to the component
* @param intent The [TagIntent] color to use
@@ -47,7 +47,7 @@ import com.adevinta.spark.tools.preview.ThemeVariant
public fun TagTinted(
text: String,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -61,7 +61,7 @@ public fun TagTinted(
}
/**
- * Tinted tag represent secondary information like `OutlinedTag`
+ * Tinted tag represent support information like `OutlinedTag`
* @param text The item label
* @param modifier The [Modifier] to be applied to the component
* @param intent The [TagIntent] color to use
@@ -72,7 +72,7 @@ public fun TagTinted(
public fun TagTinted(
text: AnnotatedString,
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
) {
@@ -92,7 +92,7 @@ public fun TagTinted(
@Composable
public fun TagTonal(
modifier: Modifier = Modifier,
- intent: TagIntent = TagIntent.Primary,
+ intent: TagIntent = TagIntent.Basic,
leadingIcon: SparkIcon? = null,
tint: Color? = null,
content: @Composable RowScope.() -> Unit,
@@ -127,7 +127,7 @@ public fun TagCriteria(
}
@Deprecated(
- "Use TagTinted instead with primary intent",
+ "Use TagTinted instead with main intent",
ReplaceWith("TagTinted"),
)
@Composable
@@ -139,7 +139,7 @@ public fun TagService(
) {
TagTonal(
modifier = modifier,
- intent = TagIntent.Primary,
+ intent = TagIntent.Main,
leadingIcon = leadingIcon,
tint = tint,
content = content,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/toggles/RadioButton.md b/spark/src/main/kotlin/com/adevinta/spark/components/toggles/RadioButton.md
index aabaf850a..086c6aff9 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/toggles/RadioButton.md
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/toggles/RadioButton.md
@@ -34,7 +34,7 @@ RadioButton(
|-----------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
|  |  |
-The primary radio button allow users to select one option from a set.
+The main radio button allow users to select one option from a set.
- Use radio buttons to select a single option from a list
- It should be visible at a glance if a radio button has been selected, and selected items should be
diff --git a/spark/src/main/kotlin/com/adevinta/spark/components/toggles/SwitchDefaults.kt b/spark/src/main/kotlin/com/adevinta/spark/components/toggles/SwitchDefaults.kt
index 3d710cc5a..866678bb8 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/components/toggles/SwitchDefaults.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/components/toggles/SwitchDefaults.kt
@@ -33,9 +33,9 @@ public object SwitchDefaults {
@Composable
internal fun colors(
checkedThumbColor: Color = SparkTheme.colors.surface,
- checkedTrackColor: Color = SparkTheme.colors.primary,
+ checkedTrackColor: Color = SparkTheme.colors.main,
checkedBorderColor: Color = Color.Transparent,
- checkedIconColor: Color = SparkTheme.colors.primary,
+ checkedIconColor: Color = SparkTheme.colors.main,
uncheckedThumbColor: Color = SparkTheme.colors.surface,
uncheckedTrackColor: Color = SparkTheme.colors.onSurface.dim4
.compositeOver(SparkTheme.colors.surface),
@@ -43,9 +43,9 @@ public object SwitchDefaults {
uncheckedIconColor: Color = SparkTheme.colors.onSurface.dim4
.compositeOver(SparkTheme.colors.surface),
disabledCheckedThumbColor: Color = SparkTheme.colors.surface,
- disabledCheckedTrackColor: Color = SparkTheme.colors.primaryContainer,
+ disabledCheckedTrackColor: Color = SparkTheme.colors.mainContainer,
disabledCheckedBorderColor: Color = Color.Transparent,
- disabledCheckedIconColor: Color = SparkTheme.colors.primaryContainer,
+ disabledCheckedIconColor: Color = SparkTheme.colors.mainContainer,
disabledUncheckedThumbColor: Color = SparkTheme.colors.surface,
disabledUncheckedTrackColor: Color = SparkTheme.colors.neutralContainer,
disabledUncheckedBorderColor: Color = Color.Transparent,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/res/SparkStringAnnotations.kt b/spark/src/main/kotlin/com/adevinta/spark/res/SparkStringAnnotations.kt
index 2f8458cb2..fd3d74aef 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/res/SparkStringAnnotations.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/res/SparkStringAnnotations.kt
@@ -51,8 +51,8 @@ public object SparkStringAnnotations {
* Given a string representing annotation value of a spark color, returns the corresponding [SpanStyle] with the color token.
*/
private fun String.toColorSpanStyle(token: SparkColors): SpanStyle? = when (this) {
- "primary" -> token.primary
- "secondary" -> token.secondary
+ "main" -> token.main
+ "support" -> token.support
"success" -> token.success
"alert" -> token.alert
"error" -> token.error
diff --git a/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt b/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
index d6720d6fc..0b2a2aa92 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/tokens/Color.kt
@@ -56,67 +56,75 @@ import androidx.compose.ui.unit.dp
import com.adevinta.spark.PreviewTheme
import com.adevinta.spark.SparkTheme
import com.adevinta.spark.tokens.PaletteTokens.Apple100
-import com.adevinta.spark.tokens.PaletteTokens.Apple200
import com.adevinta.spark.tokens.PaletteTokens.Apple400
import com.adevinta.spark.tokens.PaletteTokens.Apple500
import com.adevinta.spark.tokens.PaletteTokens.Apple700
import com.adevinta.spark.tokens.PaletteTokens.Apple800
import com.adevinta.spark.tokens.PaletteTokens.Black
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta100
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta300
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta50
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta700
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta800
+import com.adevinta.spark.tokens.PaletteTokens.BlackAdevinta900
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon100
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon200
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon400
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon500
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon700
+import com.adevinta.spark.tokens.PaletteTokens.BlueRibbon800
import com.adevinta.spark.tokens.PaletteTokens.Chili100
-import com.adevinta.spark.tokens.PaletteTokens.Chili200
import com.adevinta.spark.tokens.PaletteTokens.Chili400
import com.adevinta.spark.tokens.PaletteTokens.Chili500
import com.adevinta.spark.tokens.PaletteTokens.Chili700
import com.adevinta.spark.tokens.PaletteTokens.Chili800
+import com.adevinta.spark.tokens.PaletteTokens.PaleAdevinta100
+import com.adevinta.spark.tokens.PaletteTokens.PaleAdevinta50
+import com.adevinta.spark.tokens.PaletteTokens.PaleAdevinta700
+import com.adevinta.spark.tokens.PaletteTokens.PaleAdevinta800
+import com.adevinta.spark.tokens.PaletteTokens.PaleAdevinta900
import com.adevinta.spark.tokens.PaletteTokens.Sky100
-import com.adevinta.spark.tokens.PaletteTokens.Sky200
import com.adevinta.spark.tokens.PaletteTokens.Sky400
import com.adevinta.spark.tokens.PaletteTokens.Sky500
import com.adevinta.spark.tokens.PaletteTokens.Sky700
import com.adevinta.spark.tokens.PaletteTokens.Sky800
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton100
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton200
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton300
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton400
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton500
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton700
-import com.adevinta.spark.tokens.PaletteTokens.SugarCotton800
-import com.adevinta.spark.tokens.PaletteTokens.Surfer100
-import com.adevinta.spark.tokens.PaletteTokens.Surfer200
-import com.adevinta.spark.tokens.PaletteTokens.Surfer50
-import com.adevinta.spark.tokens.PaletteTokens.Surfer500
-import com.adevinta.spark.tokens.PaletteTokens.Surfer700
-import com.adevinta.spark.tokens.PaletteTokens.Surfer800
-import com.adevinta.spark.tokens.PaletteTokens.Surfer900
-import com.adevinta.spark.tokens.PaletteTokens.TheBlue100
-import com.adevinta.spark.tokens.PaletteTokens.TheBlue200
-import com.adevinta.spark.tokens.PaletteTokens.TheBlue500
-import com.adevinta.spark.tokens.PaletteTokens.TheBlue700
-import com.adevinta.spark.tokens.PaletteTokens.TheBlue800
-import com.adevinta.spark.tokens.PaletteTokens.TheBlueV
+import com.adevinta.spark.tokens.PaletteTokens.Violet100
+import com.adevinta.spark.tokens.PaletteTokens.Violet200
+import com.adevinta.spark.tokens.PaletteTokens.Violet300
+import com.adevinta.spark.tokens.PaletteTokens.Violet500
+import com.adevinta.spark.tokens.PaletteTokens.Violet700
+import com.adevinta.spark.tokens.PaletteTokens.Violet800
import com.adevinta.spark.tokens.PaletteTokens.White
import com.adevinta.spark.tokens.PaletteTokens.Wiggings100
-import com.adevinta.spark.tokens.PaletteTokens.Wiggings200
import com.adevinta.spark.tokens.PaletteTokens.Wiggings400
import com.adevinta.spark.tokens.PaletteTokens.Wiggings500
-import com.adevinta.spark.tokens.PaletteTokens.Wiggings700
import com.adevinta.spark.tokens.PaletteTokens.Wiggings800
import com.adevinta.spark.tools.preview.ThemeProvider
import com.adevinta.spark.tools.preview.ThemeVariant
public fun lightSparkColors(
- primary: Color = TheBlue500,
- onPrimary: Color = White,
- primaryContainer: Color = TheBlue100,
- onPrimaryContainer: Color = TheBlue700,
- primaryVariant: Color = TheBlue700,
- onPrimaryVariant: Color = White,
- secondary: Color = SugarCotton500,
- onSecondary: Color = White,
- secondaryContainer: Color = SugarCotton100,
- onSecondaryContainer: Color = SugarCotton700,
- secondaryVariant: Color = SugarCotton700,
- onSecondaryVariant: Color = White,
+ accent: Color = Violet300,
+ onAccent: Color = BlackAdevinta900,
+ accentContainer: Color = Violet100,
+ onAccentContainer: Color = Violet800,
+ accentVariant: Color = Violet700,
+ onAccentVariant: Color = White,
+ basic: Color = PaleAdevinta800,
+ onBasic: Color = White,
+ basicContainer: Color = PaleAdevinta100,
+ onBasicContainer: Color = PaleAdevinta900,
+ main: Color = BlueRibbon500,
+ onMain: Color = White,
+ mainContainer: Color = BlueRibbon100,
+ onMainContainer: Color = BlueRibbon700,
+ mainVariant: Color = BlueRibbon700,
+ onMainVariant: Color = White,
+ support: Color = PaleAdevinta800,
+ onSupport: Color = White,
+ supportContainer: Color = PaleAdevinta100,
+ onSupportContainer: Color = PaleAdevinta900,
+ supportVariant: Color = PaleAdevinta700,
+ onSupportVariant: Color = White,
tertiary: Color = Color.Magenta,
onTertiary: Color = Color.Blue,
tertiaryContainer: Color = Color.Magenta,
@@ -126,9 +134,9 @@ public fun lightSparkColors(
successContainer: Color = Apple100,
onSuccessContainer: Color = Apple700,
alert: Color = Wiggings500,
- onAlert: Color = Black,
+ onAlert: Color = BlackAdevinta900,
alertContainer: Color = Wiggings100,
- onAlertContainer: Color = Wiggings700,
+ onAlertContainer: Color = Wiggings800,
error: Color = Chili500,
onError: Color = White,
errorContainer: Color = Chili100,
@@ -137,22 +145,22 @@ public fun lightSparkColors(
onInfo: Color = White,
infoContainer: Color = Sky100,
onInfoContainer: Color = Sky700,
- neutral: Color = Surfer500,
+ neutral: Color = BlackAdevinta800,
onNeutral: Color = White,
- neutralContainer: Color = Surfer100,
- onNeutralContainer: Color = Surfer700,
+ neutralContainer: Color = BlackAdevinta100,
+ onNeutralContainer: Color = BlackAdevinta800,
background: Color = White,
- onBackground: Color = Black,
- backgroundVariant: Color = Surfer50,
- onBackgroundVariant: Color = Black,
+ onBackground: Color = BlackAdevinta900,
+ backgroundVariant: Color = BlackAdevinta50,
+ onBackgroundVariant: Color = BlackAdevinta900,
surface: Color = White,
- onSurface: Color = Color.Black,
- surfaceInverse: Color = Surfer900,
+ onSurface: Color = BlackAdevinta900,
+ surfaceInverse: Color = BlackAdevinta800,
onSurfaceInverse: Color = White,
- surfaceTint: Color = primary,
+ surfaceTint: Color = main,
inversePrimary: Color = Color.Magenta,
- outline: Color = Surfer200,
- outlineHigh: Color = Color.Black,
+ outline: Color = BlackAdevinta100,
+ outlineHigh: Color = BlackAdevinta900,
scrim: Color = Black,
dimContent1: Float = .72f,
dimContent2: Float = .56f,
@@ -160,18 +168,28 @@ public fun lightSparkColors(
dimContent4: Float = .16f,
dimContent5: Float = .08f,
): SparkColors = SparkColors(
- primary = primary,
- onPrimary = onPrimary,
- primaryContainer = primaryContainer,
- onPrimaryContainer = onPrimaryContainer,
- primaryVariant = primaryVariant,
- onPrimaryVariant = onPrimaryVariant,
- secondary = secondary,
- onSecondary = onSecondary,
- secondaryContainer = secondaryContainer,
- onSecondaryContainer = onSecondaryContainer,
- secondaryVariant = secondaryVariant,
- onSecondaryVariant = onSecondaryVariant,
+ accent = accent,
+ onAccent = onAccent,
+ accentContainer = accentContainer,
+ onAccentContainer = onAccentContainer,
+ accentVariant = accentVariant,
+ onAccentVariant = onAccentVariant,
+ basic = basic,
+ onBasic = onBasic,
+ basicContainer = basicContainer,
+ onBasicContainer = onBasicContainer,
+ main = main,
+ onMain = onMain,
+ mainContainer = mainContainer,
+ onMainContainer = onMainContainer,
+ mainVariant = mainVariant,
+ onMainVariant = onMainVariant,
+ support = support,
+ onSupport = onSupport,
+ supportContainer = supportContainer,
+ onSupportContainer = onSupportContainer,
+ supportVariant = supportVariant,
+ onSupportVariant = onSupportVariant,
tertiary = tertiary,
onTertiary = onTertiary,
tertiaryContainer = tertiaryContainer,
@@ -226,50 +244,60 @@ public fun lightSparkColors(
)
public fun darkSparkColors(
- primary: Color = TheBlueV,
- onPrimary: Color = Black,
- primaryContainer: Color = TheBlue800,
- onPrimaryContainer: Color = TheBlue200,
- primaryVariant: Color = TheBlue200,
- onPrimaryVariant: Color = Black,
- secondary: Color = SugarCotton400,
- onSecondary: Color = Black,
- secondaryContainer: Color = SugarCotton800,
- onSecondaryContainer: Color = SugarCotton200,
- secondaryVariant: Color = SugarCotton300,
- onSecondaryVariant: Color = Black,
+ accent: Color = Violet300,
+ onAccent: Color = BlackAdevinta900,
+ accentContainer: Color = Violet500,
+ onAccentContainer: Color = White,
+ accentVariant: Color = Violet200,
+ onAccentVariant: Color = PaleAdevinta900,
+ basic: Color = PaleAdevinta100,
+ onBasic: Color = BlackAdevinta900,
+ basicContainer: Color = PaleAdevinta700,
+ onBasicContainer: Color = White,
+ main: Color = BlueRibbon400,
+ onMain: Color = White,
+ mainContainer: Color = BlueRibbon800,
+ onMainContainer: Color = White,
+ mainVariant: Color = BlueRibbon200,
+ onMainVariant: Color = BlackAdevinta900,
+ support: Color = PaleAdevinta100,
+ onSupport: Color = BlackAdevinta900,
+ supportContainer: Color = PaleAdevinta700,
+ onSupportContainer: Color = White,
+ supportVariant: Color = PaleAdevinta50,
+ onSupportVariant: Color = BlackAdevinta900,
success: Color = Apple400,
- onSuccess: Color = Black,
+ onSuccess: Color = BlackAdevinta900,
successContainer: Color = Apple800,
- onSuccessContainer: Color = Apple200,
+ onSuccessContainer: Color = White,
alert: Color = Wiggings400,
- onAlert: Color = Black,
+ onAlert: Color = BlackAdevinta900,
alertContainer: Color = Wiggings800,
- onAlertContainer: Color = Wiggings200,
+ onAlertContainer: Color = White,
error: Color = Chili400,
- onError: Color = Black,
+ onError: Color = BlackAdevinta900,
errorContainer: Color = Chili800,
- onErrorContainer: Color = Chili200,
+ onErrorContainer: Color = White,
info: Color = Sky400,
- onInfo: Color = Black,
+ onInfo: Color = BlackAdevinta900,
infoContainer: Color = Sky800,
- onInfoContainer: Color = Sky200,
- neutral: Color = Surfer500,
- onNeutral: Color = Black,
- neutralContainer: Color = Surfer800,
- onNeutralContainer: Color = Surfer200,
- background: Color = Black,
+ onInfoContainer: Color = White,
+ neutral: Color = BlackAdevinta300,
+ onNeutral: Color = BlackAdevinta900,
+ neutralContainer: Color = BlackAdevinta800,
+ onNeutralContainer: Color = White,
+ background: Color = BlackAdevinta900,
onBackground: Color = White,
- backgroundVariant: Color = Surfer900,
- onBackgroundVariant: Color = Color.White,
- surface: Color = Black,
+ backgroundVariant: Color = Black,
+ onBackgroundVariant: Color = BlackAdevinta50,
+ surface: Color = BlackAdevinta900,
onSurface: Color = White,
- surfaceInverse: Color = Surfer50,
- onSurfaceInverse: Color = Black,
- surfaceTint: Color = primary,
- outline: Color = Surfer700,
+ surfaceInverse: Color = BlackAdevinta50,
+ onSurfaceInverse: Color = BlackAdevinta800,
+ surfaceTint: Color = main,
+ outline: Color = BlackAdevinta700,
outlineHigh: Color = White,
- inversePrimary: Color = Color.Magenta,
+ inverseMain: Color = Color.Magenta,
scrim: Color = Black,
dimContent1: Float = .72f,
dimContent2: Float = .56f,
@@ -277,18 +305,28 @@ public fun darkSparkColors(
dimContent4: Float = .16f,
dimContent5: Float = .08f,
): SparkColors = SparkColors(
- primary = primary,
- onPrimary = onPrimary,
- primaryContainer = primaryContainer,
- onPrimaryContainer = onPrimaryContainer,
- primaryVariant = primaryVariant,
- onPrimaryVariant = onPrimaryVariant,
- secondary = secondary,
- onSecondary = onSecondary,
- secondaryContainer = secondaryContainer,
- onSecondaryContainer = onSecondaryContainer,
- secondaryVariant = secondaryVariant,
- onSecondaryVariant = onSecondaryVariant,
+ accent = accent,
+ onAccent = onAccent,
+ accentContainer = accentContainer,
+ onAccentContainer = onAccentContainer,
+ accentVariant = accentVariant,
+ onAccentVariant = onAccentVariant,
+ basic = basic,
+ onBasic = onBasic,
+ basicContainer = basicContainer,
+ onBasicContainer = onBasicContainer,
+ main = main,
+ onMain = onMain,
+ mainContainer = mainContainer,
+ onMainContainer = onMainContainer,
+ mainVariant = mainVariant,
+ onMainVariant = onMainVariant,
+ support = support,
+ onSupport = onSupport,
+ supportContainer = supportContainer,
+ onSupportContainer = onSupportContainer,
+ supportVariant = supportVariant,
+ onSupportVariant = onSupportVariant,
tertiary = Color.Magenta,
onTertiary = Color.Blue,
tertiaryContainer = Color.Magenta,
@@ -332,7 +370,7 @@ public fun darkSparkColors(
outlineHigh = outlineHigh,
outlineVariant = outlineHigh,
scrim = scrim,
- inversePrimary = inversePrimary,
+ inversePrimary = inverseMain,
inverseSurface = surfaceInverse,
inverseOnSurface = onSurfaceInverse,
dimContent1 = dimContent1,
@@ -352,28 +390,38 @@ public fun darkSparkColors(
* To learn more about colors, see [Material Design colors](https://m3.material.io/styles/color/overview) and
* [Spark colors](https://zeroheight.com/25c15666f/p/40105d-colors/b/77b3e7).
*
- * @property primary The primary color is the color displayed most frequently across your app’s
+ * @property accent
+ * @property onAccent
+ * @property accentContainer
+ * @property onAccentContainer
+ * @property accentVariant
+ * @property onAccentVariant
+ * @property basic
+ * @property onBasic
+ * @property basicContainer
+ * @property onBasicContainer
+ * @property main The main color is the color displayed most frequently across your app’s
* screens and components.
- * @property onPrimary Color used for text and icons displayed on top of the primary color.
- * @property primaryContainer The preferred tonal color of containers.
- * @property onPrimaryContainer The color (and state variants) that should be used for content on
- * top of [primaryContainer].
- * @property primaryVariant Darker variation of [primary] color.
- * @property onPrimaryVariant Color used for text and icons displayed on top of the [primaryVariant] color.
- * @property inversePrimary Color to be used as a "primary" color in places where the inverse color
+ * @property onMain Color used for text and icons displayed on top of the main color.
+ * @property mainContainer The preferred tonal color of containers.
+ * @property onMainContainer The color (and state variants) that should be used for content on
+ * top of [mainContainer].
+ * @property mainVariant Darker variation of [main] color.
+ * @property onMainVariant Color used for text and icons displayed on top of the [mainVariant] color.
+ * @property inversePrimary Color to be used as a "main" color in places where the inverse color
* scheme is needed.
- * @property secondary The secondary color provides more ways to accent and distinguish your
- * product. Secondary colors are best for:
+ * @property support The support color provides more ways to accent and distinguish your
+ * product. Support colors are best for:
* - Floating action buttons
* - Selection controls, like checkboxes and radio buttons
* - Highlighting selected text
* - Links and headlines
- * @property onSecondary Color used for text and icons displayed on top of the secondary color.
- * @property secondaryContainer A tonal color to be used in containers.
- * @property onSecondaryContainer The color (and state variants) that should be used for content on
- * top of [secondaryContainer].
- * @property secondaryVariant Darker variation of [secondary] color.
- * @property onSecondaryVariant Color used for text and icons displayed on top of the [secondaryVariant] color.
+ * @property onSupport Color used for text and icons displayed on top of the support color.
+ * @property supportContainer A tonal color to be used in containers.
+ * @property onSupportContainer The color (and state variants) that should be used for content on
+ * top of [supportContainer].
+ * @property supportVariant Darker variation of [support] color.
+ * @property onSupportVariant Color used for text and icons displayed on top of the [supportVariant] color.
* @property success An emphasis color used to provide a positive feedback.
* @property onSuccess Color used for text and icons displayed on top of the [success] color.
* @property successContainer The preferred tonal color of success containers.
@@ -430,18 +478,28 @@ public fun darkSparkColors(
*/
@Stable
public class SparkColors(
- primary: Color,
- onPrimary: Color,
- primaryContainer: Color,
- onPrimaryContainer: Color,
- primaryVariant: Color,
- onPrimaryVariant: Color,
- secondary: Color,
- onSecondary: Color,
- secondaryContainer: Color,
- onSecondaryContainer: Color,
- secondaryVariant: Color,
- onSecondaryVariant: Color,
+ accent: Color,
+ onAccent: Color,
+ accentContainer: Color,
+ onAccentContainer: Color,
+ accentVariant: Color,
+ onAccentVariant: Color,
+ basic: Color,
+ onBasic: Color,
+ basicContainer: Color,
+ onBasicContainer: Color,
+ main: Color,
+ onMain: Color,
+ mainContainer: Color,
+ onMainContainer: Color,
+ mainVariant: Color,
+ onMainVariant: Color,
+ support: Color,
+ onSupport: Color,
+ supportContainer: Color,
+ onSupportContainer: Color,
+ supportVariant: Color,
+ onSupportVariant: Color,
tertiary: Color,
onTertiary: Color,
tertiaryContainer: Color,
@@ -494,58 +552,52 @@ public class SparkColors(
dimContent4: Float,
dimContent5: Float,
) {
- public var primary: Color by mutableStateOf(primary, structuralEqualityPolicy())
+ public var accent: Color by mutableStateOf(accent, structuralEqualityPolicy())
internal set
- public var onPrimary: Color by mutableStateOf(onPrimary, structuralEqualityPolicy())
+ public var onAccent: Color by mutableStateOf(onAccent, structuralEqualityPolicy())
internal set
- public var primaryContainer: Color by mutableStateOf(primaryContainer, structuralEqualityPolicy())
+ public var accentContainer: Color by mutableStateOf(accentContainer, structuralEqualityPolicy())
internal set
- public var onPrimaryContainer: Color by mutableStateOf(onPrimaryContainer, structuralEqualityPolicy())
+ public var onAccentContainer: Color by mutableStateOf(onAccentContainer, structuralEqualityPolicy())
internal set
- public var primaryVariant: Color by mutableStateOf(primaryVariant, structuralEqualityPolicy())
+ public var accentVariant: Color by mutableStateOf(accentVariant, structuralEqualityPolicy())
internal set
- public var onPrimaryVariant: Color by mutableStateOf(onPrimaryVariant, structuralEqualityPolicy())
+ public var onAccentVariant: Color by mutableStateOf(onAccentVariant, structuralEqualityPolicy())
internal set
- public var secondary: Color by mutableStateOf(secondary, structuralEqualityPolicy())
+
+ public var basic: Color by mutableStateOf(basic, structuralEqualityPolicy())
internal set
- public var onSecondary: Color by mutableStateOf(onSecondary, structuralEqualityPolicy())
+ public var onBasic: Color by mutableStateOf(onBasic, structuralEqualityPolicy())
internal set
- public var secondaryContainer: Color by mutableStateOf(secondaryContainer, structuralEqualityPolicy())
+ public var basicContainer: Color by mutableStateOf(basicContainer, structuralEqualityPolicy())
internal set
- public var onSecondaryContainer: Color by mutableStateOf(onSecondaryContainer, structuralEqualityPolicy())
+ public var onBasicContainer: Color by mutableStateOf(onBasicContainer, structuralEqualityPolicy())
internal set
- public var secondaryVariant: Color by mutableStateOf(secondaryVariant, structuralEqualityPolicy())
+
+ public var main: Color by mutableStateOf(main, structuralEqualityPolicy())
internal set
- public var onSecondaryVariant: Color by mutableStateOf(onSecondaryVariant, structuralEqualityPolicy())
+ public var onMain: Color by mutableStateOf(onMain, structuralEqualityPolicy())
internal set
-
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- ReplaceWith("neutral"),
- )
- public var tertiary: Color by mutableStateOf(tertiary, structuralEqualityPolicy())
+ public var mainContainer: Color by mutableStateOf(mainContainer, structuralEqualityPolicy())
internal set
-
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- ReplaceWith("onNeutral"),
- )
- public var onTertiary: Color by mutableStateOf(onTertiary, structuralEqualityPolicy())
+ public var onMainContainer: Color by mutableStateOf(onMainContainer, structuralEqualityPolicy())
internal set
-
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- ReplaceWith("backgroundVariant"),
-
- )
- public var tertiaryContainer: Color by mutableStateOf(tertiaryContainer, structuralEqualityPolicy())
+ public var mainVariant: Color by mutableStateOf(mainVariant, structuralEqualityPolicy())
+ internal set
+ public var onMainVariant: Color by mutableStateOf(onMainVariant, structuralEqualityPolicy())
internal set
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- ReplaceWith("onBackgroundVariant"),
- )
- public var onTertiaryContainer: Color by mutableStateOf(onTertiaryContainer, structuralEqualityPolicy())
+ public var support: Color by mutableStateOf(support, structuralEqualityPolicy())
+ internal set
+ public var onSupport: Color by mutableStateOf(onSupport, structuralEqualityPolicy())
+ internal set
+ public var supportContainer: Color by mutableStateOf(supportContainer, structuralEqualityPolicy())
+ internal set
+ public var onSupportContainer: Color by mutableStateOf(onSupportContainer, structuralEqualityPolicy())
+ internal set
+ public var supportVariant: Color by mutableStateOf(supportVariant, structuralEqualityPolicy())
+ internal set
+ public var onSupportVariant: Color by mutableStateOf(onSupportVariant, structuralEqualityPolicy())
internal set
public var background: Color by mutableStateOf(background, structuralEqualityPolicy())
@@ -556,6 +608,7 @@ public class SparkColors(
internal set
public var onBackgroundVariant: Color by mutableStateOf(onBackgroundVariant, structuralEqualityPolicy())
internal set
+
public var surface: Color by mutableStateOf(surface, structuralEqualityPolicy())
internal set
public var onSurface: Color by mutableStateOf(onSurface, structuralEqualityPolicy())
@@ -564,35 +617,11 @@ public class SparkColors(
internal set
public var onSurfaceInverse: Color by mutableStateOf(onSurfaceInverse, structuralEqualityPolicy())
internal set
-
- @Deprecated(
- message = "This property will be removed as it is not part of Spark Token",
- replaceWith = ReplaceWith("backgroundVariant"),
- )
- public var surfaceVariant: Color by mutableStateOf(surfaceVariant, structuralEqualityPolicy())
- internal set
-
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- replaceWith = ReplaceWith("onBackgroundVariant"),
- )
- public var onSurfaceVariant: Color by mutableStateOf(onSurfaceVariant, structuralEqualityPolicy())
- internal set
-
internal var surfaceTint: Color by mutableStateOf(surfaceTint, structuralEqualityPolicy())
public var outline: Color by mutableStateOf(outline, structuralEqualityPolicy())
internal set
public var outlineHigh: Color by mutableStateOf(outlineHigh, structuralEqualityPolicy())
internal set
-
- @Deprecated(
- "This property will be removed as it is not part of Spark Token",
- replaceWith = ReplaceWith("outlineHigh"),
- level = DeprecationLevel.WARNING,
- )
- public var outlineVariant: Color by mutableStateOf(outlineVariant, structuralEqualityPolicy())
- internal set
-
public var scrim: Color by mutableStateOf(scrim, structuralEqualityPolicy())
internal set
@@ -641,6 +670,131 @@ public class SparkColors(
public var onNeutralContainer: Color by mutableStateOf(onNeutralContainer, structuralEqualityPolicy())
internal set
+ public var dim1: Float by mutableStateOf(dimContent1, structuralEqualityPolicy())
+ internal set
+ public var dim2: Float by mutableStateOf(dimContent2, structuralEqualityPolicy())
+ internal set
+ public var dim3: Float by mutableStateOf(dimContent3, structuralEqualityPolicy())
+ internal set
+ public var dim4: Float by mutableStateOf(dimContent4, structuralEqualityPolicy())
+ internal set
+ public var dim5: Float by mutableStateOf(dimContent5, structuralEqualityPolicy())
+ internal set
+
+ // region @Deprecated
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("main"),
+ )
+ public var primary: Color by mutableStateOf(main, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onMain"),
+ )
+ public var onPrimary: Color by mutableStateOf(onMain, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("mainContainer"),
+ )
+ public var primaryContainer: Color by mutableStateOf(mainContainer, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onMainContainer"),
+ )
+ public var onPrimaryContainer: Color by mutableStateOf(onMainContainer, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("mainVariant"),
+ )
+ public var primaryVariant: Color by mutableStateOf(mainVariant, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onMainVariant"),
+ )
+ public var onPrimaryVariant: Color by mutableStateOf(onMainVariant, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("support"),
+ )
+ public var secondary: Color by mutableStateOf(support, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onSupport"),
+ )
+ public var onSecondary: Color by mutableStateOf(onSupport, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("supportContainer"),
+ )
+ public var secondaryContainer: Color by mutableStateOf(supportContainer, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onSupportContainer"),
+ )
+ public var onSecondaryContainer: Color by mutableStateOf(onSupportContainer, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("supportVariant"),
+ )
+ public var secondaryVariant: Color by mutableStateOf(supportVariant, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onSupportVariant"),
+ )
+ public var onSecondaryVariant: Color by mutableStateOf(onSupportVariant, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("neutral"),
+ )
+ public var tertiary: Color by mutableStateOf(tertiary, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onNeutral"),
+ )
+ public var onTertiary: Color by mutableStateOf(onTertiary, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("backgroundVariant"),
+
+ )
+ public var tertiaryContainer: Color by mutableStateOf(tertiaryContainer, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ ReplaceWith("onBackgroundVariant"),
+ )
+ public var onTertiaryContainer: Color by mutableStateOf(onTertiaryContainer, structuralEqualityPolicy())
+ internal set
+
@Deprecated(
"This property will be removed as it is not part of Spark Token",
replaceWith = ReplaceWith("success"),
@@ -673,6 +827,20 @@ public class SparkColors(
public var onValidContainer: Color by mutableStateOf(onValidContainer, structuralEqualityPolicy())
internal set
+ @Deprecated(
+ message = "This property will be removed as it is not part of Spark Token",
+ replaceWith = ReplaceWith("backgroundVariant"),
+ )
+ public var surfaceVariant: Color by mutableStateOf(surfaceVariant, structuralEqualityPolicy())
+ internal set
+
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ replaceWith = ReplaceWith("onBackgroundVariant"),
+ )
+ public var onSurfaceVariant: Color by mutableStateOf(onSurfaceVariant, structuralEqualityPolicy())
+ internal set
+
@Deprecated("This property will be removed as it is not part of Spark Token")
public var inversePrimary: Color by mutableStateOf(inversePrimary, structuralEqualityPolicy())
internal set
@@ -693,33 +861,31 @@ public class SparkColors(
public var inverseOnSurface: Color by mutableStateOf(inverseOnSurface, structuralEqualityPolicy())
internal set
- public var dim1: Float by mutableStateOf(dimContent1, structuralEqualityPolicy())
- internal set
- public var dim2: Float by mutableStateOf(dimContent2, structuralEqualityPolicy())
- internal set
- public var dim3: Float by mutableStateOf(dimContent3, structuralEqualityPolicy())
- internal set
- public var dim4: Float by mutableStateOf(dimContent4, structuralEqualityPolicy())
- internal set
- public var dim5: Float by mutableStateOf(dimContent5, structuralEqualityPolicy())
+ @Deprecated(
+ "This property will be removed as it is not part of Spark Token",
+ replaceWith = ReplaceWith("outlineHigh"),
+ level = DeprecationLevel.WARNING,
+ )
+ public var outlineVariant: Color by mutableStateOf(outlineVariant, structuralEqualityPolicy())
internal set
+ // endregion
/**
* Returns a copy of this Colors, optionally overriding some of the values.
*/
public fun copy(
- primary: Color = this.primary,
- onPrimary: Color = this.onPrimary,
- primaryContainer: Color = this.primaryContainer,
- onPrimaryContainer: Color = this.onPrimaryContainer,
- primaryVariant: Color = this.primaryVariant,
- onPrimaryVariant: Color = this.onPrimaryVariant,
- secondary: Color = this.secondary,
- onSecondary: Color = this.onSecondary,
- secondaryContainer: Color = this.secondaryContainer,
- onSecondaryContainer: Color = this.onSecondaryContainer,
- secondaryVariant: Color = this.secondaryVariant,
- onSecondaryVariant: Color = this.onSecondaryVariant,
+ main: Color = this.main,
+ onMain: Color = this.onMain,
+ mainContainer: Color = this.mainContainer,
+ onMainContainer: Color = this.onMainContainer,
+ mainVariant: Color = this.mainVariant,
+ onMainVariant: Color = this.onMainVariant,
+ support: Color = this.support,
+ onSupport: Color = this.onSupport,
+ supportContainer: Color = this.supportContainer,
+ onSupportContainer: Color = this.onSupportContainer,
+ supportVariant: Color = this.supportVariant,
+ onSupportVariant: Color = this.onSupportVariant,
tertiary: Color = this.tertiary,
onTertiary: Color = this.onTertiary,
tertiaryContainer: Color = this.tertiaryContainer,
@@ -763,7 +929,7 @@ public class SparkColors(
onValid: Color = this.onValid,
validContainer: Color = this.validContainer,
onValidContainer: Color = this.onValidContainer,
- inversePrimary: Color = this.inversePrimary,
+ inverseMain: Color = this.inversePrimary,
inverseSurface: Color = this.inverseSurface,
inverseOnSurface: Color = this.inverseOnSurface,
dimContent1: Float = this.dim1,
@@ -772,18 +938,28 @@ public class SparkColors(
dimContent4: Float = this.dim4,
dimContent5: Float = this.dim5,
): SparkColors = SparkColors(
- primary = primary,
- onPrimary = onPrimary,
- primaryContainer = primaryContainer,
- onPrimaryContainer = onPrimaryContainer,
- primaryVariant = primaryVariant,
- onPrimaryVariant = onPrimaryVariant,
- secondary = secondary,
- onSecondary = onSecondary,
- secondaryContainer = secondaryContainer,
- onSecondaryContainer = onSecondaryContainer,
- secondaryVariant = secondaryVariant,
- onSecondaryVariant = onSecondaryVariant,
+ accent = accent,
+ onAccent = onAccent,
+ accentContainer = accentContainer,
+ onAccentContainer = onAccentContainer,
+ accentVariant = accentVariant,
+ onAccentVariant = onAccentVariant,
+ basic = basic,
+ onBasic = onBasic,
+ basicContainer = basicContainer,
+ onBasicContainer = onBasicContainer,
+ main = main,
+ onMain = onMain,
+ mainContainer = mainContainer,
+ onMainContainer = onMainContainer,
+ mainVariant = mainVariant,
+ onMainVariant = onMainVariant,
+ support = support,
+ onSupport = onSupport,
+ supportContainer = supportContainer,
+ onSupportContainer = onSupportContainer,
+ supportVariant = supportVariant,
+ onSupportVariant = onSupportVariant,
tertiary = tertiary,
onTertiary = onTertiary,
tertiaryContainer = tertiaryContainer,
@@ -827,7 +1003,7 @@ public class SparkColors(
onValid = onValid,
validContainer = validContainer,
onValidContainer = onValidContainer,
- inversePrimary = inversePrimary,
+ inversePrimary = inverseMain,
inverseSurface = inverseSurface,
inverseOnSurface = inverseOnSurface,
dimContent1 = dimContent1,
@@ -839,14 +1015,14 @@ public class SparkColors(
override fun toString(): String = buildString {
append("SparkColors(")
- append("primary=$primary, ")
- append("onPrimary=$onPrimary, ")
- append("primaryContainer=$primaryContainer, ")
- append("onPrimaryContainer=$onPrimaryContainer, ")
- append("secondary=$secondary, ")
- append("onSecondary=$onSecondary, ")
- append("secondaryContainer=$secondaryContainer, ")
- append("onSecondaryContainer=$onSecondaryContainer, ")
+ append("main=$main, ")
+ append("onMain=$onMain, ")
+ append("mainContainer=$mainContainer, ")
+ append("onMainContainer=$onMainContainer, ")
+ append("support=$support, ")
+ append("onSupport=$onSupport, ")
+ append("supportContainer=$supportContainer, ")
+ append("onSupportContainer=$onSupportContainer, ")
append("tertiary=$tertiary, ")
append("onTertiary=$onTertiary, ")
append("tertiaryContainer=$tertiaryContainer, ")
@@ -883,7 +1059,7 @@ public class SparkColors(
append("onNeutral=$onNeutral, ")
append("neutralContainer=$neutralContainer, ")
append("onNeutralContainer=$onNeutralContainer, ")
- append("inversePrimary=$inversePrimary, ")
+ append("inverseMain=$inversePrimary, ")
append("inverseSurface=$inverseSurface, ")
append("dim1=$dim1, ")
append("dim2=$dim2, ")
@@ -895,15 +1071,15 @@ public class SparkColors(
}
public fun SparkColors.asMaterial3Colors(): ColorScheme = ColorScheme(
- primary = primary,
- onPrimary = onPrimary,
- primaryContainer = primaryContainer,
- onPrimaryContainer = onPrimaryContainer,
+ primary = main,
+ onPrimary = onMain,
+ primaryContainer = mainContainer,
+ onPrimaryContainer = onMainContainer,
inversePrimary = inversePrimary,
- secondary = secondary,
- onSecondary = onSecondary,
- secondaryContainer = secondaryContainer,
- onSecondaryContainer = onSecondaryContainer,
+ secondary = support,
+ onSecondary = onSupport,
+ secondaryContainer = supportContainer,
+ onSecondaryContainer = onSupportContainer,
tertiary = tertiary,
onTertiary = onTertiary,
tertiaryContainer = tertiaryContainer,
@@ -928,12 +1104,12 @@ public fun SparkColors.asMaterial3Colors(): ColorScheme = ColorScheme(
/**
* The Material color system contains pairs of colors that are typically used for the background
- * and content color inside a component. For example, a [Button] typically uses `primary` for its
- * background, and `onPrimary` for the color of its content (usually text or iconography).
+ * and content color inside a component. For example, a [Button] typically uses `main` for its
+ * background, and `onMain` for the color of its content (usually text or iconography).
*
* This function tries to match the provided [backgroundColor] to a 'background' color in this
* [Colors], and then will return the corresponding color used for content. For example, when
- * [backgroundColor] is [Colors.primary], this will return [Colors.onPrimary].
+ * [backgroundColor] is [Colors.main], this will return [Colors.onMain].
*
* If [backgroundColor] does not match a background color in the theme, this will return
* [Color.Unspecified].
@@ -944,12 +1120,12 @@ public fun SparkColors.asMaterial3Colors(): ColorScheme = ColorScheme(
* @see contentColorFor
*/
public fun SparkColors.contentColorFor(backgroundColor: Color): Color = when (backgroundColor) {
- primary -> onPrimary
- primaryContainer -> onPrimaryContainer
- primaryVariant -> onPrimaryVariant
- secondary -> onSecondary
- secondaryContainer -> onSecondaryContainer
- secondaryVariant -> onSecondaryVariant
+ main -> onMain
+ mainContainer -> onMainContainer
+ mainVariant -> onMainVariant
+ support -> onSupport
+ supportContainer -> onSupportContainer
+ supportVariant -> onSupportVariant
tertiary -> onTertiary
tertiaryContainer -> onTertiaryContainer
background -> onBackground
@@ -973,12 +1149,12 @@ public fun SparkColors.contentColorFor(backgroundColor: Color): Color = when (ba
/**
* The Material color system contains pairs of colors that are typically used for the background
- * and content color inside a component. For example, a [Button] typically uses `primary` for its
- * background, and `onPrimary` for the color of its content (usually text or iconography).
+ * and content color inside a component. For example, a [Button] typically uses `main` for its
+ * background, and `onMain` for the color of its content (usually text or iconography).
*
* This function tries to match the provided [backgroundColor] to a 'background' color in this
* [Colors], and then will return the corresponding color used for content. For example, when
- * [backgroundColor] is [Colors.primary], this will return [Colors.onPrimary].
+ * [backgroundColor] is [Colors.main], this will return [Colors.onMain].
*
* If [backgroundColor] does not match a background color in the theme, this will return
* the current value of [LocalContentColor] as a best-effort color.
@@ -1040,14 +1216,14 @@ public val Color.dim5: Color
* the specific changed value to recompose.
*/
internal fun SparkColors.updateColorsFrom(other: SparkColors) {
- primary = other.primary
- onPrimary = other.onPrimary
- primaryContainer = other.primaryContainer
- onPrimaryContainer = other.onPrimaryContainer
- secondary = other.secondary
- onSecondary = other.onSecondary
- secondaryContainer = other.secondaryContainer
- onSecondaryContainer = other.onSecondaryContainer
+ main = other.main
+ onMain = other.onMain
+ mainContainer = other.mainContainer
+ onMainContainer = other.onMainContainer
+ support = other.support
+ onSupport = other.onSupport
+ supportContainer = other.supportContainer
+ onSupportContainer = other.onSupportContainer
tertiary = other.tertiary
onTertiary = other.onTertiary
tertiaryContainer = other.tertiaryContainer
@@ -1116,18 +1292,28 @@ public fun debugColors(
debugColor: Color = Color.Magenta,
onDebugColor: Color = Color.Green,
): SparkColors = SparkColors(
- primary = debugColor,
- onPrimary = onDebugColor,
- primaryContainer = debugColor,
- onPrimaryContainer = onDebugColor,
- primaryVariant = debugColor,
- onPrimaryVariant = onDebugColor,
- secondary = debugColor,
- onSecondary = onDebugColor,
- secondaryContainer = debugColor,
- onSecondaryContainer = onDebugColor,
- secondaryVariant = debugColor,
- onSecondaryVariant = onDebugColor,
+ accent = debugColor,
+ onAccent = onDebugColor,
+ accentContainer = debugColor,
+ onAccentContainer = onDebugColor,
+ accentVariant = debugColor,
+ onAccentVariant = onDebugColor,
+ basic = debugColor,
+ onBasic = onDebugColor,
+ basicContainer = debugColor,
+ onBasicContainer = onDebugColor,
+ main = debugColor,
+ onMain = onDebugColor,
+ mainContainer = debugColor,
+ onMainContainer = onDebugColor,
+ mainVariant = debugColor,
+ onMainVariant = onDebugColor,
+ support = debugColor,
+ onSupport = onDebugColor,
+ supportContainer = debugColor,
+ onSupportContainer = onDebugColor,
+ supportVariant = debugColor,
+ onSupportVariant = onDebugColor,
tertiary = debugColor,
onTertiary = onDebugColor,
tertiaryContainer = debugColor,
@@ -1195,14 +1381,14 @@ private fun ColorPreview(
Row {
Column {
Row {
- ColorItem(SparkTheme.colors.primary, "primary")
- ColorItem(SparkTheme.colors.primaryContainer, "primary Container")
- ColorItem(SparkTheme.colors.primaryVariant, "primary Variant")
+ ColorItem(SparkTheme.colors.main, "main")
+ ColorItem(SparkTheme.colors.mainContainer, "main Container")
+ ColorItem(SparkTheme.colors.mainVariant, "main Variant")
}
Row {
- ColorItem(SparkTheme.colors.secondary, "secondary")
- ColorItem(SparkTheme.colors.secondaryContainer, "secondary Container")
- ColorItem(SparkTheme.colors.secondaryVariant, "secondary Variant")
+ ColorItem(SparkTheme.colors.support, "support")
+ ColorItem(SparkTheme.colors.supportContainer, "support Container")
+ ColorItem(SparkTheme.colors.supportVariant, "support Variant")
}
Row {
ColorItem(SparkTheme.colors.background, "background")
diff --git a/spark/src/main/kotlin/com/adevinta/spark/tokens/Layout.kt b/spark/src/main/kotlin/com/adevinta/spark/tokens/Layout.kt
index 6428cf987..c8b7ef238 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/tokens/Layout.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/tokens/Layout.kt
@@ -147,7 +147,7 @@ internal fun LayoutPreview() {
modifier = Modifier
.bodyWidth()
.fillMaxHeight()
- .background(SparkTheme.colors.primaryContainer),
+ .background(SparkTheme.colors.mainContainer),
) {
items(
count = 20,
@@ -164,7 +164,7 @@ private fun Item() {
Surface(
modifier = Modifier
.aspectRatio(2 / 3f),
- color = SparkTheme.colors.primary,
+ color = SparkTheme.colors.main,
shape = SparkTheme.shapes.medium,
shadowElevation = 4.dp,
tonalElevation = 4.dp,
diff --git a/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt b/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
index 06acbdc7d..e58053453 100644
--- a/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
+++ b/spark/src/main/kotlin/com/adevinta/spark/tokens/PaletteTokens.kt
@@ -27,28 +27,27 @@ internal object PaletteTokens {
internal val White = Color(0xFFFFFFFF)
internal val Black = Color(0xFF000000)
- internal val TheBlueV = Color(0xFF7583FF)
- internal val TheBlue900 = Color(0xFF080632)
- internal val TheBlue800 = Color(0xFF0D0A50)
- internal val TheBlue700 = Color(0xFF140E79)
- internal val TheBlue600 = Color(0xFF191297)
- internal val TheBlue500 = Color(0xFF2118C9)
- internal val TheBlue400 = Color(0xFF5952D6)
- internal val TheBlue300 = Color(0xFF8580E1)
- internal val TheBlue200 = Color(0xFFB1AEEC)
- internal val TheBlue100 = Color(0xFFE2E1F8)
- internal val TheBlue50 = Color(0xFFF4F4FC)
+ internal val BlueRibbon900 = Color(0xFF000A33)
+ internal val BlueRibbon800 = Color(0xFF001766)
+ internal val BlueRibbon700 = Color(0xFF002799)
+ internal val BlueRibbon600 = Color(0xFF003BCC)
+ internal val BlueRibbon500 = Color(0xFF0052FF)
+ internal val BlueRibbon400 = Color(0xFF3173FF)
+ internal val BlueRibbon300 = Color(0xFF6194FF)
+ internal val BlueRibbon200 = Color(0xFF91B5FF)
+ internal val BlueRibbon100 = Color(0xFFC2D6FF)
+ internal val BlueRibbon50 = Color(0xFFF2F6FF)
- internal val SugarCotton900 = Color(0xFF3F0E22)
- internal val SugarCotton800 = Color(0xFF651737)
- internal val SugarCotton700 = Color(0xFF982253)
- internal val SugarCotton600 = Color(0xFFCA2E6E)
- internal val SugarCotton500 = Color(0xFFFD398A)
- internal val SugarCotton400 = Color(0xFFFE6BA7)
- internal val SugarCotton300 = Color(0xFFFE92BF)
- internal val SugarCotton200 = Color(0xFFFEBAD6)
- internal val SugarCotton100 = Color(0xFFFFE1ED)
- internal val SugarCotton50 = Color(0xFFFFF5F9)
+ internal val Violet900 = Color(0xFF1E1433)
+ internal val Violet800 = Color(0xFF362555)
+ internal val Violet700 = Color(0xFF513877)
+ internal val Violet600 = Color(0xFF6E4D99)
+ internal val Violet500 = Color(0xFF8D64BB)
+ internal val Violet400 = Color(0xFFAC7DDD)
+ internal val Violet300 = Color(0xFFCC99FF)
+ internal val Violet200 = Color(0xFFDBB7FF)
+ internal val Violet100 = Color(0xFFEAD5FF)
+ internal val Violet50 = Color(0xFFF9F3FF)
internal val Apple900 = Color(0xFF0C291B)
internal val Apple800 = Color(0xFF14422B)
@@ -94,16 +93,27 @@ internal object PaletteTokens {
internal val Sky100 = Color(0xFFDAF1F4)
internal val Sky50 = Color(0xFFF3FAFC)
- internal val Surfer900 = Color(0xFF252428)
- internal val Surfer800 = Color(0xFF313036)
- internal val Surfer700 = Color(0xFF4A4950)
- internal val Surfer600 = Color(0xFF5C5B64)
- internal val Surfer500 = Color(0xFF7B7986)
- internal val Surfer400 = Color(0xFF9C9BA4)
- internal val Surfer300 = Color(0xFFB6B5BC)
- internal val Surfer200 = Color(0xFFD1D0D5)
- internal val Surfer100 = Color(0xFFEBEBED)
- internal val Surfer50 = Color(0xFFF8F8F9)
+ internal val BlackAdevinta900 = Color(0xFF1D1F2A)
+ internal val BlackAdevinta800 = Color(0xFF353741)
+ internal val BlackAdevinta700 = Color(0xFF4D4E57)
+ internal val BlackAdevinta600 = Color(0xFF65666E)
+ internal val BlackAdevinta500 = Color(0xFF7C7E84)
+ internal val BlackAdevinta400 = Color(0xFF94959A)
+ internal val BlackAdevinta300 = Color(0xFFACADB1)
+ internal val BlackAdevinta200 = Color(0xFFC4C5C7)
+ internal val BlackAdevinta100 = Color(0xFFDCDCDE)
+ internal val BlackAdevinta50 = Color(0xFFF4F4F4)
+
+ internal val PaleAdevinta900 = Color(0xFF1D1F58)
+ internal val PaleAdevinta800 = Color(0xFF35376A)
+ internal val PaleAdevinta700 = Color(0xFF4D4E7B)
+ internal val PaleAdevinta600 = Color(0xFF65668D)
+ internal val PaleAdevinta500 = Color(0xFF7C7E9F)
+ internal val PaleAdevinta400 = Color(0xFF9495B0)
+ internal val PaleAdevinta300 = Color(0xFFACADC2)
+ internal val PaleAdevinta200 = Color(0xFFC4C5D3)
+ internal val PaleAdevinta100 = Color(0xFFDCDCE5)
+ internal val PaleAdevinta50 = Color(0xFFF4F4F7)
internal val Kiwi900 = Color(0xFF353710)
internal val Kiwi800 = Color(0xFF54581A)
diff --git a/spark/src/main/res/values-fr/strings.xml b/spark/src/main/res/values-fr/strings.xml
index cfcc163d1..42aa644a6 100644
--- a/spark/src/main/res/values-fr/strings.xml
+++ b/spark/src/main/res/values-fr/strings.xml
@@ -53,8 +53,8 @@
- %d nouvelles notifications
- Les Meilleures pratiques pour les textes sur Android
- Les Meilleures pratiques pour les %s sur
Android
+ Les Meilleures pratiques pour les textes sur Android
+ Les Meilleures pratiques pour les %s sur
Android
Obligatoire
diff --git a/spark/src/main/res/values/strings.xml b/spark/src/main/res/values/strings.xml
index 954b8b9e3..05df2eb63 100644
--- a/spark/src/main/res/values/strings.xml
+++ b/spark/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
Rating of %1$.1f
- Photo de profil
+ Profile photo
%d new notifications
- Best practices for text on
Android
- Best practices for %s on
Android
+ Best practices for text on
Android
+ Best practices for %s on
Android
Mandatory