diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoScreen.kt b/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoScreen.kt index 86d4b420..f23a1acb 100644 --- a/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoScreen.kt +++ b/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoScreen.kt @@ -9,11 +9,12 @@ * * Software description: Android library of reusable graphical components */ - + package com.orange.ouds.app.ui.components.button import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -33,11 +34,13 @@ import com.orange.ouds.app.ui.utilities.composable.CustomizationSwitchListItem import com.orange.ouds.app.ui.utilities.composable.DemoScreen import com.orange.ouds.app.ui.utilities.composable.DetailScreenDescription import com.orange.ouds.core.component.button.OudsButton +import com.orange.ouds.core.component.coloredbox.OudsColoredBox import com.orange.ouds.core.theme.OudsTheme import com.orange.ouds.core.theme.OudsThemeTweak import com.orange.ouds.core.theme.value import com.orange.ouds.core.utilities.OudsPreview import com.orange.ouds.foundation.utilities.UiModePreviews +import com.orange.ouds.theme.tokens.OudsColorKeyToken import com.orange.ouds.theme.tokens.OudsSpaceKeyToken @@ -53,6 +56,12 @@ fun ButtonDemoScreen() = DemoScreen(rememberButtonDemoState()) { onCheckedChange = { enabled = it }, enabled = style == OudsButton.Style.Default ) + CustomizationSwitchListItem( + label = stringResource(R.string.app_common_onColoredBackground_label), + checked = onColoredBox, + onCheckedChange = { onColoredBox = it }, + enabled = style == OudsButton.Style.Default + ) CustomizationChoiceChipsColumn( modifier = Modifier.padding(top = OudsSpaceKeyToken.Fixed.Medium.value), label = stringResource(R.string.app_components_button_hierarchy_label), @@ -89,8 +98,10 @@ fun ButtonDemoScreen() = DemoScreen(rememberButtonDemoState()) { descriptionRes = Component.Button.descriptionRes ) ButtonDemo(state = this@DemoScreen) - OudsThemeTweak(OudsTheme.Tweak.Invert) { - ButtonDemo(state = this@DemoScreen) + if (!onColoredBox) { + OudsThemeTweak(OudsTheme.Tweak.Invert) { + ButtonDemo(state = this@DemoScreen) + } } } } @@ -98,12 +109,12 @@ fun ButtonDemoScreen() = DemoScreen(rememberButtonDemoState()) { @Composable private fun ButtonDemo(state: ButtonDemoState) { - Box( + ButtonDemoBox( + colored = state.onColoredBox, modifier = Modifier .background(OudsTheme.colorScheme.backgroundColors.primary) .padding(all = OudsSpaceKeyToken.Fixed.Medium.value) - .fillMaxWidth(), - contentAlignment = Alignment.Center + .fillMaxWidth() ) { val text = stringResource(id = R.string.app_components_button_label) val icon = OudsButton.Icon(painterResource(id = R.drawable.ic_heart), stringResource(id = R.string.app_components_button_icon_a11y)) @@ -142,6 +153,27 @@ private fun ButtonDemo(state: ButtonDemoState) { } } +@Composable +private fun ButtonDemoBox(colored: Boolean, modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) { + val contentAlignment = Alignment.Center + if (colored) { + OudsColoredBox( + modifier = modifier, + color = OudsColorKeyToken.Surface.Brand.Primary, + contentAlignment = contentAlignment, + content = content + ) + } else { + Box( + modifier = Modifier + .background(OudsTheme.colorScheme.backgroundColors.primary) + .then(modifier), + contentAlignment = contentAlignment, + content = content + ) + } +} + @UiModePreviews.Default @Composable private fun PreviewButtonDemoScreen() = OudsPreview { diff --git a/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoState.kt b/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoState.kt index 32f040d5..42122fa8 100644 --- a/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoState.kt +++ b/app/src/main/java/com/orange/ouds/app/ui/components/button/ButtonDemoState.kt @@ -26,15 +26,17 @@ import com.orange.ouds.core.component.button.OudsButtonDefaults @Composable fun rememberButtonDemoState( enabled: Boolean = true, + onColoredBox: Boolean = false, style: OudsButton.Style = OudsButtonDefaults.Style, hierarchy: OudsButton.Hierarchy = OudsButtonDefaults.Hierarchy, layout: ButtonDemoState.Layout = ButtonDemoState.Layout.TextOnly ) = rememberSaveable(enabled, style, hierarchy, layout, saver = ButtonDemoState.Saver) { - ButtonDemoState(enabled, style, hierarchy, layout) + ButtonDemoState(enabled, onColoredBox, style, hierarchy, layout) } class ButtonDemoState( enabled: Boolean, + onColoredBox: Boolean, style: OudsButton.Style, hierarchy: OudsButton.Hierarchy, layout: Layout @@ -44,6 +46,7 @@ class ButtonDemoState( val Saver = run { val enabledKey = "enabled" + val onColoredBoxKey = "onColoredBox" val styleKey = "style" val hierarchyKey = "hierarchy" val layoutKey = "layout" @@ -51,6 +54,7 @@ class ButtonDemoState( save = { state -> mapOf( enabledKey to state.enabled, + onColoredBoxKey to state.onColoredBox, styleKey to state.style, hierarchyKey to state.hierarchy, layoutKey to state.layout @@ -59,6 +63,7 @@ class ButtonDemoState( restore = { map -> ButtonDemoState( map[enabledKey] as Boolean, + map[onColoredBoxKey] as Boolean, map[styleKey] as OudsButton.Style, map[hierarchyKey] as OudsButton.Hierarchy, map[layoutKey] as Layout @@ -70,6 +75,8 @@ class ButtonDemoState( var enabled: Boolean by mutableStateOf(enabled) + var onColoredBox: Boolean by mutableStateOf(onColoredBox) + var style: OudsButton.Style by mutableStateOf(style) var hierarchy: OudsButton.Hierarchy by mutableStateOf(hierarchy) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c9808f47..c7b1203a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,7 @@ Bottom sheet collapsed Customize Enabled + On colored background ChangeTheme diff --git a/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt b/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt index e719652a..10e755ab 100644 --- a/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt +++ b/core/src/main/java/com/orange/ouds/core/component/button/OudsButton.kt @@ -13,17 +13,22 @@ package com.orange.ouds.core.component.button import android.os.Parcelable +import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button @@ -57,10 +62,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.orange.ouds.core.R +import com.orange.ouds.core.component.coloredbox.OudsColoredBox import com.orange.ouds.core.component.content.OudsComponentContent import com.orange.ouds.core.component.content.OudsComponentIcon import com.orange.ouds.core.extensions.InteractionState import com.orange.ouds.core.extensions.collectInteractionStateAsState +import com.orange.ouds.core.theme.LocalColoredBox import com.orange.ouds.core.theme.OudsTheme import com.orange.ouds.core.theme.value import com.orange.ouds.core.utilities.OudsPreview @@ -305,7 +312,7 @@ private fun borderWidth(hierarchy: OudsButton.Hierarchy, state: OudsButton.State OudsButton.State.Disabled -> borderWidthDefault OudsButton.State.Hovered, OudsButton.State.Pressed, - OudsButton.State.Loading -> borderWidthDefaultInteraction + OudsButton.State.Loading -> if (LocalColoredBox.current) borderWidthDefaultInteractionMono else borderWidthDefaultInteraction OudsButton.State.Focused -> OudsBorderKeyToken.Width.FocusInset OudsButton.State.Skeleton -> null } @@ -329,24 +336,36 @@ private fun borderColor(hierarchy: OudsButton.Hierarchy, state: OudsButton.State return with(OudsTheme.componentsTokens.button) { when (hierarchy) { OudsButton.Hierarchy.Default -> when (state) { - OudsButton.State.Enabled -> colorBorderDefaultEnabled - OudsButton.State.Hovered -> colorBorderDefaultHover - OudsButton.State.Pressed -> colorBorderDefaultPressed - OudsButton.State.Loading -> colorBorderDefaultLoading - OudsButton.State.Disabled -> colorBorderDefaultDisabled - OudsButton.State.Focused -> colorBorderDefaultFocus + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorBorderDefaultEnabledMono else colorBorderDefaultEnabled + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorBorderDefaultHoverMono else colorBorderDefaultHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorBorderDefaultPressedMono else colorBorderDefaultPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorBorderDefaultLoadingMono else colorBorderDefaultLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorBorderDefaultDisabledMono else colorBorderDefaultDisabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorBorderDefaultFocusMono else colorBorderDefaultFocus OudsButton.State.Skeleton -> null } OudsButton.Hierarchy.Minimal -> when (state) { - OudsButton.State.Enabled -> colorBorderMinimalEnabled - OudsButton.State.Hovered -> colorBorderMinimalHover - OudsButton.State.Pressed -> colorBorderMinimalPressed - OudsButton.State.Loading -> colorBorderMinimalLoading - OudsButton.State.Disabled -> colorBorderMinimalDisabled - OudsButton.State.Focused -> colorBorderMinimalFocus + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorBorderMinimalEnabledMono else colorBorderMinimalEnabled + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorBorderMinimalHoverMono else colorBorderMinimalHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorBorderMinimalPressedMono else colorBorderMinimalPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorBorderMinimalLoadingMono else colorBorderMinimalLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorBorderMinimalDisabledMono else colorBorderMinimalDisabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorBorderMinimalFocusMono else colorBorderMinimalFocus OudsButton.State.Skeleton -> null } - OudsButton.Hierarchy.Strong, + OudsButton.Hierarchy.Strong -> if (LocalColoredBox.current) { + when (state) { + OudsButton.State.Enabled -> colorBorderStrongEnabledMono + OudsButton.State.Hovered -> colorBorderStrongHoverMono + OudsButton.State.Pressed -> colorBorderStrongPressedMono + OudsButton.State.Loading -> colorBorderStrongLoadingMono + OudsButton.State.Disabled -> colorBorderStrongDisabledMono + OudsButton.State.Focused -> colorBorderStrongFocusMono + OudsButton.State.Skeleton -> null + } + } else { + null + } OudsButton.Hierarchy.Negative -> null }?.value } @@ -367,30 +386,30 @@ private fun containerColor(hierarchy: OudsButton.Hierarchy, state: OudsButton.St return with(OudsTheme.componentsTokens.button) { when (hierarchy) { OudsButton.Hierarchy.Default -> when (state) { - OudsButton.State.Enabled -> colorBgDefaultEnabled - OudsButton.State.Focused -> colorBgDefaultFocus - OudsButton.State.Hovered -> colorBgDefaultHover - OudsButton.State.Pressed -> colorBgDefaultPressed - OudsButton.State.Loading -> colorBgDefaultLoading - OudsButton.State.Disabled -> colorBgDefaultDisabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorBgDefaultEnabledMono else colorBgDefaultEnabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorBgDefaultFocusMono else colorBgDefaultFocus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorBgDefaultHoverMono else colorBgDefaultHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorBgDefaultPressedMono else colorBgDefaultPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorBgDefaultLoadingMono else colorBgDefaultLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorBgDefaultDisabledMono else colorBgDefaultDisabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Minimal -> when (state) { - OudsButton.State.Enabled -> colorBgMinimalEnabled - OudsButton.State.Focused -> colorBgMinimalFocus - OudsButton.State.Hovered -> colorBgMinimalHover - OudsButton.State.Pressed -> colorBgMinimalPressed - OudsButton.State.Loading -> colorBgMinimalLoading - OudsButton.State.Disabled -> colorBgMinimalDisabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorBgMinimalEnabledMono else colorBgMinimalEnabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorBgMinimalFocusMono else colorBgMinimalFocus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorBgMinimalHoverMono else colorBgMinimalHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorBgMinimalPressedMono else colorBgMinimalPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorBgMinimalLoadingMono else colorBgMinimalLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorBgMinimalDisabledMono else colorBgMinimalDisabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Strong -> when (state) { - OudsButton.State.Enabled -> OudsColorKeyToken.Action.Enabled - OudsButton.State.Focused -> OudsColorKeyToken.Action.Focus - OudsButton.State.Hovered -> OudsColorKeyToken.Action.Hover - OudsButton.State.Pressed -> OudsColorKeyToken.Action.Pressed - OudsButton.State.Loading -> OudsColorKeyToken.Action.Loading - OudsButton.State.Disabled -> OudsColorKeyToken.Action.Disabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorBgStrongEnabledMono else OudsColorKeyToken.Action.Enabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorBgStrongFocusMono else OudsColorKeyToken.Action.Focus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorBgStrongHoverMono else OudsColorKeyToken.Action.Hover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorBgStrongPressedMono else OudsColorKeyToken.Action.Pressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorBgStrongLoadingMono else OudsColorKeyToken.Action.Loading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorBgStrongDisabledMono else OudsColorKeyToken.Action.Disabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Negative -> when (state) { @@ -411,30 +430,30 @@ private fun contentColor(hierarchy: OudsButton.Hierarchy, state: OudsButton.Stat return with(OudsTheme.componentsTokens.button) { when (hierarchy) { OudsButton.Hierarchy.Default -> when (state) { - OudsButton.State.Enabled -> colorContentDefaultEnabled - OudsButton.State.Focused -> colorContentDefaultFocus - OudsButton.State.Hovered -> colorContentDefaultHover - OudsButton.State.Pressed -> colorContentDefaultPressed - OudsButton.State.Loading -> colorContentDefaultLoading - OudsButton.State.Disabled -> colorContentDefaultDisabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorContentDefaultEnabledMono else colorContentDefaultEnabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorContentDefaultFocusMono else colorContentDefaultFocus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorContentDefaultHoverMono else colorContentDefaultHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorContentDefaultPressedMono else colorContentDefaultPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorContentDefaultLoadingMono else colorContentDefaultLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorContentDefaultDisabledMono else colorContentDefaultDisabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Minimal -> when (state) { - OudsButton.State.Enabled -> colorContentMinimalEnabled - OudsButton.State.Focused -> colorContentMinimalFocus - OudsButton.State.Hovered -> colorContentMinimalHover - OudsButton.State.Pressed -> colorContentMinimalPressed - OudsButton.State.Loading -> colorContentMinimalLoading - OudsButton.State.Disabled -> colorContentMinimalDisabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorContentMinimalEnabledMono else colorContentMinimalEnabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorContentMinimalFocusMono else colorContentMinimalFocus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorContentMinimalHoverMono else colorContentMinimalHover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorContentMinimalPressedMono else colorContentMinimalPressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorContentMinimalLoadingMono else colorContentMinimalLoading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorContentMinimalDisabledMono else colorContentMinimalDisabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Strong -> when (state) { - OudsButton.State.Enabled -> OudsColorKeyToken.Content.OnAction.Enabled - OudsButton.State.Focused -> OudsColorKeyToken.Content.OnAction.Focus - OudsButton.State.Hovered -> OudsColorKeyToken.Content.OnAction.Hover - OudsButton.State.Pressed -> OudsColorKeyToken.Content.OnAction.Pressed - OudsButton.State.Loading -> OudsColorKeyToken.Content.OnAction.Loading - OudsButton.State.Disabled -> OudsColorKeyToken.Content.OnAction.Disabled + OudsButton.State.Enabled -> if (LocalColoredBox.current) colorContentStrongEnabledMono else OudsColorKeyToken.Content.OnAction.Enabled + OudsButton.State.Focused -> if (LocalColoredBox.current) colorContentStrongFocusMono else OudsColorKeyToken.Content.OnAction.Focus + OudsButton.State.Hovered -> if (LocalColoredBox.current) colorContentStrongHoverMono else OudsColorKeyToken.Content.OnAction.Hover + OudsButton.State.Pressed -> if (LocalColoredBox.current) colorContentStrongPressedMono else OudsColorKeyToken.Content.OnAction.Pressed + OudsButton.State.Loading -> if (LocalColoredBox.current) colorContentStrongLoadingMono else OudsColorKeyToken.Content.OnAction.Loading + OudsButton.State.Disabled -> if (LocalColoredBox.current) colorContentStrongDisabledMono else OudsColorKeyToken.Content.OnAction.Disabled OudsButton.State.Skeleton -> OudsTheme.componentsTokens.skeleton.colorBg } OudsButton.Hierarchy.Negative -> when (state) { @@ -617,20 +636,82 @@ private fun PreviewOudsButton(@PreviewParameter(OudsButtonPreviewParameterProvid internal fun PreviewOudsButton( darkThemeEnabled: Boolean, parameter: OudsButtonPreviewParameter -) = OudsPreview(modifier = Modifier.padding(16.dp), darkThemeEnabled = darkThemeEnabled) { +) = OudsPreview(darkThemeEnabled = darkThemeEnabled) { with(parameter) { - val text = if (hasText) hierarchy.name else null - val icon = if (hasIcon) OudsButton.Icon(painterResource(id = android.R.drawable.star_on), "") else null - val chunkedStates = states.chunked(2) - Column(verticalArrangement = Arrangement.spacedBy(16.dp)) { - chunkedStates.forEach { states -> - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { - states.forEach { state -> - OudsButton(icon = icon, text = text, onClick = {}, hierarchy = hierarchy, previewState = state) + val columnCount = 2 + val content: @Composable () -> Unit = { + Box(modifier = Modifier.padding(16.dp)) { + val text = if (hasText) hierarchy.name else null + val icon = if (hasIcon) OudsButton.Icon(painterResource(id = android.R.drawable.star_on), "") else null + val chunkedStates = states.chunked(columnCount) + Column(verticalArrangement = Arrangement.spacedBy(16.dp)) { + chunkedStates.forEach { states -> + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + states.forEach { state -> + OudsButton(icon = icon, text = text, onClick = {}, hierarchy = hierarchy, previewState = state) + } + } } } } } + if (surfaceKeyTokenGroup != null) { + RainbowColoredBox(surfaceKeyTokenGroup = surfaceKeyTokenGroup, columnCount = columnCount, content = content) + } else { + content() + } + } +} + +internal enum class SurfaceKeyTokenGroup { + Brand, StatusEmphasized, StatusMuted +} + +@Composable +private fun RainbowColoredBox(surfaceKeyTokenGroup: SurfaceKeyTokenGroup, columnCount: Int, content: @Composable () -> Unit) { + // The color parameter below can be whichever surface + // because the actual colors will be drawn as a rainbow in order to display multiple colored boxes at once + OudsColoredBox(color = OudsColorKeyToken.Surface.Status.Positive.Emphasized) { + Box( + modifier = Modifier + .width(IntrinsicSize.Max) + .height(IntrinsicSize.Max) + ) { + Row(modifier = Modifier.fillMaxSize()) { + val colors = buildList { + repeat(columnCount) { + addAll( + when (surfaceKeyTokenGroup) { + SurfaceKeyTokenGroup.Brand -> listOf( + OudsColorKeyToken.Surface.Brand.Primary + ) + SurfaceKeyTokenGroup.StatusEmphasized -> listOf( + OudsColorKeyToken.Surface.Status.Positive.Emphasized, + OudsColorKeyToken.Surface.Status.Negative.Emphasized, + OudsColorKeyToken.Surface.Status.Warning.Emphasized, + OudsColorKeyToken.Surface.Status.Info.Emphasized + ) + SurfaceKeyTokenGroup.StatusMuted -> listOf( + OudsColorKeyToken.Surface.Status.Positive.Muted, + OudsColorKeyToken.Surface.Status.Negative.Muted, + OudsColorKeyToken.Surface.Status.Warning.Muted, + OudsColorKeyToken.Surface.Status.Info.Muted + ) + } + ) + } + } + colors.map { color -> + Box( + modifier = Modifier + .background(color = color.value) + .fillMaxSize() + .weight(1.0f) + ) + } + } + content() + } } } @@ -638,6 +719,8 @@ internal data class OudsButtonPreviewParameter( val hierarchy: OudsButton.Hierarchy, val hasText: Boolean, val hasIcon: Boolean, + val surfaceKeyTokenGroup: SurfaceKeyTokenGroup? = null, +) { val states: List = listOf( OudsButton.State.Enabled, OudsButton.State.Hovered, @@ -646,16 +729,24 @@ internal data class OudsButtonPreviewParameter( OudsButton.State.Disabled, OudsButton.State.Focused, OudsButton.State.Skeleton - ) -) + ).filter { surfaceKeyTokenGroup == null || it != OudsButton.State.Skeleton } +} internal class OudsButtonPreviewParameterProvider : BasicPreviewParameterProvider(*previewParameterValues.toTypedArray()) private val previewParameterValues: List get() = buildList { OudsButton.Hierarchy.entries.forEach { hierarchy -> - add(OudsButtonPreviewParameter(hierarchy, hasText = true, hasIcon = false)) - add(OudsButtonPreviewParameter(hierarchy, hasText = true, hasIcon = true)) - add(OudsButtonPreviewParameter(hierarchy, hasText = false, hasIcon = true)) + val parameters = listOf( + OudsButtonPreviewParameter(hierarchy, hasText = true, hasIcon = false), + OudsButtonPreviewParameter(hierarchy, hasText = true, hasIcon = true), + OudsButtonPreviewParameter(hierarchy, hasText = false, hasIcon = true), + ) + addAll(parameters) + if (hierarchy != OudsButton.Hierarchy.Negative) { + //addAll(parameters.map { it.copy(surfaceKeyTokenGroup = SurfaceKeyTokenGroup.Brand) }) + addAll(parameters.map { it.copy(surfaceKeyTokenGroup = SurfaceKeyTokenGroup.StatusEmphasized) }) + //addAll(parameters.map { it.copy(surfaceKeyTokenGroup = SurfaceKeyTokenGroup.StatusMuted) }) + } } - } + } \ No newline at end of file diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png index d40c5c01..2706eeba 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[0].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png index 958dfc21..5aac6fe1 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png index 7d108a43..d5627847 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[12].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[12].png new file mode 100644 index 00000000..6c244b7b Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[12].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[13].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[13].png new file mode 100644 index 00000000..fb458c80 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[13].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[14].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[14].png new file mode 100644 index 00000000..7b07a582 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[14].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[15].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[15].png new file mode 100644 index 00000000..0a8090b7 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[15].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[16].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[16].png new file mode 100644 index 00000000..30172107 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[16].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[17].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[17].png new file mode 100644 index 00000000..cefb1c34 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[17].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[18].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[18].png new file mode 100644 index 00000000..83e8e3bd Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[18].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[19].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[19].png new file mode 100644 index 00000000..ae3c775a Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[19].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png index ca366dd6..51b7d78a 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[1].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[20].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[20].png new file mode 100644 index 00000000..dc645f0b Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[20].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[2].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[2].png index f2ca871c..32b6028e 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[2].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[2].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png index 692a210b..2f898702 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png index b792c892..ed6ed44a 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png index c7f76dfb..76e2af73 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png index 83ebdd33..41c80e99 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png index 527b0bdc..f997ddb1 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png index 5472f22e..e43aec15 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png index 113730eb..aba8ec45 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png index 64ac28e8..f2b53088 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[0].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png index 04e04a20..b297d639 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png index 49ce468c..3f3a02d2 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[12].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[12].png new file mode 100644 index 00000000..c375eb05 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[12].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[13].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[13].png new file mode 100644 index 00000000..0441295e Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[13].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[14].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[14].png new file mode 100644 index 00000000..a01e9758 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[14].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[15].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[15].png new file mode 100644 index 00000000..eaa6558a Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[15].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[16].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[16].png new file mode 100644 index 00000000..f156c5b9 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[16].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[17].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[17].png new file mode 100644 index 00000000..b65accab Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[17].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[18].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[18].png new file mode 100644 index 00000000..0edaba34 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[18].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[19].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[19].png new file mode 100644 index 00000000..a8d90662 Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[19].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png index 805e3e0e..fc256827 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[1].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[20].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[20].png new file mode 100644 index 00000000..4121ebfa Binary files /dev/null and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[20].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[2].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[2].png index 71247345..526ce579 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[2].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[2].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png index 9ebfd616..d2122406 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png index ffcbcb6e..0a4a5b09 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png index 5cb5519f..e4876771 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png index 7596919a..6274d4ca 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png index 78783cc2..74543b56 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png index 50493bee..97acd5ac 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png differ diff --git a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png index bcf71b9a..5570af12 100644 Binary files a/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png and b/core/src/test/snapshots/images/com.orange.ouds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png differ