From 2614a0e34dd79ebeb379a2f9b8dbb7ee98c069a4 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 09:39:10 +0100 Subject: [PATCH 01/17] Add new dimension design tokens --- .../spendesk/grapes/compose/theme/Dimensions.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt index f8c5ebe2..6b31116d 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt @@ -19,12 +19,28 @@ data class GrapesDimensions( val borderRadiusSmall: Dp = 2.dp, val borderRadiusNormal: Dp = 4.dp, + @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing1")) val paddingXSmall: Dp = 4.dp, + @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing2")) val paddingSmall: Dp = 8.dp, + @Deprecated("Grapes dimension deprecated, new design shouldn't use 12.dp anymore") val paddingMedium: Dp = 12.dp, + @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing3")) val paddingLarge: Dp = 16.dp, + @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing4")) val paddingXLarge: Dp = 24.dp, + val spacing0: Dp = 0.dp, + val spacing1: Dp = 4.dp, + val spacing2: Dp = 8.dp, + val spacing3: Dp = 16.dp, + val spacing4: Dp = 24.dp, + val spacing5: Dp = 32.dp, + val spacing6: Dp = 40.dp, + val spacing7: Dp = 48.dp, + val spacing8: Dp = 56.dp, + val spacing9: Dp = 64.dp, + val elevationNormal: Dp = 8.dp, val iconNormal: Dp = 16.dp, From 15b3b987391994e2282d7119b95ec8a33864d1a3 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 09:45:37 +0100 Subject: [PATCH 02/17] Replacing existing usage of deprecated dimension --- .../compose/actionmenu/ActionMenuItem.kt | 8 ++++---- .../compose/actionmenu/ActionMenuSection.kt | 14 +++++++------- .../com/spendesk/grapes/compose/badge/Badge.kt | 4 ++-- .../grapes/compose/bucket/GrapesBucket.kt | 2 +- .../compose/bucket/GrapesBucketHeadline.kt | 10 +++++----- .../grapes/compose/button/GrapesButtonBrand.kt | 4 ++-- .../grapes/compose/button/GrapesCoreButton.kt | 2 +- .../compose/callout/GrapesCoreCallout.kt | 6 +++--- .../GrapesCalloutContentBottomSignature.kt | 2 +- .../compose/card/GrapesInformationCard.kt | 10 +++++----- .../grapes/compose/gauge/GrapesGauge.kt | 2 +- .../grapes/compose/icons/GrapesSurface.kt | 2 +- .../compose/icons/StatusInformationIcon.kt | 6 +++--- .../listitem/GrapesInlineInformationItem.kt | 2 +- .../grapes/compose/listitem/IconAction.kt | 4 ++-- .../grapes/compose/listitem/SectionItem.kt | 4 ++-- .../grapes/compose/listitem/TextDivider.kt | 6 +++--- .../spendesk/grapes/compose/message/Message.kt | 18 +++++++++--------- .../compose/message/PasswordValidation.kt | 2 +- .../grapes/compose/select/GrapesSelect.kt | 4 ++-- .../compose/selectors/GrapesCheckboxText.kt | 2 +- .../compose/selectors/GrapesRadioButtonText.kt | 2 +- .../compose/selectors/GrapesSelectBlock.kt | 2 +- .../compose/selectors/GrapesSelectCardText.kt | 14 +++++++------- .../spendesk/grapes/compose/tag/GrapesTag.kt | 2 +- .../grapes/compose/template/AskTemplate.kt | 4 ++-- .../compose/template/error/ErrorTemplate.kt | 10 +++++----- .../template/molecule/InformativeComponent.kt | 2 +- .../compose/textfield/GrapesPinTextField.kt | 4 ++-- .../GrapesPinTextFieldDecorationBox.kt | 2 +- 30 files changed, 78 insertions(+), 78 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt index 2e143b60..53e2ea3e 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt @@ -61,8 +61,8 @@ fun ActionMenuItem( disabledContentColor = GrapesTheme.colors.neutralNormal, ), contentPadding = PaddingValues( - start = GrapesTheme.dimensions.paddingXLarge, - end = GrapesTheme.dimensions.paddingLarge, + start = GrapesTheme.dimensions.spacing4, + end = GrapesTheme.dimensions.spacing3, top = verticalInnerPadding, bottom = verticalInnerPadding, ), @@ -76,7 +76,7 @@ fun ActionMenuItem( enabled = enabled, icon = icon, ) - Spacer(Modifier.width(GrapesTheme.dimensions.paddingXLarge)) + Spacer(Modifier.width(GrapesTheme.dimensions.spacing4)) Text( text = text, maxLines = ACTION_TEXT_MAX_LINES, @@ -85,7 +85,7 @@ fun ActionMenuItem( modifier = Modifier.weight(1f), ) if (enabled) { - Spacer(Modifier.width(GrapesTheme.dimensions.paddingLarge)) + Spacer(Modifier.width(GrapesTheme.dimensions.spacing3)) Icon( painter = painterResource(R.drawable.ic_chevron_right), contentDescription = null, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt index 5dd266d9..93ee8c6a 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt @@ -50,8 +50,8 @@ fun ActionMenuSection( shape = sectionShape, ) { Column( - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall), - modifier = Modifier.padding(GrapesTheme.dimensions.paddingSmall), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), + modifier = Modifier.padding(GrapesTheme.dimensions.spacing2), ) { ActionMenuSectionHeader( title = title, @@ -71,7 +71,7 @@ private fun ActionMenuSectionHeader( modifier: Modifier = Modifier, ) { Row( - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), verticalAlignment = Alignment.CenterVertically, modifier = modifier, ) { @@ -84,11 +84,11 @@ private fun ActionMenuSectionHeader( ), ) Column( - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1), modifier = Modifier.padding( - bottom = GrapesTheme.dimensions.paddingSmall, - top = GrapesTheme.dimensions.paddingSmall, - end = GrapesTheme.dimensions.paddingSmall, + bottom = GrapesTheme.dimensions.spacing2, + top = GrapesTheme.dimensions.spacing2, + end = GrapesTheme.dimensions.spacing2, ) ) { Text( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt index 18468341..e4d7cb00 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt @@ -29,7 +29,7 @@ fun GrapesBadge( text = content, modifier = modifier .background(backgroundColor, RoundedCornerShape(100)) - .padding(horizontal = GrapesTheme.dimensions.paddingLarge, vertical = GrapesTheme.dimensions.paddingXSmall), + .padding(horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.spacing1), style = GrapesTheme.typography.titleM, color = GrapesTheme.colors.mainWhite ) @@ -39,7 +39,7 @@ fun GrapesBadge( @Composable fun GrapesBadgePreview() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesBadge(content = "Message Inline Success", configuration = GrapesConfigurationStatus.SUCCESS) GrapesBadge(content = "Message Inline Information", configuration = GrapesConfigurationStatus.INFORMATION) GrapesBadge(content = "Message Inline Neutral", configuration = GrapesConfigurationStatus.NEUTRAL) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucket.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucket.kt index c7652b31..d94fcd98 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucket.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucket.kt @@ -60,7 +60,7 @@ internal fun GrapesBucketCore( headline() if (content != null) { - Spacer(Modifier.padding(bottom = GrapesTheme.dimensions.paddingLarge)) + Spacer(Modifier.padding(bottom = GrapesTheme.dimensions.spacing3)) content() } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt index a73254e7..28459047 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt @@ -66,19 +66,19 @@ private fun GrapesBucketHeadlinePreview() { ) { GrapesBucketHeadline(title = "Bucket de Rick Astley") - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing3)) GrapesBucketHeadline(title = "Bucket de Rick Astley a bit longer than expecteeeeeeeeeeeeeed") - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing3)) GrapesBucketHeadline(title = "Bucket de Rick Astley a bit longer than expecteeeeeeeeeeeeeeeeeeed", action = "Remove", actionColor = GrapesTheme.colors.mainAlertNormal) - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing3)) GrapesBucketHeadline(title = "Bucket de Rick Astley", action = "Remove", actionColor = GrapesTheme.colors.mainAlertNormal) - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing3)) GrapesBucketHeadline(title = "Bucket de Rick Astley", action = "Remooooooove with too many ooooooooooos", actionColor = GrapesTheme.colors.mainAlertNormal) - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing3)) } } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonBrand.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonBrand.kt index e477e73e..fc1c1d10 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonBrand.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonBrand.kt @@ -109,8 +109,8 @@ private fun GrapesButtonBrandPreview() { modifier = Modifier .fillMaxSize() .background(GrapesTheme.colors.mainBackground) - .padding(GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + .padding(GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { GrapesGoogleButton(label = "Register to Google", onClick = { /*TODO*/ }) GrapesMicrosoftButton(label = "Register to Microsoft", onClick = { /*TODO*/ }) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesCoreButton.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesCoreButton.kt index 8dc043d1..6643c42b 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesCoreButton.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesCoreButton.kt @@ -223,7 +223,7 @@ private fun RowScope.BoxedIcon( iconSize: Dp, icon: @Composable () -> Unit, ) { - val paddingValues = PaddingValues(end = GrapesTheme.dimensions.paddingSmall) + val paddingValues = PaddingValues(end = GrapesTheme.dimensions.spacing2) val direction = LocalLayoutDirection.current Box( modifier = Modifier diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt index e6f23103..78cc655e 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt @@ -38,11 +38,11 @@ fun GrapesCoreCallout( border = BorderStroke(GrapesCalloutDefaults.borderThickness, colors.borderStrokeColor().value), ) { Column( - modifier = Modifier.padding(GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall), + modifier = Modifier.padding(GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), ) { Row( - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), ) { ProvideTextStyle( GrapesTheme.typography.titleS.copy(color = colors.titleColor().value), diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentBottomSignature.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentBottomSignature.kt index 35b6d19c..2612db26 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentBottomSignature.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentBottomSignature.kt @@ -32,7 +32,7 @@ fun GrapesCalloutContentBottomSignature( ) { Row( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), verticalAlignment = Alignment.CenterVertically, ) { Image( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt index 7281cf6a..c48f8696 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt @@ -40,19 +40,19 @@ fun GrapesInformationCard( border = border, ) { Column( - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge), - modifier = Modifier.padding(vertical = GrapesTheme.dimensions.paddingLarge), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3), + modifier = Modifier.padding(vertical = GrapesTheme.dimensions.spacing3), ) { Text( text = title, style = GrapesTheme.typography.titleS, - modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.paddingLarge), + modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing3), ) GrapesDivider() Column( verticalArrangement = contentVerticalArrangement, content = content, - modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.paddingLarge), + modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing3), ) } } @@ -72,7 +72,7 @@ object GrapesInformationCardDefaults { ) val contentVerticalArrangement: Arrangement.HorizontalOrVertical - @Composable get() = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + @Composable get() = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) } @Preview diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt index 6dc2e22d..a022ff2f 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt @@ -189,7 +189,7 @@ private fun createStripeGauge( @Preview(showBackground = true) private fun GaugePreview() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesGauge( modifier = Modifier.padding(16.dp), backgroundColor = GrapesTheme.colors.mainNeutralLighter, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/icons/GrapesSurface.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/icons/GrapesSurface.kt index f2b2a8e0..a7da2095 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/icons/GrapesSurface.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/icons/GrapesSurface.kt @@ -47,7 +47,7 @@ fun GrapesSurface( @Composable fun grapesSurfacePreview() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesSurface(modifier = Modifier.size(50.dp), configuration = GrapesConfigurationStatus.SUCCESS, content = {}) GrapesSurface(modifier = Modifier.size(50.dp), configuration = GrapesConfigurationStatus.INFORMATION, content = {}) GrapesSurface(modifier = Modifier.size(50.dp), configuration = GrapesConfigurationStatus.ALERT, content = {}) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/icons/StatusInformationIcon.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/icons/StatusInformationIcon.kt index 9425c4ec..2f99434e 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/icons/StatusInformationIcon.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/icons/StatusInformationIcon.kt @@ -78,7 +78,7 @@ fun StatusInformationIcon( @Composable fun StatusInformationIconS() { GrapesTheme { - Row(horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Row(horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { StatusInformationIcon(configuration = GrapesConfigurationStatus.SUCCESS, size = Size.S) StatusInformationIcon(configuration = GrapesConfigurationStatus.INFORMATION, size = Size.S) StatusInformationIcon(configuration = GrapesConfigurationStatus.ALERT, size = Size.S) @@ -93,7 +93,7 @@ fun StatusInformationIconS() { @Composable fun StatusInformationIconM() { GrapesTheme { - Row(horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Row(horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { StatusInformationIcon(configuration = GrapesConfigurationStatus.SUCCESS, size = Size.M) StatusInformationIcon(configuration = GrapesConfigurationStatus.INFORMATION, size = Size.M) StatusInformationIcon(configuration = GrapesConfigurationStatus.ALERT, size = Size.M) @@ -108,7 +108,7 @@ fun StatusInformationIconM() { @Composable fun StatusInformationIconL() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { StatusInformationIcon(configuration = GrapesConfigurationStatus.SUCCESS, size = Size.L) StatusInformationIcon(configuration = GrapesConfigurationStatus.INFORMATION, size = Size.L) StatusInformationIcon(configuration = GrapesConfigurationStatus.ALERT, size = Size.L) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt index 124f2d61..01b656ad 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt @@ -25,7 +25,7 @@ fun GrapesInlineInformationItem( ) { Row( modifier = modifier, - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1), verticalAlignment = Alignment.CenterVertically, ) { Text( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt index c7b292be..aaa70e03 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt @@ -36,7 +36,7 @@ internal fun IconAction(iconActionConfiguration: ListItemConfiguration.IconActio Row( modifier = modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { StatusInformationIcon( @@ -48,7 +48,7 @@ internal fun IconAction(iconActionConfiguration: ListItemConfiguration.IconActio Column( modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall) + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1) ) { Text(text = iconActionConfiguration.title, style = GrapesTheme.typography.titleM, color = titleColor) iconActionConfiguration.description?.let { diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt index ba288cfb..cf7b849c 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt @@ -32,10 +32,10 @@ fun SectionItem( icon: @Composable (Modifier) -> Unit = {}, ) { Row( - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3), verticalAlignment = Alignment.CenterVertically, modifier = modifier.padding( - horizontal = GrapesTheme.dimensions.paddingLarge, + horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.paddingMedium, ), ) { diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt index 7e8b8ec9..e9e5e986 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt @@ -28,7 +28,7 @@ fun TextDivider( ) { Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3), modifier = modifier.fillMaxWidth() ) { GrapesDivider(modifier = Modifier.weight(1f), color = color) @@ -45,8 +45,8 @@ private fun TextDividerPreview() { modifier = Modifier .fillMaxSize() .background(GrapesTheme.colors.mainBackground) - .padding(GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + .padding(GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { TextDivider(text = "OR") } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt index f0a24898..d40518c9 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt @@ -44,7 +44,7 @@ fun GrapesMessage( showIcon: Boolean = false, titleTextAlign: TextAlign? = null, descriptionTextAlign: TextAlign? = null, - contentPadding: PaddingValues = PaddingValues(GrapesTheme.dimensions.paddingLarge), + contentPadding: PaddingValues = PaddingValues(GrapesTheme.dimensions.spacing3), ) { GrapesSurface( modifier = modifier.width(IntrinsicSize.Max), @@ -55,7 +55,7 @@ fun GrapesMessage( Row(verticalAlignment = Alignment.CenterVertically) { if (showIcon) { GrapesIcon(configuration = configuration) - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingSmall)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing2)) } Text( text = title, @@ -67,7 +67,7 @@ fun GrapesMessage( } if (description != null) { - Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingXSmall)) + Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing1)) Text( text = description, style = GrapesTheme.typography.bodyS, @@ -84,11 +84,11 @@ fun GrapesMessage( @Composable private fun MessageInlineSmallContentPadding() { val padding = PaddingValues( - horizontal = GrapesTheme.dimensions.paddingSmall, - vertical = GrapesTheme.dimensions.paddingXSmall, + horizontal = GrapesTheme.dimensions.spacing2, + vertical = GrapesTheme.dimensions.spacing1, ) GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesMessage( title = "Message Inline Information", configuration = GrapesConfigurationStatus.INFORMATION, @@ -122,7 +122,7 @@ private fun MessageInlineSmallContentPadding() { @Composable private fun MessageInline() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesMessage(title = "Message Inline Success", configuration = GrapesConfigurationStatus.SUCCESS) GrapesMessage(title = "Message Inline Information", configuration = GrapesConfigurationStatus.INFORMATION) GrapesMessage(title = "Message Inline Neutral", configuration = GrapesConfigurationStatus.NEUTRAL) @@ -136,7 +136,7 @@ private fun MessageInline() { @Composable private fun MessageInlineIcon() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesMessage(title = "Message Inline Success", configuration = GrapesConfigurationStatus.SUCCESS, showIcon = true) GrapesMessage(title = "Message Inline Information", configuration = GrapesConfigurationStatus.INFORMATION, showIcon = true) GrapesMessage(title = "Message Inline Neutral", configuration = GrapesConfigurationStatus.NEUTRAL, showIcon = true) @@ -150,7 +150,7 @@ private fun MessageInlineIcon() { @Composable private fun MessageInlineIconBlock() { GrapesTheme { - Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall)) { + Column(verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1)) { GrapesMessage( title = "Message Inline Icon Block Success", description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla nec lectus sed sem porttitor viverra. Vestibulum magna leo.", diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt index 00e91b76..f14a0b70 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt @@ -78,7 +78,7 @@ private fun PasswordValidationItem( Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingSmall) + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2) ) { Box(modifier = Modifier.size(PasswordValidationDefaults.ValidationBoxSize), contentAlignment = Alignment.Center) { Icon(painter = painterResource(id = itemIcon), contentDescription = null, tint = itemColor, modifier = Modifier.size(iconSize)) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt index e51b09a4..34fc6100 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt @@ -99,11 +99,11 @@ private fun Select( Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3), modifier = modifier .background(itemColor, shape = RoundedCornerShape(50, 50, radiusSize, radiusSize)) .border(1.dp, GrapesTheme.colors.mainNeutralLight, shape = RoundedCornerShape(50, 50, radiusSize, radiusSize)) - .padding(horizontal = GrapesTheme.dimensions.paddingLarge, vertical = GrapesTheme.dimensions.paddingMedium) + .padding(horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.paddingMedium) ) { Text(text = label, style = GrapesTheme.typography.titleS, color = contentColor) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt index 5502bdd0..36d6762a 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt @@ -49,7 +49,7 @@ fun GrapesCheckboxText( isEnabled = isEnabled, onCheckedChange = { onToggleCheck.invoke() }, ) - Spacer(Modifier.padding(end = GrapesTheme.dimensions.paddingSmall)) + Spacer(Modifier.padding(end = GrapesTheme.dimensions.spacing2)) Text( text = text, color = GrapesTheme.colors.mainComplementary, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt index 7aaa2ec5..01ba37ce 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt @@ -43,7 +43,7 @@ fun GrapesRadioButtonText( isEnabled = isEnabled, onClick = null ) - Spacer(Modifier.padding(end = GrapesTheme.dimensions.paddingSmall)) + Spacer(Modifier.padding(end = GrapesTheme.dimensions.spacing2)) Text( text = text, color = GrapesTheme.colors.mainNeutralDarker, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlock.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlock.kt index 810a52a7..57250e2d 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlock.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlock.kt @@ -45,7 +45,7 @@ fun GrapesSelectBlock( Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { Icon( modifier = Modifier - .padding(start = GrapesTheme.dimensions.paddingLarge, end = GrapesTheme.dimensions.paddingLarge) + .padding(start = GrapesTheme.dimensions.spacing3, end = GrapesTheme.dimensions.spacing3) .size(GrapesTheme.dimensions.iconLarge), painter = painterResource(id = icon), contentDescription = iconDescription, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt index 7ef87f3f..41ddb5bf 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt @@ -55,7 +55,7 @@ fun GrapesSelectCardText( isSelected = isSelected, content = { Row( - modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.paddingLarge), + modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing3), verticalAlignment = Alignment.CenterVertically ) { Icon( @@ -64,12 +64,12 @@ fun GrapesSelectCardText( contentDescription = iconDescription, tint = if (isSelected) GrapesSelectCardTextDefaultColors.selectedIconColor else GrapesSelectCardTextDefaultColors.unselectedIconColor ) - Spacer(Modifier.size(GrapesTheme.dimensions.paddingLarge)) + Spacer(Modifier.size(GrapesTheme.dimensions.spacing3)) Column( modifier = Modifier .padding( - top = GrapesTheme.dimensions.paddingXLarge, - bottom = GrapesTheme.dimensions.paddingXLarge + top = GrapesTheme.dimensions.spacing4, + bottom = GrapesTheme.dimensions.spacing4 ), verticalArrangement = Arrangement.Center ) { @@ -80,7 +80,7 @@ fun GrapesSelectCardText( style = GrapesTheme.typography.titleM, text = title ) - Spacer(modifier = Modifier.padding(GrapesTheme.dimensions.paddingXSmall)) + Spacer(modifier = Modifier.padding(GrapesTheme.dimensions.spacing1)) Text( color = if (isSelected) GrapesSelectCardTextDefaultColors.selectedDescriptionColor else GrapesSelectCardTextDefaultColors.unselectedDescriptionColor, overflow = TextOverflow.Ellipsis, @@ -118,8 +118,8 @@ private fun GrapesSelectCardTextPreview() { var isSelected = remember { mutableIntStateOf(0) } LazyColumn( - modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { item { GrapesSelectCardText( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt index 61fe8a2d..a2c79a41 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt @@ -140,7 +140,7 @@ fun GrapesTag( Row( modifier = Modifier .padding(PaddingValues(horizontal = 8.dp, vertical = 4.dp)), - horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingXSmall), + horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1), ) { if (icon != null) { Box( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt index 32868407..73d986fe 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt @@ -32,9 +32,9 @@ private fun AskTemplate( InformativeComponent( middlePart = { Column( - modifier = Modifier.padding(GrapesTheme.dimensions.paddingSmall), + modifier = Modifier.padding(GrapesTheme.dimensions.spacing2), horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { header() title() diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt index 2352c77a..0cb21f9a 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt @@ -87,7 +87,7 @@ fun ErrorTemplate( Column( modifier = Modifier .fillMaxSize() - .padding(GrapesTheme.dimensions.paddingLarge), + .padding(GrapesTheme.dimensions.spacing3), horizontalAlignment = Alignment.CenterHorizontally ) { Column( @@ -101,7 +101,7 @@ fun ErrorTemplate( icon() } - Spacer(modifier = Modifier.height(GrapesTheme.dimensions.paddingXLarge)) + Spacer(modifier = Modifier.height(GrapesTheme.dimensions.spacing4)) AnimatedVisibility(visible = isVisible, enter = configuration.titleEnterAnimation) { title() @@ -132,8 +132,8 @@ fun ErrorTemplatePreview() { Column( modifier = Modifier .background(GrapesTheme.colors.mainWhite) - .padding(GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + .padding(GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { AnimatedContent(targetState = isError, label = "Preview animation") { animatedIsError -> if (animatedIsError) { @@ -155,4 +155,4 @@ fun ErrorTemplatePreview() { } } -} \ No newline at end of file +} diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/molecule/InformativeComponent.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/molecule/InformativeComponent.kt index 20ae1efc..655db9c4 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/molecule/InformativeComponent.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/molecule/InformativeComponent.kt @@ -31,7 +31,7 @@ internal fun InformativeComponent( listOf(GrapesTheme.colors.mainPrimaryNormal, GrapesTheme.colors.mainPrimaryDark) ) ) - .padding(GrapesTheme.dimensions.paddingLarge), + .padding(GrapesTheme.dimensions.spacing3), horizontalAlignment = Alignment.CenterHorizontally ) { Spacer(modifier = Modifier.weight(1f)) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextField.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextField.kt index ba86f807..5a50eaa8 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextField.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextField.kt @@ -134,8 +134,8 @@ fun PinTextInputPreview() { GrapesTheme.colors.mainBackground ) .fillMaxWidth() - .padding(GrapesTheme.dimensions.paddingLarge), - verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.paddingLarge) + .padding(GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3) ) { GrapesPinTextField("", {}) GrapesPinTextField("12", {}) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt index 82097d72..64b0e477 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt @@ -44,7 +44,7 @@ fun GrapesPinTextFieldDecorationBox( } PinText( - modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.paddingXSmall), + modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing1), char = char, isError = isError, isEnabled = isEnabled, From c1c32fea532ce1b364a5df06e47ff169c19813cc Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 10:00:13 +0100 Subject: [PATCH 03/17] Define new shape tokens --- .../com/spendesk/grapes/compose/theme/Shapes.kt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Shapes.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Shapes.kt index 13e880d4..5372c954 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Shapes.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Shapes.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp /** @@ -14,6 +13,13 @@ import androidx.compose.ui.unit.dp */ @Immutable data class GrapesShapes( + val shape0: CornerBasedShape = RoundedCornerShape(cornerRadius0Dp), + val shape1: CornerBasedShape = RoundedCornerShape(cornerRadius1Dp), + val shape2: CornerBasedShape = RoundedCornerShape(cornerRadius2Dp), + val shape3: CornerBasedShape = RoundedCornerShape(cornerRadius3Dp), + val shape4: CornerBasedShape = RoundedCornerShape(cornerRadiusRoundedPercent), + + @Deprecated("Grapes shape deprecated", ReplaceWith("borderRadius1")) val xSmall: CornerBasedShape = RoundedCornerShape(XSmallShapeCornerRadius), /** @@ -22,17 +28,26 @@ data class GrapesShapes( * the corner size to be 50%. [TextField] uses this shape with overriding the bottom corners * to zero. */ + @Deprecated("Grapes shape deprecated", ReplaceWith("borderRadius2")) val small: CornerBasedShape = RoundedCornerShape(SmallShapeCornerRadius), /** * Shape used by medium components like [Card] or [AlertDialog]. */ + @Deprecated("Grapes shape deprecated - no longer use 12dp border radius.") val medium: CornerBasedShape = RoundedCornerShape(MediumShapeCornerRadius), /** * Shape used by large components like [ModalDrawer] or [ModalBottomSheetLayout]. */ + @Deprecated("Grapes shape deprecated", ReplaceWith("borderRadius0")) val large: CornerBasedShape = RoundedCornerShape(LargeShapeCornerRadius) ) +private val cornerRadius0Dp = 0.dp +private val cornerRadius1Dp = 4.dp +private val cornerRadius2Dp = 8.dp +private val cornerRadius3Dp = 16.dp +private const val cornerRadiusRoundedPercent = 50 + private val XSmallShapeCornerRadius = 4.dp private val SmallShapeCornerRadius = 8.dp private val MediumShapeCornerRadius = 12.dp From ad52f589853aefcd94f4f01e51d401571262f037 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 10:01:31 +0100 Subject: [PATCH 04/17] Remove border radius from dimensions --- .../main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt | 3 +-- .../main/java/com/spendesk/grapes/compose/theme/Dimensions.kt | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt index a022ff2f..9be1a933 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/gauge/GrapesGauge.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.ui.Modifier @@ -65,7 +64,7 @@ fun GrapesGauge( backgroundColor: Color, gauges: List, modifier: Modifier = Modifier, - clipShape: Shape = RoundedCornerShape(GrapesTheme.dimensions.borderRadiusNormal), + clipShape: Shape = GrapesTheme.shapes.shape1, ) { GrapesGaugeContainer( modifier = modifier, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt index 6b31116d..6af2df39 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Dimensions.kt @@ -16,9 +16,6 @@ data class GrapesDimensions( val borderLarge: Dp = 2.0.dp, - val borderRadiusSmall: Dp = 2.dp, - val borderRadiusNormal: Dp = 4.dp, - @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing1")) val paddingXSmall: Dp = 4.dp, @Deprecated("Grapes dimension deprecated", ReplaceWith("spacing2")) From 385a4f4295d276ebcf4061275d75af313508fb5b Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 10:04:50 +0100 Subject: [PATCH 05/17] Migrate shapes to new shape design tokens --- .../compose/actionmenu/ActionMenuItem.kt | 2 +- .../compose/bucket/GrapesBucketContainer.kt | 6 ++-- .../button/GrapesButtonStyleDefaults.kt | 28 +++++++++---------- .../compose/callout/GrapesCoreCallout.kt | 2 +- .../grapes/compose/listitem/SectionItem.kt | 2 +- .../grapes/compose/message/Message.kt | 2 +- .../selectors/GrapesSelectBlockContainer.kt | 21 ++++++++++++-- .../GrapesPinTextFieldDecorationBox.kt | 4 +-- .../textfield/GrapesTextFieldDefaults.kt | 2 +- 9 files changed, 42 insertions(+), 27 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt index 53e2ea3e..8820e1e5 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt @@ -66,7 +66,7 @@ fun ActionMenuItem( top = verticalInnerPadding, bottom = verticalInnerPadding, ), - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, modifier = modifier, ) { Row( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketContainer.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketContainer.kt index 1a4db3a0..c80cb5d5 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketContainer.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketContainer.kt @@ -32,9 +32,9 @@ fun GrapesBucketContainer( ) { Box( modifier = modifier - .background(GrapesTheme.colors.mainWhite, GrapesTheme.shapes.small) - .border(GrapesBucketBorderWidth, GrapesTheme.colors.mainNeutralNormal, GrapesTheme.shapes.small) - .clip(GrapesTheme.shapes.small) + .background(GrapesTheme.colors.mainWhite, GrapesTheme.shapes.shape2) + .border(GrapesBucketBorderWidth, GrapesTheme.colors.mainNeutralNormal, GrapesTheme.shapes.shape2) + .clip(GrapesTheme.shapes.shape2) ) { content() } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt index 68e3a438..d2b5832e 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt @@ -32,7 +32,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainPrimaryDark, colors = ButtonColorDefaults.primary, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -50,7 +50,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = GrapesButtonDefaults.iconSizeSmall, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainPrimaryDark, colors = ButtonColorDefaults.primary, contentPadding = GrapesButtonDefaults.PaddingValuesSmall, @@ -68,7 +68,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralNormal, colors = ButtonColorDefaults.secondary, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -86,7 +86,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = GrapesButtonDefaults.iconSizeSmall, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralNormal, colors = ButtonColorDefaults.secondary, contentPadding = GrapesButtonDefaults.PaddingValuesSmall, @@ -104,7 +104,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainPrimaryLight, colors = ButtonColorDefaults.text, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -122,7 +122,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = GrapesButtonDefaults.iconSizeSmall, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainPrimaryLight, colors = ButtonColorDefaults.text, contentPadding = GrapesButtonDefaults.PaddingValuesSmall, @@ -140,7 +140,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainAlertDark, colors = ButtonColorDefaults.alert, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -158,7 +158,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainAlertDark, colors = ButtonColorDefaults.alertOutlined, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -176,7 +176,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeight.value ), iconSize = GrapesButtonDefaults.iconSize, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainWarningDark, colors = ButtonColorDefaults.warning, contentPadding = GrapesButtonDefaults.PaddingValues, @@ -194,7 +194,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = GrapesButtonDefaults.iconSizeSmall, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralLight, colors = ButtonColorDefaults.linkPrimary, contentPadding = GrapesButtonDefaults.PaddingValuesSmall, @@ -212,7 +212,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = GrapesButtonDefaults.iconSizeSmall, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralLighter, colors = ButtonColorDefaults.linkSecondary, contentPadding = GrapesButtonDefaults.PaddingValuesSmall, @@ -230,7 +230,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = 40.dp, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralLighter, colors = ButtonColorDefaults.google, contentPadding = GrapesButtonDefaults.PaddingValuesBrand, @@ -248,7 +248,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = 40.dp, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralLighter, colors = ButtonColorDefaults.secondary, contentPadding = GrapesButtonDefaults.PaddingValuesBrand, @@ -266,7 +266,7 @@ object GrapesButtonStyleDefaults { height = GrapesButtonDefaults.MinHeightSmall.value ), iconSize = 40.dp, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, rippleColor = GrapesTheme.colors.mainNeutralLighter, colors = ButtonColorDefaults.secondary, contentPadding = GrapesButtonDefaults.PaddingValuesBrand, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt index 78cc655e..a1bec010 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt @@ -32,7 +32,7 @@ fun GrapesCoreCallout( ) { Surface( modifier = modifier.fillMaxWidth(), - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, color = colors.containerColor().value, contentColor = colors.contentColor().value, border = BorderStroke(GrapesCalloutDefaults.borderThickness, colors.borderStrokeColor().value), diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt index cf7b849c..ba409d72 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt @@ -61,7 +61,7 @@ private fun Preview() { icon = { modifier -> Box( modifier - .clip(GrapesTheme.shapes.small) + .clip(GrapesTheme.shapes.shape2) .background(Color.Blue)) }, description = "85.99€ per month", diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt index d40518c9..05f3004d 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt @@ -49,7 +49,7 @@ fun GrapesMessage( GrapesSurface( modifier = modifier.width(IntrinsicSize.Max), configuration = configuration, - shape = GrapesTheme.shapes.small, + shape = GrapesTheme.shapes.shape2, ) { Column(modifier = Modifier.padding(contentPadding)) { Row(verticalAlignment = Alignment.CenterVertically) { diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlockContainer.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlockContainer.kt index 2810125f..598e3392 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlockContainer.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectBlockContainer.kt @@ -26,15 +26,30 @@ fun GrapesSelectBlockContainer( content: @Composable () -> Unit, modifier: Modifier = Modifier ) { - val borderModifier = if (isSelected) Modifier.border(GrapesTheme.dimensions.borderLarge, GrapesSelectBlockContainerDefaultColors.selectedBorderColor, GrapesTheme.shapes.small) else Modifier - val backgroundModifier = if (isSelected) Modifier.background(color = GrapesSelectBlockContainerDefaultColors.selectedBackgroundColor, GrapesTheme.shapes.small) else Modifier + val borderModifier = if (isSelected) { + Modifier.border( + width = GrapesTheme.dimensions.borderLarge, + color = GrapesSelectBlockContainerDefaultColors.selectedBorderColor, + shape = GrapesTheme.shapes.shape2 + ) + } else { + Modifier + } + val backgroundModifier = if (isSelected) { + Modifier.background( + color = GrapesSelectBlockContainerDefaultColors.selectedBackgroundColor, + GrapesTheme.shapes.shape2 + ) + } else { + Modifier + } Box( modifier = modifier .fillMaxWidth() .then(borderModifier) .then(backgroundModifier) - .clip(GrapesTheme.shapes.small) + .clip(GrapesTheme.shapes.shape2) ) { content() } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt index 64b0e477..2285816a 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt @@ -68,13 +68,13 @@ private fun PinText( modifier = modifier .width(GrapesPinTextFieldDefaults.PinCharWidth) .height(GrapesPinTextFieldDefaults.PinCharHeight) - .background(GrapesTheme.colors.mainWhite, shape = GrapesTheme.shapes.small) + .background(GrapesTheme.colors.mainWhite, shape = GrapesTheme.shapes.shape2) .border( width = GrapesPinTextFieldDefaults.PinCharBorderWidth, color = GrapesPinTextFieldDefaults .pinFieldColors() .borderColor(isEnabled = isEnabled, isError = isError, isSelected = isFocused), - shape = GrapesTheme.shapes.small + shape = GrapesTheme.shapes.shape2 ) .pointerInput(Unit) { detectTapGestures( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextFieldDefaults.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextFieldDefaults.kt index ea92c7de..4bfe43b5 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextFieldDefaults.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextFieldDefaults.kt @@ -44,7 +44,7 @@ object GrapesTextFieldDefaults { val TextFieldShape: Shape @Composable @ReadOnlyComposable - get() = GrapesTheme.shapes.small + get() = GrapesTheme.shapes.shape2 fun textFieldPadding( From a5d39bcf34962f7059888c08b10f6f7c0d421afe Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 11:33:25 +0100 Subject: [PATCH 06/17] Add shape examples in compose sample tab --- .../samples/home/fragments/ComposeFragment.kt | 87 ++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt index e5939c32..8679b642 100644 --- a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt +++ b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt @@ -4,8 +4,20 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material.Text +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.unit.dp import androidx.fragment.app.Fragment import com.spendesk.grapes.compose.button.GrapesButton import com.spendesk.grapes.compose.theme.GrapesTheme @@ -24,8 +36,79 @@ class ComposeFragment : Fragment() { ComposeView(requireContext()).apply { setContent { GrapesTheme { - Row { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.spacing3), + verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing3), + ) { GrapesButton(text = "First Compose component test") + Spacer(Modifier.height(GrapesTheme.dimensions.spacing3)) + Text(text = "Shapes", style = GrapesTheme.typography.titleM) + Box( + modifier = Modifier + .height(100.dp) + .width(200.dp) + .background(GrapesTheme.colors.mainPrimaryDark, shape = GrapesTheme.shapes.shape0), + contentAlignment = Alignment.Center + ) { + Text( + text = "shape0", + style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + ) + } + Box( + modifier = Modifier + .height(100.dp) + .width(200.dp) + .background(GrapesTheme.colors.mainPrimaryDark, shape = GrapesTheme.shapes.shape1), + contentAlignment = Alignment.Center + ) { + + Text( + text = "shape1", + style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + ) + } + Box( + modifier = Modifier + .height(100.dp) + .width(200.dp) + .background(GrapesTheme.colors.mainPrimaryDark, shape = GrapesTheme.shapes.shape2), + contentAlignment = Alignment.Center + ) { + + Text( + text = "shape2", + style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + ) + } + Box( + modifier = Modifier + .height(100.dp) + .width(200.dp) + .background(GrapesTheme.colors.mainPrimaryDark, shape = GrapesTheme.shapes.shape3), + contentAlignment = Alignment.Center + ) { + + Text( + text = "shape3", + style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + ) + } + Box( + modifier = Modifier + .height(100.dp) + .width(200.dp) + .background(GrapesTheme.colors.mainPrimaryDark, shape = GrapesTheme.shapes.shape4), + contentAlignment = Alignment.Center + ) { + + Text( + text = "shape4", + style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + ) + } } } } From 1db8fdcbb1908de6f9e3d79f3cffb8998477c841 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:24:24 +0100 Subject: [PATCH 07/17] Rename color --- .../src/main/java/com/spendesk/grapes/compose/theme/Colors.kt | 2 +- .../java/com/spendesk/grapes/compose/theme/ColorsPalette.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Colors.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Colors.kt index 2241f1be..d96b1ebc 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Colors.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Colors.kt @@ -77,7 +77,7 @@ data class GrapesColors( val google: Color, - val primaryDarker: Color, + val primaryDark: Color, val primaryNormal: Color, val primaryLight: Color, val primaryLighter: Color, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/ColorsPalette.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/ColorsPalette.kt index b92533f1..7fe15645 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/ColorsPalette.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/ColorsPalette.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.Color fun lightColorsPalette( legacyPrimaryDark: Color = mainPrimaryDark, legacyPrimaryLighter: Color = mainPrimaryLighter, - primaryDarker: Color = daisyBush, + primaryDark: Color = daisyBush, primaryNormal: Color = purpleHeart, primaryLight: Color = purpleHeartLight, primaryLighter: Color = moonRaker, @@ -81,7 +81,7 @@ fun lightColorsPalette( mainAlertLighter = alertLighter, mainAlertLightest = alertLightest, google = google, - primaryDarker = primaryDarker, + primaryDark = primaryDark, primaryNormal = primaryNormal, primaryLight = primaryLight, primaryLighter = primaryLighter, From a0f67a6cbffdd15f6087ff78bf730ecdc3a64adf Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:36:08 +0100 Subject: [PATCH 08/17] Align typographies with design tokens --- .../grapes/compose/theme/Typography.kt | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt index 5e4fb6eb..fd2da2bd 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/theme/Typography.kt @@ -21,14 +21,11 @@ private val DefaultGrapesFontFamily = FontFamily( @Immutable data class GrapesTypography constructor( - val bodyXs: TextStyle, val bodyS: TextStyle, - val bodyRegular: TextStyle, val bodyM: TextStyle, val bodyL: TextStyle, val bodyXl: TextStyle, val bodyXxl: TextStyle, - val titleXs: TextStyle, val titleS: TextStyle, val titleM: TextStyle, val titleL: TextStyle, @@ -36,63 +33,48 @@ data class GrapesTypography constructor( ) { constructor( defaultFontFamily: FontFamily = DefaultGrapesFontFamily, - bodyXs: TextStyle = TextStyle( - fontWeight = FontWeight.Normal, - fontSize = 12.sp, - ), bodyS: TextStyle = TextStyle( fontWeight = FontWeight.Normal, - fontSize = 14.sp, - ), - bodyRegular: TextStyle = TextStyle( - fontWeight = FontWeight.Normal, - fontSize = 16.sp, + fontSize = 12.sp, ), bodyM: TextStyle = TextStyle( fontWeight = FontWeight.Normal, - fontSize = 24.sp, + fontSize = 14.sp, ), bodyL: TextStyle = TextStyle( fontWeight = FontWeight.Normal, - fontSize = 32.sp, + fontSize = 16.sp ), bodyXl: TextStyle = TextStyle( fontWeight = FontWeight.Normal, - fontSize = 40.sp, + fontSize = 20.sp ), bodyXxl: TextStyle = TextStyle( fontWeight = FontWeight.Normal, - fontSize = 56.sp, - ), - titleXs: TextStyle = TextStyle( - fontWeight = FontWeight.Medium, - fontSize = 12.sp, + fontSize = 40.sp ), titleS: TextStyle = TextStyle( fontWeight = FontWeight.Medium, - fontSize = 14.sp, + fontSize = 12.sp, ), titleM: TextStyle = TextStyle( fontWeight = FontWeight.Medium, - fontSize = 16.sp, + fontSize = 14.sp, ), titleL: TextStyle = TextStyle( fontWeight = FontWeight.Medium, - fontSize = 18.sp, + fontSize = 16.sp, ), titleXl: TextStyle = TextStyle( fontWeight = FontWeight.Medium, - fontSize = 32.sp, + fontSize = 20.sp, ), ) : this( - bodyXs = bodyXs.withDefaultFontFamily(defaultFontFamily), bodyS = bodyS.withDefaultFontFamily(defaultFontFamily), - bodyRegular = bodyRegular.withDefaultFontFamily(defaultFontFamily), bodyM = bodyM.withDefaultFontFamily(defaultFontFamily), bodyL = bodyL.withDefaultFontFamily(defaultFontFamily), bodyXl = bodyXl.withDefaultFontFamily(defaultFontFamily), bodyXxl = bodyXxl.withDefaultFontFamily(defaultFontFamily), - titleXs = titleXs.withDefaultFontFamily(defaultFontFamily), titleS = titleS.withDefaultFontFamily(defaultFontFamily), titleM = titleM.withDefaultFontFamily(defaultFontFamily), titleL = titleL.withDefaultFontFamily(defaultFontFamily), From 299d6e7c825799926b5b22c0cde9fae010534836 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:39:53 +0100 Subject: [PATCH 09/17] Refactor legacy titleXl to not change with new token --- .../java/com/spendesk/grapes/compose/template/AskTemplate.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt index 73d986fe..d15b8afc 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt @@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.sp import com.spendesk.grapes.compose.R import com.spendesk.grapes.compose.button.GrapesButton import com.spendesk.grapes.compose.button.GrapesButtonStyleDefaults @@ -61,7 +62,7 @@ fun AskTemplate( val titleText = @Composable { Text( text = title, - style = GrapesTheme.typography.titleXl, + style = GrapesTheme.typography.titleXl.copy(fontSize = 32.sp), color = GrapesTheme.colors.mainWhite, textAlign = TextAlign.Center ) From 98c58a4c97dcef0dda96220dbf4909c1b29296cc Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:41:52 +0100 Subject: [PATCH 10/17] Refactor legacy titleM to new titleL --- .../compose/actionmenu/ActionMenuSection.kt | 2 +- .../spendesk/grapes/compose/badge/Badge.kt | 2 +- .../button/GrapesButtonStyleDefaults.kt | 22 +++++++++---------- .../grapes/compose/listitem/IconAction.kt | 2 +- .../compose/selectors/GrapesSelectCardText.kt | 2 +- .../compose/template/error/ErrorTemplate.kt | 2 +- .../samples/home/fragments/ComposeFragment.kt | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt index 93ee8c6a..9b94a39c 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt @@ -93,7 +93,7 @@ private fun ActionMenuSectionHeader( ) { Text( text = title, - style = GrapesTheme.typography.titleM, + style = GrapesTheme.typography.titleL, color = GrapesTheme.colors.structureComplementary, maxLines = TITLE_MAX_LINES, overflow = TextOverflow.Ellipsis, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt index e4d7cb00..6b7b0a14 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/badge/Badge.kt @@ -30,7 +30,7 @@ fun GrapesBadge( modifier = modifier .background(backgroundColor, RoundedCornerShape(100)) .padding(horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.spacing1), - style = GrapesTheme.typography.titleM, + style = GrapesTheme.typography.titleL, color = GrapesTheme.colors.mainWhite ) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt index d2b5832e..6b72a616 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt @@ -26,7 +26,7 @@ object GrapesButtonStyleDefaults { @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -62,7 +62,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -98,7 +98,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -134,7 +134,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -152,7 +152,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -170,7 +170,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidth.value, height = GrapesButtonDefaults.MinHeight.value @@ -188,7 +188,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -206,7 +206,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -224,7 +224,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -242,7 +242,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -260,7 +260,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleM, + textStyle = GrapesTheme.typography.titleL, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt index aaa70e03..f50ebc36 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt @@ -50,7 +50,7 @@ internal fun IconAction(iconActionConfiguration: ListItemConfiguration.IconActio modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing1) ) { - Text(text = iconActionConfiguration.title, style = GrapesTheme.typography.titleM, color = titleColor) + Text(text = iconActionConfiguration.title, style = GrapesTheme.typography.titleL, color = titleColor) iconActionConfiguration.description?.let { Text(text = it, style = GrapesTheme.typography.bodyS, color = GrapesTheme.colors.mainNeutralDarker) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt index 41ddb5bf..275a3364 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt @@ -77,7 +77,7 @@ fun GrapesSelectCardText( color = if (isSelected) GrapesSelectCardTextDefaultColors.selectedTitleColor else GrapesSelectCardTextDefaultColors.unselectedTitleColor, overflow = TextOverflow.Ellipsis, maxLines = 1, - style = GrapesTheme.typography.titleM, + style = GrapesTheme.typography.titleL, text = title ) Spacer(modifier = Modifier.padding(GrapesTheme.dimensions.spacing1)) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt index 0cb21f9a..2f9032b7 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt @@ -45,7 +45,7 @@ fun ErrorTemplate( ) { ErrorTemplate( title = { - Text(text = title, style = GrapesTheme.typography.titleM) + Text(text = title, style = GrapesTheme.typography.titleL) }, icon = icon, description = description?.let { diff --git a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt index 8679b642..37615f86 100644 --- a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt +++ b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt @@ -44,7 +44,7 @@ class ComposeFragment : Fragment() { ) { GrapesButton(text = "First Compose component test") Spacer(Modifier.height(GrapesTheme.dimensions.spacing3)) - Text(text = "Shapes", style = GrapesTheme.typography.titleM) + Text(text = "Shapes", style = GrapesTheme.typography.titleL) Box( modifier = Modifier .height(100.dp) From 28b2e0ed5ffaf7f173d7d9f4f6f2c0cd3fbdbf11 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:44:54 +0100 Subject: [PATCH 11/17] Refactor legacy titleS to titleM --- .../grapes/compose/actionmenu/ActionMenuItem.kt | 2 +- .../grapes/compose/bucket/GrapesBucketHeadline.kt | 4 ++-- .../grapes/compose/button/GrapesButtonStyleDefaults.kt | 6 +++--- .../grapes/compose/callout/GrapesCoreCallout.kt | 2 +- .../grapes/compose/card/GrapesInformationCard.kt | 2 +- .../com/spendesk/grapes/compose/message/Message.kt | 2 +- .../com/spendesk/grapes/compose/select/GrapesSelect.kt | 2 +- .../java/com/spendesk/grapes/compose/tag/GrapesTag.kt | 2 +- .../grapes/samples/home/fragments/ComposeFragment.kt | 10 +++++----- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt index 8820e1e5..1a586d93 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuItem.kt @@ -81,7 +81,7 @@ fun ActionMenuItem( text = text, maxLines = ACTION_TEXT_MAX_LINES, overflow = TextOverflow.Ellipsis, - style = GrapesTheme.typography.titleS, + style = GrapesTheme.typography.titleM, modifier = Modifier.weight(1f), ) if (enabled) { diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt index 28459047..59be4ded 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/bucket/GrapesBucketHeadline.kt @@ -38,7 +38,7 @@ fun GrapesBucketHeadline( color = GrapesTheme.colors.mainComplementary, overflow = TextOverflow.Ellipsis, maxLines = 1, - style = GrapesTheme.typography.titleS + style = GrapesTheme.typography.titleM ) if (action != null && actionColor != null) { Spacer(modifier = Modifier.size(GrapesTheme.dimensions.paddingMedium)) @@ -48,7 +48,7 @@ fun GrapesBucketHeadline( color = actionColor, overflow = TextOverflow.Ellipsis, maxLines = 1, - style = GrapesTheme.typography.titleS + style = GrapesTheme.typography.titleM ) } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt index 6b72a616..d848bef7 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/button/GrapesButtonStyleDefaults.kt @@ -44,7 +44,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleS, + textStyle = GrapesTheme.typography.titleM, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -80,7 +80,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleS, + textStyle = GrapesTheme.typography.titleM, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value @@ -116,7 +116,7 @@ object GrapesButtonStyleDefaults { @Composable @ReadOnlyComposable get() = GrapesButtonStyle( - textStyle = GrapesTheme.typography.titleS, + textStyle = GrapesTheme.typography.titleM, minSize = Size( width = GrapesButtonDefaults.MinWidthSmall.value, height = GrapesButtonDefaults.MinHeightSmall.value diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt index a1bec010..c26819d9 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/GrapesCoreCallout.kt @@ -45,7 +45,7 @@ fun GrapesCoreCallout( horizontalArrangement = Arrangement.spacedBy(GrapesTheme.dimensions.spacing2), ) { ProvideTextStyle( - GrapesTheme.typography.titleS.copy(color = colors.titleColor().value), + GrapesTheme.typography.titleM.copy(color = colors.titleColor().value), ) { if (leadingIcon != null) { Box( diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt index c48f8696..9e93e96e 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/card/GrapesInformationCard.kt @@ -45,7 +45,7 @@ fun GrapesInformationCard( ) { Text( text = title, - style = GrapesTheme.typography.titleS, + style = GrapesTheme.typography.titleM, modifier = Modifier.padding(horizontal = GrapesTheme.dimensions.spacing3), ) GrapesDivider() diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt index 05f3004d..0bfe80a6 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt @@ -59,7 +59,7 @@ fun GrapesMessage( } Text( text = title, - style = GrapesTheme.typography.titleS, + style = GrapesTheme.typography.titleM, color = GrapesTheme.colors.contentColorFor(configuration), textAlign = titleTextAlign, modifier = Modifier.fillMaxWidth(), diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt index 34fc6100..ae8b98f0 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/select/GrapesSelect.kt @@ -105,7 +105,7 @@ private fun Select( .border(1.dp, GrapesTheme.colors.mainNeutralLight, shape = RoundedCornerShape(50, 50, radiusSize, radiusSize)) .padding(horizontal = GrapesTheme.dimensions.spacing3, vertical = GrapesTheme.dimensions.paddingMedium) ) { - Text(text = label, style = GrapesTheme.typography.titleS, color = contentColor) + Text(text = label, style = GrapesTheme.typography.titleM, color = contentColor) GrapesSelectIcon(expanded = isExpanded, tint = contentColor) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt index a2c79a41..42a5ebe6 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/tag/GrapesTag.kt @@ -154,7 +154,7 @@ fun GrapesTag( } ProvideTextStyle( - GrapesTheme.typography.titleS.copy(color = LocalContentColor.current), + GrapesTheme.typography.titleM.copy(color = LocalContentColor.current), ) { Text(text = label) } diff --git a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt index 37615f86..83f3cb7d 100644 --- a/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt +++ b/sample/src/main/java/com/spendesk/grapes/samples/home/fragments/ComposeFragment.kt @@ -54,7 +54,7 @@ class ComposeFragment : Fragment() { ) { Text( text = "shape0", - style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + style = GrapesTheme.typography.titleM.copy(color = GrapesTheme.colors.structureSurface), ) } Box( @@ -67,7 +67,7 @@ class ComposeFragment : Fragment() { Text( text = "shape1", - style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + style = GrapesTheme.typography.titleM.copy(color = GrapesTheme.colors.structureSurface), ) } Box( @@ -80,7 +80,7 @@ class ComposeFragment : Fragment() { Text( text = "shape2", - style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + style = GrapesTheme.typography.titleM.copy(color = GrapesTheme.colors.structureSurface), ) } Box( @@ -93,7 +93,7 @@ class ComposeFragment : Fragment() { Text( text = "shape3", - style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + style = GrapesTheme.typography.titleM.copy(color = GrapesTheme.colors.structureSurface), ) } Box( @@ -106,7 +106,7 @@ class ComposeFragment : Fragment() { Text( text = "shape4", - style = GrapesTheme.typography.titleS.copy(color = GrapesTheme.colors.structureSurface), + style = GrapesTheme.typography.titleM.copy(color = GrapesTheme.colors.structureSurface), ) } } From 0ade0902294730b8b9f53f3987570f1564698173 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:47:10 +0100 Subject: [PATCH 12/17] Migrate legacy titleXs to titleS --- .../com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt index c36235a7..218658da 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt @@ -61,7 +61,7 @@ private fun RowScope.GrapesNavigationBarItem( tab: GrapesNavigationItem, onSelected: (GrapesNavigationItem) -> Unit, ) { - val textStyle = GrapesTheme.typography.titleXs + val textStyle = GrapesTheme.typography.titleS val colors = NavigationBarItemDefaults.colors( indicatorColor = GrapesTheme.colors.mainWhite, selectedIconColor = GrapesTheme.colors.mainPrimaryNormal, From 9d742c2a649eaa6c400ff893340a1de2f22b1743 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:54:24 +0100 Subject: [PATCH 13/17] Migrate legacy bodyM to new body --- .../compose/textfield/GrapesPinTextFieldDecorationBox.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt index 2285816a..f4ddf936 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesPinTextFieldDecorationBox.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.sp import com.spendesk.grapes.compose.theme.GrapesTheme /** @@ -86,7 +87,7 @@ private fun PinText( ) { Text( text = char, - style = GrapesTheme.typography.bodyM, + style = GrapesTheme.typography.bodyXl.copy(fontSize = 24.sp), color = GrapesPinTextFieldDefaults.pinFieldColors().textColor(isEnabled = isEnabled, isError = isError, isSelected = isFocused), textAlign = TextAlign.Center ) From a04bc257015d3a198f5f8c1f1c8aaabd2f3e04e7 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:55:46 +0100 Subject: [PATCH 14/17] Migrate legacy bodyRegular to bodyL --- .../grapes/compose/listitem/GrapesInlineInformationItem.kt | 4 ++-- .../com/spendesk/grapes/compose/listitem/SectionItem.kt | 4 ++-- .../com/spendesk/grapes/compose/listitem/TextDivider.kt | 2 +- .../spendesk/grapes/compose/selectors/GrapesCheckboxText.kt | 2 +- .../grapes/compose/selectors/GrapesRadioButtonText.kt | 2 +- .../com/spendesk/grapes/compose/template/AskTemplate.kt | 2 +- .../spendesk/grapes/compose/template/error/ErrorTemplate.kt | 2 +- .../grapes/compose/textfield/GrapesBaseTextField.kt | 6 +++--- .../spendesk/grapes/compose/textfield/GrapesSearchInput.kt | 2 +- .../spendesk/grapes/compose/textfield/GrapesTextInput.kt | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt index 01b656ad..3b8cfd41 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/GrapesInlineInformationItem.kt @@ -31,7 +31,7 @@ fun GrapesInlineInformationItem( Text( text = title, color = GrapesTheme.colors.mainNeutralDarker, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, modifier = Modifier.weight(1f), ) Box( @@ -40,7 +40,7 @@ fun GrapesInlineInformationItem( ) { Text( text = value, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, textAlign = TextAlign.End ) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt index ba409d72..ad02e6c7 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/SectionItem.kt @@ -42,12 +42,12 @@ fun SectionItem( icon(Modifier.size(iconSize)) Text( text = title, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, ) Spacer(modifier = Modifier.weight(1f)) Text( text = description, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, ) } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt index e9e5e986..945864eb 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/TextDivider.kt @@ -32,7 +32,7 @@ fun TextDivider( modifier = modifier.fillMaxWidth() ) { GrapesDivider(modifier = Modifier.weight(1f), color = color) - Text(text = text, maxLines = 1, overflow = TextOverflow.Ellipsis, style = GrapesTheme.typography.bodyRegular, color = color) + Text(text = text, maxLines = 1, overflow = TextOverflow.Ellipsis, style = GrapesTheme.typography.bodyL, color = color) GrapesDivider(modifier = Modifier.weight(1f), color = color) } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt index 36d6762a..df34cad8 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesCheckboxText.kt @@ -53,7 +53,7 @@ fun GrapesCheckboxText( Text( text = text, color = GrapesTheme.colors.mainComplementary, - style = GrapesTheme.typography.bodyRegular + style = GrapesTheme.typography.bodyL ) } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt index 01ba37ce..142eb5e8 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesRadioButtonText.kt @@ -47,7 +47,7 @@ fun GrapesRadioButtonText( Text( text = text, color = GrapesTheme.colors.mainNeutralDarker, - style = GrapesTheme.typography.bodyRegular + style = GrapesTheme.typography.bodyL ) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt index d15b8afc..a192097b 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/AskTemplate.kt @@ -72,7 +72,7 @@ fun AskTemplate( if (description != null) { Text( text = description, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, color = GrapesTheme.colors.mainWhite, textAlign = TextAlign.Center ) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt index 2f9032b7..40548728 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/template/error/ErrorTemplate.kt @@ -52,7 +52,7 @@ fun ErrorTemplate( { Text( text = it, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, textAlign = TextAlign.Center ) } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt index 4df690c9..1a0d28f2 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt @@ -54,7 +54,7 @@ internal fun GrapesBaseTextField( helperText: String? = null, enabled: Boolean = true, readOnly: Boolean = false, - textStyle: TextStyle = GrapesTheme.typography.bodyRegular, + textStyle: TextStyle = GrapesTheme.typography.bodyL, singleLine: Boolean = false, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, minLines: Int = 1, @@ -145,7 +145,7 @@ internal fun GrapesBaseTextField( helperText: String? = null, enabled: Boolean = true, readOnly: Boolean = false, - textStyle: TextStyle = GrapesTheme.typography.bodyRegular, + textStyle: TextStyle = GrapesTheme.typography.bodyL, textPadding: PaddingValues = GrapesTextFieldDefaults.textFieldPadding(), isError: Boolean = false, singleLine: Boolean = false, @@ -322,7 +322,7 @@ private fun GrapesBasicTextFieldDecorationBox( placeholder = { Text( text = placeholderValue, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, color = colors.placeholderColor(enabled = enabled).value, ) }, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesSearchInput.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesSearchInput.kt index 59a9f0ca..3342591f 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesSearchInput.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesSearchInput.kt @@ -40,7 +40,7 @@ fun GrapesSearchInputSecondary( enabled: Boolean = true, readOnly: Boolean = false, singleLine: Boolean = true, - textStyle: TextStyle = GrapesTheme.typography.bodyRegular, + textStyle: TextStyle = GrapesTheme.typography.bodyL, colors: GrapesTextFieldColors = GrapesTextFieldDefaults.textFieldColors( backgroundColor = GrapesTheme.colors.mainNeutralLighter, leadingIconColor = GrapesTheme.colors.mainNeutralNormal, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextInput.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextInput.kt index 4abf580a..31d3698b 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextInput.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesTextInput.kt @@ -59,7 +59,7 @@ fun GrapesTextInput( helperText: String? = null, enabled: Boolean = true, readOnly: Boolean = false, - textStyle: TextStyle = GrapesTheme.typography.bodyRegular, + textStyle: TextStyle = GrapesTheme.typography.bodyL, colors: GrapesTextFieldColors = GrapesTextFieldDefaults.textFieldColors(), isError: Boolean = false, onClick: (() -> Unit)? = null, @@ -106,7 +106,7 @@ fun GrapesTextInput( helperText: String? = null, enabled: Boolean = true, readOnly: Boolean = false, - textStyle: TextStyle = GrapesTheme.typography.bodyRegular, + textStyle: TextStyle = GrapesTheme.typography.bodyL, colors: GrapesTextFieldColors = GrapesTextFieldDefaults.textFieldColors(), isError: Boolean = false, onClick: (() -> Unit)? = null, @@ -352,7 +352,7 @@ private fun PreviewRowOptionSwitch( Text( modifier = Modifier, text = label, - style = GrapesTheme.typography.bodyRegular, + style = GrapesTheme.typography.bodyL, ) Switch( modifier = Modifier, From 7e2fa3fa88cea6862904efa5c2bef9e2941149f8 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:57:25 +0100 Subject: [PATCH 15/17] Refactor legacy bodyS to bodyM --- .../spendesk/grapes/compose/actionmenu/ActionMenuSection.kt | 2 +- .../com/spendesk/grapes/compose/appbar/GrapesTopAppBar.kt | 4 ++-- .../grapes/compose/callout/molecules/GrapesCalloutContent.kt | 4 ++-- .../java/com/spendesk/grapes/compose/listitem/IconAction.kt | 2 +- .../main/java/com/spendesk/grapes/compose/message/Message.kt | 2 +- .../com/spendesk/grapes/compose/message/PasswordValidation.kt | 4 ++-- .../spendesk/grapes/compose/selectors/GrapesSelectCardText.kt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt index 9b94a39c..f1d325f9 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/actionmenu/ActionMenuSection.kt @@ -100,7 +100,7 @@ private fun ActionMenuSectionHeader( ) Text( text = description, - style = GrapesTheme.typography.bodyS, + style = GrapesTheme.typography.bodyM, color = GrapesTheme.colors.neutralDark, maxLines = DESCRIPTION_MAX_LINES, overflow = TextOverflow.Ellipsis, diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesTopAppBar.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesTopAppBar.kt index 4dce35fa..99343f3b 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesTopAppBar.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesTopAppBar.kt @@ -79,8 +79,8 @@ fun GrapesTopAppBarTitleWithSubtitle( Text( text = subTitle, - lineHeight = GrapesTheme.typography.bodyS.fontSize, - style = GrapesTheme.typography.bodyS, + lineHeight = GrapesTheme.typography.bodyM.fontSize, + style = GrapesTheme.typography.bodyM, ) } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/molecules/GrapesCalloutContent.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/molecules/GrapesCalloutContent.kt index 4aced7f8..df5878ad 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/callout/molecules/GrapesCalloutContent.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/callout/molecules/GrapesCalloutContent.kt @@ -20,7 +20,7 @@ fun ColumnScope.GrapesCalloutContent( Text( modifier = Modifier.fillMaxWidth(), text = description, - style = GrapesTheme.typography.bodyS, + style = GrapesTheme.typography.bodyM, ) bottomContent?.invoke(this) @@ -34,7 +34,7 @@ fun ColumnScope.GrapesCalloutContent( Text( modifier = Modifier.fillMaxWidth(), text = description, - style = GrapesTheme.typography.bodyS, + style = GrapesTheme.typography.bodyM, ) bottomContent?.invoke(this) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt index f50ebc36..8157b779 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/listitem/IconAction.kt @@ -52,7 +52,7 @@ internal fun IconAction(iconActionConfiguration: ListItemConfiguration.IconActio ) { Text(text = iconActionConfiguration.title, style = GrapesTheme.typography.titleL, color = titleColor) iconActionConfiguration.description?.let { - Text(text = it, style = GrapesTheme.typography.bodyS, color = GrapesTheme.colors.mainNeutralDarker) + Text(text = it, style = GrapesTheme.typography.bodyM, color = GrapesTheme.colors.mainNeutralDarker) } } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt index 0bfe80a6..0ccadad3 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/Message.kt @@ -70,7 +70,7 @@ fun GrapesMessage( Spacer(modifier = Modifier.size(GrapesTheme.dimensions.spacing1)) Text( text = description, - style = GrapesTheme.typography.bodyS, + style = GrapesTheme.typography.bodyM, color = GrapesTheme.colors.mainComplementary, textAlign = descriptionTextAlign, modifier = Modifier.fillMaxWidth(), diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt index f14a0b70..0bcbd51c 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt @@ -83,7 +83,7 @@ private fun PasswordValidationItem( Box(modifier = Modifier.size(PasswordValidationDefaults.ValidationBoxSize), contentAlignment = Alignment.Center) { Icon(painter = painterResource(id = itemIcon), contentDescription = null, tint = itemColor, modifier = Modifier.size(iconSize)) } - Text(text = label, style = GrapesTheme.typography.bodyS, color = itemColor) + Text(text = label, style = GrapesTheme.typography.bodyM, color = itemColor) } } @@ -129,7 +129,7 @@ private fun PasswordValidationPreview() { } } ) - Text(text = "Change ${item.label} status", style = GrapesTheme.typography.bodyS) + Text(text = "Change ${item.label} status", style = GrapesTheme.typography.bodyM) } } } diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt index 275a3364..88ee9627 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/selectors/GrapesSelectCardText.kt @@ -85,7 +85,7 @@ fun GrapesSelectCardText( color = if (isSelected) GrapesSelectCardTextDefaultColors.selectedDescriptionColor else GrapesSelectCardTextDefaultColors.unselectedDescriptionColor, overflow = TextOverflow.Ellipsis, maxLines = 2, - style = GrapesTheme.typography.bodyS, + style = GrapesTheme.typography.bodyM, text = description ) } From 27146f45ae7af5775dbf1e319aa928dc2d49f561 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 14:58:08 +0100 Subject: [PATCH 16/17] Migrate legacy bodyXs to bodyS --- .../spendesk/grapes/compose/textfield/GrapesBaseTextField.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt index 1a0d28f2..7f407a7d 100644 --- a/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt +++ b/library-compose/src/main/java/com/spendesk/grapes/compose/textfield/GrapesBaseTextField.kt @@ -240,7 +240,7 @@ internal fun GrapesHelperText( text: String, modifier: Modifier = Modifier, enabled: Boolean = true, - textStyle: TextStyle = GrapesTheme.typography.bodyXs, + textStyle: TextStyle = GrapesTheme.typography.bodyS, isError: Boolean = false, colors: GrapesTextFieldColors = GrapesTextFieldDefaults.textFieldColors(), contentPadding: PaddingValues = GrapesTextFieldDefaults.textFieldPadding(), From 75f1f789f696a3b8f00a75b0c88f4cfe1adeb9e8 Mon Sep 17 00:00:00 2001 From: Kelian CLERC Date: Wed, 13 Dec 2023 16:33:23 +0100 Subject: [PATCH 17/17] Bump grapes version name --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 32abd182..f1890120 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -grapes-version = '1.19.0' +grapes-version = '1.20.0' androidMinSdk = "21" androidTargetSdk = "34" androidCompileSdk = "34"