Rename OudsContrastedSurface to OudsColoredSurface

Orange-OpenSource · Dec 30, 2024 · 47b334c · 47b334c
1 parent 881a926
commit 47b334c
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 17 deletions.
diff --git a/...ontrastedsurface/OudsContrastedSurface.kt → ...nent/coloredsurface/OudsColoredSurface.kt b/...ontrastedsurface/OudsContrastedSurface.kt → ...nent/coloredsurface/OudsColoredSurface.kt
@@ -10,7 +10,7 @@
  * Software description: Android library of reusable graphical components
  */
 
-package com.orange.ouds.core.component.contrastedsurface
+package com.orange.ouds.core.component.coloredsurface
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.padding
@@ -24,7 +24,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import com.orange.ouds.core.component.button.OudsButton
-import com.orange.ouds.core.theme.LocalContrastedSurface
+import com.orange.ouds.core.theme.LocalColoredSurface
 import com.orange.ouds.core.theme.value
 import com.orange.ouds.core.utilities.OudsPreview
 import com.orange.ouds.foundation.utilities.BasicPreviewParameterProvider
@@ -44,13 +44,13 @@ import com.orange.ouds.theme.tokens.OudsSpaceKeyToken
  * @param content The content of this colored surface.
  */
 @Composable
-fun OudsContrastedSurface(
+fun OudsColoredSurface(
     color: OudsColorKeyToken.Surface,
     modifier: Modifier = Modifier,
     shape: Shape = RectangleShape,
     content: @Composable () -> Unit
 ) {
-    CompositionLocalProvider(LocalContrastedSurface provides color) {
+    CompositionLocalProvider(LocalColoredSurface provides color) {
         Surface(
             modifier = modifier,
             shape = shape,
@@ -83,21 +83,21 @@ private fun contentColorFor(color: OudsColorKeyToken.Surface): Color {
 @Suppress("PreviewShouldNotBeCalledRecursively")
 @UiModePreviews.Default
 @Composable
-private fun PreviewOudsContrastedSurface(@PreviewParameter(OudsContrastedSurfacePreviewParameterProvider::class) parameter: OudsColorKeyToken.Surface) {
-    PreviewOudsContrastedSurface(darkThemeEnabled = isSystemInDarkTheme(), parameter = parameter)
+private fun PreviewOudsColoredSurface(@PreviewParameter(OudsColoredSurfacePreviewParameterProvider::class) parameter: OudsColorKeyToken.Surface) {
+    PreviewOudsColoredSurface(darkThemeEnabled = isSystemInDarkTheme(), parameter = parameter)
 }
 
 @Composable
-internal fun PreviewOudsContrastedSurface(darkThemeEnabled: Boolean, parameter: OudsColorKeyToken.Surface) = OudsPreview(darkThemeEnabled = darkThemeEnabled) {
-    OudsContrastedSurface(color = parameter) {
+internal fun PreviewOudsColoredSurface(darkThemeEnabled: Boolean, parameter: OudsColorKeyToken.Surface) = OudsPreview(darkThemeEnabled = darkThemeEnabled) {
+    OudsColoredSurface(color = parameter) {
         Text(
             modifier = Modifier.padding(all = OudsSpaceKeyToken.Fixed.Medium.value),
             text = parameter.name.removePrefix("OudsColorKeyToken."),
         )
     }
 }
 
-internal class OudsContrastedSurfacePreviewParameterProvider : BasicPreviewParameterProvider<OudsColorKeyToken.Surface>(*previewParameterValues.toTypedArray())
+internal class OudsColoredSurfacePreviewParameterProvider : BasicPreviewParameterProvider<OudsColorKeyToken.Surface>(*previewParameterValues.toTypedArray())
 
 private val previewParameterValues: List<OudsColorKeyToken.Surface>
     get() = listOf(

diff --git a/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt b/core/src/main/java/com/orange/ouds/core/theme/OudsTheme.kt
@@ -41,7 +41,7 @@ private val LocalOpacities = staticCompositionLocalOf<OudsOpacities> { missingCo
 private val LocalSizes = staticCompositionLocalOf<OudsSizes> { missingCompositionLocalError("LocalSizes") }
 private val LocalSpaces = staticCompositionLocalOf<OudsSpaces> { missingCompositionLocalError("LocalSpaces") }
 private val LocalComponentsTokens = staticCompositionLocalOf<OudsComponentsTokens> { missingCompositionLocalError("LocalComponentsTokens") }
-internal val LocalContrastedSurface = staticCompositionLocalOf<OudsColorKeyToken.Surface?> { null }
+internal val LocalColoredSurface = staticCompositionLocalOf<OudsColorKeyToken.Surface?> { null }
 
 object OudsTheme {
 

diff --git a/...astedsurface/OudsContrastedSurfaceTest.kt → .../coloredsurface/OudsColoredSurfaceTest.kt b/...astedsurface/OudsContrastedSurfaceTest.kt → .../coloredsurface/OudsColoredSurfaceTest.kt
@@ -10,7 +10,7 @@
  * Software description: Android library of reusable graphical components
  */
 
-package com.orange.ouds.core.component.contrastedsurface
+package com.orange.ouds.core.component.coloredsurface
 
 import app.cash.paparazzi.Paparazzi
 import com.android.ide.common.rendering.api.SessionParams
@@ -21,31 +21,31 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(Parameterized::class)
-internal class OudsContrastedSurfaceTest(private val parameter: OudsColorKeyToken.Surface) {
+internal class OudsColoredSurfaceTest(private val parameter: OudsColorKeyToken.Surface) {
 
     companion object {
         @JvmStatic
         @Parameterized.Parameters
-        internal fun data() = OudsContrastedSurfacePreviewParameterProvider().values.toList()
+        internal fun data() = OudsColoredSurfacePreviewParameterProvider().values.toList()
     }
 
     @get:Rule
     val paparazzi = Paparazzi(renderingMode = SessionParams.RenderingMode.SHRINK, maxPercentDifference = 0.0)
 
     @Test
-    fun takeOudsContrastedSurfaceLightThemeSnapshot() {
+    fun takeOudsColoredSurfaceLightThemeSnapshot() {
         paparazzi.snapshot {
-            PreviewOudsContrastedSurface(
+            PreviewOudsColoredSurface(
                 darkThemeEnabled = false,
                 parameter = parameter
             )
         }
     }
 
     @Test
-    fun takeOudsContrastedSurfaceDarkThemeSnapshot() {
+    fun takeOudsColoredSurfaceDarkThemeSnapshot() {
         paparazzi.snapshot {
-            PreviewOudsContrastedSurface(
+            PreviewOudsColoredSurface(
                 darkThemeEnabled = true,
                 parameter = parameter
             )

diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[0].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[0].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[10].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[10].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[11].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[11].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[12].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[12].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[1].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[1].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[2].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[2].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[3].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[3].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[4].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[4].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[5].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[5].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[6].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[6].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[7].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[7].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[8].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[8].png
diff --git a/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[9].png b/...edsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceDarkThemeSnapshot[9].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[0].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[0].png
diff --git a/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[10].png b/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[10].png
diff --git a/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[11].png b/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[11].png
diff --git a/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[12].png b/...surface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[12].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[1].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[1].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[2].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[2].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[3].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[3].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[4].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[4].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[5].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[5].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[6].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[6].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[7].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[7].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[8].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[8].png
diff --git a/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[9].png b/...dsurface_OudsColoredSurfaceTest_takeOudsColoredSurfaceLightThemeSnapshot[9].png