Skip to content

Commit f3a0ab6

Browse files
boosted-botTayebsed93
boosted-bot
and
Tayebsed93
authored
chore(🤖): add theme component tokens (library version 1.3.0) (#285)
* chore: update tokens * chore: delete theme orange country and white label * fix: font roboto mono * fix : ouds component token * fix : delete optional parameter color * fix: missing radio button token * fix: ci/cd test --------- Co-authored-by: boosted-bot <boosted-bot@users.noreply.github.com> Co-authored-by: Tayeb Sedraia <tayeb.sedraia@orange.com>
1 parent 2c87ea6 commit f3a0ab6

167 files changed

Lines changed: 2324 additions & 4037 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.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,10 @@ jobs:
5353
cd ouds_theme_orange
5454
flutter test
5555
56-
- name: Run ouds_theme_orange_country tests
56+
- name: Run ouds_theme_sosh tests
5757
shell: bash
5858
run: |
59-
cd ouds_theme_orange_country
60-
flutter test
61-
62-
- name: Run ouds_theme_white_label tests
63-
shell: bash
64-
run: |
65-
cd ouds_theme_white_label
59+
cd ouds_theme_sosh
6660
flutter test
6761
6862
build-android:

‎app/lib/ui/components/badge/badge_code_generator.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BadgeCodeGenerator {
2727
late String labelValue = "";
2828

2929
if (BadgeCustomizationUtils.getType(customizationState!.selectedType) == BadgeEnumType.count) {
30-
labelValue = "label: ${BadgeCustomizationUtils.getNumberText(customizationState!)}";
30+
labelValue = "label: ${BadgeCustomizationUtils.getNumberText(customizationState)}";
3131
} else {
3232
labelValue = "label: null";
3333
}

‎app/lib/ui/components/control_item/control_item_code_generator.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ ${dividerCode(context)}${control == ControlItemType.radioButton ? outlinedCode(c
7575

7676
// Method to generate the error code for the control item
7777
static String groupValueCode(BuildContext context) {
78-
final customizationState = ControlItemCustomization.of(context);
7978
return '\ngroupValue: selectedOption,';
8079
}
8180

‎app/lib/ui/utilities/code.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class CodeState extends State<Code> with SingleTickerProviderStateMixin {
146146
horizontal: theme.currentTheme.spaceScheme(context).paddingInlineMedium,
147147
),
148148
decoration: BoxDecoration(
149-
color: theme.currentTheme.colorScheme(context).surfaceStatusNeutralMuted,
149+
color: theme.currentTheme.colorScheme(context).bgSecondary,
150150
borderRadius: BorderRadius.circular(theme.currentTheme.borderTokens.radiusDefault),
151151
border: Border.all(
152152
color: theme.currentTheme.colorScheme(context).borderDefault,
@@ -166,7 +166,7 @@ class CodeState extends State<Code> with SingleTickerProviderStateMixin {
166166
fontSize: theme.currentTheme.fontTokens.sizeBodyMediumMobile,
167167
letterSpacing: theme.currentTheme.fontTokens.letterSpacingBodyMediumMobile,
168168
fontFamily: 'RobotoMono',
169-
package: 'ouds_theme_white_label',
169+
package: theme.currentTheme.packageName,
170170
),
171171
),
172172
),

‎ouds_core/lib/components/badge/ouds_badge.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ class _OudsBadgeState extends State<OudsBadge> {
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_border_modifier.dart‎

Lines changed: 15 additions & 17 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,17 +61,15 @@ 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!,
68-
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
67+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalHover : theme.componentsTokens(context).button.colorBorderMinimalHover, width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
6968
case OudsButtonHierarchy.negative:
7069
return BorderSide.none;
7170
default:
7271
return BorderSide(
73-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled! : theme.componentsTokens(context).button.colorBorderDefaultHover!,
74-
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!);
72+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultEnabled : theme.componentsTokens(context).button.colorBorderDefaultHover, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction);
7573
}
7674
}
7775

@@ -80,17 +78,17 @@ class ButtonBorderModifier {
8078
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
8179
switch (hierarchy) {
8280
case OudsButtonHierarchy.strong:
83-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongPressed!, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!) : BorderSide.none;
81+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongPressed, width: theme.componentsTokens(context).button.borderWidthDefaultInteraction) : BorderSide.none;
8482
case OudsButtonHierarchy.minimal:
8583
return BorderSide(
86-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalPressed! : theme.componentsTokens(context).button.colorBorderMinimalPressed!,
87-
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
84+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalPressed : theme.componentsTokens(context).button.colorBorderMinimalPressed,
85+
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
8886
case OudsButtonHierarchy.negative:
8987
return BorderSide.none;
9088
default:
9189
return BorderSide(
92-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultPressed! : theme.componentsTokens(context).button.colorBorderDefaultPressed!,
93-
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction!);
90+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultPressed : theme.componentsTokens(context).button.colorBorderDefaultPressed,
91+
width: theme.componentsTokens(context).button.borderWidthDefaultInteraction);
9492
}
9593
}
9694

