Add support for buttons displayed on contrasted surfaces

Orange-OpenSource · Dec 30, 2024 · bc76311 · bc76311
1 parent c57d4ed
commit bc76311
Show file tree

Hide file tree

Showing 38 changed files with 163 additions and 79 deletions.
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
diff --git a/core/src/main/java/com/orange/ouds/core/utilities/OudsPreview.kt b/core/src/main/java/com/orange/ouds/core/utilities/OudsPreview.kt
@@ -12,11 +12,9 @@
 
 package com.orange.ouds.core.utilities
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import com.orange.ouds.core.BuildConfig
 import com.orange.ouds.core.theme.OudsTheme
 import com.orange.ouds.core.theme.value
@@ -25,21 +23,12 @@ import com.orange.ouds.theme.tokens.OudsColorKeyToken
 /**
  * Configures the Compose OUDS preview environment in Android Studio.
  *
- * @param modifier The modifier for the preview content.
  * @param darkThemeEnabled Indicates whether the dark theme is enabled or not.
  * @param content The content of the preview.
  */
 @Composable
-fun OudsPreview(modifier: Modifier = Modifier, darkThemeEnabled: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
+fun OudsPreview(darkThemeEnabled: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
     OudsTheme(themeContract = BuildConfig.PREVIEW_THEME, darkThemeEnabled) {
-        // Add a box to be able to see components
-        // Use a box instead of a surface to avoid clipping children in cases where something is drawn outside of the component to preview
-        Box(
-            modifier = Modifier
-                .background(OudsColorKeyToken.Background.Primary.value)
-                .then(modifier)
-        ) {
-            content()
-        }
+        Surface(color = OudsColorKeyToken.Background.Primary.value, content = content) // Add a surface to be able to see components
     }
 }
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[10].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[11].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[12].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[12].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[13].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[13].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[14].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[14].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[15].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[15].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[16].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[16].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[17].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[17].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[18].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[18].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[19].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[19].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[20].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[20].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[3].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[4].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[5].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[6].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[7].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[8].png
diff --git a/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png b/...uds.core.component.button_OudsButtonTest_takeOudsButtonDarkThemeSnapshot[9].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[10].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[11].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[12].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[12].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[13].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[13].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[14].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[14].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[15].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[15].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[16].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[16].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[17].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[17].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[18].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[18].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[19].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[19].png
diff --git a/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[20].png b/...s.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[20].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[3].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[4].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[5].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[6].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[7].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[8].png
diff --git a/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png b/...ds.core.component.button_OudsButtonTest_takeOudsButtonLightThemeSnapshot[9].png