Merge pull request #339 from Spendesk/task/create-tertiary-button

Create tertiary button & fix GrapesStackItem design

Author: RomainGF

library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonColors.kt

@@ -35,6 +35,16 @@ object ButtonColorDefaults {
             disabledContentColor = GrapesTheme.colors.mainWhite
         )
 
+    val tertiary: ButtonColors
+        @Composable
+        @ReadOnlyComposable
+        get() = GrapesButtonColors(
+            backgroundColor = GrapesTheme.colors.structureSurface,
+            contentColor = GrapesTheme.colors.primaryNormal,
+            disabledBackgroundColor = GrapesTheme.colors.structureSurface,
+            disabledContentColor = GrapesTheme.colors.neutralNormal,
+        )
+
     val text: ButtonColors
         @Composable
         @ReadOnlyComposable

library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt

@@ -94,6 +94,24 @@ object GrapesButtonStyleDefaults {
             isFillMaxWidthWithContent = false,
         )
 
+    val tertiary: GrapesButtonStyle
+        @Composable
+        @ReadOnlyComposable
+        get() = GrapesButtonStyle(
+            textStyle = GrapesTheme.typography.titleL,
+            minSize = Size(
+                width = GrapesButtonDefaults.MinWidth.value,
+                height = GrapesButtonDefaults.MinHeight.value
+            ),
+            iconSize = GrapesButtonDefaults.iconSize,
+            shape = GrapesTheme.shapes.shape2,
+            rippleColor = GrapesTheme.colors.primaryLighter,
+            colors = ButtonColorDefaults.tertiary,
+            contentPadding = GrapesButtonDefaults.PaddingValues,
+            borderStroke = null,
+            isFillMaxWidthWithContent = true,
+        )
+
     val text: GrapesButtonStyle
         @Composable
         @ReadOnlyComposable

library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesStackItem.kt

@@ -42,7 +42,7 @@ object GrapesStackItemDefaults {
     fun colors(
         titleColor: Color = GrapesTheme.colors.neutralDarker,
         descriptionColor: Color = GrapesTheme.colors.neutralDarker,
-        backgroundColor: Color = GrapesTheme.colors.neutralLightest
+        backgroundColor: Color = GrapesTheme.colors.structureBackground
     ): GrapesStackItemColors = GrapesStackItemColors(
         titleColor = titleColor,
         descriptionColor = descriptionColor,
@@ -73,7 +73,7 @@ fun GrapesStackItem(
             .then(clickableModifier)
             .background(colors.backgroundColor)
             .padding(
-                vertical = GrapesTheme.dimensions.spacing3,
+                vertical = GrapesTheme.dimensions.spacing2,
                 horizontal = GrapesTheme.dimensions.spacing2,
             ),
     ) {