Skip to content

Commit 4d3b950

Browse files
chore: add Sosh theme (#267)
* chore: update tokens * chore : add themes temporary to test * chore : add sosh_color_semantic.dart not generated * fix : token sosh semantic * fix : token semantic contract optional parameter * fix : scheme contract color parameter optional * fix : component token optional parameter * fix : component radio button ouds_core asset sosh * fix : component checkbox ouds_core asset sosh * fix : chips component to detect selected token * chore : demo app color_screen optional parameter * chore : delete w950 weight parameter raw token * chore : replace unimplemented error by semantic * chore : component token optional parameters * fix : color opacity token * fixed : new file by tokenator * fix : color code app * chore : separated icons with sosh and orange theme * chore : delete theme white label and country --------- Co-authored-by: boosted-bot <boosted-bot@users.noreply.github.com> Co-authored-by: Tayeb Sedraia <tayeb.sedraia@orange.com>
1 parent c273443 commit 4d3b950

158 files changed

Lines changed: 3259 additions & 1556 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

NOTICE.txt

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ in whole or part of, in any medium, except as required for reasonable and custom
88
and reproducing the content of the NOTICE and DOCUMENTATION files.
99
Any use or displaying shall constitute an infringement under intellectual property laws of France and international conventions.
1010

11+
## OUDS / Design Toolbox
1112
ouds-flutter/app/assets/about_privacy_policy.md
1213
ouds-flutter/app/assets/about_legal_information.md
1314
ouds-flutter/app/assets/ic_heart.svg
@@ -44,11 +45,56 @@ ouds-flutter/app/assets/il_components_badge.svg
4445
ouds-flutter/app/assets/il_components_chip.svg
4546
ouds-flutter/app/assets/il_components_chip_dark.svg
4647

48+
## OUDS / Themes / Orange
49+
ouds_theme_orange/assets/ic_bullet.svg
50+
ouds_theme_orange/assets/ic_bullet_nested_1.svg
51+
ouds_theme_orange/assets/ic_bullet_nested_2.svg
52+
ouds_theme_orange/assets/ic_checkbox_selected.svg
53+
ouds_theme_orange/assets/ic_checkbox_undeterminate.svg
54+
ouds_theme_orange/assets/ic_chevron_down.svg
55+
ouds_theme_orange/assets/ic_chevron_left.svg
56+
ouds_theme_orange/assets/ic_chevron_right.svg
57+
ouds_theme_orange/assets/ic_chevron_up.svg
58+
ouds_theme_orange/assets/ic_delete.svg
59+
ouds_theme_orange/assets/ic_heart.svg
60+
ouds_theme_orange/assets/ic_radio-button_selected.svg
61+
ouds_theme_orange/assets/ic_search.svg
62+
ouds_theme_orange/assets/ic_switch_selected.svg
63+
ouds_theme_orange/assets/ic_tick.svg
4764

48-
ouds-core/assets/checkbox_selected.svg
49-
ouds-core/assets/checkbox_indeterminate.svg
50-
ouds-core/assets/symbol_radio_selected.svg
51-
ouds-core/assets/symbol_switch_checked.svg
52-
ouds-core/assets/symbol_filter_chip_selected.svg
65+
ouds_theme_sosh/fonts/Roboto-Black.ttf
66+
ouds_theme_sosh/fonts/Roboto-Bold.ttf
67+
ouds_theme_sosh/fonts/Roboto-Medium.ttf
68+
ouds_theme_sosh/fonts/Roboto-Regular.ttf
69+
ouds_theme_sosh/fonts/Roboto-Thin.ttf
70+
ouds_theme_sosh/fonts/SF-Pro-Display-Black-Black.ttf
71+
ouds_theme_sosh/fonts/SF-Pro-Display-Black-Bold.ttf
72+
ouds_theme_sosh/fonts/SF-Pro-Display-Black-Medium.ttf
73+
ouds_theme_sosh/fonts/SF-Pro-Display-Black-Regular.ttf
74+
ouds_theme_sosh/fonts/SF-Pro-Display-Black-Thin.ttf
75+
76+
77+
## OUDS / Themes / Sosh
78+
ouds_theme_sosh/assets/ic_bullet.svg
79+
ouds_theme_sosh/assets/ic_bullet_nested_1.svg
80+
ouds_theme_sosh/assets/ic_bullet_nested_2.svg
81+
ouds_theme_sosh/assets/ic_checkbox_selected.svg
82+
ouds_theme_sosh/assets/ic_checkbox_undeterminate.svg
83+
ouds_theme_sosh/assets/ic_chevron_down.svg
84+
ouds_theme_sosh/assets/ic_chevron_left.svg
85+
ouds_theme_sosh/assets/ic_chevron_right.svg
86+
ouds_theme_sosh/assets/ic_chevron_up.svg
87+
ouds_theme_sosh/assets/ic_delete.svg
88+
ouds_theme_sosh/assets/ic_heart.svg
89+
ouds_theme_sosh/assets/ic_radio-button_selected.svg
90+
ouds_theme_sosh/assets/ic_search.svg
91+
ouds_theme_sosh/assets/ic_switch_selected.svg
92+
ouds_theme_sosh/assets/ic_tick.svg
93+
94+
ouds_theme_sosh/fonts/Sosh-Black.ttf
95+
ouds_theme_sosh/fonts/Sosh-Bold.ttf
96+
ouds_theme_sosh/fonts/Sosh-Medium.ttf
97+
ouds_theme_sosh/fonts/Sosh-Regular.ttf
98+
ouds_theme_sosh/fonts/Sosh-Thin.ttf
5399

54100
End of the parts list under Orange SA Copyright

app/lib/ui/tokens/color/color_screen.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class ColorWidget extends StatelessWidget {
132132
),
133133
),
134134
SizedBox(height: currentTheme.spaceScheme(context).rowGapNone),
135-
Text(colorTokenItem.colorToHex(colorTokenItem.value), style: currentTheme.typographyTokens.typeBodyDefaultMedium(context).copyWith(color: currentTheme.colorScheme(context).contentMuted)),
135+
Text(colorTokenItem.colorToHex(colorTokenItem.value!), style: currentTheme.typographyTokens.typeBodyDefaultMedium(context).copyWith(color: currentTheme.colorScheme(context).contentMuted)),
136136
],
137137
),
138138
),
@@ -146,7 +146,7 @@ class ColorTokenItem {
146146
const ColorTokenItem({required this.name, required this.value});
147147

148148
final String name;
149-
final Color value;
149+
final Color? value;
150150

151151
String colorToHex(Color color) {
152152
// Convert the individual RGBA components (Red, Green, Blue) from double to int

app/lib/ui/utilities/code.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class CodeState extends State<Code> with SingleTickerProviderStateMixin {
123123
turns: Tween(begin: 0.0, end: 0.5).animate(_animationController),
124124
child: Icon(
125125
Icons.expand_more,
126-
color: theme.currentTheme.colorScheme(context).contentDefault,
126+
color: theme.currentTheme.colorScheme(context).contentBrandPrimary,
127127
),
128128
),
129129
],

ouds_core/lib/components/badge/internal/ouds_badge_size_modifier.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class OudsBadgeSizeModifier {
2727
OudsBadgeSizeModifier(this.context);
2828

2929
/// Retrieves the size (double) for the badge based on the provided size enum.
30-
double getSize(OudsBadgeSize? state) {
30+
double? getSize(OudsBadgeSize? state) {
3131
final theme = OudsTheme.of(context).componentsTokens(context).badge;
3232

3333
switch (state) {

ouds_core/lib/components/badge/ouds_badge.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ class _OudsBadgeState extends State<OudsBadge> {
100100
width: type == Type.count ? null : badgeSizeModifier.getSize(widget.size),
101101
height: type == Type.count ? null : badgeSizeModifier.getSize(widget.size),
102102
constraints: BoxConstraints(
103-
minHeight: badgeSizeModifier.getSize(widget.size),
104-
minWidth: badgeSizeModifier.getSize(widget.size),
105-
maxHeight: type == Type.count ? double.infinity : badgeSizeModifier.getSize(widget.size),
106-
maxWidth: type == Type.count ? double.infinity : badgeSizeModifier.getSize(widget.size),
103+
minHeight: badgeSizeModifier.getSize(widget.size)!,
104+
minWidth: badgeSizeModifier.getSize(widget.size)!,
105+
maxHeight: type == Type.count ? double.infinity : badgeSizeModifier.getSize(widget.size)!,
106+
maxWidth: type == Type.count ? double.infinity : badgeSizeModifier.getSize(widget.size)!,
107107
),
108108
child: Badge(
109109
padding: widget.icon != null
110-
? EdgeInsets.only(left: badge.spaceInset, right: badge.spaceInset)
110+
? EdgeInsets.only(left: badge.spaceInset!, right: badge.spaceInset!)
111111
: widget.size == OudsBadgeSize.large
112-
? EdgeInsets.only(left: badge.spacePaddingInlineLarge, right: badge.spacePaddingInlineLarge)
113-
: EdgeInsets.only(left: badge.spacePaddingInlineMedium, right: badge.spacePaddingInlineMedium),
112+
? EdgeInsets.only(left: badge.spacePaddingInlineLarge!, right: badge.spacePaddingInlineLarge!)
113+
: EdgeInsets.only(left: badge.spacePaddingInlineMedium!, right: badge.spacePaddingInlineMedium!),
114114
backgroundColor: badgeStatusModifier.getStatusColor(widget.status),
115115
label: badgeLabel,
116116
child: widget.child,

ouds_core/lib/components/button/internal/button_background_modifier.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ButtonBackgroundModifier {
4242
);
4343
}
4444

45-
static Color _getEnabledColor(BuildContext context, OudsButtonHierarchy hierarchy) {
45+
static Color? _getEnabledColor(BuildContext context, OudsButtonHierarchy hierarchy) {
4646
final theme = OudsTheme.of(context);
4747
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
4848
switch (hierarchy) {
@@ -57,7 +57,7 @@ class ButtonBackgroundModifier {
5757
}
5858
}
5959

60-
static Color _getHoverColor(BuildContext context, OudsButtonHierarchy hierarchy) {
60+
static Color? _getHoverColor(BuildContext context, OudsButtonHierarchy hierarchy) {
6161
final theme = OudsTheme.of(context);
6262
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
6363
switch (hierarchy) {
@@ -72,7 +72,7 @@ class ButtonBackgroundModifier {
7272
}
7373
}
7474

75-
static Color _getPressedColor(BuildContext context, OudsButtonHierarchy hierarchy) {
75+
static Color? _getPressedColor(BuildContext context, OudsButtonHierarchy hierarchy) {
7676
final theme = OudsTheme.of(context);
7777
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
7878
switch (hierarchy) {
@@ -87,7 +87,7 @@ class ButtonBackgroundModifier {
8787
}
8888
}
8989

90-
static Color _getDisabledColor(BuildContext context, OudsButtonHierarchy hierarchy) {
90+
static Color? _getDisabledColor(BuildContext context, OudsButtonHierarchy hierarchy) {
9191
final theme = OudsTheme.of(context);
9292
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
9393
switch (hierarchy) {

ouds_core/lib/components/button/internal/button_border_modifier.dart

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class ButtonBorderModifier {
4444
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
4545
switch (hierarchy) {
4646
case OudsButtonHierarchy.strong:
47-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongEnabled, width: theme.componentsTokens(context).button.borderWidthDefault) : BorderSide.none;
47+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongEnabled!, width: theme.componentsTokens(context).button.borderWidthDefault!) : BorderSide.none;
4848
case OudsButtonHierarchy.minimal:
4949
return BorderSide(
50-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalEnabled : theme.componentsTokens(context).button.colorBorderMinimalEnabled, width: theme.componentsTokens(context).button.borderWidthMinimal);
50+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalEnabled! : theme.componentsTokens(context).button.colorBorderMinimalEnabled!, width: theme.componentsTokens(context).button.borderWidthMinimal!);
5151
case OudsButtonHierarchy.negative:
5252
return BorderSide.none;
5353
default:
5454
return BorderSide(
55-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled : theme.componentsTokens(context).button.colorBorderDefaultEnabled, width: theme.componentsTokens(context).button.borderWidthDefault);
55+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled! : theme.componentsTokens(context).button.colorBorderDefaultEnabled!, width: theme.componentsTokens(context).button.borderWidthDefault!);
5656
}
5757
}
5858

@@ -61,15 +61,17 @@ class ButtonBorderModifier {
6161
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
6262
switch (hierarchy) {
6363
case OudsButtonHierarchy.strong:
64-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongHover, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction) : BorderSide.none;
64+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongHover!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!) : BorderSide.none;
6565
case OudsButtonHierarchy.minimal:
6666
return BorderSide(
67-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalHover : theme.componentsTokens(context).button.colorBorderMinimalHover, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
67+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalHover! : theme.componentsTokens(context).button.colorBorderMinimalHover!,
68+
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
6869
case OudsButtonHierarchy.negative:
6970
return BorderSide.none;
7071
default:
7172
return BorderSide(
72-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled : theme.componentsTokens(context).button.colorBorderDefaultHover, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction);
73+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled! : theme.componentsTokens(context).button.colorBorderDefaultHover!,
74+
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!);
7375
}
7476
}
7577

@@ -78,17 +80,17 @@ class ButtonBorderModifier {
7880
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
7981
switch (hierarchy) {
8082
case OudsButtonHierarchy.strong:
81-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongPressed, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction) : BorderSide.none;
83+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongPressed!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!) : BorderSide.none;
8284
case OudsButtonHierarchy.minimal:
8385
return BorderSide(
84-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalPressed : theme.componentsTokens(context).button.colorBorderMinimalPressed,
85-
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
86+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalPressed! : theme.componentsTokens(context).button.colorBorderMinimalPressed!,
87+
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
8688
case OudsButtonHierarchy.negative:
8789
return BorderSide.none;
8890
default:
8991
return BorderSide(
90-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultPressed : theme.componentsTokens(context).button.colorBorderDefaultPressed,
91-
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction);
92+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultPressed! : theme.componentsTokens(context).button.colorBorderDefaultPressed!,
93+
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!);
9294
}
9395
}
9496

@@ -97,16 +99,16 @@ class ButtonBorderModifier {
9799
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
98100
switch (hierarchy) {
99101
case OudsButtonHierarchy.strong:
100-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongDisabled, width: theme.componentsTokens(context).button.borderWidthDefault) : BorderSide.none;
102+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongDisabled!, width: theme.componentsTokens(context).button.borderWidthDefault!) : BorderSide.none;
101103
case OudsButtonHierarchy.minimal:
102104
return BorderSide(
103-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalDisabled : theme.componentsTokens(context).button.colorBorderMinimalDisabled,
104-
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
105+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalDisabled! : theme.componentsTokens(context).button.colorBorderMinimalDisabled!,
106+
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
105107
case OudsButtonHierarchy.negative:
106108
return BorderSide.none;
107109
default:
108110
return BorderSide(
109-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultDisabled : theme.componentsTokens(context).button.colorBorderDefaultDisabled, width: theme.componentsTokens(context).button.borderWidthDefault);
111+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultDisabled! : theme.componentsTokens(context).button.colorBorderDefaultDisabled!, width: theme.componentsTokens(context).button.borderWidthDefault!);
110112
}
111113
}
112114
}

ouds_core/lib/components/button/internal/button_foreground_modifier.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ButtonForegroundModifier {
4141
);
4242
}
4343

44-
static Color _getEnabledForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
44+
static Color? _getEnabledForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
4545
final theme = OudsTheme.of(context);
4646
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
4747
switch (hierarchy) {
@@ -56,7 +56,7 @@ class ButtonForegroundModifier {
5656
}
5757
}
5858

59-
static Color _getHoverForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
59+
static Color? _getHoverForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
6060
final theme = OudsTheme.of(context);
6161
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
6262
switch (hierarchy) {
@@ -71,7 +71,7 @@ class ButtonForegroundModifier {
7171
}
7272
}
7373

74-
static Color _getPressedForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
74+
static Color? _getPressedForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
7575
final theme = OudsTheme.of(context);
7676
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
7777
switch (hierarchy) {
@@ -86,7 +86,7 @@ class ButtonForegroundModifier {
8686
}
8787
}
8888

89-
static Color _getDisabledForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
89+
static Color? _getDisabledForegroundColor(BuildContext context, OudsButtonHierarchy hierarchy) {
9090
final theme = OudsTheme.of(context);
9191
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
9292
switch (hierarchy) {

ouds_core/lib/components/button/internal/button_loading_modifier.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ButtonLoadingModifier {
2727
this.label,
2828
});
2929

30-
static Color getColorToken(BuildContext context, OudsButtonHierarchy hierarchy) {
30+
static Color? getColorToken(BuildContext context, OudsButtonHierarchy hierarchy) {
3131
final theme = OudsTheme.of(context);
3232
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
3333
switch (hierarchy) {
@@ -42,7 +42,7 @@ class ButtonLoadingModifier {
4242
}
4343
}
4444

45-
static Color getBackgroundToken(BuildContext context, OudsButtonHierarchy hierarchy) {
45+
static Color? getBackgroundToken(BuildContext context, OudsButtonHierarchy hierarchy) {
4646
final theme = OudsTheme.of(context);
4747
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
4848
switch (hierarchy) {
@@ -62,17 +62,17 @@ class ButtonLoadingModifier {
6262
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
6363
switch (hierarchy) {
6464
case OudsButtonHierarchy.strong:
65-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongLoading, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction) : BorderSide.none;
65+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongLoading!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!) : BorderSide.none;
6666
case OudsButtonHierarchy.minimal:
6767
return onColoredSurface
68-
? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderMinimalLoading, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction)
69-
: BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderMinimalLoading, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
68+
? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderMinimalLoading!, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!)
69+
: BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderMinimalLoading!, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
7070
case OudsButtonHierarchy.negative:
7171
return BorderSide.none;
7272
default:
7373
return onColoredSurface
74-
? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderDefaultLoading, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction)
75-
: BorderSide(color: theme.componentsTokens(context).button.colorBorderDefaultLoading, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction);
74+
? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderDefaultLoading!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!)
75+
: BorderSide(color: theme.componentsTokens(context).button.colorBorderDefaultLoading!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!);
7676
}
7777
}
7878
}

0 commit comments

Comments
 (0)