fix: Refactor color tokens (#561)

adevinta · Jul 31, 2023 · 657b34a · 657b34a
1 parent 3bf2541
commit 657b34a
Show file tree

Hide file tree

Showing 242 changed files with 1,585 additions and 1,204 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...devinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png b/...devinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_dark.png
diff --git a/...evinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png b/...evinta.spark_PreviewScreenshotTests_preview_tests_appbar_bottomappbar_light.png
diff --git a/...evinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png b/...evinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_dark.png
diff --git a/...vinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png b/...vinta.spark_PreviewScreenshotTests_preview_tests_appbar_navigationbar_light.png
diff --git a/...m.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png b/...m.adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_dark.png
diff --git a/....adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png b/....adevinta.spark_PreviewScreenshotTests_preview_tests_appbar_topappbar_light.png
diff --git a/...nta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png b/...nta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_dark.png
diff --git a/...ta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png b/...ta.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxnostroke_light.png
diff --git a/...a.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png b/...a.spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_dark.png
diff --git a/....spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png b/....spark_PreviewScreenshotTests_preview_tests_badge_badgedboxwithstroke_light.png
diff --git a/...devinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png b/...devinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_dark.png
diff --git a/...evinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png b/...evinta.spark_PreviewScreenshotTests_preview_tests_badge_badgenostroke_light.png
diff --git a/...vinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png b/...vinta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_dark.png
diff --git a/...inta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png b/...inta.spark_PreviewScreenshotTests_preview_tests_badge_badgewithstroke_light.png