@@ -99,16 +97,16 @@ class ButtonBorderModifier {
9997
final onColoredSurface = OudsTheme.isOnColoredSurfaceOf(context);
10098
switch (hierarchy) {
10199
case OudsButtonHierarchy.strong:
102-
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongDisabled!, width: theme.componentsTokens(context).button.borderWidthDefault!) : BorderSide.none;
100+
return onColoredSurface ? BorderSide(color: theme.componentsTokens(context).buttonMono.colorBorderStrongDisabled, width: theme.componentsTokens(context).button.borderWidthDefault) : BorderSide.none;
103101
case OudsButtonHierarchy.minimal:
104102
return BorderSide(
105-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalDisabled! : theme.componentsTokens(context).button.colorBorderMinimalDisabled!,
106-
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction!);
103+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderMinimalDisabled : theme.componentsTokens(context).button.colorBorderMinimalDisabled,
104+
width: theme.componentsTokens(context).button.borderWidthMinimalInteraction);
107105
case OudsButtonHierarchy.negative:
108106
return BorderSide.none;
109107
default:
110108
return BorderSide(
111-
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultDisabled! : theme.componentsTokens(context).button.colorBorderDefaultDisabled!, width: theme.componentsTokens(context).button.borderWidthDefault!);
109+
color: onColoredSurface ? theme.componentsTokens(context).buttonMono.colorBorderDefaultDisabled : theme.componentsTokens(context).button.colorBorderDefaultDisabled, width: theme.componentsTokens(context).button.borderWidthDefault);
112110
}
113111
}
114112
}

‎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
}

‎ouds_core/lib/components/button/internal/button_padding_modifier.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ class ButtonPaddingModifier {
1919
final theme = OudsTheme.of(context);
2020
switch (layout) {
2121
case OudsButtonLayout.iconOnly:
22-
return EdgeInsetsDirectional.all(theme.componentsTokens(context).button.spaceInsetIconOnly!);
22+
return EdgeInsetsDirectional.all(theme.componentsTokens(context).button.spaceInsetIconOnly);
2323
case OudsButtonLayout.iconAndText:
2424
return EdgeInsetsDirectional.only(
25-
top: theme.componentsTokens(context).button.spacePaddingBlock!,
26-
end: theme.componentsTokens(context).button.spacePaddingInlineEndIconStart!,
27-
bottom: theme.componentsTokens(context).button.spacePaddingBlock!,
28-
start: theme.componentsTokens(context).button.spacePaddingInlineIconStart!,
25+
top: theme.componentsTokens(context).button.spacePaddingBlock,
26+
end: theme.componentsTokens(context).button.spacePaddingInlineEndIconStart,
27+
bottom: theme.componentsTokens(context).button.spacePaddingBlock,
28+
start: theme.componentsTokens(context).button.spacePaddingInlineIconStart,
2929
);
3030
case OudsButtonLayout.textOnly:
3131
return EdgeInsetsDirectional.only(
32-
top: theme.componentsTokens(context).button.spacePaddingBlock!,
33-
end: theme.componentsTokens(context).button.spacePaddingInlineIconNone!,
34-
bottom: theme.componentsTokens(context).button.spacePaddingBlock!,
35-
start: theme.componentsTokens(context).button.spacePaddingInlineIconNone!,
32+
top: theme.componentsTokens(context).button.spacePaddingBlock,
33+
end: theme.componentsTokens(context).button.spacePaddingInlineIconNone,
34+
bottom: theme.componentsTokens(context).button.spacePaddingBlock,
35+
start: theme.componentsTokens(context).button.spacePaddingInlineIconNone,
3636
);
3737
}
3838
}

‎ouds_core/lib/components/button/internal/button_style_modifier.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class ButtonStyleModifier {
2828
}) {
2929
double iconSize;
3030
if (layout == OudsButtonLayout.iconOnly) {
31-
iconSize = OudsTheme.of(context).componentsTokens(context).button.sizeIconOnly!;
31+
iconSize = OudsTheme.of(context).componentsTokens(context).button.sizeIconOnly;
3232
} else if (layout == OudsButtonLayout.iconAndText) {
33-
iconSize = OudsTheme.of(context).componentsTokens(context).button.sizeIcon!;
33+
iconSize = OudsTheme.of(context).componentsTokens(context).button.sizeIcon;
3434
} else {
3535
iconSize = 0.0;
3636
}
@@ -52,14 +52,14 @@ class ButtonStyleModifier {
5252
side: ButtonBorderModifier.resolveBorderColor(context, hierarchy, style),
5353
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
5454
RoundedRectangleBorder(
55-
borderRadius: BorderRadius.circular(OudsTheme.of(context).componentsTokens(context).button.borderRadius!),
55+
borderRadius: BorderRadius.circular(OudsTheme.of(context).componentsTokens(context).button.borderRadius),
5656
),
5757
),
5858
padding: WidgetStateProperty.all<EdgeInsetsGeometry>(
5959
ButtonPaddingModifier.getPadding(context, layout),
6060
),
6161
minimumSize: WidgetStateProperty.all<Size>(
62-
Size(OudsTheme.of(context).componentsTokens(context).button.sizeMinWidth!, OudsTheme.of(context).componentsTokens(context).button.sizeMinHeight!),
62+
Size(OudsTheme.of(context).componentsTokens(context).button.sizeMinWidth, OudsTheme.of(context).componentsTokens(context).button.sizeMinHeight),
6363
),
6464
animationDuration: Duration.zero,
6565
);

0 commit comments

Comments
 (0)