diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 85aa3cab7..4879c6cb6 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [DemoApp][Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/app/lib/ui/components/chip/chip_filter_demo_sreen.dart b/app/lib/ui/components/chip/chip_filter_demo_sreen.dart index aa4b79962..2c3f35ee4 100644 --- a/app/lib/ui/components/chip/chip_filter_demo_sreen.dart +++ b/app/lib/ui/components/chip/chip_filter_demo_sreen.dart @@ -37,7 +37,7 @@ import 'package:provider/provider.dart'; class ChipFilterDemoScreen extends StatefulWidget { final String? previousPageTitle; - const ChipFilterDemoScreen({super.key,this.previousPageTitle}); + const ChipFilterDemoScreen({super.key, this.previousPageTitle}); @override State createState() => _ChipFilterDemoScreenState(); @@ -61,20 +61,10 @@ class _ChipFilterDemoScreenState extends State { child: Padding( padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone), child: Scaffold( - bottomSheet: OudsSheetsBottom( - onExpansionChanged: _onExpansionChanged, - sheetContent: const _CustomizationContent(), - title: context.l10n.app_common_customize_label, - ), + bottomSheet: OudsSheetsBottom(onExpansionChanged: _onExpansionChanged, sheetContent: const _CustomizationContent(), title: context.l10n.app_common_customize_label), extendBodyBehindAppBar: true, - appBar: MainAppBar( - title: context.l10n.app_components_filterChip_label, - showBackButton: true, - previousPageTitle: widget.previousPageTitle,), - body: ExcludeSemantics( - excluding: !_isBottomSheetExpanded, - child: _Body(), - ), + appBar: MainAppBar(title: context.l10n.app_components_filterChip_label, showBackButton: true, previousPageTitle: widget.previousPageTitle), + body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()), ), ), ), @@ -100,12 +90,8 @@ class _BodyState extends State<_Body> { children: [ _ChipFilterDemo(), SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium), - Code( - code: ChipFilterCodeGenerator.updateCode(context), - ), - ReferenceDesignVersionComponent( - version: OudsComponentVersion.chip, - ) + Code(code: ChipFilterCodeGenerator.updateCode(context)), + ReferenceDesignVersionComponent(version: OudsComponentVersion.filterChip), ], ), ); @@ -134,18 +120,17 @@ class _ChipFilterDemoState extends State<_ChipFilterDemo> { return LightDarkBox( child: OudsFilterChip( - label: ChipCustomizationUtils.getText(customizationState), - avatar: ChipCustomizationUtils.getIcon(customizationState, themeController!), - selected: customizationState?.hasSelected, - onSelected: customizationState?.hasEnabled == true - ? (newValue) { - setState( - () { - customizationState?.hasSelected = newValue; - }, - ); - } - : null), + label: ChipCustomizationUtils.getText(customizationState), + avatar: ChipCustomizationUtils.getIcon(customizationState, themeController!), + selected: customizationState?.hasSelected, + onSelected: customizationState?.hasEnabled == true + ? (newValue) { + setState(() { + customizationState?.hasSelected = newValue; + }); + } + : null, + ), ); } } @@ -207,12 +192,7 @@ class _CustomizationContentState extends State<_CustomizationContent> { }); }, ), - CustomizableTextField( - title: context.l10n.app_components_common_label_label, - text: customizationState.labelText, - focusNode: labelFocus, - fieldType: FieldType.label, - ) + CustomizableTextField(title: context.l10n.app_components_common_label_label, text: customizationState.labelText, focusNode: labelFocus, fieldType: FieldType.label), ], ); } diff --git a/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart b/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart index b73e5101b..bcdfe30e2 100644 --- a/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart +++ b/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart @@ -36,7 +36,7 @@ import 'package:provider/provider.dart'; class ChipSuggestionDemoScreen extends StatefulWidget { final String? previousPageTitle; - const ChipSuggestionDemoScreen({super.key,this.previousPageTitle}); + const ChipSuggestionDemoScreen({super.key, this.previousPageTitle}); @override State createState() => _ChipSuggestionDemoScreenState(); @@ -60,20 +60,10 @@ class _ChipSuggestionDemoScreenState extends State { child: Padding( padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone), child: Scaffold( - bottomSheet: OudsSheetsBottom( - onExpansionChanged: _onExpansionChanged, - sheetContent: const _CustomizationContent(), - title: context.l10n.app_common_customize_label, - ), + bottomSheet: OudsSheetsBottom(onExpansionChanged: _onExpansionChanged, sheetContent: const _CustomizationContent(), title: context.l10n.app_common_customize_label), extendBodyBehindAppBar: true, - appBar: MainAppBar( - title: context.l10n.app_components_suggestionChip_label, - showBackButton: true, - previousPageTitle: widget.previousPageTitle), - body: ExcludeSemantics( - excluding: !_isBottomSheetExpanded, - child: _Body(), - ), + appBar: MainAppBar(title: context.l10n.app_components_suggestionChip_label, showBackButton: true, previousPageTitle: widget.previousPageTitle), + body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()), ), ), ), @@ -99,12 +89,8 @@ class _BodyState extends State<_Body> { children: [ _ChipSuggestionDemo(), SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium), - Code( - code: ChipSuggestionCodeGenerator.updateCode(context), - ), - ReferenceDesignVersionComponent( - version: OudsComponentVersion.chip, - ) + Code(code: ChipSuggestionCodeGenerator.updateCode(context)), + ReferenceDesignVersionComponent(version: OudsComponentVersion.suggestionChip), ], ), ); @@ -189,12 +175,7 @@ class _CustomizationContentState extends State<_CustomizationContent> { }); }, ), - CustomizableTextField( - title: context.l10n.app_components_common_label_label, - text: customizationState.labelText, - focusNode: labelFocus, - fieldType: FieldType.label, - ) + CustomizableTextField(title: context.l10n.app_components_common_label_label, text: customizationState.labelText, focusNode: labelFocus, fieldType: FieldType.label), ], ); } diff --git a/app/lib/ui/tokens/color/color_tokens_model.dart b/app/lib/ui/tokens/color/color_tokens_model.dart index 526ffc437..ebe6d777c 100644 --- a/app/lib/ui/tokens/color/color_tokens_model.dart +++ b/app/lib/ui/tokens/color/color_tokens_model.dart @@ -37,7 +37,6 @@ class ColorTokensModel { ColorTokenItem(name: 'actionSupportLoading', value: theme.colorScheme(context).actionSupportLoading), ColorTokenItem(name: 'actionSupportPressed', value: theme.colorScheme(context).actionSupportPressed), ColorTokenItem(name: 'actionVisited', value: theme.colorScheme(context).actionVisited), - ColorTokenItem(name: 'actionAccent', value: theme.colorScheme(context).actionIosAccent), ], context.l10n.app_tokens_color_always_label: [ ColorTokenItem(name: 'alwaysBlack', value: theme.colorScheme(context).alwaysBlack), diff --git a/ouds_core/CHANGELOG.md b/ouds_core/CHANGELOG.md index 24afd63d9..a46ddb943 100644 --- a/ouds_core/CHANGELOG.md +++ b/ouds_core/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_core/README.md b/ouds_core/README.md index 0c759b1e4..6ad1b5de3 100644 --- a/ouds_core/README.md +++ b/ouds_core/README.md @@ -32,7 +32,7 @@ It is intended to replace internal frameworks and the previous [ODS](https://git ## Tokens version -- **OUDS core token version**: 1.9.0. +- **OUDS core token version**: 1.10s.0. ## Other OUDS Libraries @@ -56,16 +56,32 @@ It is intended to replace internal frameworks and the previous [ODS](https://git Alert Message - 1.1.0 + 1.1.1 Badge 1.2.0 + + Badge Count + 1.2.0 + + + Badge Icon + 1.3.0 + Bar 1.0.0 + + Bottom Sheet + 1.0.0 + + + Bullet List + 1.1.0 + Button 3.2.0 @@ -74,49 +90,57 @@ It is intended to replace internal frameworks and the previous [ODS](https://git Checkbox 2.4.0 - - Chip - 1.3.0 - Divider 1.0.0 + + Filter Chip + 1.4.0 + Inline Alert 1.0.0 + + Input Tag + 1.2.0 + Link 2.2.0 Password Input - 1.2.0 + 1.3.0 Phone Number Input - 1.2.0 + 1.3.0 Pin Code Input - 1.2.0 + 1.3.0 Radio Button 1.4.0 + + Suggestion Chip + 1.4.0 + Switch 1.5.0 Tag - 1.4.0 + 1.5.0 Text Input - 1.3.0 + 1.4.0 diff --git a/ouds_core/lib/components/badge/ouds_badge.dart b/ouds_core/lib/components/badge/ouds_badge.dart index bf37f668d..11835ec4b 100644 --- a/ouds_core/lib/components/badge/ouds_badge.dart +++ b/ouds_core/lib/components/badge/ouds_badge.dart @@ -23,22 +23,11 @@ import 'package:ouds_theme_contract/ouds_theme.dart'; /// @nodoc /// this is an internal enum should not be exposed to the user -enum _OudsBadgeType { - icon, - count, - standard, -} +enum _OudsBadgeType { icon, count, standard } /// The [OudsBadgeStatus] enum defines the visual importance of the badge within the UI. @Deprecated('use OudsIconStatus subclasses (Neutral, Accent, Positive, Info, Warning, Negative). This type will be removed in the next major release.') -enum OudsBadgeStatus { - negative, - accent, - positive, - info, - warning, - neutral, -} +enum OudsBadgeStatus { negative, accent, positive, info, warning, neutral } /// @nodoc // deprecation remove : this enum is added only to support the deprecated enum and will be removed after deprecation @@ -60,12 +49,7 @@ extension OudsBadgeStatusConverter on OudsBadgeStatus { } /// The [OudsBadgeSize] enum defines the size of the badge within the UI. -enum OudsBadgeSize { - xsmall, - small, - medium, - large; -} +enum OudsBadgeSize { xsmall, small, medium, large } /// [OUDS Badge design guidelines](https://r.orange.fr/r/S-ouds-doc-badge) /// @@ -220,67 +204,46 @@ class OudsBadge extends StatefulWidget { final bool? _withIcon; /// ⚠️ **DEPRECATED:** Use [OudsBadge.standard], [OudsBadge.icon], or [OudsBadge.count] constructors instead. - @Deprecated('Use named constructors for clarity: OudsBadge.standard() for standard type, OudsBadge.icon() for icon type, or OudsBadge.count() for count type.' - ' This constructor will be removed in a future version.') + @Deprecated( + 'Use named constructors for clarity: OudsBadge.standard() for standard type, OudsBadge.icon() for icon type, or OudsBadge.count() for count type.' + ' This constructor will be removed in a future version.', + ) const OudsBadge({ super.key, OudsBadgeStatus? status, this.size = OudsBadgeSize.medium, this.label, - @Deprecated( - 'icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.') - this.icon, + @Deprecated('icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.') this.icon, this.child, this.enabled = true, this.semanticsLabel, - }) : _deprecatedStatus = status, - status = null, - _withIcon = null; + }) : _deprecatedStatus = status, + status = null, + _withIcon = null; - const OudsBadge.icon({ - super.key, - this.size = OudsBadgeSize.medium, - this.child, - this.enabled = true, - this.semanticsLabel, - this.status, - bool withIcon = true, - }) : label = null, - icon = null, - _deprecatedStatus = null, - _withIcon = withIcon; + const OudsBadge.icon({super.key, this.size = OudsBadgeSize.medium, this.child, this.enabled = true, this.semanticsLabel, this.status, bool withIcon = true}) + : label = null, + icon = null, + _deprecatedStatus = null, + _withIcon = withIcon; - const OudsBadge.standard({ - super.key, - this.size = OudsBadgeSize.medium, - this.child, - this.enabled = true, - this.semanticsLabel, - this.status, - }) : label = null, - icon = null, - _deprecatedStatus = null, - _withIcon = false; + const OudsBadge.standard({super.key, this.size = OudsBadgeSize.medium, this.child, this.enabled = true, this.semanticsLabel, this.status}) + : label = null, + icon = null, + _deprecatedStatus = null, + _withIcon = false; - const OudsBadge.count({ - super.key, - this.label, - this.size = OudsBadgeSize.medium, - this.child, - this.enabled = true, - this.semanticsLabel, - this.status, - }) : icon = null, - _deprecatedStatus = null, - _withIcon = false; + const OudsBadge.count({super.key, this.label, this.size = OudsBadgeSize.medium, this.child, this.enabled = true, this.semanticsLabel, this.status}) + : icon = null, + _deprecatedStatus = null, + _withIcon = false; @override State createState() => _OudsBadgeState(); } class _OudsBadgeState extends State { - OudsIconStatus? get _effectiveStatus => - widget.status ?? widget._deprecatedStatus?.toIconStatus(); + OudsIconStatus? get _effectiveStatus => widget.status ?? widget._deprecatedStatus?.toIconStatus(); @override Widget build(BuildContext context) { @@ -320,12 +283,8 @@ class _OudsBadgeState extends State { constraints: BoxConstraints( minHeight: scaledSize, minWidth: scaledSize, - maxHeight: type == _OudsBadgeType.count || type == _OudsBadgeType.standard - ? double.infinity - : scaledSize, - maxWidth: type == _OudsBadgeType.count || type == _OudsBadgeType.standard - ? double.infinity - : scaledSize, + maxHeight: type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? double.infinity : scaledSize, + maxWidth: type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? double.infinity : scaledSize, ), child: Semantics( label: widget.semanticsLabel, @@ -336,29 +295,19 @@ class _OudsBadgeState extends State { alignment: widget.size == OudsBadgeSize.large ? AlignmentDirectional(5, -1.5) : widget.size == OudsBadgeSize.medium - ? AlignmentDirectional(2, -1.3) - : null, - padding: widget.size == OudsBadgeSize.large - ? EdgeInsets.only( - left: badge.spaceInset, right: badge.spaceInset) + ? AlignmentDirectional(2, -1.3) : null, - backgroundColor: badgeStatusModifier.getStatusColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), + padding: widget.size == OudsBadgeSize.large ? EdgeInsets.only(left: badge.spaceInsetMediumLarge, right: badge.spaceInsetMediumLarge) : null, + backgroundColor: badgeStatusModifier.getStatusColor(widget._deprecatedStatus, _effectiveStatus, widget.enabled), child: widget.child, ) : Badge( padding: widget.icon != null || hasIcon - ? EdgeInsets.only( - left: badge.spaceInset, right: badge.spaceInset) + ? EdgeInsets.only(left: badge.spaceInsetMediumLarge, right: badge.spaceInsetMediumLarge) : widget.size == OudsBadgeSize.large - ? EdgeInsets.only( - left: badge.spacePaddingInlineLarge, - right: badge.spacePaddingInlineLarge) - : EdgeInsets.only( - left: badge.spacePaddingInlineMedium, - right: badge.spacePaddingInlineMedium), - backgroundColor: badgeStatusModifier.getStatusColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), + ? EdgeInsets.only(left: badge.spacePaddingInlineLarge, right: badge.spacePaddingInlineLarge) + : EdgeInsets.only(left: badge.spacePaddingInlineMedium, right: badge.spacePaddingInlineMedium), + backgroundColor: badgeStatusModifier.getStatusColor(widget._deprecatedStatus, _effectiveStatus, widget.enabled), label: badgeLabel, child: widget.child, ), @@ -371,26 +320,13 @@ class _OudsBadgeState extends State { final theme = OudsTheme.of(context); final badgeStatusModifier = OudsBadgeStatusModifier(context); // this condition is two eliminate the text when we are in XSmall or Small - return widget.size == OudsBadgeSize.large || - widget.size == OudsBadgeSize.medium + return widget.size == OudsBadgeSize.large || widget.size == OudsBadgeSize.medium ? ExcludeSemantics( child: Text( _formattedLabel(), style: widget.size == OudsBadgeSize.large - ? theme.typographyTokens - .typeLabelDefaultMedium(context) - .copyWith( - color: badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, - _effectiveStatus, - widget.enabled)) - : theme.typographyTokens - .typeLabelDefaultSmall(context) - .copyWith( - color: badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, - _effectiveStatus, - widget.enabled)), + ? theme.typographyTokens.typeLabelDefaultMedium(context).copyWith(color: badgeStatusModifier.getStatusTextAndIconColor(widget._deprecatedStatus, _effectiveStatus, widget.enabled)) + : theme.typographyTokens.typeLabelDefaultSmall(context).copyWith(color: badgeStatusModifier.getStatusTextAndIconColor(widget._deprecatedStatus, _effectiveStatus, widget.enabled)), textAlign: TextAlign.center, ), ) @@ -403,8 +339,7 @@ class _OudsBadgeState extends State { final badgeStatusModifier = OudsBadgeStatusModifier(context); // This gets the fixed icon for Positive, Negative, etc. - final fixedIcon = - badgeStatusModifier.getIcon(widget._deprecatedStatus, _effectiveStatus); + final fixedIcon = badgeStatusModifier.getIcon(widget._deprecatedStatus, _effectiveStatus); // This correctly gets the user-defined icon for Neutral and Accent final userDefinedIcon = badgeStatusModifier.getAssetsName(_effectiveStatus); @@ -414,20 +349,14 @@ class _OudsBadgeState extends State { final iconPath = fixedIcon ?? assetName ?? userDefinedIcon ?? ""; // this condition is two eliminate the text when we are in XSmall or Small - return widget.size == OudsBadgeSize.large || - widget.size == OudsBadgeSize.medium + return widget.size == OudsBadgeSize.large || widget.size == OudsBadgeSize.medium ? SizedBox.expand( child: SvgPicture.asset( excludeFromSemantics: true, iconPath, fit: BoxFit.contain, - package: - fixedIcon != null ? OudsTheme.of(context).packageName : null, - colorFilter: ColorFilter.mode( - badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), - BlendMode.srcIn, - ), + package: fixedIcon != null ? OudsTheme.of(context).packageName : null, + colorFilter: ColorFilter.mode(badgeStatusModifier.getStatusTextAndIconColor(widget._deprecatedStatus, _effectiveStatus, widget.enabled), BlendMode.srcIn), ), ) : Container(); @@ -459,8 +388,7 @@ class _OudsBadgeState extends State { /// the badge size is either `medium` or `large`. /// - [_OudsBadgeType.standard]: when neither icon nor label applies (fallback case). _OudsBadgeType get type { - final isMediumOrLarge = - widget.size == OudsBadgeSize.medium || widget.size == OudsBadgeSize.large; + final isMediumOrLarge = widget.size == OudsBadgeSize.medium || widget.size == OudsBadgeSize.large; // Check for the icon property final hasIcon = switch (_effectiveStatus) { @@ -473,8 +401,7 @@ class _OudsBadgeState extends State { null => false, }; - if (widget.icon != null || - (widget.icon == null && hasIcon && widget._withIcon == true)) { + if (widget.icon != null || (widget.icon == null && hasIcon && widget._withIcon == true)) { return _OudsBadgeType.icon; } else if (widget.label != null && isMediumOrLarge) { return _OudsBadgeType.count; diff --git a/ouds_core/lib/components/checkbox/ouds_checkbox.dart b/ouds_core/lib/components/checkbox/ouds_checkbox.dart index 07cfd4951..0ad7c174d 100644 --- a/ouds_core/lib/components/checkbox/ouds_checkbox.dart +++ b/ouds_core/lib/components/checkbox/ouds_checkbox.dart @@ -75,14 +75,7 @@ class OudsCheckbox extends StatefulWidget { final bool tristate; final bool readOnly; - const OudsCheckbox({ - super.key, - required this.value, - required this.onChanged, - this.isError = false, - this.tristate = false, - this.readOnly = false, - }); + const OudsCheckbox({super.key, required this.value, required this.onChanged, this.isError = false, this.tristate = false, this.readOnly = false}); @override State createState() => _OudsCheckboxState(); @@ -129,8 +122,8 @@ class _OudsCheckboxState extends State { String? semanticValue = widget.value == true ? l10n?.core_checkbox_checked_a11y : widget.value == null - ? l10n?.core_checkbox_indeterminate_a11y - : l10n?.core_checkbox_unchecked_a11y; + ? l10n?.core_checkbox_indeterminate_a11y + : l10n?.core_checkbox_unchecked_a11y; String toggleActionLabel = (widget.onChanged != null && !widget.readOnly) ? '${l10n?.core_checkbox_hint_a11y}' : ''; @@ -180,26 +173,18 @@ class _OudsCheckboxState extends State { }); }, child: Container( - constraints: BoxConstraints( - maxHeight: checkbox.sizeMaxHeight, - minHeight: checkbox.sizeMinHeight, - minWidth: checkbox.sizeMinWidth, - ), + constraints: BoxConstraints(maxHeight: checkbox.sizeMaxHeight, minHeight: checkbox.sizeMinHeight, minWidth: checkbox.sizeMinWidth), decoration: BoxDecoration( color: _isPressed ? checkboxBackgroundModifier.getBackgroundColor(checkboxState) : Colors.transparent, - borderRadius: BorderRadius.circular( - checkboxBorderModifier.getBorderRadius(controlItem.borderRadiusItemOnly), - ), + borderRadius: BorderRadius.circular(checkboxBorderModifier.getBorderRadius(checkbox.borderRadius)), ), child: Center( child: ExcludeSemantics( child: SizedBox( - width: checkbox.sizeIndicator, - height: checkbox.sizeIndicator, + width: controlItem.sizeControlIndicator, + height: controlItem.sizeControlIndicator, child: ClipRRect( - borderRadius: BorderRadius.circular( - checkboxBorderModifier.getBorderRadius(checkbox.borderRadius), - ), + borderRadius: BorderRadius.circular(checkboxBorderModifier.getBorderRadius(checkbox.borderRadius)), child: Stack( fit: StackFit.expand, children: [ @@ -207,15 +192,9 @@ class _OudsCheckboxState extends State { decoration: BoxDecoration( border: OudsBorder().borderAll( color: checkboxBorderModifier.getBorderColor(checkboxState, widget.isError, isCheckedOrIndeterminate(widget.value), _isHighContrast), - width: checkboxBorderModifier.getBorderWidth( - checkboxState, - isCheckedOrIndeterminate(widget.value), - checkbox, - ), - ), - borderRadius: BorderRadius.circular( - checkboxBorderModifier.getBorderRadius(checkbox.borderRadius), + width: checkboxBorderModifier.getBorderWidth(checkboxState, isCheckedOrIndeterminate(widget.value), checkbox), ), + borderRadius: BorderRadius.circular(checkboxBorderModifier.getBorderRadius(checkbox.borderRadius)), ), ), if (widget.value == true) @@ -225,10 +204,7 @@ class _OudsCheckboxState extends State { AppAssets.icons.componentCheckboxSelected, package: OudsTheme.of(context).packageName, fit: BoxFit.contain, - colorFilter: ColorFilter.mode( - checkboxTickModifier.getTickColor(checkboxState, widget.isError, _isHighContrast), - BlendMode.srcIn, - ), + colorFilter: ColorFilter.mode(checkboxTickModifier.getTickColor(checkboxState, widget.isError, _isHighContrast), BlendMode.srcIn), ), ) else if (widget.value == null) @@ -238,10 +214,7 @@ class _OudsCheckboxState extends State { AppAssets.icons.componentCheckboxUndetermined, package: OudsTheme.of(context).packageName, fit: BoxFit.contain, - colorFilter: ColorFilter.mode( - checkboxTickModifier.getTickColor(checkboxState, widget.isError, _isHighContrast), - BlendMode.srcIn, - ), + colorFilter: ColorFilter.mode(checkboxTickModifier.getTickColor(checkboxState, widget.isError, _isHighContrast), BlendMode.srcIn), ), ), ], diff --git a/ouds_core/lib/components/control/internal/modifier/ouds_control_background_modifier.dart b/ouds_core/lib/components/control/internal/modifier/ouds_control_background_modifier.dart index bbcf16243..05edbe94c 100644 --- a/ouds_core/lib/components/control/internal/modifier/ouds_control_background_modifier.dart +++ b/ouds_core/lib/components/control/internal/modifier/ouds_control_background_modifier.dart @@ -28,9 +28,9 @@ class OudsControlBackgroundModifier { final controlItem = OudsTheme.of(context).componentsTokens(context).controlItem; switch (state) { case OudsControlState.hovered: - return controlItem.colorBgHover; + return controlItem.colorBgCurrentHover; case OudsControlState.pressed: - return controlItem.colorBgPressed; + return controlItem.colorBgCurrentPressed; case OudsControlState.disabled: return Colors.transparent; case OudsControlState.enabled: @@ -45,9 +45,9 @@ class OudsControlBackgroundModifier { final controlItem = OudsTheme.of(context).componentsTokens(context).controlItem; switch (state) { case OudsControlItemState.hovered: - return controlItem.colorBgHover; + return controlItem.colorBgCurrentHover; case OudsControlItemState.pressed: - return controlItem.colorBgPressed; + return controlItem.colorBgCurrentPressed; case OudsControlItemState.disabled: return Colors.transparent; case OudsControlItemState.enabled: diff --git a/ouds_core/lib/components/control/internal/modifier/ouds_control_indicator.dart b/ouds_core/lib/components/control/internal/modifier/ouds_control_indicator.dart index 9b32ff599..b7f9dba4e 100644 --- a/ouds_core/lib/components/control/internal/modifier/ouds_control_indicator.dart +++ b/ouds_core/lib/components/control/internal/modifier/ouds_control_indicator.dart @@ -36,10 +36,10 @@ class OudsControlIndicatorModifier { // Check if the type is not switchButton and is radio if (type != OudsControlItemType.switchButton && type == OudsControlItemType.radio) { // Return the size of the radio button indicator - return OudsTheme.of(context).componentsTokens(context).radioButton.sizeIndicator; + return OudsTheme.of(context).componentsTokens(context).controlItem.sizeControlIndicator; } else { // Return the size of the checkbox indicator - return OudsTheme.of(context).componentsTokens(context).checkbox.sizeIndicator; + return OudsTheme.of(context).componentsTokens(context).controlItem.sizeControlIndicator; } } } diff --git a/ouds_core/lib/components/control/ouds_control_item.dart b/ouds_core/lib/components/control/ouds_control_item.dart index 68f74c547..e706f05b1 100644 --- a/ouds_core/lib/components/control/ouds_control_item.dart +++ b/ouds_core/lib/components/control/ouds_control_item.dart @@ -29,11 +29,7 @@ import 'package:ouds_theme_contract/ouds_theme.dart'; import 'internal/modifier/ouds_control_tick_modifier.dart'; -enum OudsControlItemType { - switchButton, - checkbox, - radio, -} +enum OudsControlItemType { switchButton, checkbox, radio } /// Refactor of controls for [Checkbox], [Switch], and [RadioButton]. /// This implementation provides a customizable control item with properties such as text, icon, and interaction states. @@ -102,7 +98,8 @@ class OudsControlItem extends StatefulWidget { class OudsControlItemState extends State { // Create an instance of the state controller to manage interaction changes - final OudsInteractionStateController interactionState = OudsInteractionStateController(); + final OudsInteractionStateController interactionState = + OudsInteractionStateController(); bool _isHighContrast = false; @override @@ -152,7 +149,9 @@ class OudsControlItemState extends State { ); final controlItemState = controlItemStateDeterminer.determineControlState(); - final controlItemBackgroundModifier = OudsControlBackgroundModifier(context); + final controlItemBackgroundModifier = OudsControlBackgroundModifier( + context, + ); final controlBorderModifier = OudsControlBorderModifier(context); final borderTokens = OudsTheme.of(context).borderTokens; final componentsTokens = OudsTheme.of(context).componentsTokens(context); @@ -171,15 +170,17 @@ class OudsControlItemState extends State { // children: [ Container( decoration: BoxDecoration( - color: controlItemBackgroundModifier.getBackgroundColor(controlItemState), - borderRadius: BorderRadius.circular( - borderTokens.radiusNone, + color: controlItemBackgroundModifier.getBackgroundColor( + controlItemState, ), + borderRadius: BorderRadius.circular(borderTokens.radiusNone), ), constraints: BoxConstraints( - minHeight: controlItemTokens.sizeMinHeight, + minHeight: controlItemTokens.sizeMinHeightDefault, minWidth: controlItemTokens.sizeMinWidth, - maxWidth: widget.constrainedMaxWidth ? controlItemTokens.sizeMaxWidth : double.infinity, + maxWidth: widget.constrainedMaxWidth + ? controlItemTokens.sizeMaxWidth + : double.infinity, ), child: InkWell( onTap: !(controlItemState == OudsControlState.readOnly) @@ -193,20 +194,27 @@ class OudsControlItemState extends State { }); } : null, - onHighlightChanged: widget.onTap != null ? interactionState.setPressed : null, + onHighlightChanged: widget.onTap != null + ? interactionState.setPressed + : null, onHover: interactionState.setHovered, highlightColor: Colors.transparent, - hoverColor: controlItemTokens.colorBgHover, + hoverColor: controlItemTokens.colorBgCurrentHover, splashColor: Colors.transparent, child: Padding( padding: EdgeInsetsDirectional.symmetric( horizontal: controlItemTokens.spacePaddingInline, - vertical: controlItemTokens.spacePaddingBlockDefault, + vertical: + controlItemTokens.spacePaddingBlockDensityDefault, ), child: IntrinsicHeight( child: Row( - crossAxisAlignment: _isLongText() ? CrossAxisAlignment.start : CrossAxisAlignment.center, - children: widget.reversed ? _buildStandardLayout(controlItemState) : _buildInvertedLayout(controlItemState), + crossAxisAlignment: _isLongText() + ? CrossAxisAlignment.start + : CrossAxisAlignment.center, + children: widget.reversed + ? _buildStandardLayout(controlItemState) + : _buildInvertedLayout(controlItemState), ), ), ), @@ -214,7 +222,8 @@ class OudsControlItemState extends State { ), // ], //), - if (widget.outlined || (widget.selected && interactionState.isPressed)) + if (widget.outlined || + (widget.selected && interactionState.isPressed)) Positioned.fill( child: IgnorePointer( child: Container( @@ -248,16 +257,19 @@ class OudsControlItemState extends State { ], ), // Error text below the component (under the divider), with its own padding - if (widget.error && (widget.errorText != null && widget.errorText!.trim().isNotEmpty)) + if (widget.error && + (widget.errorText != null && widget.errorText!.trim().isNotEmpty)) Padding( padding: EdgeInsetsDirectional.only( start: controlItemTokens.spacePaddingInline, - top: controlItemTokens.spacePaddingBlockTopErrorText, + top: controlItemTokens.spacePaddingBlockTopHelperText, end: controlItemTokens.spacePaddingInline, ), child: Text( widget.errorText ?? '', - style: OudsTheme.of(context).typographyTokens.typeLabelDefaultMedium(context).copyWith( + style: OudsTheme.of(context).typographyTokens + .typeLabelDefaultMedium(context) + .copyWith( color: controlItemTextModifier.getErrorMessageTextColor( controlItemState, ), @@ -270,142 +282,228 @@ class OudsControlItemState extends State { } bool _isLongText() { - return (widget.text.length > 150) || ((widget.extraLabelText?.length ?? 0) > 0) || ((widget.description?.length ?? 0) > 0); + return (widget.text.length > 150) || + ((widget.extraLabelText?.length ?? 0) > 0) || + ((widget.description?.length ?? 0) > 0); } Widget controlItemDivider(BuildContext context) { - final actualThickness = OudsTheme.of(context).componentsTokens(context).divider.borderWidth; - final divider = OudsDivider.horizontal( - thickness: actualThickness, - ); + final actualThickness = OudsTheme.of( + context, + ).componentsTokens(context).divider.borderWidth; + final divider = OudsDivider.horizontal(thickness: actualThickness); - return Padding(padding: EdgeInsetsDirectional.all(OudsTheme.of(context).spaceScheme(context).fixedNone), child: divider); + return Padding( + padding: EdgeInsetsDirectional.all( + OudsTheme.of(context).spaceScheme(context).fixedNone, + ), + child: divider, + ); } List _buildStandardLayout(OudsControlState controlItemState) => [ - AbsorbPointer( - child: Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - minHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - ), - alignment: Alignment.center, - child: SizedBox( - height: widget.componentType != OudsControlItemType.switchButton - ? OudsControlIndicatorModifier(context).getSizeIndicator(widget.componentType, context) - : OudsTheme.of(context).componentsTokens(context).switchButton.sizeHeightTrack, - width: widget.componentType != OudsControlItemType.switchButton ? OudsControlIndicatorModifier(context).getSizeIndicator(widget.componentType, context) : null, - child: widget.indicator(), - ), - ), + AbsorbPointer( + child: Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, ), - Container( - width: OudsTheme.of(context).componentsTokens(context).controlItem.spaceColumnGap, + alignment: Alignment.center, + child: SizedBox( + height: widget.componentType != OudsControlItemType.switchButton + ? OudsControlIndicatorModifier( + context, + ).getSizeIndicator(widget.componentType, context) + : OudsTheme.of( + context, + ).componentsTokens(context).switchButton.sizeHeightTrack, + width: widget.componentType != OudsControlItemType.switchButton + ? OudsControlIndicatorModifier( + context, + ).getSizeIndicator(widget.componentType, context) + : null, + child: widget.indicator(), ), - _buildTextWithAdditionalAndDescription(controlItemState), - if (widget.icon != null || widget.error) - Container( - width: OudsTheme.of(context).componentsTokens(context).controlItem.spaceColumnGap, + ), + ), + Container( + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceColumnGap, + ), + _buildTextWithAdditionalAndDescription(controlItemState), + if (widget.icon != null || widget.error) + Container( + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceColumnGap, + ), + if (widget.icon != null && widget.error == false) + Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, + ), + alignment: Alignment.center, + child: SizedBox( + height: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + child: OudsControlItem.buildIcon( + context, + widget.icon!, + controlItemState, + false, ), - if (widget.icon != null && widget.error == false) - Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - ), - alignment: Alignment.center, - child: SizedBox( - height: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - width: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - child: OudsControlItem.buildIcon( + ), + ), + if (widget.error) + Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, + ), + alignment: Alignment.center, + child: Container( + /// TODO: replace this tokens + /* padding: EdgeInsets.symmetric( + horizontal: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spacePaddingInlineErrorIcon, + ),*/ + child: SvgPicture.asset( + excludeFromSemantics: true, + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + height: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + AppAssets.icons.componentAlertImportantFill, + package: OudsTheme.of(context).packageName, + colorFilter: ColorFilter.mode( + OudsControlTickModifier( context, - widget.icon!, - controlItemState, - false, - ), + ).getIconErrorColor(controlItemState), + BlendMode.srcIn, ), ), - if (widget.error) - Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - ), - alignment: Alignment.center, - child: Container( - padding: EdgeInsets.symmetric(horizontal: OudsTheme.of(context).componentsTokens(context).controlItem.spacePaddingInlineErrorIcon), - child: SvgPicture.asset( - excludeFromSemantics: true, - width: OudsTheme.of(context).componentsTokens(context).controlItem.sizeErrorIcon, - height: OudsTheme.of(context).componentsTokens(context).controlItem.sizeErrorIcon, - AppAssets.icons.componentAlertImportantFill, - package: OudsTheme.of(context).packageName, - colorFilter: ColorFilter.mode( - OudsControlTickModifier(context).getIconErrorColor(controlItemState), - BlendMode.srcIn, - ), - ), - ), - ), - ]; + ), + ), + ]; List _buildInvertedLayout(OudsControlState controlItemState) => [ - if (widget.icon != null && widget.error == false) - Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - ), - alignment: Alignment.center, - child: SizedBox( - height: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - width: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - child: OudsControlItem.buildIcon( - context, - widget.icon!, - controlItemState, - false, - ), - ), + if (widget.icon != null && widget.error == false) + Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, + ), + alignment: Alignment.center, + child: SizedBox( + height: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall, + child: OudsControlItem.buildIcon( + context, + widget.icon!, + controlItemState, + false, ), - if (widget.error) - Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - ), - alignment: Alignment.center, - child: Container( - padding: EdgeInsets.symmetric(horizontal: OudsTheme.of(context).componentsTokens(context).controlItem.spacePaddingInlineErrorIcon), - child: SvgPicture.asset( - excludeFromSemantics: true, - AppAssets.icons.componentAlertImportantFill, - package: OudsTheme.of(context).packageName, - colorFilter: ColorFilter.mode( - OudsControlTickModifier(context).getIconErrorColor(controlItemState), - BlendMode.srcIn, - ), - ), - ), + ), + ), + if (widget.error) + Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, + ), + alignment: Alignment.center, + child: Container( + /// TODO: replace this tokens + padding: EdgeInsets.symmetric( + horizontal: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spacePaddingInline, ), - if (widget.icon != null || widget.error) SizedBox(width: OudsTheme.of(context).componentsTokens(context).controlItem.spaceColumnGap), - _buildTextWithAdditionalAndDescription(controlItemState), - SizedBox(width: OudsTheme.of(context).componentsTokens(context).controlItem.spaceColumnGap), - AbsorbPointer( - child: Container( - constraints: BoxConstraints( - maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, - minHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeIcon, - ), - alignment: Alignment.center, - child: SizedBox( - height: widget.componentType != OudsControlItemType.switchButton - ? OudsTheme.of(context).componentsTokens(context).controlItem.sizeLoader - : OudsTheme.of(context).componentsTokens(context).switchButton.sizeHeightTrack, - width: widget.componentType != OudsControlItemType.switchButton ? OudsTheme.of(context).componentsTokens(context).controlItem.sizeLoader : null, - child: widget.indicator(), + child: SvgPicture.asset( + excludeFromSemantics: true, + AppAssets.icons.componentAlertImportantFill, + package: OudsTheme.of(context).packageName, + colorFilter: ColorFilter.mode( + OudsControlTickModifier( + context, + ).getIconErrorColor(controlItemState), + BlendMode.srcIn, ), ), ), - ]; + ), + if (widget.icon != null || widget.error) + SizedBox( + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceColumnGap, + ), + _buildTextWithAdditionalAndDescription(controlItemState), + SizedBox( + width: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceColumnGap, + ), + AbsorbPointer( + child: Container( + /// TODO: replace this tokens + constraints: BoxConstraints( + // maxHeight: OudsTheme.of(context).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetMedium, + ), + alignment: Alignment.center, + child: SizedBox( + height: widget.componentType != OudsControlItemType.switchButton + ? OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall + : OudsTheme.of( + context, + ).componentsTokens(context).switchButton.sizeHeightTrack, + width: widget.componentType != OudsControlItemType.switchButton + ? OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeAssetSmall + : null, + child: widget.indicator(), + ), + ), + ), + ]; - Widget _buildTextWithAdditionalAndDescription(OudsControlState controlItemState) { + Widget _buildTextWithAdditionalAndDescription( + OudsControlState controlItemState, + ) { final controlItemTextModifier = OudsControlTextModifier(context); final hasExtraLabelText = widget.extraLabelText?.trim().isNotEmpty ?? false; final hasDescription = widget.description?.trim().isNotEmpty ?? false; @@ -413,20 +511,33 @@ class OudsControlItemState extends State { final List columnChildren = [ Text( widget.text, - style: OudsTheme.of(context).typographyTokens.typeLabelDefaultLarge(context).copyWith( - color: controlItemTextModifier.getTextColor(controlItemState, widget.error), + style: OudsTheme.of(context).typographyTokens + .typeLabelDefaultLarge(context) + .copyWith( + color: controlItemTextModifier.getTextColor( + controlItemState, + widget.error, + ), ), ), ]; if (hasExtraLabelText) { columnChildren.add( - SizedBox(height: OudsTheme.of(context).componentsTokens(context).controlItem.spaceRowGap), + SizedBox( + height: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceRowGap, + ), ); columnChildren.add( Text( widget.extraLabelText!, - style: OudsTheme.of(context).typographyTokens.typeLabelStrongMedium(context).copyWith( - color: controlItemTextModifier.getExtraLabelTextColor(controlItemState), + style: OudsTheme.of(context).typographyTokens + .typeLabelStrongMedium(context) + .copyWith( + color: controlItemTextModifier.getExtraLabelTextColor( + controlItemState, + ), ), ), ); @@ -434,13 +545,21 @@ class OudsControlItemState extends State { if (hasDescription) { columnChildren.add( - SizedBox(height: OudsTheme.of(context).componentsTokens(context).controlItem.spaceRowGap), + SizedBox( + height: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.spaceRowGap, + ), ); columnChildren.add( Text( widget.description!, - style: OudsTheme.of(context).typographyTokens.typeLabelDefaultMedium(context).copyWith( - color: controlItemTextModifier.getDescriptionTextColor(controlItemState), + style: OudsTheme.of(context).typographyTokens + .typeLabelDefaultMedium(context) + .copyWith( + color: controlItemTextModifier.getDescriptionTextColor( + controlItemState, + ), ), ), ); diff --git a/ouds_core/lib/components/navigation/internal/ouds_navigation_bar_status_modifier.dart b/ouds_core/lib/components/navigation/internal/ouds_navigation_bar_status_modifier.dart index 7413660c1..64d8dfe92 100644 --- a/ouds_core/lib/components/navigation/internal/ouds_navigation_bar_status_modifier.dart +++ b/ouds_core/lib/components/navigation/internal/ouds_navigation_bar_status_modifier.dart @@ -28,13 +28,15 @@ class OudsNavigationBarStatusModifier { /// based on its interaction [state] and whether it is [isSelected]. Color getTextIconItemColor(OudsNavigationBarControlState state, [bool isSelected = false]) { final barTheme = OudsTheme.of(context).componentsTokens(context).bar; + final colorTokens = OudsTheme.of(context).colorScheme(context).colorTokens; + switch (state) { case OudsNavigationBarControlState.enabled: return isSelected ? barTheme.colorContentSelectedEnabled : ThemeUtils.isDarkTheme(context) == false - ? barTheme.colorContentUnselectedEnabledLight - : barTheme.colorContentUnselectedEnabledDark; + ? colorTokens.contentColorTokens.contentMutedLight + : colorTokens.contentColorTokens.contentMutedDark; case OudsNavigationBarControlState.hovered: return isSelected ? barTheme.colorContentSelectedHover : barTheme.colorContentUnselectedHover; case OudsNavigationBarControlState.focused: @@ -54,13 +56,13 @@ class OudsNavigationBarStatusModifier { final oudsTheme = OudsTheme.of(context); switch (state) { case OudsNavigationBarControlState.enabled: - return isSelected ? barTheme.colorActiveIndicatorAndroidSelectedEnabled : oudsTheme.colorScheme(context).opacityTransparent; + return isSelected ? barTheme.colorCurrentIndicatorAndroidSelectedEnabled : barTheme.colorCurrentIndicatorAndroidUnselectedDisabled; case OudsNavigationBarControlState.hovered: - return isSelected ? barTheme.colorActiveIndicatorAndroidSelectedHover : barTheme.colorActiveIndicatorAndroidUnselectedHover; + return isSelected ? barTheme.colorCurrentIndicatorAndroidSelectedHover : barTheme.colorCurrentIndicatorAndroidUnselectedHover; case OudsNavigationBarControlState.focused: - return isSelected ? barTheme.colorActiveIndicatorAndroidSelectedFocus : barTheme.colorActiveIndicatorAndroidUnselectedFocus; + return isSelected ? barTheme.colorCurrentIndicatorAndroidSelectedFocus : barTheme.colorCurrentIndicatorAndroidUnselectedFocus; case OudsNavigationBarControlState.pressed: - return isSelected ? barTheme.colorActiveIndicatorAndroidSelectedPressed : barTheme.colorActiveIndicatorAndroidUnselectedPressed; + return isSelected ? barTheme.colorCurrentIndicatorAndroidSelectedPressed : barTheme.colorCurrentIndicatorAndroidUnselectedPressed; } } @@ -70,13 +72,13 @@ class OudsNavigationBarStatusModifier { final barTheme = OudsTheme.of(context).componentsTokens(context).bar; switch (state) { case OudsNavigationBarControlState.enabled: - return barTheme.colorActiveIndicatorCustomSelectedEnabled.withValues(alpha: barTheme.opacityActiveIndicatorCustom); + return barTheme.colorCurrentIndicatorCustomSelectedEnabled.withValues(alpha: barTheme.opacityCurrentIndicatorCustom); case OudsNavigationBarControlState.hovered: - return barTheme.colorActiveIndicatorCustomSelectedHover.withValues(alpha: barTheme.opacityActiveIndicatorCustom); + return barTheme.colorCurrentIndicatorCustomSelectedHover.withValues(alpha: barTheme.opacityCurrentIndicatorCustom); case OudsNavigationBarControlState.focused: - return barTheme.colorActiveIndicatorCustomSelectedFocus.withValues(alpha: barTheme.opacityActiveIndicatorCustom); + return barTheme.colorCurrentIndicatorCustomSelectedFocus.withValues(alpha: barTheme.opacityCurrentIndicatorCustom); case OudsNavigationBarControlState.pressed: - return barTheme.colorActiveIndicatorCustomSelectedPressed.withValues(alpha: barTheme.opacityActiveIndicatorCustom); + return barTheme.colorCurrentIndicatorCustomSelectedPressed.withValues(alpha: barTheme.opacityCurrentIndicatorCustom); } } } diff --git a/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart b/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart index 84dfebd0e..23c190c09 100644 --- a/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart +++ b/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart @@ -68,11 +68,7 @@ class OudsNavigationBarItem { final OudsNavigationBarItemBadge? badge; /// Creates a navigation bar item with an icon, a label, and an optional badge. - const OudsNavigationBarItem({ - required this.icon, - required this.label, - this.badge, - }); + const OudsNavigationBarItem({required this.icon, required this.label, this.badge}); /// Builds the destination icon for a Material 3 [NavigationDestination], optionally wrapped /// with an [OudsBadge]. @@ -101,13 +97,7 @@ class OudsNavigationBarItem { fit: BoxFit.contain, height: 26, //sizeIcon.iconDecorativeExtraSmall, width: 26, //sizeIcon.iconDecorativeExtraSmall, - colorFilter: ColorFilter.mode( - modifier.getTextIconItemColor( - controlState, - isSelected, - ), - BlendMode.srcIn, - ), + colorFilter: ColorFilter.mode(modifier.getTextIconItemColor(controlState, isSelected), BlendMode.srcIn), ); return badge != null @@ -126,14 +116,11 @@ class OudsNavigationBarItem { final navigationBarStatusModifier = OudsNavigationBarStatusModifier(context); return Container( - height: bar.sizeHeightActiveIndicatorCustom, // thickness of the bar - width: bar.sizeWidthActiveIndicatorCustomTop, // width of the bar (adjust) + height: bar.sizeHeightCurrentIndicatorCustom, // thickness of the bar + width: bar.sizeWidthCurrentIndicatorCustomTop, // width of the bar (adjust) decoration: BoxDecoration( color: isSelected ? navigationBarStatusModifier.getIndicatorBarColor(controlState) : Colors.transparent, - borderRadius: BorderRadius.horizontal( - left: Radius.circular(bar.borderRadiusActiveIndicatorCustomTop), - right: Radius.circular(bar.borderRadiusActiveIndicatorCustomTop), - ), + borderRadius: BorderRadius.horizontal(left: Radius.circular(bar.borderRadiusCurrentIndicatorCustomTop), right: Radius.circular(bar.borderRadiusCurrentIndicatorCustomTop)), ), ); } @@ -148,11 +135,7 @@ class OudsNavigationBarItem { /// - [controlState] drives icon/top-indicator colors according to the current /// OUDS navigation control state. /// - [isSelected] indicates whether this destination is currently selected. - Column toNavigationDestination( - BuildContext context, - OudsNavigationBarControlState controlState, { - required bool isSelected, - }) { + Column toNavigationDestination(BuildContext context, OudsNavigationBarControlState controlState, {required bool isSelected}) { final modifier = OudsNavigationBarStatusModifier(context); final bar = OudsTheme.of(context).componentsTokens(context).bar; @@ -167,7 +150,7 @@ class OudsNavigationBarItem { icon: _buildBadgeIconNavigationDestination(context, icon, modifier, controlState, badge, isSelected: isSelected), selectedIcon: _buildBadgeIconNavigationDestination(context, icon, modifier, controlState, badge, isSelected: isSelected), ), - ) + ), ], ); } @@ -182,11 +165,7 @@ class OudsNavigationBarItem { /// - [controlState] to drive icon/top-indicator colors, /// - [isSelected] for the destination selection state. /// - BottomNavigationBarItem toBottomNavigationBarItem( - BuildContext context, - OudsNavigationBarControlState controlState, { - required bool isSelected, - }) { + BottomNavigationBarItem toBottomNavigationBarItem(BuildContext context, OudsNavigationBarControlState controlState, {required bool isSelected}) { final modifier = OudsNavigationBarStatusModifier(context); return BottomNavigationBarItem( @@ -226,22 +205,14 @@ class OudsNavigationBarItem { fit: BoxFit.contain, height: 26, //sizeIcon.iconDecorativeExtraSmall, width: 26, //sizeIcon.iconDecorativeExtraSmall, - colorFilter: ColorFilter.mode( - modifier.getTextIconItemColor( - controlState, - isSelected, - ), - BlendMode.srcIn, - ), + colorFilter: ColorFilter.mode(modifier.getTextIconItemColor(controlState, isSelected), BlendMode.srcIn), ); return badge != null ? Column( children: [ _buildTopIndicatorBar(context, bar, isSelected, controlState), - SizedBox( - height: 2, - ), + SizedBox(height: 2), OudsBadge.count( semanticsLabel: badge.contentDescription, label: badge.count.toString(), @@ -251,15 +222,7 @@ class OudsNavigationBarItem { ), ], ) - : Column( - children: [ - _buildTopIndicatorBar(context, bar, isSelected, controlState), - SizedBox( - height: 2, - ), - widgetIcon, - ], - ); + : Column(children: [_buildTopIndicatorBar(context, bar, isSelected, controlState), SizedBox(height: 2), widgetIcon]); } } @@ -285,10 +248,7 @@ class OudsNavigationBarItemBadge { final int? count; /// Creates a badge for a navigation bar item. - const OudsNavigationBarItemBadge({ - required this.contentDescription, - this.count, - }); + const OudsNavigationBarItemBadge({required this.contentDescription, this.count}); /// Returns true if the badge has a numeric count. bool get hasCount => count != null; diff --git a/ouds_core/lib/components/radio_button/ouds_radio_button.dart b/ouds_core/lib/components/radio_button/ouds_radio_button.dart index 24cde81a8..bda788be2 100644 --- a/ouds_core/lib/components/radio_button/ouds_radio_button.dart +++ b/ouds_core/lib/components/radio_button/ouds_radio_button.dart @@ -79,14 +79,7 @@ class OudsRadioButton extends StatefulWidget { final bool isError; final bool readOnly; - const OudsRadioButton({ - super.key, - required this.value, - required this.groupValue, - required this.onChanged, - this.isError = false, - this.readOnly = false, - }); + const OudsRadioButton({super.key, required this.value, required this.groupValue, required this.onChanged, this.isError = false, this.readOnly = false}); @override OudsRadioButtonState createState() => OudsRadioButtonState(); @@ -134,7 +127,8 @@ class OudsRadioButtonState extends State> { return Semantics( enabled: widget.onChanged != null && !(widget.readOnly), - label: "${_selected ? l10n?.core_common_selected_a11y : l10n?.core_common_unselected_a11y} " + label: + "${_selected ? l10n?.core_common_selected_a11y : l10n?.core_common_unselected_a11y} " "${l10n?.core_radioButton_radioButton_a11y}", value: widget.isError ? l10n?.core_common_error_a11y : null, child: SizedBox( @@ -163,21 +157,15 @@ class OudsRadioButtonState extends State> { }); }, child: Container( - constraints: BoxConstraints( - maxHeight: radioButton.sizeMaxHeight, - minHeight: radioButton.sizeMinHeight, - minWidth: radioButton.sizeMinWidth, - ), + constraints: BoxConstraints(maxHeight: radioButton.sizeMaxHeight, minHeight: radioButton.sizeMinHeight, minWidth: radioButton.sizeMinWidth), decoration: BoxDecoration( color: _isPressed ? radioButtonBackgroundModifier.getBackgroundColor(radioButtonState) : Colors.transparent, - borderRadius: BorderRadius.circular( - radioButtonBorderModifier.getBorderRadius(controlItem.borderRadiusItemOnly), - ), + borderRadius: BorderRadius.circular(radioButtonBorderModifier.getBorderRadius(controlItem.borderRadiusDefault)), ), child: Center( child: SizedBox( - width: radioButton.sizeIndicator, - height: radioButton.sizeIndicator, + width: controlItem.sizeControlIndicator, + height: controlItem.sizeControlIndicator, child: Stack( fit: StackFit.expand, children: [ @@ -188,9 +176,7 @@ class OudsRadioButtonState extends State> { color: radioButtonBorderModifier.getBorderColor(radioButtonState, widget.isError, _selected, _isHighContrast), width: radioButtonBorderModifier.getBorderWidth(radioButtonState, _selected, radioButton), ), - borderRadius: BorderRadius.circular( - radioButtonBorderModifier.getBorderRadius(radioButton.borderRadius), - ), + borderRadius: BorderRadius.circular(radioButtonBorderModifier.getBorderRadius(radioButton.borderRadius)), ), ), @@ -204,14 +190,7 @@ class OudsRadioButtonState extends State> { excludeFromSemantics: true, package: OudsTheme.of(context).packageName, fit: BoxFit.contain, - colorFilter: ColorFilter.mode( - radioButtonTickModifier.getTickColor( - radioButtonState, - widget.isError, - _isHighContrast, - ), - BlendMode.srcIn, - ), + colorFilter: ColorFilter.mode(radioButtonTickModifier.getTickColor(radioButtonState, widget.isError, _isHighContrast), BlendMode.srcIn), ), ), ), diff --git a/ouds_global_raw_tokens/lib/border_raw_tokens.dart b/ouds_global_raw_tokens/lib/border_raw_tokens.dart index 5676ce824..bfee83394 100644 --- a/ouds_global_raw_tokens/lib/border_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/border_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator class BorderRawTokens { diff --git a/ouds_global_raw_tokens/lib/color_raw_tokens.dart b/ouds_global_raw_tokens/lib/color_raw_tokens.dart index 4c43be220..9f3bef76b 100644 --- a/ouds_global_raw_tokens/lib/color_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/color_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -109,8 +109,7 @@ class ColorRawTokens { static const colorOpacityBlack960 = Color(0xf5000000); static const colorOpacityDodgerBlue80 = Color(0x1426b2ff); static const colorOpacityDodgerBlue520 = Color(0x8500598a); - static const colorOpacityGrayDark800800 = Color(0xcc1f1f1f); - static const colorOpacityGrayLight80800 = Color(0xccf4f4f4); + static const colorOpacityGrayDark880800 = Color(0xcc141414); static const colorOpacityMalachite120 = Color(0x1f3de35a); static const colorOpacityMalachite640 = Color(0xa30e621d); static const colorOpacityScarlet80 = Color(0x14db0002); diff --git a/ouds_global_raw_tokens/lib/dimension_raw_tokens.dart b/ouds_global_raw_tokens/lib/dimension_raw_tokens.dart index 8e33e3fd2..a19827ddc 100644 --- a/ouds_global_raw_tokens/lib/dimension_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/dimension_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator class DimensionRawTokens { diff --git a/ouds_global_raw_tokens/lib/effect_raw_tokens.dart b/ouds_global_raw_tokens/lib/effect_raw_tokens.dart index 6d4271614..59bc531ea 100644 --- a/ouds_global_raw_tokens/lib/effect_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/effect_raw_tokens.dart @@ -10,10 +10,10 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator class EffectRawTokens { - static const effectBlur160 = 16; static const effectBlur320 = 32; + static const effectBlur480 = 48; } \ No newline at end of file diff --git a/ouds_global_raw_tokens/lib/font_raw_tokens.dart b/ouds_global_raw_tokens/lib/font_raw_tokens.dart index 74840c619..7fbc1ce12 100644 --- a/ouds_global_raw_tokens/lib/font_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/font_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_global_raw_tokens/lib/grid_raw_tokens.dart b/ouds_global_raw_tokens/lib/grid_raw_tokens.dart index 8ea7c88b4..9817d826e 100644 --- a/ouds_global_raw_tokens/lib/grid_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/grid_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_global_raw_tokens/lib/opacity_raw_tokens.dart b/ouds_global_raw_tokens/lib/opacity_raw_tokens.dart index 201b200d4..880ab9dab 100644 --- a/ouds_global_raw_tokens/lib/opacity_raw_tokens.dart +++ b/ouds_global_raw_tokens/lib/opacity_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// OUDS core tokens version 1.9.0 +// OUDS core tokens version 1.10.0 // Generated by Tokenator class OpacityRawTokens { diff --git a/ouds_theme_contract/CHANGELOG.md b/ouds_theme_contract/CHANGELOG.md index c162d1240..7f4e3a159 100644 --- a/ouds_theme_contract/CHANGELOG.md +++ b/ouds_theme_contract/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_theme_contract/lib/ouds_component_version.dart b/ouds_theme_contract/lib/ouds_component_version.dart index 9beb006cc..aa4068391 100644 --- a/ouds_theme_contract/lib/ouds_component_version.dart +++ b/ouds_theme_contract/lib/ouds_component_version.dart @@ -13,22 +13,27 @@ // Generated by Tokenator class OudsComponentVersion { - static const alertMessage = '1.1.0'; - static const badge = '1.2.0'; - static const bar = '1.0.0'; - static const bulletList = '1.0.0'; - static const button = '3.2.0'; - static const checkbox = '2.4.0'; - static const chip = '1.3.0'; - static const divider = '1.0.0'; - static const inlineAlert = '1.0.0'; - static const link = '2.2.0'; - static const passwordInput = '1.2.0'; - static const phoneNumberInput = '1.2.0'; - static const pinCodeInput = '1.2.0'; - static const radioButton = '1.4.0'; - static const skeleton = '1.0.0'; - static const switchButton = '1.5.0'; - static const tag = '1.4.0'; - static const textInput = '1.3.0'; + static const alertMessage = '1.1.0'; + static const badge = '1.2.0'; + static const badgeCount = '1.2.0'; + static const badgeIcon = '1.3.0'; + static const bar = '1.0.0'; + static const bottomSheet = '1.0.0'; + static const bulletList = '1.1.0'; + static const button = '3.2.0'; + static const checkbox = '2.4.0'; + static const divider = '1.0.0'; + static const filterChip = '1.4.0'; + static const inlineAlert = '1.0.0'; + static const inputTag = '1.2.0'; + static const link = '2.2.0'; + static const passwordInput = '1.3.0'; + static const phoneNumberInput = '1.3.0'; + static const pinCodeInput = '1.3.0'; + static const radioButton = '1.4.0'; + static const skeleton = '1.0.0'; + static const suggestionChip = '1.4.0'; + static const switchButton = '1.5.0'; + static const tag = '1.5.0'; + static const textInput = '1.4.0'; } diff --git a/ouds_theme_contract/lib/ouds_tokens_version.dart b/ouds_theme_contract/lib/ouds_tokens_version.dart index cac791562..7a705f11f 100644 --- a/ouds_theme_contract/lib/ouds_tokens_version.dart +++ b/ouds_theme_contract/lib/ouds_tokens_version.dart @@ -13,14 +13,14 @@ // Generated by Tokenator class OudsTokensVersion { - static const oudsCore = '1.9.0'; + static const oudsCore = '1.10.0'; static const androidCore = '1.0.0'; static const androidSystem = '1.2.0'; static const orangeCore = '1.2.0'; - static const orangeBrand = '2.3.0'; - static const orangeCompactBrand = '2.3.0'; - static const soshCore = '1.2.0'; - static const soshBrand = '2.3.0'; - static const wireframeCore = '1.3.0'; - static const wireframeBrand = '2.3.0'; + static const orangeBrand = '2.4.0'; + static const orangeCompactBrand = '2.4.0'; + static const soshCore = '1.3.0'; + static const soshBrand = '2.4.0'; + static const wireframeCore = '1.4.0'; + static const wireframeBrand = '2.4.0'; } diff --git a/ouds_theme_contract/lib/theme/scheme/color/ouds_color_scheme.dart b/ouds_theme_contract/lib/theme/scheme/color/ouds_color_scheme.dart index 6a7736a3c..e88b0ed7b 100644 --- a/ouds_theme_contract/lib/theme/scheme/color/ouds_color_scheme.dart +++ b/ouds_theme_contract/lib/theme/scheme/color/ouds_color_scheme.dart @@ -23,10 +23,7 @@ class OudsColorScheme { final OudsColorSemanticTokens colorTokens; final bool isDarkTheme; - OudsColorScheme({ - required this.colorTokens, - required this.isDarkTheme, - }); + OudsColorScheme({required this.colorTokens, required this.isDarkTheme}); /// Creates an [OudsColorScheme] based on the current theme mode. /// @@ -36,10 +33,7 @@ class OudsColorScheme { /// [colorTokens] defines the semantic color values to be used. /// /// This ensures the correct color scheme is applied depending on the active theme. - factory OudsColorScheme.fromContext({ - required BuildContext context, - required OudsColorSemanticTokens colorTokens, - }) { + factory OudsColorScheme.fromContext({required BuildContext context, required OudsColorSemanticTokens colorTokens}) { final themeMode = OudsTheme.modeOf(context); final isDark = themeMode == ThemeMode.system ? WidgetsBinding.instance.platformDispatcher.platformBrightness == Brightness.dark : themeMode == ThemeMode.dark; @@ -74,8 +68,6 @@ class OudsColorScheme { Color get actionPressed => isDarkTheme ? colorTokens.actionColorTokens.actionPressedDark : colorTokens.actionColorTokens.actionPressedLight; - Color get actionIosAccent => isDarkTheme ? colorTokens.actionColorTokens.actionIosAccentDark : colorTokens.actionColorTokens.actionIosAccentLight; - Color get actionSelected => isDarkTheme ? colorTokens.actionColorTokens.actionSelectedDark : colorTokens.actionColorTokens.actionSelectedLight; Color get actionSupportEnabled => isDarkTheme ? colorTokens.actionColorTokens.actionSupportEnabledDark : colorTokens.actionColorTokens.actionSupportEnabledLight; @@ -237,7 +229,7 @@ class OudsColorScheme { Color get overlayDrag => isDarkTheme ? colorTokens.overlayColorTokens.overlayDragDark : colorTokens.overlayColorTokens.overlayDragLight; - Color get overlayModal => isDarkTheme ? colorTokens.overlayColorTokens.overlayModalDark : colorTokens.overlayColorTokens.overlayModalLight; + Color get overlayModal => isDarkTheme ? colorTokens.overlayColorTokens.overlayModalSheetDark : colorTokens.overlayColorTokens.overlayModalSheetLight; /// Color - Repository @@ -367,7 +359,9 @@ class OudsColorScheme { Color get repositorySecondaryHigh => colorTokens.repositoryColorTokens.repositorySecondaryHigh; - Color get repositorySecondaryHigher => colorTokens.repositoryColorTokens.repositorySecondaryHigher; + Color get repositorySecondaryHigherHigh => colorTokens.repositoryColorTokens.repositorySecondaryHigherHigh; + + Color get repositorySecondaryHigherLow => colorTokens.repositoryColorTokens.repositorySecondaryHigherLow; Color get repositorySecondaryMedium => colorTokens.repositoryColorTokens.repositorySecondaryMedium; diff --git a/ouds_theme_contract/lib/theme/scheme/responsive/ouds_size_scheme.dart b/ouds_theme_contract/lib/theme/scheme/responsive/ouds_size_scheme.dart index 9c7840c23..0cd0643ce 100644 --- a/ouds_theme_contract/lib/theme/scheme/responsive/ouds_size_scheme.dart +++ b/ouds_theme_contract/lib/theme/scheme/responsive/ouds_size_scheme.dart @@ -33,216 +33,108 @@ class OudsSizeScheme { OudsSizeScheme._({required this.sizeTokens, required this.sizeClass}); /// Factory to create a responsive [OudsSizeScheme] from context and size tokens. - factory OudsSizeScheme.fromContext({ - required BuildContext context, - required OudsSizeSemanticTokens sizeTokens, - }) { + factory OudsSizeScheme.fromContext({required BuildContext context, required OudsSizeSemanticTokens sizeTokens}) { final sizeClass = OudsWindowSizeClassUtil.of(context); - return OudsSizeScheme._( - sizeTokens: sizeTokens, - sizeClass: sizeClass, - ); + return OudsSizeScheme._(sizeTokens: sizeTokens, sizeClass: sizeClass); } /// Responsive `size` tokens (mobile/tablet) /// IconWithBodySmall - double get iconWithBodySmallSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodySmallSizeSmallMobile, - tablet: sizeTokens.iconWithBodySmallSizeSmallTablet, - ); - - double get iconWithBodySmallSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodySmallSizeMediumMobile, - tablet: sizeTokens.iconWithBodySmallSizeMediumTablet, - ); - - double get iconWithBodySmallSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodySmallSizeLargeMobile, - tablet: sizeTokens.iconWithBodySmallSizeLargeTablet, - ); + double get iconWithBodySmallSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodySmallSizeSmallMobile, tablet: sizeTokens.iconWithBodySmallSizeSmallTablet); + + double get iconWithBodySmallSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodySmallSizeMediumMobile, tablet: sizeTokens.iconWithBodySmallSizeMediumTablet); + + double get iconWithBodySmallSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodySmallSizeLargeMobile, tablet: sizeTokens.iconWithBodySmallSizeLargeTablet); /// IconWithBodyMedium - double get iconWithBodyMediumSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyMediumSizeSmallMobile, - tablet: sizeTokens.iconWithBodyMediumSizeSmallTablet, - ); + double get iconWithBodyMediumSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyMediumSizeSmallMobile, tablet: sizeTokens.iconWithBodyMediumSizeSmallTablet); - double get iconWithBodyMediumSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyMediumSizeMediumMobile, - tablet: sizeTokens.iconWithBodyMediumSizeMediumTablet, - ); + double get iconWithBodyMediumSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyMediumSizeMediumMobile, tablet: sizeTokens.iconWithBodyMediumSizeMediumTablet); - double get iconWithBodyMediumSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyMediumSizeLargeMobile, - tablet: sizeTokens.iconWithBodyMediumSizeLargeTablet, - ); + double get iconWithBodyMediumSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyMediumSizeLargeMobile, tablet: sizeTokens.iconWithBodyMediumSizeLargeTablet); /// IconWithBodyLarge - double get iconWithBodyLargeSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyLargeSizeSmallMobile, - tablet: sizeTokens.iconWithBodyLargeSizeSmallTablet, - ); + double get iconWithBodyLargeSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyLargeSizeSmallMobile, tablet: sizeTokens.iconWithBodyLargeSizeSmallTablet); - double get iconWithBodyLargeSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyLargeSizeMediumMobile, - tablet: sizeTokens.iconWithBodyLargeSizeMediumTablet, - ); + double get iconWithBodyLargeSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyLargeSizeMediumMobile, tablet: sizeTokens.iconWithBodyLargeSizeMediumTablet); - double get iconWithBodyLargeSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithBodyLargeSizeLargeMobile, - tablet: sizeTokens.iconWithBodyLargeSizeLargeTablet, - ); + double get iconWithBodyLargeSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithBodyLargeSizeLargeMobile, tablet: sizeTokens.iconWithBodyLargeSizeLargeTablet); /// IconWithHeadingSmall - double get iconWithHeadingSmallSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingSmallSizeSmallMobile, - tablet: sizeTokens.iconWithHeadingSmallSizeSmallTablet, - ); - - double get iconWithHeadingSmallSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingSmallSizeMediumMobile, - tablet: sizeTokens.iconWithHeadingSmallSizeMediumTablet, - ); - - double get iconWithHeadingSmallSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingSmallSizeLargeMobile, - tablet: sizeTokens.iconWithHeadingSmallSizeLargeTablet, - ); + double get iconWithHeadingSmallSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingSmallSizeSmallMobile, tablet: sizeTokens.iconWithHeadingSmallSizeSmallTablet); + + double get iconWithHeadingSmallSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingSmallSizeMediumMobile, tablet: sizeTokens.iconWithHeadingSmallSizeMediumTablet); + + double get iconWithHeadingSmallSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingSmallSizeLargeMobile, tablet: sizeTokens.iconWithHeadingSmallSizeLargeTablet); /// IconWithHeadingMedium - double get iconWithHeadingMediumSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingMediumSizeSmallMobile, - tablet: sizeTokens.iconWithHeadingMediumSizeSmallTablet, - ); - - double get iconWithHeadingMediumSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingMediumSizeMediumMobile, - tablet: sizeTokens.iconWithHeadingMediumSizeMediumTablet, - ); - - double get iconWithHeadingMediumSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingMediumSizeLargeMobile, - tablet: sizeTokens.iconWithHeadingMediumSizeLargeTablet, - ); + double get iconWithHeadingMediumSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingMediumSizeSmallMobile, tablet: sizeTokens.iconWithHeadingMediumSizeSmallTablet); + + double get iconWithHeadingMediumSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingMediumSizeMediumMobile, tablet: sizeTokens.iconWithHeadingMediumSizeMediumTablet); + + double get iconWithHeadingMediumSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingMediumSizeLargeMobile, tablet: sizeTokens.iconWithHeadingMediumSizeLargeTablet); /// IconWithHeadingLarge - double get iconWithHeadingLargeSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingLargeSizeSmallMobile, - tablet: sizeTokens.iconWithHeadingLargeSizeSmallTablet, - ); - - double get iconWithHeadingLargeSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingLargeSizeMediumMobile, - tablet: sizeTokens.iconWithHeadingLargeSizeMediumTablet, - ); - - double get iconWithHeadingLargeSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingLargeSizeLargeMobile, - tablet: sizeTokens.iconWithHeadingLargeSizeLargeTablet, - ); + double get iconWithHeadingLargeSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingLargeSizeSmallMobile, tablet: sizeTokens.iconWithHeadingLargeSizeSmallTablet); + + double get iconWithHeadingLargeSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingLargeSizeMediumMobile, tablet: sizeTokens.iconWithHeadingLargeSizeMediumTablet); + + double get iconWithHeadingLargeSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingLargeSizeLargeMobile, tablet: sizeTokens.iconWithHeadingLargeSizeLargeTablet); /// IconWithHeadingExtraLarge - double get iconWithHeadingExtraLargeSizeSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingXlargeSizeSmallMobile, - tablet: sizeTokens.iconWithHeadingXlargeSizeSmallTablet, - ); - - double get iconWithHeadingExtraLargeSizeMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingXlargeSizeMediumMobile, - tablet: sizeTokens.iconWithHeadingXlargeSizeMediumTablet, - ); - - double get iconWithHeadingExtraLargeSizeLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.iconWithHeadingXlargeSizeLargeMobile, - tablet: sizeTokens.iconWithHeadingXlargeSizeLargeTablet, - ); - - /// MaxWidthTypeDisplay - double get maxWidthTypeDisplaySmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplaySmallMobile, - tablet: sizeTokens.maxWidthTypeDisplaySmallTablet, - ); - - double get maxWidthTypeDisplayMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplayMediumMobile, - tablet: sizeTokens.maxWidthTypeDisplayMediumTablet, - ); - - double get maxWidthTypeDisplayLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplayLargeMobile, - tablet: sizeTokens.maxWidthTypeDisplayLargeTablet, - ); - - /// MaxWidthTypeHeading - double get maxWidthTypeHeadingSmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingSmallMobile, - tablet: sizeTokens.maxWidthTypeHeadingSmallTablet, - ); - - double get maxWidthTypeHeadingMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingMediumMobile, - tablet: sizeTokens.maxWidthTypeHeadingMediumTablet, - ); - - double get maxWidthTypeHeadingLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingLargeMobile, - tablet: sizeTokens.maxWidthTypeHeadingLargeTablet, - ); - - double get maxWidthTypeHeadingExtraLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingXlargeMobile, - tablet: sizeTokens.maxWidthTypeHeadingXlargeTablet, - ); - - /// MaxWidthTypeBody - double get maxWidthTypeBodySmall => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodySmallMobile, - tablet: sizeTokens.maxWidthTypeBodySmallTablet, - ); - - double get maxWidthTypeBodyMedium => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodyMediumMobile, - tablet: sizeTokens.maxWidthTypeBodyMediumTablet, - ); - - double get maxWidthTypeBodyLarge => OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodyLargeMobile, - tablet: sizeTokens.maxWidthTypeBodyLargeTablet, - ); + double get iconWithHeadingExtraLargeSizeSmall => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingXlargeSizeSmallMobile, tablet: sizeTokens.iconWithHeadingXlargeSizeSmallTablet); + + double get iconWithHeadingExtraLargeSizeMedium => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingXlargeSizeMediumMobile, tablet: sizeTokens.iconWithHeadingXlargeSizeMediumTablet); + + double get iconWithHeadingExtraLargeSizeLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.iconWithHeadingXlargeSizeLargeMobile, tablet: sizeTokens.iconWithHeadingXlargeSizeLargeTablet); + + /// maxWidthDisplay + double get maxWidthDisplaySmall => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthDisplaySmallMobile, tablet: sizeTokens.maxWidthDisplaySmallTablet); + + double get maxWidthDisplayMedium => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthDisplayMediumMobile, tablet: sizeTokens.maxWidthDisplayMediumTablet); + + double get maxWidthDisplayLarge => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthDisplayLargeMobile, tablet: sizeTokens.maxWidthDisplayLargeTablet); + + /// maxWidthHeading + double get maxWidthHeadingSmall => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthHeadingSmallMobile, tablet: sizeTokens.maxWidthHeadingSmallTablet); + + double get maxWidthHeadingMedium => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthHeadingMediumMobile, tablet: sizeTokens.maxWidthHeadingMediumTablet); + + double get maxWidthHeadingLarge => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthHeadingLargeMobile, tablet: sizeTokens.maxWidthHeadingLargeTablet); + + double get maxWidthHeadingExtraLarge => + OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthHeadingXlargeMobile, tablet: sizeTokens.maxWidthHeadingXlargeTablet); + + /// maxWidthBody + double get maxWidthBodySmall => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthBodySmallMobile, tablet: sizeTokens.maxWidthBodySmallTablet); + + double get maxWidthBodyMedium => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthBodyMediumMobile, tablet: sizeTokens.maxWidthBodyMediumTablet); + + double get maxWidthBodyLarge => OudsWindowSizeClassUtil.selectMobileTablet(sizeClass: sizeClass, mobile: sizeTokens.maxWidthBodyLargeMobile, tablet: sizeTokens.maxWidthBodyLargeTablet); /// Non-responsive tokens (direct mapping) diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_alert_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_alert_tokens.dart index 279a55d3b..a8a41b041 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_alert_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_alert_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsAlertTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_badge_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_badge_tokens.dart index 0c0102969..8dffb57c1 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_badge_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_badge_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsBadgeTokens { @@ -18,7 +18,9 @@ abstract class OudsBadgeTokens { late double sizeMedium; late double sizeSmall; late double sizeXsmall; - late double spaceInset; + late double spaceInsetMediumLarge; + late double spaceInsetSmall; + late double spaceInsetXsmall; late double spacePaddingInlineLarge; late double spacePaddingInlineMedium; } diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_bar_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_bar_tokens.dart index 4ad5e5f60..805c3f3c6 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_bar_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_bar_tokens.dart @@ -10,27 +10,14 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; abstract class OudsBarTokens { - late double borderRadiusActiveIndicatorCustomBottom; - late double borderRadiusActiveIndicatorCustomTop; - late Color colorActiveIndicatorAndroidSelectedDisabled; - late Color colorActiveIndicatorAndroidSelectedEnabled; - late Color colorActiveIndicatorAndroidSelectedFocus; - late Color colorActiveIndicatorAndroidSelectedHover; - late Color colorActiveIndicatorAndroidSelectedPressed; - late Color colorActiveIndicatorAndroidUnselectedDisabled; - late Color colorActiveIndicatorAndroidUnselectedFocus; - late Color colorActiveIndicatorAndroidUnselectedHover; - late Color colorActiveIndicatorAndroidUnselectedPressed; - late Color colorActiveIndicatorCustomSelectedEnabled; - late Color colorActiveIndicatorCustomSelectedFocus; - late Color colorActiveIndicatorCustomSelectedHover; - late Color colorActiveIndicatorCustomSelectedPressed; + late double borderRadiusCurrentIndicatorCustomBottom; + late double borderRadiusCurrentIndicatorCustomTop; late Color colorBgOpaque; late Color colorBgTranslucentDark; late Color colorBgTranslucentLight; @@ -40,14 +27,27 @@ abstract class OudsBarTokens { late Color colorContentSelectedFocus; late Color colorContentSelectedHover; late Color colorContentSelectedPressed; - late Color colorContentUnselectedEnabledDark; - late Color colorContentUnselectedEnabledLight; + late Color colorContentUnselectedEnabled; late Color colorContentUnselectedFocus; late Color colorContentUnselectedHover; late Color colorContentUnselectedPressed; + late Color colorCurrentIndicatorAndroidSelectedDisabled; + late Color colorCurrentIndicatorAndroidSelectedEnabled; + late Color colorCurrentIndicatorAndroidSelectedFocus; + late Color colorCurrentIndicatorAndroidSelectedHover; + late Color colorCurrentIndicatorAndroidSelectedPressed; + late Color colorCurrentIndicatorAndroidUnselectedDisabled; + late Color colorCurrentIndicatorAndroidUnselectedFocus; + late Color colorCurrentIndicatorAndroidUnselectedHover; + late Color colorCurrentIndicatorAndroidUnselectedPressed; + late Color colorCurrentIndicatorCustomSelectedEnabled; + late Color colorCurrentIndicatorCustomSelectedFocus; + late Color colorCurrentIndicatorCustomSelectedHover; + late Color colorCurrentIndicatorCustomSelectedPressed; + late Color colorIosAccent; late int effectBgBlur; - late double opacityActiveIndicatorCustom; - late double sizeHeightActiveIndicatorCustom; - late double sizeWidthActiveIndicatorCustomBottom; - late double sizeWidthActiveIndicatorCustomTop; + late double opacityCurrentIndicatorCustom; + late double sizeHeightCurrentIndicatorCustom; + late double sizeWidthCurrentIndicatorCustomBottom; + late double sizeWidthCurrentIndicatorCustomTop; } diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart index c23543b2d..21092a615 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsBulletListTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_buttonMono_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_buttonMono_tokens.dart index 95dfbc9da..6cf0b5de1 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_buttonMono_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_buttonMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_button_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_button_tokens.dart index 132c1642b..c9c8aa751 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_button_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_button_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_checkbox_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_checkbox_tokens.dart index 5bbdc2929..41264c13f 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_checkbox_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_checkbox_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsCheckboxTokens { @@ -23,7 +23,6 @@ abstract class OudsCheckboxTokens { late double borderWidthUnselectedFocus; late double borderWidthUnselectedHover; late double borderWidthUnselectedPressed; - late double sizeIndicator; late double sizeMaxHeight; late double sizeMinHeight; late double sizeMinWidth; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_chip_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_chip_tokens.dart index 43312c0e0..b15f39efe 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_chip_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_chip_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_controlItem_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_controlItem_tokens.dart index 4848b03c9..d1cfdf188 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_controlItem_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_controlItem_tokens.dart @@ -10,30 +10,57 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; abstract class OudsControlItemTokens { - late double borderRadius; - late double borderRadiusItemOnly; - late Color colorBgFocus; - late Color colorBgHover; - late Color colorBgLoading; - late Color colorBgPressed; - late Color colorContentLoader; - late double sizeErrorIcon; - late double sizeIcon; - late double sizeLoader; - late double sizeMaxHeightAssetsContainer; + late double borderRadiusCurrentIndicator; + late double borderRadiusDefault; + late double borderRadiusMedia; + late double borderRadiusMediaRoundedCorner; + late double borderRadiusRounded; + late double borderWidthCurrentPage; + late double borderWidthDefault; + late Color colorBadgeSafetyArea; + late Color colorBgCurrentDisabled; + late Color colorBgCurrentEnabled; + late Color colorBgCurrentFocus; + late Color colorBgCurrentHover; + late Color colorBgCurrentPressed; + late Color colorContentCurrentDisabled; + late Color colorContentCurrentEnabled; + late Color colorContentCurrentFocus; + late Color colorContentCurrentHover; + late Color colorContentCurrentPressed; + late double fontLetterSpacingAvatarInitialXlarge; + late double fontLineHeightAvatarInitialXlarge; + late double fontSizeAvatarInitialXlarge; + late double opacityCurrentDivider; + late double opacityCurrentIndicator; + late double sizeAssetLarge; + late double sizeAssetMedium; + late double sizeAssetSmall; + late double sizeAssetXlarge; + late double sizeControlIndicator; + late double sizeCurrentIndicatorWidth; + late double sizeFlagHeight; late double sizeMaxWidth; - late double sizeMinHeight; + late double sizeMinHeightCompact; + late double sizeMinHeightDefault; late double sizeMinWidth; late double spaceColumnGap; - late double spacePaddingBlockDefault; - late double spacePaddingBlockTopErrorText; + late double spacePaddingBlockBottomSlot; + late double spacePaddingBlockDensityCompact; + late double spacePaddingBlockDensityCompactBottomExpandContainer; + late double spacePaddingBlockDensityCompactTopAlignmentTopCounterweight; + late double spacePaddingBlockDensityCompactTopAlignmentTopTextContainer; + late double spacePaddingBlockDensityDefault; + late double spacePaddingBlockDensityDefaultBottomExpandContainer; + late double spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight; + late double spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer; + late double spacePaddingBlockTopHelperText; late double spacePaddingInline; - late double spacePaddingInlineErrorIcon; late double spaceRowGap; } diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_divider_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_divider_tokens.dart index f056bf741..8f9f6bd1b 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_divider_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_divider_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsDividerTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart index 53586e73f..8d55378cf 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart @@ -10,13 +10,14 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; abstract class OudsIconTokens { - late Color colorContentDefault; late Color colorContentStatusWarningExternalShape; late Color colorContentStatusWarningInternalShape; + late Color colorContentStatusWarningInverseExternalShape; + late Color colorContentStatusWarningInverseInternalShape; } diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_inputTag_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_inputTag_tokens.dart index 34983fd95..98717341a 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_inputTag_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_inputTag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_linkMono_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_linkMono_tokens.dart index 39fdf9714..460d27f19 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_linkMono_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_linkMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_link_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_link_tokens.dart index 58c01a6b3..0b1aec7de 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_link_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_link_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_pinCodeInput_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_pinCodeInput_tokens.dart index 1eeaa5b8a..e349d9203 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_pinCodeInput_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_pinCodeInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsPinCodeInputTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_radioButton_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_radioButton_tokens.dart index b7866dcb8..f4050e38b 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_radioButton_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_radioButton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsRadioButtonTokens { @@ -23,7 +23,6 @@ abstract class OudsRadioButtonTokens { late double borderWidthUnselectedFocus; late double borderWidthUnselectedHover; late double borderWidthUnselectedPressed; - late double sizeIndicator; late double sizeMaxHeight; late double sizeMinHeight; late double sizeMinWidth; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_skeleton_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_skeleton_tokens.dart index d919d58be..3d0f3b143 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_skeleton_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_skeleton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_switch_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_switch_tokens.dart index b894cefc5..3dccf3806 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_switch_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_switch_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_tag_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_tag_tokens.dart index c8c615b66..cc27c6c67 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_tag_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_tag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsTagTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_textInput_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_textInput_tokens.dart index 68be1b9cf..3b3ab6ae0 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_textInput_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_textInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -33,6 +33,8 @@ abstract class OudsTextInputTokens { late double sizeVerticalDividerHeight; late double spaceColumnGapDefault; late double spaceColumnGapInlineText; + late double spaceColumnGapLabelAsterisk; + late double spaceColumnGapLabelSmallAsterisk; late double spaceColumnGapTrailingErrorAction; late double spacePaddingBlockDefault; late double spacePaddingBlockTopHelperText; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_border_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_border_semantic_tokens.dart index 75bc804e4..a209fe72b 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_border_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsBorderSemanticTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_action_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_action_semantic_tokens.dart index 0401bc71f..ce65c428c 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_action_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_action_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -26,8 +26,6 @@ abstract class OudsColorActionSemanticTokens { final Color actionHighlightedLight; final Color actionHoverDark; final Color actionHoverLight; - final Color actionIosAccentDark; - final Color actionIosAccentLight; final Color actionLoadingDark; final Color actionLoadingLight; final Color actionNegativeEnabledDark; @@ -74,8 +72,6 @@ abstract class OudsColorActionSemanticTokens { required this.actionHighlightedLight, required this.actionHoverDark, required this.actionHoverLight, - required this.actionIosAccentDark, - required this.actionIosAccentLight, required this.actionLoadingDark, required this.actionLoadingLight, required this.actionNegativeEnabledDark, diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart index 4f96a5c24..6ad7384b3 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_bg_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_bg_semantic_tokens.dart index 1fb71a9f3..fb13b0887 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_bg_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_bg_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_border_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_border_semantic_tokens.dart index f9215e144..1b7b169fc 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_border_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_content_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_content_semantic_tokens.dart index 9867ba94e..b9b618353 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_content_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_content_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -76,6 +76,14 @@ abstract class OudsColorContentSemanticTokens { final Color contentStatusAccentLight; final Color contentStatusInfoDark; final Color contentStatusInfoLight; + final Color contentStatusInverseInfoDark; + final Color contentStatusInverseInfoLight; + final Color contentStatusInverseNegativeDark; + final Color contentStatusInverseNegativeLight; + final Color contentStatusInversePositiveDark; + final Color contentStatusInversePositiveLight; + final Color contentStatusInverseWarningDark; + final Color contentStatusInverseWarningLight; final Color contentStatusNegativeDark; final Color contentStatusNegativeLight; final Color contentStatusPositiveDark; @@ -144,6 +152,14 @@ abstract class OudsColorContentSemanticTokens { required this.contentStatusAccentLight, required this.contentStatusInfoDark, required this.contentStatusInfoLight, + required this.contentStatusInverseInfoDark, + required this.contentStatusInverseInfoLight, + required this.contentStatusInverseNegativeDark, + required this.contentStatusInverseNegativeLight, + required this.contentStatusInversePositiveDark, + required this.contentStatusInversePositiveLight, + required this.contentStatusInverseWarningDark, + required this.contentStatusInverseWarningLight, required this.contentStatusNegativeDark, required this.contentStatusNegativeLight, required this.contentStatusPositiveDark, diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart index 420ff2699..41e8749b4 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart index b963bbdb0..baed528c8 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart @@ -10,28 +10,32 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; abstract class OudsColorOverlaySemanticTokens { + final Color overlayBackdropDark; + final Color overlayBackdropLight; final Color overlayDragDark; final Color overlayDragLight; final Color overlayDropdownDark; final Color overlayDropdownLight; - final Color overlayModalDark; - final Color overlayModalLight; + final Color overlayModalSheetDark; + final Color overlayModalSheetLight; final Color overlayTooltipDark; final Color overlayTooltipLight; const OudsColorOverlaySemanticTokens({ + required this.overlayBackdropDark, + required this.overlayBackdropLight, required this.overlayDragDark, required this.overlayDragLight, required this.overlayDropdownDark, required this.overlayDropdownLight, - required this.overlayModalDark, - required this.overlayModalLight, + required this.overlayModalSheetDark, + required this.overlayModalSheetLight, required this.overlayTooltipDark, required this.overlayTooltipLight, }); diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_repository_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_repository_semantic_tokens.dart index 14dfef67c..a3fa52bc3 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_repository_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_repository_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -105,7 +105,8 @@ abstract class OudsColorRepositorySemanticTokens { final Color repositoryPrimaryLowest; final Color repositoryPrimaryMedium; final Color repositorySecondaryHigh; - final Color repositorySecondaryHigher; + final Color repositorySecondaryHigherHigh; + final Color repositorySecondaryHigherLow; final Color repositorySecondaryHighest; final Color repositorySecondaryLow; final Color repositorySecondaryLower; @@ -216,7 +217,8 @@ abstract class OudsColorRepositorySemanticTokens { required this.repositoryPrimaryLowest, required this.repositoryPrimaryMedium, required this.repositorySecondaryHigh, - required this.repositorySecondaryHigher, + required this.repositorySecondaryHigherHigh, + required this.repositorySecondaryHigherLow, required this.repositorySecondaryHighest, required this.repositorySecondaryLow, required this.repositorySecondaryLower, diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_surface_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_surface_semantic_tokens.dart index a2c2e0d57..95b762741 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_surface_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_surface_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_effect_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_effect_semantic_tokens.dart index bc116f401..429ce8cf7 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_effect_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_effect_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsEffectSemanticTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_font_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_font_semantic_tokens.dart index a064e093c..2e48ac52a 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_font_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_font_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_grid_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_grid_semantic_tokens.dart index 7b31be03b..c5842bfc6 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_grid_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_grid_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsGridSemanticTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart index 3eb848da5..2387603e7 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsOpacitySemanticTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_size_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_size_semantic_tokens.dart index 8cb9e1de4..cb02082d8 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_size_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_size_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsSizeSemanticTokens { @@ -81,33 +81,34 @@ abstract class OudsSizeSemanticTokens { late double iconWithLabelXlargeSizeLarge; late double iconWithLabelXlargeSizeMedium; late double iconWithLabelXlargeSizeSmall; - late double maxWidthTypeBodyLargeMobile; - late double maxWidthTypeBodyLargeTablet; - late double maxWidthTypeBodyMediumMobile; - late double maxWidthTypeBodyMediumTablet; - late double maxWidthTypeBodySmallMobile; - late double maxWidthTypeBodySmallTablet; - late double maxWidthTypeDisplayLargeMobile; - late double maxWidthTypeDisplayLargeTablet; - late double maxWidthTypeDisplayMediumMobile; - late double maxWidthTypeDisplayMediumTablet; - late double maxWidthTypeDisplaySmallMobile; - late double maxWidthTypeDisplaySmallTablet; - late double maxWidthTypeHeadingLargeMobile; - late double maxWidthTypeHeadingLargeTablet; - late double maxWidthTypeHeadingMediumMobile; - late double maxWidthTypeHeadingMediumTablet; - late double maxWidthTypeHeadingSmallMobile; - late double maxWidthTypeHeadingSmallTablet; - late double maxWidthTypeHeadingXlargeMobile; - late double maxWidthTypeHeadingXlargeTablet; - late double maxWidthTypeLabelLargeMobile; - late double maxWidthTypeLabelLargeTablet; - late double maxWidthTypeLabelMediumMobile; - late double maxWidthTypeLabelMediumTablet; - late double maxWidthTypeLabelSmallMobile; - late double maxWidthTypeLabelSmallTablet; - late double maxWidthTypeLabelXlargeMobile; - late double maxWidthTypeLabelXlargeTablet; + late double iconWithLabelXlargeSizeXsmall; + late double maxWidthBodyLargeMobile; + late double maxWidthBodyLargeTablet; + late double maxWidthBodyMediumMobile; + late double maxWidthBodyMediumTablet; + late double maxWidthBodySmallMobile; + late double maxWidthBodySmallTablet; + late double maxWidthDisplayLargeMobile; + late double maxWidthDisplayLargeTablet; + late double maxWidthDisplayMediumMobile; + late double maxWidthDisplayMediumTablet; + late double maxWidthDisplaySmallMobile; + late double maxWidthDisplaySmallTablet; + late double maxWidthHeadingLargeMobile; + late double maxWidthHeadingLargeTablet; + late double maxWidthHeadingMediumMobile; + late double maxWidthHeadingMediumTablet; + late double maxWidthHeadingSmallMobile; + late double maxWidthHeadingSmallTablet; + late double maxWidthHeadingXlargeMobile; + late double maxWidthHeadingXlargeTablet; + late double maxWidthLabelLargeMobile; + late double maxWidthLabelLargeTablet; + late double maxWidthLabelMediumMobile; + late double maxWidthLabelMediumTablet; + late double maxWidthLabelSmallMobile; + late double maxWidthLabelSmallTablet; + late double maxWidthLabelXlargeMobile; + late double maxWidthLabelXlargeTablet; late double minInteractiveArea; } diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_space_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_space_semantic_tokens.dart index 7389db569..43a486b83 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_space_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_space_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator abstract class OudsSpaceSemanticTokens { diff --git a/ouds_theme_orange/CHANGELOG.md b/ouds_theme_orange/CHANGELOG.md index ba725f942..3c2e35560 100644 --- a/ouds_theme_orange/CHANGELOG.md +++ b/ouds_theme_orange/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_theme_orange/lib/components/orange_alert_tokens.dart b/ouds_theme_orange/lib/components/orange_alert_tokens.dart index d4f145093..f84f7bbf5 100644 --- a/ouds_theme_orange/lib/components/orange_alert_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_alert_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange/lib/components/orange_badge_tokens.dart b/ouds_theme_orange/lib/components/orange_badge_tokens.dart index 8a0217498..42383dfd7 100644 --- a/ouds_theme_orange/lib/components/orange_badge_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_badge_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -31,7 +31,11 @@ class OrangeBadgeTokens extends OudsBadgeTokens { @override double get sizeXsmall => DimensionRawTokens.dimension100; @override - double get spaceInset => DimensionRawTokens.dimensionOutOfSystem75; + double get spaceInsetMediumLarge => DimensionRawTokens.dimensionOutOfSystem75; + @override + double get spaceInsetSmall => DimensionRawTokens.dimensionOutOfSystem50; + @override + double get spaceInsetXsmall => DimensionRawTokens.dimensionOutOfSystem25; @override double get spacePaddingInlineLarge => providersTokens.spaceTokens.paddingInline2xsmall; @override diff --git a/ouds_theme_orange/lib/components/orange_bar_tokens.dart b/ouds_theme_orange/lib/components/orange_bar_tokens.dart index 58bb41b7b..3e76c19e4 100644 --- a/ouds_theme_orange/lib/components/orange_bar_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_bar_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -26,71 +26,71 @@ class OrangeBarTokens extends OudsBarTokens { OrangeBarTokens(this.providersTokens); @override - double get borderRadiusActiveIndicatorCustomBottom => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicatorCustomBottom => providersTokens.borderTokens.radiusNone; @override - double get borderRadiusActiveIndicatorCustomTop => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicatorCustomTop => providersTokens.borderTokens.radiusNone; @override - Color get colorActiveIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark880800; @override - Color get colorActiveIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityWhite800; @override - Color get colorActiveIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedEnabled => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorActiveIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorActiveIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorActiveIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorContentUnselectedEnabled => providersTokens.colorScheme.contentMuted; @override - Color get colorActiveIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark800800; + Color get colorCurrentIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityGrayLight80800; + Color get colorCurrentIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; + Color get colorCurrentIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedEnabled => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorCurrentIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorCurrentIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorCurrentIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentUnselectedEnabledDark => ColorRawTokens.colorOpacityWhite600; + Color get colorCurrentIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorContentUnselectedEnabledLight => ColorRawTokens.colorOpacityBlack600; + Color get colorCurrentIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorIosAccent => providersTokens.colorScheme.actionSelected; @override - int get effectBgBlur => EffectRawTokens.effectBlur160; + int get effectBgBlur => EffectRawTokens.effectBlur320; @override - double get opacityActiveIndicatorCustom => providersTokens.opacityTokens.opaque; + double get opacityCurrentIndicatorCustom => providersTokens.opacityTokens.opaque; @override - double get sizeHeightActiveIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; + double get sizeHeightCurrentIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; @override - double get sizeWidthActiveIndicatorCustomBottom => DimensionRawTokens.dimension300; + double get sizeWidthCurrentIndicatorCustomBottom => DimensionRawTokens.dimension300; @override - double get sizeWidthActiveIndicatorCustomTop => DimensionRawTokens.dimension650; + double get sizeWidthCurrentIndicatorCustomTop => DimensionRawTokens.dimension500; } diff --git a/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart b/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart index ba3b96981..668cd5818 100644 --- a/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange/lib/components/orange_buttonMono_tokens.dart b/ouds_theme_orange/lib/components/orange_buttonMono_tokens.dart index c6863d4af..58f2af012 100644 --- a/ouds_theme_orange/lib/components/orange_buttonMono_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_buttonMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_button_tokens.dart b/ouds_theme_orange/lib/components/orange_button_tokens.dart index 4c2e6ec8f..8a20cdae9 100644 --- a/ouds_theme_orange/lib/components/orange_button_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_button_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_checkbox_tokens.dart b/ouds_theme_orange/lib/components/orange_checkbox_tokens.dart index 0fe69fd8e..4e8872d8c 100644 --- a/ouds_theme_orange/lib/components/orange_checkbox_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_checkbox_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class OrangeCheckboxTokens extends OudsCheckboxTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_orange/lib/components/orange_chip_tokens.dart b/ouds_theme_orange/lib/components/orange_chip_tokens.dart index f037b07ef..da4581ca2 100644 --- a/ouds_theme_orange/lib/components/orange_chip_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_chip_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_controlItem_tokens.dart b/ouds_theme_orange/lib/components/orange_controlItem_tokens.dart index f5f68a8f5..3c1d40f5d 100644 --- a/ouds_theme_orange/lib/components/orange_controlItem_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_controlItem_tokens.dart @@ -10,11 +10,12 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_global_raw_tokens/font_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart'; @@ -24,43 +25,97 @@ class OrangeControlItemTokens extends OudsControlItemTokens { OrangeControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusNone; @override - double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; @override - Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; @override - Color get colorBgPressed => providersTokens.colorScheme.actionSupportPressed; + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; @override - Color get colorContentLoader => providersTokens.colorScheme.contentDefault; + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override - double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; @override - double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; @override - double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBgCurrentEnabled => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.actionSupportEnabled, providersTokens.colorScheme.actionSupportHover); @override - double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @override + Color get colorContentCurrentDisabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentEnabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentFocus => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentHover => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentPressed => providersTokens.colorScheme.contentDefault; + @override + double get fontLetterSpacingAvatarInitialXlarge => FontRawTokens.fontLetterSpacing450; + @override + double get fontLineHeightAvatarInitialXlarge => FontRawTokens.fontLineHeight650; + @override + double get fontSizeAvatarInitialXlarge => FontRawTokens.fontSize450; + @override + double get opacityCurrentDivider => providersTokens.opacityTokens.opaque; + @override + double get opacityCurrentIndicator => providersTokens.opacityTokens.opaque; + @override + double get sizeAssetLarge => DimensionRawTokens.dimension500; + @override + double get sizeAssetMedium => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @override + double get sizeAssetSmall => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @override + double get sizeAssetXlarge => DimensionRawTokens.dimension700; + @override + double get sizeControlIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @override + double get sizeCurrentIndicatorWidth => DimensionRawTokens.dimension50; + @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override double get sizeMaxWidth => DimensionRawTokens.dimension4000; @override - double get sizeMinHeight => DimensionRawTokens.dimension650; + double get sizeMinHeightCompact => providersTokens.sizeTokens.minInteractiveArea; + @override + double get sizeMinHeightDefault => DimensionRawTokens.dimension750; @override double get sizeMinWidth => DimensionRawTokens.dimension2000; @override double get spaceColumnGap => providersTokens.spaceTokens.columnGapMedium; @override - double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; + double get spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; + double get spacePaddingBlockDensityCompactTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlockNone; + @override + double get spacePaddingBlockDensityDefault => providersTokens.spaceTokens.paddingBlockMedium; + @override + double get spacePaddingBlockDensityDefaultBottomExpandContainer => providersTokens.spaceTokens.paddingBlock3xlarge; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockSmall; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlock4xsmall; + @override + double get spacePaddingBlockTopHelperText => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; @override double get spaceRowGap => providersTokens.spaceTokens.rowGapNone; } diff --git a/ouds_theme_orange/lib/components/orange_divider_tokens.dart b/ouds_theme_orange/lib/components/orange_divider_tokens.dart index a16fddf7f..442ed1387 100644 --- a/ouds_theme_orange/lib/components/orange_divider_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_divider_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; diff --git a/ouds_theme_orange/lib/components/orange_icon_tokens.dart b/ouds_theme_orange/lib/components/orange_icon_tokens.dart index c8097ab25..1d981c017 100644 --- a/ouds_theme_orange/lib/components/orange_icon_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_icon_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -22,10 +22,12 @@ class OrangeIconTokens extends OudsIconTokens { OrangeIconTokens(this.providersTokens); - @override - Color get colorContentDefault => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedLower); @override Color get colorContentStatusWarningExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningMedium, providersTokens.colorScheme.repositoryWarningLow); @override Color get colorContentStatusWarningInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningHigh, providersTokens.colorScheme.opacityTransparent); + @override + Color get colorContentStatusWarningInverseExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningLow, providersTokens.colorScheme.repositoryWarningMedium); + @override + Color get colorContentStatusWarningInverseInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.opacityTransparent, providersTokens.colorScheme.repositoryWarningHigh); } diff --git a/ouds_theme_orange/lib/components/orange_inputTag_tokens.dart b/ouds_theme_orange/lib/components/orange_inputTag_tokens.dart index 01c45d755..2fb6beaa5 100644 --- a/ouds_theme_orange/lib/components/orange_inputTag_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_inputTag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_linkMono_tokens.dart b/ouds_theme_orange/lib/components/orange_linkMono_tokens.dart index 635801b4c..ae1fe3d06 100644 --- a/ouds_theme_orange/lib/components/orange_linkMono_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_linkMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_link_tokens.dart b/ouds_theme_orange/lib/components/orange_link_tokens.dart index f6bc298d6..ae61c1ced 100644 --- a/ouds_theme_orange/lib/components/orange_link_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_link_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_pinCodeInput_tokens.dart b/ouds_theme_orange/lib/components/orange_pinCodeInput_tokens.dart index de11170c0..456c98b6a 100644 --- a/ouds_theme_orange/lib/components/orange_pinCodeInput_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_pinCodeInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange/lib/components/orange_radioButton_tokens.dart b/ouds_theme_orange/lib/components/orange_radioButton_tokens.dart index 3c74d365c..1e2786e6f 100644 --- a/ouds_theme_orange/lib/components/orange_radioButton_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_radioButton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class OrangeRadioButtonTokens extends OudsRadioButtonTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_orange/lib/components/orange_skeleton_tokens.dart b/ouds_theme_orange/lib/components/orange_skeleton_tokens.dart index 974a1d3a0..d8a2e5732 100644 --- a/ouds_theme_orange/lib/components/orange_skeleton_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_skeleton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_switch_tokens.dart b/ouds_theme_orange/lib/components/orange_switch_tokens.dart index 6a3fefb6f..a2c92c0e5 100644 --- a/ouds_theme_orange/lib/components/orange_switch_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_switch_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/components/orange_tag_tokens.dart b/ouds_theme_orange/lib/components/orange_tag_tokens.dart index 508b0e0bf..1a740aef7 100644 --- a/ouds_theme_orange/lib/components/orange_tag_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_tag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -35,9 +35,9 @@ class OrangeTagTokens extends OudsTagTokens { @override double get sizeMinHeightSmall => DimensionRawTokens.dimension300; @override - double get sizeMinWidthDefault => DimensionRawTokens.dimension600; + double get sizeMinWidthDefault => DimensionRawTokens.dimension400; @override - double get sizeMinWidthSmall => DimensionRawTokens.dimension550; + double get sizeMinWidthSmall => DimensionRawTokens.dimension300; @override double get spaceColumnGapDefault => providersTokens.spaceTokens.columnGap2xsmall; @override diff --git a/ouds_theme_orange/lib/components/orange_textInput_tokens.dart b/ouds_theme_orange/lib/components/orange_textInput_tokens.dart index db168ff29..d5bb4fad8 100644 --- a/ouds_theme_orange/lib/components/orange_textInput_tokens.dart +++ b/ouds_theme_orange/lib/components/orange_textInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -26,7 +26,7 @@ class OrangeTextInputTokens extends OudsTextInputTokens { @override double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - double get borderRadiusRounded => providersTokens.borderTokens.radiusSmall; + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; @override double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override @@ -58,6 +58,10 @@ class OrangeTextInputTokens extends OudsTextInputTokens { @override double get spaceColumnGapInlineText => providersTokens.spaceTokens.columnGapXsmall; @override + double get spaceColumnGapLabelAsterisk => providersTokens.spaceTokens.columnGap2xsmall; + @override + double get spaceColumnGapLabelSmallAsterisk => DimensionRawTokens.dimensionOutOfSystem75; + @override double get spaceColumnGapTrailingErrorAction => providersTokens.spaceTokens.columnGapXsmall; @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlock2xsmall; diff --git a/ouds_theme_orange/lib/semantic/orange_border_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_border_semantic_tokens.dart index 17d24bfb4..a96e104ee 100644 --- a/ouds_theme_orange/lib/semantic/orange_border_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_tokens.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_color_action_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_action_semantic_tokens.dart index ee4e6c350..ecef4b122 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_action_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_action_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; @@ -29,8 +29,6 @@ class OrangeColorActionSemanticTokens extends OudsColorActionSemanticTokens { super.actionHighlightedLight = ColorRawTokens.colorFunctionalBlack, super.actionHoverDark = ColorRawTokens.colorOpacityWhite640, super.actionHoverLight = ColorRawTokens.colorOpacityBlack680, - super.actionIosAccentDark = OrangeColorRawTokens.colorOrange500, - super.actionIosAccentLight = OrangeColorRawTokens.colorOrange550, super.actionLoadingDark = OrangeColorRawTokens.colorOrange500, super.actionLoadingLight = OrangeColorRawTokens.colorOrange550, super.actionNegativeEnabledDark = ColorRawTokens.colorFunctionalScarlet300, diff --git a/ouds_theme_orange/lib/semantic/orange_color_always_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_always_semantic_tokens.dart index 429c0b370..9186e475d 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_always_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_always_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_color_bg_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_bg_semantic_tokens.dart index 71e618293..50688a882 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_bg_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_bg_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_color_border_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_border_semantic_tokens.dart index 55b8eb6a1..5327b4a09 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_border_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -28,7 +28,7 @@ class OrangeColorBorderSemanticTokens extends OudsColorBorderSemanticTokens { super.borderBrandTertiaryLight = const Color(0x00ff0000), super.borderDefaultDark = ColorRawTokens.colorOpacityWhite200, super.borderDefaultLight = ColorRawTokens.colorOpacityBlack200, - super.borderEmphasizedDark = ColorRawTokens.colorOpacityWhite920, + super.borderEmphasizedDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderEmphasizedLight = ColorRawTokens.colorFunctionalBlack, super.borderFocusDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderFocusInsetDark = ColorRawTokens.colorFunctionalGrayDark880, diff --git a/ouds_theme_orange/lib/semantic/orange_color_content_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_content_semantic_tokens.dart index 8a0eeb33c..c39228ace 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_content_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_content_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -80,6 +80,14 @@ class OrangeColorContentSemanticTokens extends OudsColorContentSemanticTokens { super.contentStatusAccentLight = OrangeColorRawTokens.colorOrange500, super.contentStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, super.contentStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoDark = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoLight = ColorRawTokens.colorFunctionalDodgerBlue300, + super.contentStatusInverseNegativeDark = ColorRawTokens.colorFunctionalScarlet600, + super.contentStatusInverseNegativeLight = ColorRawTokens.colorFunctionalScarlet300, + super.contentStatusInversePositiveDark = ColorRawTokens.colorFunctionalMalachite750, + super.contentStatusInversePositiveLight = ColorRawTokens.colorFunctionalMalachite300, + super.contentStatusInverseWarningDark = ColorRawTokens.colorFunctionalSun750, + super.contentStatusInverseWarningLight = ColorRawTokens.colorFunctionalSun300, super.contentStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.contentStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.contentStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, diff --git a/ouds_theme_orange/lib/semantic/orange_color_opacity_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_opacity_semantic_tokens.dart index 3d2cc4926..9e077e08b 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_opacity_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_color_overlay_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_overlay_semantic_tokens.dart index 001cbc035..debdaeb00 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_overlay_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_overlay_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart'; @@ -18,12 +18,14 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class OrangeColorOverlaySemanticTokens extends OudsColorOverlaySemanticTokens { const OrangeColorOverlaySemanticTokens({ + super.overlayBackdropDark = ColorRawTokens.colorOpacityBlack680, + super.overlayBackdropLight = ColorRawTokens.colorOpacityBlack680, super.overlayDragDark = ColorRawTokens.colorOpacityWhite80, super.overlayDragLight = ColorRawTokens.colorOpacityBlack40, super.overlayDropdownDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayDropdownLight = ColorRawTokens.colorFunctionalWhite, - super.overlayModalDark = ColorRawTokens.colorFunctionalGrayDark640, - super.overlayModalLight = ColorRawTokens.colorFunctionalWhite, + super.overlayModalSheetDark = ColorRawTokens.colorFunctionalGrayDark720, + super.overlayModalSheetLight = ColorRawTokens.colorFunctionalWhite, super.overlayTooltipDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayTooltipLight = ColorRawTokens.colorFunctionalGrayDark720, }); diff --git a/ouds_theme_orange/lib/semantic/orange_color_repository_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_repository_semantic_tokens.dart index 492b62f4a..7e0728894 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_repository_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_repository_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -109,7 +109,8 @@ class OrangeColorRepositorySemanticTokens extends OudsColorRepositorySemanticTok super.repositoryPrimaryLowest = const Color(0x00ff0000), super.repositoryPrimaryMedium = OrangeColorRawTokens.colorOrange550, super.repositorySecondaryHigh = const Color(0x00ff0000), - super.repositorySecondaryHigher = const Color(0x00ff0000), + super.repositorySecondaryHigherHigh = const Color(0x00ff0000), + super.repositorySecondaryHigherLow = const Color(0x00ff0000), super.repositorySecondaryHighest = const Color(0x00ff0000), super.repositorySecondaryLow = const Color(0x00ff0000), super.repositorySecondaryLower = const Color(0x00ff0000), diff --git a/ouds_theme_orange/lib/semantic/orange_color_surface_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_surface_semantic_tokens.dart index 17f17db60..a6ba03b96 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_surface_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_surface_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_effect_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_effect_semantic_tokens.dart index 59c69113d..46f80f44e 100644 --- a/ouds_theme_orange/lib/semantic/orange_effect_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_effect_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_effect_semantic_tokens.dart'; @@ -18,5 +18,5 @@ import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; class OrangeEffectSemanticTokens extends OudsEffectSemanticTokens { @override - int get blurDrag => EffectRawTokens.effectBlur320; + int get blurDrag => EffectRawTokens.effectBlur480; } diff --git a/ouds_theme_orange/lib/semantic/orange_font_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_font_semantic_tokens.dart index 4efe43f32..9b980470a 100644 --- a/ouds_theme_orange/lib/semantic/orange_font_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_font_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_grid_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_grid_semantic_tokens.dart index ec020d25d..1a4db58c9 100644 --- a/ouds_theme_orange/lib/semantic/orange_grid_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_grid_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart'; @@ -18,7 +18,7 @@ import 'package:ouds_global_raw_tokens/grid_raw_tokens.dart'; class OrangeGridSemanticTokens extends OudsGridSemanticTokens { @override - double get compactColumnGap => GridRawTokens.gridColumnGap100; + double get compactColumnGap => GridRawTokens.gridColumnGap200; @override double get compactMargin => GridRawTokens.gridMargin300; @override diff --git a/ouds_theme_orange/lib/semantic/orange_opacity_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_opacity_semantic_tokens.dart index 2ac68cc87..5b9c437df 100644 --- a/ouds_theme_orange/lib/semantic/orange_opacity_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_size_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_size_semantic_tokens.dart index 2f9451a27..1a8c2f3d2 100644 --- a/ouds_theme_orange/lib/semantic/orange_size_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_size_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart'; @@ -126,7 +126,7 @@ class OrangeSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelLargeSizeSmall => DimensionRawTokens.dimension300; @override - double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension550; + double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension450; @override double get iconWithLabelLargeSizeXsmall => DimensionRawTokens.dimension250; @override @@ -146,67 +146,69 @@ class OrangeSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelSmallSizeXsmall => DimensionRawTokens.dimensionOutOfSystem250; @override - double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension550; + double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension500; @override - double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension500; + double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension450; @override double get iconWithLabelXlargeSizeSmall => DimensionRawTokens.dimension400; @override - double get maxWidthTypeBodyLargeMobile => DimensionRawTokens.dimension6000; + double get iconWithLabelXlargeSizeXsmall => DimensionRawTokens.dimension350; @override - double get maxWidthTypeBodyLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodySmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeMobile => DimensionRawTokens.dimension9000; + double get maxWidthBodySmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplaySmallMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthDisplaySmallTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingLargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingMediumMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingMediumTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingMediumMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingMediumTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingXlargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingXlargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingXlargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeLabelLargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingXlargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeLabelLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelXlargeMobile => DimensionRawTokens.dimension6000; + @override + double get maxWidthLabelXlargeTablet => DimensionRawTokens.dimension6000; @override double get minInteractiveArea => DimensionRawTokens.dimension600; } diff --git a/ouds_theme_orange/lib/semantic/orange_space_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_space_semantic_tokens.dart index b7a5d7d24..6a4ed4765 100644 --- a/ouds_theme_orange/lib/semantic/orange_space_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_space_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/CHANGELOG.md b/ouds_theme_orange_compact/CHANGELOG.md index 437a02f35..f7b9403f2 100644 --- a/ouds_theme_orange_compact/CHANGELOG.md +++ b/ouds_theme_orange_compact/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_alert_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_alert_tokens.dart index f284e52d2..fe1433bbb 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_alert_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_alert_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_badge_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_badge_tokens.dart index 1181c952d..58be79b2c 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_badge_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_badge_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -31,7 +31,11 @@ class OrangeCompactBadgeTokens extends OudsBadgeTokens { @override double get sizeXsmall => DimensionRawTokens.dimension100; @override - double get spaceInset => DimensionRawTokens.dimensionOutOfSystem75; + double get spaceInsetMediumLarge => DimensionRawTokens.dimensionOutOfSystem75; + @override + double get spaceInsetSmall => DimensionRawTokens.dimensionOutOfSystem50; + @override + double get spaceInsetXsmall => DimensionRawTokens.dimensionOutOfSystem25; @override double get spacePaddingInlineLarge => providersTokens.spaceTokens.paddingInline2xsmall; @override diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_bar_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_bar_tokens.dart index d46a42594..a79e00274 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_bar_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_bar_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -26,71 +26,71 @@ class OrangeCompactBarTokens extends OudsBarTokens { OrangeCompactBarTokens(this.providersTokens); @override - double get borderRadiusActiveIndicatorCustomBottom => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicatorCustomBottom => providersTokens.borderTokens.radiusNone; @override - double get borderRadiusActiveIndicatorCustomTop => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicatorCustomTop => providersTokens.borderTokens.radiusNone; @override - Color get colorActiveIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark880800; @override - Color get colorActiveIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityWhite800; @override - Color get colorActiveIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedEnabled => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorActiveIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorActiveIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorActiveIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorContentUnselectedEnabled => providersTokens.colorScheme.contentMuted; @override - Color get colorActiveIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark800800; + Color get colorCurrentIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityGrayLight80800; + Color get colorCurrentIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; + Color get colorCurrentIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedEnabled => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorCurrentIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorCurrentIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorCurrentIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentUnselectedEnabledDark => ColorRawTokens.colorOpacityWhite600; + Color get colorCurrentIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorContentUnselectedEnabledLight => ColorRawTokens.colorOpacityBlack600; + Color get colorCurrentIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorIosAccent => providersTokens.colorScheme.actionSelected; @override - int get effectBgBlur => EffectRawTokens.effectBlur160; + int get effectBgBlur => EffectRawTokens.effectBlur320; @override - double get opacityActiveIndicatorCustom => providersTokens.opacityTokens.opaque; + double get opacityCurrentIndicatorCustom => providersTokens.opacityTokens.opaque; @override - double get sizeHeightActiveIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; + double get sizeHeightCurrentIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; @override - double get sizeWidthActiveIndicatorCustomBottom => DimensionRawTokens.dimension300; + double get sizeWidthCurrentIndicatorCustomBottom => DimensionRawTokens.dimension300; @override - double get sizeWidthActiveIndicatorCustomTop => DimensionRawTokens.dimension650; + double get sizeWidthCurrentIndicatorCustomTop => DimensionRawTokens.dimension500; } diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart index 9dcf5ef4a..f78cc02af 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_buttonMono_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_buttonMono_tokens.dart index 783b19b10..c1edd790b 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_buttonMono_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_buttonMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_button_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_button_tokens.dart index 43ca868ab..6d7a8b116 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_button_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_button_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_checkbox_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_checkbox_tokens.dart index 9419fa1e0..ec4070916 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_checkbox_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_checkbox_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class OrangeCompactCheckboxTokens extends OudsCheckboxTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_chip_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_chip_tokens.dart index 710d34d69..cc7b75126 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_chip_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_chip_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_controlItem_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_controlItem_tokens.dart index be09ca4ba..ff5018251 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_controlItem_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_controlItem_tokens.dart @@ -10,11 +10,12 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_global_raw_tokens/font_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart'; @@ -24,43 +25,97 @@ class OrangeCompactControlItemTokens extends OudsControlItemTokens { OrangeCompactControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusNone; @override - double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; @override - Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; @override - Color get colorBgPressed => providersTokens.colorScheme.actionSupportPressed; + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; @override - Color get colorContentLoader => providersTokens.colorScheme.contentDefault; + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override - double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; @override - double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; @override - double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSupportEnabled; @override - double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1000; + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @override + Color get colorContentCurrentDisabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentEnabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentFocus => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentHover => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentPressed => providersTokens.colorScheme.contentDefault; + @override + double get fontLetterSpacingAvatarInitialXlarge => FontRawTokens.fontLetterSpacing350; + @override + double get fontLineHeightAvatarInitialXlarge => FontRawTokens.fontLineHeight550; + @override + double get fontSizeAvatarInitialXlarge => FontRawTokens.fontSize350; + @override + double get opacityCurrentDivider => providersTokens.opacityTokens.opaque; + @override + double get opacityCurrentIndicator => providersTokens.opacityTokens.opaque; + @override + double get sizeAssetLarge => DimensionRawTokens.dimension450; + @override + double get sizeAssetMedium => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @override + double get sizeAssetSmall => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @override + double get sizeAssetXlarge => DimensionRawTokens.dimension650; + @override + double get sizeControlIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @override + double get sizeCurrentIndicatorWidth => DimensionRawTokens.dimension50; + @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override double get sizeMaxWidth => DimensionRawTokens.dimension4000; @override - double get sizeMinHeight => DimensionRawTokens.dimension500; + double get sizeMinHeightCompact => providersTokens.sizeTokens.minInteractiveArea; + @override + double get sizeMinHeightDefault => DimensionRawTokens.dimension650; @override double get sizeMinWidth => DimensionRawTokens.dimension1800; @override double get spaceColumnGap => providersTokens.spaceTokens.columnGapMedium; @override - double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; + double get spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock4xsmall; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; + double get spacePaddingBlockDensityCompactTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlockNone; + @override + double get spacePaddingBlockDensityDefault => providersTokens.spaceTokens.paddingBlockMedium; + @override + double get spacePaddingBlockDensityDefaultBottomExpandContainer => providersTokens.spaceTokens.paddingBlock3xlarge; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockSmall; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlockNone; + @override + double get spacePaddingBlockTopHelperText => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; @override double get spaceRowGap => providersTokens.spaceTokens.rowGapNone; } diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_divider_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_divider_tokens.dart index 0b1f281b7..fbece539f 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_divider_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_divider_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart index 38bbc6e0f..097d61185 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -22,10 +22,12 @@ class OrangeCompactIconTokens extends OudsIconTokens { OrangeCompactIconTokens(this.providersTokens); - @override - Color get colorContentDefault => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedLower); @override Color get colorContentStatusWarningExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningMedium, providersTokens.colorScheme.repositoryWarningLow); @override Color get colorContentStatusWarningInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningHigh, providersTokens.colorScheme.opacityTransparent); + @override + Color get colorContentStatusWarningInverseExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningLow, providersTokens.colorScheme.repositoryWarningMedium); + @override + Color get colorContentStatusWarningInverseInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.opacityTransparent, providersTokens.colorScheme.repositoryWarningHigh); } diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_inputTag_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_inputTag_tokens.dart index 03d1a9e4f..1739e894a 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_inputTag_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_inputTag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_linkMono_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_linkMono_tokens.dart index c27b730cc..80df6986c 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_linkMono_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_linkMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_link_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_link_tokens.dart index b7e33c680..e266e2cf0 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_link_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_link_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_pinCodeInput_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_pinCodeInput_tokens.dart index 2574f0284..ae5044e0e 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_pinCodeInput_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_pinCodeInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_radioButton_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_radioButton_tokens.dart index ddc122d10..72a988efe 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_radioButton_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_radioButton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class OrangeCompactRadioButtonTokens extends OudsRadioButtonTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_skeleton_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_skeleton_tokens.dart index a4a621cc5..7bc4fe783 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_skeleton_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_skeleton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_switch_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_switch_tokens.dart index be32fb6b5..892612f97 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_switch_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_switch_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_tag_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_tag_tokens.dart index ac642bf75..da910d002 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_tag_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_tag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -35,9 +35,9 @@ class OrangeCompactTagTokens extends OudsTagTokens { @override double get sizeMinHeightSmall => DimensionRawTokens.dimension250; @override - double get sizeMinWidthDefault => DimensionRawTokens.dimension550; + double get sizeMinWidthDefault => DimensionRawTokens.dimension350; @override - double get sizeMinWidthSmall => DimensionRawTokens.dimension500; + double get sizeMinWidthSmall => DimensionRawTokens.dimension300; @override double get spaceColumnGapDefault => providersTokens.spaceTokens.columnGap2xsmall; @override diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_textInput_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_textInput_tokens.dart index 1f29afb7a..d3f79f40e 100644 --- a/ouds_theme_orange_compact/lib/components/orangeCompact_textInput_tokens.dart +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_textInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -26,7 +26,7 @@ class OrangeCompactTextInputTokens extends OudsTextInputTokens { @override double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - double get borderRadiusRounded => providersTokens.borderTokens.radiusSmall; + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; @override double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override @@ -58,6 +58,10 @@ class OrangeCompactTextInputTokens extends OudsTextInputTokens { @override double get spaceColumnGapInlineText => providersTokens.spaceTokens.columnGapXsmall; @override + double get spaceColumnGapLabelAsterisk => providersTokens.spaceTokens.columnGap2xsmall; + @override + double get spaceColumnGapLabelSmallAsterisk => DimensionRawTokens.dimensionOutOfSystem75; + @override double get spaceColumnGapTrailingErrorAction => providersTokens.spaceTokens.columnGapXsmall; @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlock2xsmall; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_border_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_border_semantic_tokens.dart index 1a471bf5e..2400ca440 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_border_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_action_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_action_semantic_tokens.dart index 21a8aaf89..f41df6935 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_action_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_action_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; @@ -29,8 +29,6 @@ class OrangeCompactColorActionSemanticTokens extends OudsColorActionSemanticToke super.actionHighlightedLight = ColorRawTokens.colorFunctionalBlack, super.actionHoverDark = ColorRawTokens.colorOpacityWhite640, super.actionHoverLight = ColorRawTokens.colorOpacityBlack680, - super.actionIosAccentDark = OrangeColorRawTokens.colorOrange500, - super.actionIosAccentLight = OrangeColorRawTokens.colorOrange550, super.actionLoadingDark = OrangeColorRawTokens.colorOrange500, super.actionLoadingLight = OrangeColorRawTokens.colorOrange550, super.actionNegativeEnabledDark = ColorRawTokens.colorFunctionalScarlet300, diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_always_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_always_semantic_tokens.dart index e559aea55..30c7a9f96 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_always_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_always_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_bg_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_bg_semantic_tokens.dart index 3135fd32b..99d39e344 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_bg_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_bg_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_border_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_border_semantic_tokens.dart index d23ab57eb..d851eb9eb 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_border_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -28,7 +28,7 @@ class OrangeCompactColorBorderSemanticTokens extends OudsColorBorderSemanticToke super.borderBrandTertiaryLight = const Color(0x00ff0000), super.borderDefaultDark = ColorRawTokens.colorOpacityWhite200, super.borderDefaultLight = ColorRawTokens.colorOpacityBlack200, - super.borderEmphasizedDark = ColorRawTokens.colorOpacityWhite920, + super.borderEmphasizedDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderEmphasizedLight = ColorRawTokens.colorFunctionalBlack, super.borderFocusDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderFocusInsetDark = ColorRawTokens.colorFunctionalBlack, diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_content_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_content_semantic_tokens.dart index 2de44ac9e..83e027a15 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_content_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_content_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -80,6 +80,14 @@ class OrangeCompactColorContentSemanticTokens extends OudsColorContentSemanticTo super.contentStatusAccentLight = OrangeColorRawTokens.colorOrange500, super.contentStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, super.contentStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoDark = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoLight = ColorRawTokens.colorFunctionalDodgerBlue300, + super.contentStatusInverseNegativeDark = ColorRawTokens.colorFunctionalScarlet600, + super.contentStatusInverseNegativeLight = ColorRawTokens.colorFunctionalScarlet300, + super.contentStatusInversePositiveDark = ColorRawTokens.colorFunctionalMalachite750, + super.contentStatusInversePositiveLight = ColorRawTokens.colorFunctionalMalachite300, + super.contentStatusInverseWarningDark = ColorRawTokens.colorFunctionalSun750, + super.contentStatusInverseWarningLight = ColorRawTokens.colorFunctionalSun300, super.contentStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.contentStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.contentStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_opacity_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_opacity_semantic_tokens.dart index 3a41a0a9a..ac7d99fd5 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_opacity_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_overlay_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_overlay_semantic_tokens.dart index 1d92ac31c..c0886a434 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_overlay_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_overlay_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart'; @@ -18,12 +18,14 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class OrangeCompactColorOverlaySemanticTokens extends OudsColorOverlaySemanticTokens { const OrangeCompactColorOverlaySemanticTokens({ + super.overlayBackdropDark = ColorRawTokens.colorOpacityBlack680, + super.overlayBackdropLight = ColorRawTokens.colorOpacityBlack680, super.overlayDragDark = ColorRawTokens.colorOpacityWhite80, super.overlayDragLight = ColorRawTokens.colorOpacityBlack40, super.overlayDropdownDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayDropdownLight = ColorRawTokens.colorFunctionalWhite, - super.overlayModalDark = ColorRawTokens.colorFunctionalGrayDark640, - super.overlayModalLight = ColorRawTokens.colorFunctionalWhite, + super.overlayModalSheetDark = ColorRawTokens.colorFunctionalGrayDark720, + super.overlayModalSheetLight = ColorRawTokens.colorFunctionalWhite, super.overlayTooltipDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayTooltipLight = ColorRawTokens.colorFunctionalGrayDark720, }); diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_repository_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_repository_semantic_tokens.dart index 0852d983d..ef90a3cff 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_repository_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_repository_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -109,7 +109,8 @@ class OrangeCompactColorRepositorySemanticTokens extends OudsColorRepositorySema super.repositoryPrimaryLowest = const Color(0x00ff0000), super.repositoryPrimaryMedium = OrangeColorRawTokens.colorOrange550, super.repositorySecondaryHigh = const Color(0x00ff0000), - super.repositorySecondaryHigher = const Color(0x00ff0000), + super.repositorySecondaryHigherHigh = const Color(0x00ff0000), + super.repositorySecondaryHigherLow = const Color(0x00ff0000), super.repositorySecondaryHighest = const Color(0x00ff0000), super.repositorySecondaryLow = const Color(0x00ff0000), super.repositorySecondaryLower = const Color(0x00ff0000), diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_surface_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_surface_semantic_tokens.dart index 68119a047..84a3caa10 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_surface_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_color_surface_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_effect_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_effect_semantic_tokens.dart index e6605007e..5bed7340f 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_effect_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_effect_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_effect_semantic_tokens.dart'; @@ -18,5 +18,5 @@ import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; class OrangeCompactEffectSemanticTokens extends OudsEffectSemanticTokens { @override - int get blurDrag => EffectRawTokens.effectBlur320; + int get blurDrag => EffectRawTokens.effectBlur480; } diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_font_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_font_semantic_tokens.dart index 873a831f8..5f476767d 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_font_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_font_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_grid_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_grid_semantic_tokens.dart index ef4360fbe..4ae361b6a 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_grid_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_grid_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart'; @@ -18,7 +18,7 @@ import 'package:ouds_global_raw_tokens/grid_raw_tokens.dart'; class OrangeCompactGridSemanticTokens extends OudsGridSemanticTokens { @override - double get compactColumnGap => GridRawTokens.gridColumnGap100; + double get compactColumnGap => GridRawTokens.gridColumnGap200; @override double get compactMargin => GridRawTokens.gridMargin100; @override diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_opacity_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_opacity_semantic_tokens.dart index 77c3e3f04..97f23ce3e 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_opacity_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_size_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_size_semantic_tokens.dart index 396a721eb..d012bdab0 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_size_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_size_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart'; @@ -126,7 +126,7 @@ class OrangeCompactSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelLargeSizeSmall => DimensionRawTokens.dimension250; @override - double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension500; + double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension400; @override double get iconWithLabelLargeSizeXsmall => DimensionRawTokens.dimension200; @override @@ -146,67 +146,69 @@ class OrangeCompactSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelSmallSizeXsmall => DimensionRawTokens.dimensionOutOfSystem250; @override - double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension500; + double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension450; @override - double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension450; + double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension400; @override double get iconWithLabelXlargeSizeSmall => DimensionRawTokens.dimension350; @override - double get maxWidthTypeBodyLargeMobile => DimensionRawTokens.dimension6000; + double get iconWithLabelXlargeSizeXsmall => DimensionRawTokens.dimension300; @override - double get maxWidthTypeBodyLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodySmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeMobile => DimensionRawTokens.dimension9000; + double get maxWidthBodySmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallMobile => DimensionRawTokens.dimension7000; + double get maxWidthDisplayMediumTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplaySmallMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingLargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthDisplaySmallTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingLargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingLargeTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthHeadingMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingSmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthHeadingSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingXlargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingXlargeTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingXlargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeLabelLargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingXlargeTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeLabelLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelXlargeMobile => DimensionRawTokens.dimension6000; + @override + double get maxWidthLabelXlargeTablet => DimensionRawTokens.dimension6000; @override double get minInteractiveArea => DimensionRawTokens.dimension500; } diff --git a/ouds_theme_orange_compact/lib/semantic/orangeCompact_space_semantic_tokens.dart b/ouds_theme_orange_compact/lib/semantic/orangeCompact_space_semantic_tokens.dart index 07a9ed2e1..654a0eaf2 100644 --- a/ouds_theme_orange_compact/lib/semantic/orangeCompact_space_semantic_tokens.dart +++ b/ouds_theme_orange_compact/lib/semantic/orangeCompact_space_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Orange Compact brand tokens version 2.3.0 +// Orange Compact brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/CHANGELOG.md b/ouds_theme_sosh/CHANGELOG.md index 64be6a1fe..b3143dbe2 100644 --- a/ouds_theme_sosh/CHANGELOG.md +++ b/ouds_theme_sosh/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart b/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart index 885c44938..dcec7dc77 100644 --- a/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_badge_tokens.dart b/ouds_theme_sosh/lib/components/sosh_badge_tokens.dart index b5d69f853..23c06ec16 100644 --- a/ouds_theme_sosh/lib/components/sosh_badge_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_badge_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -31,7 +31,11 @@ class SoshBadgeTokens extends OudsBadgeTokens { @override double get sizeXsmall => DimensionRawTokens.dimension100; @override - double get spaceInset => DimensionRawTokens.dimensionOutOfSystem75; + double get spaceInsetMediumLarge => DimensionRawTokens.dimensionOutOfSystem75; + @override + double get spaceInsetSmall => DimensionRawTokens.dimensionOutOfSystem50; + @override + double get spaceInsetXsmall => DimensionRawTokens.dimensionOutOfSystem25; @override double get spacePaddingInlineLarge => providersTokens.spaceTokens.paddingInline2xsmall; @override diff --git a/ouds_theme_sosh/lib/components/sosh_bar_tokens.dart b/ouds_theme_sosh/lib/components/sosh_bar_tokens.dart index f8b82d73e..8dcc49b49 100644 --- a/ouds_theme_sosh/lib/components/sosh_bar_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_bar_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -19,6 +19,7 @@ import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_bar_tokens.dart'; +import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; class SoshBarTokens extends OudsBarTokens { final OudsProvidersTokens providersTokens; @@ -26,71 +27,71 @@ class SoshBarTokens extends OudsBarTokens { SoshBarTokens(this.providersTokens); @override - double get borderRadiusActiveIndicatorCustomBottom => providersTokens.borderTokens.radiusPill; + double get borderRadiusCurrentIndicatorCustomBottom => providersTokens.borderTokens.radiusPill; @override - double get borderRadiusActiveIndicatorCustomTop => providersTokens.borderTokens.radiusDefault; + double get borderRadiusCurrentIndicatorCustomTop => providersTokens.borderTokens.radiusDefault; @override - Color get colorActiveIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentDark => SoshColorRawTokens.colorOpacityBlueDuckDark960800; @override - Color get colorActiveIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityWhite800; @override - Color get colorActiveIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorActiveIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorActiveIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; + Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorActiveIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorContentUnselectedEnabled => providersTokens.colorScheme.contentMuted; @override - Color get colorActiveIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; @override - Color get colorActiveIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark800800; + Color get colorCurrentIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityGrayLight80800; + Color get colorCurrentIndicatorAndroidSelectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; + Color get colorCurrentIndicatorAndroidSelectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorCurrentIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorCurrentIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorCurrentIndicatorAndroidUnselectedHover => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorCurrentIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.opacityTransparent; @override - Color get colorContentUnselectedEnabledDark => ColorRawTokens.colorOpacityWhite600; + Color get colorCurrentIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorContentUnselectedEnabledLight => ColorRawTokens.colorOpacityBlack600; + Color get colorCurrentIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorContentUnselectedFocus => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorContentUnselectedHover => providersTokens.colorScheme.contentDefault; + Color get colorCurrentIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorIosAccent => providersTokens.colorScheme.actionSelected; @override - int get effectBgBlur => EffectRawTokens.effectBlur160; + int get effectBgBlur => EffectRawTokens.effectBlur320; @override - double get opacityActiveIndicatorCustom => providersTokens.opacityTokens.opaque; + double get opacityCurrentIndicatorCustom => providersTokens.opacityTokens.opaque; @override - double get sizeHeightActiveIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; + double get sizeHeightCurrentIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; @override - double get sizeWidthActiveIndicatorCustomBottom => DimensionRawTokens.dimension300; + double get sizeWidthCurrentIndicatorCustomBottom => DimensionRawTokens.dimension300; @override - double get sizeWidthActiveIndicatorCustomTop => DimensionRawTokens.dimension650; + double get sizeWidthCurrentIndicatorCustomTop => DimensionRawTokens.dimension500; } diff --git a/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart b/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart index 1cae52c39..7624b4878 100644 --- a/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_buttonMono_tokens.dart b/ouds_theme_sosh/lib/components/sosh_buttonMono_tokens.dart index 4dc75f158..30565f7a4 100644 --- a/ouds_theme_sosh/lib/components/sosh_buttonMono_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_buttonMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_button_tokens.dart b/ouds_theme_sosh/lib/components/sosh_button_tokens.dart index e619623ac..dd41ef399 100644 --- a/ouds_theme_sosh/lib/components/sosh_button_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_button_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_checkbox_tokens.dart b/ouds_theme_sosh/lib/components/sosh_checkbox_tokens.dart index 6ae929b1f..100b343e3 100644 --- a/ouds_theme_sosh/lib/components/sosh_checkbox_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_checkbox_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class SoshCheckboxTokens extends OudsCheckboxTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart b/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart index 2a388462f..0d4122358 100644 --- a/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_controlItem_tokens.dart b/ouds_theme_sosh/lib/components/sosh_controlItem_tokens.dart index 2ffb8dc1e..6836072ca 100644 --- a/ouds_theme_sosh/lib/components/sosh_controlItem_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_controlItem_tokens.dart @@ -10,11 +10,12 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_global_raw_tokens/font_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart'; @@ -24,43 +25,97 @@ class SoshControlItemTokens extends OudsControlItemTokens { SoshControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusDefault; @override - double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + double get borderRadiusRounded => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgPressed => providersTokens.colorScheme.actionSupportPressed; + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; @override - Color get colorContentLoader => providersTokens.colorScheme.contentDefault; + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override - double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; @override - double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; @override - double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSupportEnabled; @override - double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @override + Color get colorContentCurrentDisabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentEnabled => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentFocus => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentHover => providersTokens.colorScheme.contentDefault; + @override + Color get colorContentCurrentPressed => providersTokens.colorScheme.contentDefault; + @override + double get fontLetterSpacingAvatarInitialXlarge => FontRawTokens.fontLetterSpacing450; + @override + double get fontLineHeightAvatarInitialXlarge => FontRawTokens.fontLineHeight650; + @override + double get fontSizeAvatarInitialXlarge => FontRawTokens.fontSize450; + @override + double get opacityCurrentDivider => providersTokens.opacityTokens.opaque; + @override + double get opacityCurrentIndicator => providersTokens.opacityTokens.opaque; + @override + double get sizeAssetLarge => DimensionRawTokens.dimension500; + @override + double get sizeAssetMedium => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @override + double get sizeAssetSmall => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @override + double get sizeAssetXlarge => DimensionRawTokens.dimension700; + @override + double get sizeControlIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @override + double get sizeCurrentIndicatorWidth => DimensionRawTokens.dimension50; + @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override double get sizeMaxWidth => DimensionRawTokens.dimension4000; @override - double get sizeMinHeight => DimensionRawTokens.dimension650; + double get sizeMinHeightCompact => providersTokens.sizeTokens.minInteractiveArea; + @override + double get sizeMinHeightDefault => DimensionRawTokens.dimension750; @override double get sizeMinWidth => DimensionRawTokens.dimension2000; @override double get spaceColumnGap => providersTokens.spaceTokens.columnGapMedium; @override - double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; + double get spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; + double get spacePaddingBlockDensityCompactTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlockNone; + @override + double get spacePaddingBlockDensityDefault => providersTokens.spaceTokens.paddingBlockMedium; + @override + double get spacePaddingBlockDensityDefaultBottomExpandContainer => providersTokens.spaceTokens.paddingBlock3xlarge; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockSmall; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlock4xsmall; + @override + double get spacePaddingBlockTopHelperText => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; @override double get spaceRowGap => providersTokens.spaceTokens.rowGapNone; } diff --git a/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart b/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart index 3276a956f..9d6dbed31 100644 --- a/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart b/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart index eeb60d585..523d40cc2 100644 --- a/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -22,10 +22,12 @@ class SoshIconTokens extends OudsIconTokens { SoshIconTokens(this.providersTokens); - @override - Color get colorContentDefault => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedLower); @override Color get colorContentStatusWarningExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningMedium, providersTokens.colorScheme.repositoryWarningLow); @override Color get colorContentStatusWarningInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningHigh, providersTokens.colorScheme.opacityTransparent); + @override + Color get colorContentStatusWarningInverseExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningLow, providersTokens.colorScheme.repositoryWarningMedium); + @override + Color get colorContentStatusWarningInverseInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.opacityTransparent, providersTokens.colorScheme.repositoryWarningHigh); } diff --git a/ouds_theme_sosh/lib/components/sosh_inputTag_tokens.dart b/ouds_theme_sosh/lib/components/sosh_inputTag_tokens.dart index 2008b937c..c1435463c 100644 --- a/ouds_theme_sosh/lib/components/sosh_inputTag_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_inputTag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_linkMono_tokens.dart b/ouds_theme_sosh/lib/components/sosh_linkMono_tokens.dart index aad32e420..a0f7c4eae 100644 --- a/ouds_theme_sosh/lib/components/sosh_linkMono_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_linkMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_link_tokens.dart b/ouds_theme_sosh/lib/components/sosh_link_tokens.dart index 77314f286..692e5433e 100644 --- a/ouds_theme_sosh/lib/components/sosh_link_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_link_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_pinCodeInput_tokens.dart b/ouds_theme_sosh/lib/components/sosh_pinCodeInput_tokens.dart index 33ce5ac3b..697894522 100644 --- a/ouds_theme_sosh/lib/components/sosh_pinCodeInput_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_pinCodeInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_radioButton_tokens.dart b/ouds_theme_sosh/lib/components/sosh_radioButton_tokens.dart index 8b9c88c03..0fedcb48d 100644 --- a/ouds_theme_sosh/lib/components/sosh_radioButton_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_radioButton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class SoshRadioButtonTokens extends OudsRadioButtonTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_sosh/lib/components/sosh_skeleton_tokens.dart b/ouds_theme_sosh/lib/components/sosh_skeleton_tokens.dart index 710b68994..93f6b7c95 100644 --- a/ouds_theme_sosh/lib/components/sosh_skeleton_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_skeleton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_switch_tokens.dart b/ouds_theme_sosh/lib/components/sosh_switch_tokens.dart index 641b90b12..268229252 100644 --- a/ouds_theme_sosh/lib/components/sosh_switch_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_switch_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/components/sosh_tag_tokens.dart b/ouds_theme_sosh/lib/components/sosh_tag_tokens.dart index c6fafee8d..c35774096 100644 --- a/ouds_theme_sosh/lib/components/sosh_tag_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_tag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -35,9 +35,9 @@ class SoshTagTokens extends OudsTagTokens { @override double get sizeMinHeightSmall => DimensionRawTokens.dimension300; @override - double get sizeMinWidthDefault => DimensionRawTokens.dimension600; + double get sizeMinWidthDefault => DimensionRawTokens.dimension400; @override - double get sizeMinWidthSmall => DimensionRawTokens.dimension550; + double get sizeMinWidthSmall => DimensionRawTokens.dimension300; @override double get spaceColumnGapDefault => providersTokens.spaceTokens.columnGap2xsmall; @override diff --git a/ouds_theme_sosh/lib/components/sosh_textInput_tokens.dart b/ouds_theme_sosh/lib/components/sosh_textInput_tokens.dart index dddf53743..c3120fd5e 100644 --- a/ouds_theme_sosh/lib/components/sosh_textInput_tokens.dart +++ b/ouds_theme_sosh/lib/components/sosh_textInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -28,7 +28,7 @@ class SoshTextInputTokens extends OudsTextInputTokens { @override double get borderRadiusRounded => providersTokens.borderTokens.radiusDefault; @override - double get borderWidthDefault => providersTokens.borderTokens.widthThin; + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override double get borderWidthFocus => providersTokens.borderTokens.widthMedium; @override @@ -58,6 +58,10 @@ class SoshTextInputTokens extends OudsTextInputTokens { @override double get spaceColumnGapInlineText => providersTokens.spaceTokens.columnGapXsmall; @override + double get spaceColumnGapLabelAsterisk => providersTokens.spaceTokens.columnGap2xsmall; + @override + double get spaceColumnGapLabelSmallAsterisk => DimensionRawTokens.dimensionOutOfSystem75; + @override double get spaceColumnGapTrailingErrorAction => providersTokens.spaceTokens.columnGapXsmall; @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlock2xsmall; diff --git a/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart b/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart index 2427986ec..547348d66 100644 --- a/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart +++ b/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh core tokens version 1.2.0 +// Sosh core tokens version 1.3.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -63,6 +63,7 @@ class SoshColorRawTokens { static const colorMagenta800 = Color(0xff590d20); static const colorMagenta900 = Color(0xff2c0710); static const colorMagenta950 = Color(0xff160308); + static const colorOpacityBlueDuckDark960800 = Color(0xcc061618); static const colorOpacityMagenta120 = Color(0x1fe55277); /** Test for support Figma */ static const colorOpacityMagenta640 = Color(0xa3851430); /** Test for support Figma */ } \ No newline at end of file diff --git a/ouds_theme_sosh/lib/semantic/sosh_border_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_border_semantic_tokens.dart index 6e46c1c7d..539e9b03b 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_border_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_action_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_action_semantic_tokens.dart index 0df23d6f5..bcb5bb84e 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_action_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_action_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -29,8 +29,6 @@ class SoshColorActionSemanticTokens extends OudsColorActionSemanticTokens { super.actionHighlightedLight = SoshColorRawTokens.colorBlueDuckDark400, super.actionHoverDark = ColorRawTokens.colorFunctionalGrayLight160, super.actionHoverLight = ColorRawTokens.colorFunctionalBlack, - super.actionIosAccentDark = SoshColorRawTokens.colorBlueDuckLight800, - super.actionIosAccentLight = SoshColorRawTokens.colorMagenta500, super.actionLoadingDark = SoshColorRawTokens.colorCitrine300, super.actionLoadingLight = SoshColorRawTokens.colorBlueDuckDark400, super.actionNegativeEnabledDark = ColorRawTokens.colorFunctionalScarlet300, diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_always_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_always_semantic_tokens.dart index 17cee8fc3..9e6b175d2 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_always_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_always_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_bg_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_bg_semantic_tokens.dart index 77d4a22d1..0f84195e2 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_bg_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_bg_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_border_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_border_semantic_tokens.dart index 0851eea58..f7da729b9 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_border_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -27,7 +27,7 @@ class SoshColorBorderSemanticTokens extends OudsColorBorderSemanticTokens { super.borderBrandTertiaryLight = SoshColorRawTokens.colorCitrine500, super.borderDefaultDark = ColorRawTokens.colorOpacityWhite200, super.borderDefaultLight = ColorRawTokens.colorOpacityBlack200, - super.borderEmphasizedDark = ColorRawTokens.colorOpacityWhite920, + super.borderEmphasizedDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderEmphasizedLight = ColorRawTokens.colorFunctionalBlack, super.borderFocusDark = ColorRawTokens.colorFunctionalGrayLight160, super.borderFocusInsetDark = ColorRawTokens.colorFunctionalGrayDark880, diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_content_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_content_semantic_tokens.dart index e97e02697..cd83f6fdb 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_content_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_content_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -79,6 +79,14 @@ class SoshColorContentSemanticTokens extends OudsColorContentSemanticTokens { super.contentStatusAccentLight = SoshColorRawTokens.colorMagenta500, super.contentStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, super.contentStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoDark = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoLight = ColorRawTokens.colorFunctionalDodgerBlue300, + super.contentStatusInverseNegativeDark = ColorRawTokens.colorFunctionalScarlet600, + super.contentStatusInverseNegativeLight = ColorRawTokens.colorFunctionalScarlet300, + super.contentStatusInversePositiveDark = ColorRawTokens.colorFunctionalMalachite750, + super.contentStatusInversePositiveLight = ColorRawTokens.colorFunctionalMalachite300, + super.contentStatusInverseWarningDark = ColorRawTokens.colorFunctionalSun750, + super.contentStatusInverseWarningLight = ColorRawTokens.colorFunctionalSun300, super.contentStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.contentStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.contentStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_opacity_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_opacity_semantic_tokens.dart index 71f6ed9ec..34a7dd97d 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_opacity_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_overlay_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_overlay_semantic_tokens.dart index e0bff0753..55dadbd4c 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_overlay_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_overlay_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,12 +19,14 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorOverlaySemanticTokens extends OudsColorOverlaySemanticTokens { const SoshColorOverlaySemanticTokens({ + super.overlayBackdropDark = ColorRawTokens.colorOpacityBlack680, + super.overlayBackdropLight = ColorRawTokens.colorOpacityBlack680, super.overlayDragDark = ColorRawTokens.colorOpacityWhite80, super.overlayDragLight = ColorRawTokens.colorOpacityBlack40, super.overlayDropdownDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayDropdownLight = ColorRawTokens.colorFunctionalWhite, - super.overlayModalDark = SoshColorRawTokens.colorBlueDuckDark720, - super.overlayModalLight = ColorRawTokens.colorFunctionalWhite, + super.overlayModalSheetDark = SoshColorRawTokens.colorBlueDuckDark800, + super.overlayModalSheetLight = ColorRawTokens.colorFunctionalWhite, super.overlayTooltipDark = ColorRawTokens.colorFunctionalGrayDark560, super.overlayTooltipLight = ColorRawTokens.colorFunctionalGrayDark720, }); diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_repository_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_repository_semantic_tokens.dart index 062cb3367..ac410e373 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_repository_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_repository_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -109,7 +109,8 @@ class SoshColorRepositorySemanticTokens extends OudsColorRepositorySemanticToken super.repositoryPrimaryLowest = SoshColorRawTokens.colorMagenta50, super.repositoryPrimaryMedium = SoshColorRawTokens.colorMagenta500, super.repositorySecondaryHigh = SoshColorRawTokens.colorBlueDuckDark720, - super.repositorySecondaryHigher = SoshColorRawTokens.colorBlueDuckDark880, + super.repositorySecondaryHigherHigh = SoshColorRawTokens.colorBlueDuckDark880, + super.repositorySecondaryHigherLow = SoshColorRawTokens.colorBlueDuckDark800, super.repositorySecondaryHighest = SoshColorRawTokens.colorBlueDuckDark960, super.repositorySecondaryLow = SoshColorRawTokens.colorBlueDuckDark400, super.repositorySecondaryLower = SoshColorRawTokens.colorBlueDuckLight800, diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_surface_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_surface_semantic_tokens.dart index 1e16c6f07..416180d5b 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_surface_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_surface_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_effect_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_effect_semantic_tokens.dart index 18020c378..b6f8b151b 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_effect_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_effect_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_effect_semantic_tokens.dart'; @@ -18,5 +18,5 @@ import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; class SoshEffectSemanticTokens extends OudsEffectSemanticTokens { @override - int get blurDrag => EffectRawTokens.effectBlur320; + int get blurDrag => EffectRawTokens.effectBlur480; } diff --git a/ouds_theme_sosh/lib/semantic/sosh_font_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_font_semantic_tokens.dart index 6829d74b7..2e34c9880 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_font_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_font_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_grid_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_grid_semantic_tokens.dart index 61d0a0d62..84673de53 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_grid_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_grid_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart'; @@ -18,7 +18,7 @@ import 'package:ouds_global_raw_tokens/grid_raw_tokens.dart'; class SoshGridSemanticTokens extends OudsGridSemanticTokens { @override - double get compactColumnGap => GridRawTokens.gridColumnGap100; + double get compactColumnGap => GridRawTokens.gridColumnGap200; @override double get compactMargin => GridRawTokens.gridMargin300; @override diff --git a/ouds_theme_sosh/lib/semantic/sosh_opacity_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_opacity_semantic_tokens.dart index 66d584dd9..f3649a50a 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_opacity_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/lib/semantic/sosh_size_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_size_semantic_tokens.dart index e14b99655..c819c7506 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_size_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_size_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart'; @@ -126,7 +126,7 @@ class SoshSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelLargeSizeSmall => DimensionRawTokens.dimension300; @override - double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension550; + double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension450; @override double get iconWithLabelLargeSizeXsmall => DimensionRawTokens.dimension250; @override @@ -146,67 +146,69 @@ class SoshSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelSmallSizeXsmall => DimensionRawTokens.dimensionOutOfSystem250; @override - double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension550; + double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension500; @override - double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension500; + double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension450; @override double get iconWithLabelXlargeSizeSmall => DimensionRawTokens.dimension400; @override - double get maxWidthTypeBodyLargeMobile => DimensionRawTokens.dimension6000; + double get iconWithLabelXlargeSizeXsmall => DimensionRawTokens.dimension350; @override - double get maxWidthTypeBodyLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodySmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeMobile => DimensionRawTokens.dimension9000; + double get maxWidthBodySmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplaySmallMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthDisplaySmallTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingLargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingMediumMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingMediumTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingMediumMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingMediumTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingXlargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingXlargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingXlargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeLabelLargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingXlargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeLabelLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelXlargeMobile => DimensionRawTokens.dimension6000; + @override + double get maxWidthLabelXlargeTablet => DimensionRawTokens.dimension6000; @override double get minInteractiveArea => DimensionRawTokens.dimension600; } diff --git a/ouds_theme_sosh/lib/semantic/sosh_space_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_space_semantic_tokens.dart index 8b83ad2ed..fbb387530 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_space_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_space_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_wireframe/CHANGELOG.md b/ouds_theme_wireframe/CHANGELOG.md index 86a3963df..bdb3cc3f1 100644 --- a/ouds_theme_wireframe/CHANGELOG.md +++ b/ouds_theme_wireframe/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713)) - [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710)) - [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) diff --git a/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart index 9bbf5d78d..fea3658e3 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_badge_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_badge_tokens.dart index d74ebbfeb..621aca7fe 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_badge_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_badge_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -31,7 +31,11 @@ class WireframeBadgeTokens extends OudsBadgeTokens { @override double get sizeXsmall => DimensionRawTokens.dimension100; @override - double get spaceInset => DimensionRawTokens.dimensionOutOfSystem75; + double get spaceInsetMediumLarge => DimensionRawTokens.dimensionOutOfSystem75; + @override + double get spaceInsetSmall => DimensionRawTokens.dimensionOutOfSystem50; + @override + double get spaceInsetXsmall => DimensionRawTokens.dimensionOutOfSystem25; @override double get spacePaddingInlineLarge => providersTokens.spaceTokens.paddingInline2xsmall; @override diff --git a/ouds_theme_wireframe/lib/components/wireframe_bar_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_bar_tokens.dart index 5b0f277da..22dc990b5 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_bar_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_bar_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -19,6 +19,7 @@ import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_bar_tokens.dart'; +import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; class WireframeBarTokens extends OudsBarTokens { final OudsProvidersTokens providersTokens; @@ -26,71 +27,71 @@ class WireframeBarTokens extends OudsBarTokens { WireframeBarTokens(this.providersTokens); @override - double get borderRadiusActiveIndicatorCustomBottom => providersTokens.borderTokens.radiusPill; + double get borderRadiusCurrentIndicatorCustomBottom => providersTokens.borderTokens.radiusPill; @override - double get borderRadiusActiveIndicatorCustomTop => providersTokens.borderTokens.radiusDefault; + double get borderRadiusCurrentIndicatorCustomTop => providersTokens.borderTokens.radiusDefault; @override - Color get colorActiveIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.actionSupportDisabled; + Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.actionSupportEnabled; + Color get colorBgTranslucentDark => WireframeColorRawTokens.colorOpacityGrayDark880800; @override - Color get colorActiveIndicatorAndroidSelectedFocus => providersTokens.colorScheme.actionSupportFocus; + Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityWhite800; @override - Color get colorActiveIndicatorAndroidSelectedHover => providersTokens.colorScheme.actionSupportHover; + Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; @override - Color get colorActiveIndicatorAndroidSelectedPressed => providersTokens.colorScheme.actionSupportPressed; + Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.actionSupportDisabled; + Color get colorContentSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorActiveIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.actionSupportFocus; + Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorActiveIndicatorAndroidUnselectedHover => providersTokens.colorScheme.actionSupportHover; + Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorActiveIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.actionSupportPressed; + Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorActiveIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorContentUnselectedEnabled => providersTokens.colorScheme.contentMuted; @override - Color get colorActiveIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorContentUnselectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorActiveIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorContentUnselectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorActiveIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorBgOpaque => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedDisabled => providersTokens.colorScheme.actionSupportDisabled; @override - Color get colorBgTranslucentDark => ColorRawTokens.colorOpacityGrayDark800800; + Color get colorCurrentIndicatorAndroidSelectedEnabled => providersTokens.colorScheme.actionSupportEnabled; @override - Color get colorBgTranslucentLight => ColorRawTokens.colorOpacityGrayLight80800; + Color get colorCurrentIndicatorAndroidSelectedFocus => providersTokens.colorScheme.actionSupportFocus; @override - Color get colorBorderBadge => providersTokens.colorScheme.bgSecondary; + Color get colorCurrentIndicatorAndroidSelectedHover => providersTokens.colorScheme.actionSupportHover; @override - Color get colorContentOnIosAccent => providersTokens.colorScheme.contentOnActionSelected; + Color get colorCurrentIndicatorAndroidSelectedPressed => providersTokens.colorScheme.actionSupportPressed; @override - Color get colorContentSelectedEnabled => providersTokens.colorScheme.actionSelected; + Color get colorCurrentIndicatorAndroidUnselectedDisabled => providersTokens.colorScheme.actionSupportDisabled; @override - Color get colorContentSelectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorCurrentIndicatorAndroidUnselectedFocus => providersTokens.colorScheme.actionSupportFocus; @override - Color get colorContentSelectedHover => providersTokens.colorScheme.actionHover; + Color get colorCurrentIndicatorAndroidUnselectedHover => providersTokens.colorScheme.actionSupportHover; @override - Color get colorContentSelectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorCurrentIndicatorAndroidUnselectedPressed => providersTokens.colorScheme.actionSupportPressed; @override - Color get colorContentUnselectedEnabledDark => ColorRawTokens.colorOpacityWhite600; + Color get colorCurrentIndicatorCustomSelectedEnabled => providersTokens.colorScheme.actionSelected; @override - Color get colorContentUnselectedEnabledLight => ColorRawTokens.colorOpacityBlack600; + Color get colorCurrentIndicatorCustomSelectedFocus => providersTokens.colorScheme.actionFocus; @override - Color get colorContentUnselectedFocus => providersTokens.colorScheme.actionFocus; + Color get colorCurrentIndicatorCustomSelectedHover => providersTokens.colorScheme.actionHover; @override - Color get colorContentUnselectedHover => providersTokens.colorScheme.actionHover; + Color get colorCurrentIndicatorCustomSelectedPressed => providersTokens.colorScheme.actionPressed; @override - Color get colorContentUnselectedPressed => providersTokens.colorScheme.actionPressed; + Color get colorIosAccent => providersTokens.colorScheme.actionSelected; @override - int get effectBgBlur => EffectRawTokens.effectBlur160; + int get effectBgBlur => EffectRawTokens.effectBlur320; @override - double get opacityActiveIndicatorCustom => providersTokens.opacityTokens.invisible; + double get opacityCurrentIndicatorCustom => providersTokens.opacityTokens.invisible; @override - double get sizeHeightActiveIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; + double get sizeHeightCurrentIndicatorCustom => DimensionRawTokens.dimensionOutOfSystem75; @override - double get sizeWidthActiveIndicatorCustomBottom => DimensionRawTokens.dimension300; + double get sizeWidthCurrentIndicatorCustomBottom => DimensionRawTokens.dimension300; @override - double get sizeWidthActiveIndicatorCustomTop => DimensionRawTokens.dimension650; + double get sizeWidthCurrentIndicatorCustomTop => DimensionRawTokens.dimension500; } diff --git a/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart index 885433280..acf68efbe 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_buttonMono_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_buttonMono_tokens.dart index 17b3ce094..73beefd5d 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_buttonMono_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_buttonMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_button_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_button_tokens.dart index 709970e6e..cbeac62c4 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_button_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_button_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -41,9 +41,9 @@ class WireframeButtonTokens extends OudsButtonTokens { @override Color get colorBgBrandHover => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositorySecondaryHigh, providersTokens.colorScheme.repositorySecondaryLower); @override - Color get colorBgBrandLoading => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositorySecondaryHigher, providersTokens.colorScheme.repositorySecondaryLowest); + Color get colorBgBrandLoading => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositorySecondaryHigherHigh, providersTokens.colorScheme.repositorySecondaryLowest); @override - Color get colorBgBrandPressed => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositorySecondaryHigher, providersTokens.colorScheme.repositorySecondaryLowest); + Color get colorBgBrandPressed => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositorySecondaryHigherHigh, providersTokens.colorScheme.repositorySecondaryLowest); @override Color get colorBgDefaultDisabled => providersTokens.colorScheme.actionDisabled; @override diff --git a/ouds_theme_wireframe/lib/components/wireframe_checkbox_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_checkbox_tokens.dart index fb59094e5..b1c523a25 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_checkbox_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_checkbox_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class WireframeCheckboxTokens extends OudsCheckboxTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart index 9aab2e068..5138287b5 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_controlItem_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_controlItem_tokens.dart index db59dafdc..575822833 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_controlItem_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_controlItem_tokens.dart @@ -10,11 +10,12 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_global_raw_tokens/font_raw_tokens.dart'; import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart'; @@ -24,43 +25,97 @@ class WireframeControlItemTokens extends OudsControlItemTokens { WireframeControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusDefault; @override - double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; @override - Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + double get borderRadiusRounded => providersTokens.borderTokens.radiusDefault; @override - Color get colorBgPressed => providersTokens.colorScheme.actionSupportPressed; + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; @override - Color get colorContentLoader => providersTokens.colorScheme.actionLoading; + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; @override - double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; @override - double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionDisabled; @override - double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSelected; @override - double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionPressed; + @override + Color get colorContentCurrentDisabled => providersTokens.colorScheme.contentOnActionDisabled; + @override + Color get colorContentCurrentEnabled => providersTokens.colorScheme.contentOnActionSelected; + @override + Color get colorContentCurrentFocus => providersTokens.colorScheme.contentOnActionFocus; + @override + Color get colorContentCurrentHover => providersTokens.colorScheme.contentOnActionHover; + @override + Color get colorContentCurrentPressed => providersTokens.colorScheme.contentOnActionPressed; + @override + double get fontLetterSpacingAvatarInitialXlarge => FontRawTokens.fontLetterSpacing450; + @override + double get fontLineHeightAvatarInitialXlarge => FontRawTokens.fontLineHeight650; + @override + double get fontSizeAvatarInitialXlarge => FontRawTokens.fontSize450; + @override + double get opacityCurrentDivider => providersTokens.opacityTokens.invisible; + @override + double get opacityCurrentIndicator => providersTokens.opacityTokens.invisible; + @override + double get sizeAssetLarge => DimensionRawTokens.dimension500; + @override + double get sizeAssetMedium => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @override + double get sizeAssetSmall => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @override + double get sizeAssetXlarge => DimensionRawTokens.dimension700; + @override + double get sizeControlIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @override + double get sizeCurrentIndicatorWidth => DimensionRawTokens.dimension50; + @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override double get sizeMaxWidth => DimensionRawTokens.dimension4000; @override - double get sizeMinHeight => DimensionRawTokens.dimension650; + double get sizeMinHeightCompact => providersTokens.sizeTokens.minInteractiveArea; + @override + double get sizeMinHeightDefault => DimensionRawTokens.dimension750; @override double get sizeMinWidth => DimensionRawTokens.dimension2000; @override double get spaceColumnGap => providersTokens.spaceTokens.columnGapMedium; @override - double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; + double get spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; @override - double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; + double get spacePaddingBlockDensityCompactTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlockNone; + @override + double get spacePaddingBlockDensityDefault => providersTokens.spaceTokens.paddingBlockMedium; + @override + double get spacePaddingBlockDensityDefaultBottomExpandContainer => providersTokens.spaceTokens.paddingBlock3xlarge; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockSmall; + @override + double get spacePaddingBlockDensityDefaultTopAlignmentTopTextContainer => providersTokens.spaceTokens.paddingBlock4xsmall; + @override + double get spacePaddingBlockTopHelperText => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingInline => providersTokens.spaceTokens.paddingInlineLarge; @override double get spaceRowGap => providersTokens.spaceTokens.rowGapNone; } diff --git a/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart index 003f0a3e2..e44c8669a 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart index 5b29b6a93..655d36423 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -22,10 +22,12 @@ class WireframeIconTokens extends OudsIconTokens { WireframeIconTokens(this.providersTokens); - @override - Color get colorContentDefault => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryNeutralEmphasizedBlack, providersTokens.colorScheme.repositoryNeutralMutedLower); @override Color get colorContentStatusWarningExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningMedium, providersTokens.colorScheme.repositoryWarningLow); @override Color get colorContentStatusWarningInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningHigh, providersTokens.colorScheme.opacityTransparent); + @override + Color get colorContentStatusWarningInverseExternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.repositoryWarningLow, providersTokens.colorScheme.repositoryWarningMedium); + @override + Color get colorContentStatusWarningInverseInternalShape => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.opacityTransparent, providersTokens.colorScheme.repositoryWarningHigh); } diff --git a/ouds_theme_wireframe/lib/components/wireframe_inputTag_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_inputTag_tokens.dart index 014e6f5f3..706c6ed9e 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_inputTag_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_inputTag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_linkMono_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_linkMono_tokens.dart index 7eaed3dc9..041144a6e 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_linkMono_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_linkMono_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_link_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_link_tokens.dart index cd3ed420d..a877e07b6 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_link_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_link_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_pinCodeInput_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_pinCodeInput_tokens.dart index e3149c366..0c0a03d86 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_pinCodeInput_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_pinCodeInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_radioButton_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_radioButton_tokens.dart index 92df2f4eb..0d3d9115c 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_radioButton_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_radioButton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -40,8 +40,6 @@ class WireframeRadioButtonTokens extends OudsRadioButtonTokens { @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; @override - double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; - @override double get sizeMaxHeight => providersTokens.sizeTokens.minInteractiveArea; @override double get sizeMinHeight => providersTokens.sizeTokens.minInteractiveArea; diff --git a/ouds_theme_wireframe/lib/components/wireframe_skeleton_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_skeleton_tokens.dart index 5555ccc8f..0c4c4510e 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_skeleton_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_skeleton_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_switch_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_switch_tokens.dart index f166ffebd..a4191f56d 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_switch_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_switch_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/components/wireframe_tag_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_tag_tokens.dart index ad2f0fb4c..c8add3451 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_tag_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_tag_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; @@ -35,9 +35,9 @@ class WireframeTagTokens extends OudsTagTokens { @override double get sizeMinHeightSmall => DimensionRawTokens.dimension300; @override - double get sizeMinWidthDefault => DimensionRawTokens.dimension600; + double get sizeMinWidthDefault => DimensionRawTokens.dimension400; @override - double get sizeMinWidthSmall => DimensionRawTokens.dimension550; + double get sizeMinWidthSmall => DimensionRawTokens.dimension300; @override double get spaceColumnGapDefault => providersTokens.spaceTokens.columnGap2xsmall; @override diff --git a/ouds_theme_wireframe/lib/components/wireframe_textInput_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_textInput_tokens.dart index 7e3fd776e..21819a653 100644 --- a/ouds_theme_wireframe/lib/components/wireframe_textInput_tokens.dart +++ b/ouds_theme_wireframe/lib/components/wireframe_textInput_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -58,6 +58,10 @@ class WireframeTextInputTokens extends OudsTextInputTokens { @override double get spaceColumnGapInlineText => providersTokens.spaceTokens.columnGapXsmall; @override + double get spaceColumnGapLabelAsterisk => providersTokens.spaceTokens.columnGap2xsmall; + @override + double get spaceColumnGapLabelSmallAsterisk => DimensionRawTokens.dimensionOutOfSystem75; + @override double get spaceColumnGapTrailingErrorAction => providersTokens.spaceTokens.columnGapXsmall; @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlock2xsmall; diff --git a/ouds_theme_wireframe/lib/raw/wireframe_color_raw_tokens.dart b/ouds_theme_wireframe/lib/raw/wireframe_color_raw_tokens.dart index 0fb0e676e..42b11f0de 100644 --- a/ouds_theme_wireframe/lib/raw/wireframe_color_raw_tokens.dart +++ b/ouds_theme_wireframe/lib/raw/wireframe_color_raw_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe core tokens version 1.3.0 +// Wireframe core tokens version 1.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -76,8 +76,7 @@ class WireframeColorRawTokens { static const colorOpacityBlack880 = Color(0xe005052e); static const colorOpacityBlack920 = Color(0xeb05052e); static const colorOpacityBlack960 = Color(0xf505052e); - static const colorOpacityGrayDark800800 = Color(0xcc181c26); - static const colorOpacityGrayLight80800 = Color(0xccf7f8fa); + static const colorOpacityGrayDark880800 = Color(0xcc101319); static const colorOpacityRoyalBlue0 = Color(0x002055e5); static const colorOpacityRoyalBlue40 = Color(0x0a2055e5); static const colorOpacityRoyalBlue80 = Color(0x142055e5); diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_border_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_border_semantic_tokens.dart index 6f37ad8ba..18e3f03c6 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_border_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_tokens.dart'; @@ -28,13 +28,13 @@ class WireframeBorderSemanticTokens extends OudsBorderSemanticTokens { @override double get radiusPill => BorderRawTokens.borderRadius9999; @override - double get radiusSmall => BorderRawTokens.borderRadius100; + double get radiusSmall => BorderRawTokens.borderRadius75; @override String get styleDefault => BorderRawTokens.borderStyleSolid; @override String get styleDrag => BorderRawTokens.borderStyleDashed; @override - double get widthDefault => BorderRawTokens.borderWidth25; + double get widthDefault => BorderRawTokens.borderWidth50; @override double get widthFocus => BorderRawTokens.borderWidth125; @override @@ -48,5 +48,5 @@ class WireframeBorderSemanticTokens extends OudsBorderSemanticTokens { @override double get widthThicker => BorderRawTokens.borderWidth150; @override - double get widthThin => BorderRawTokens.borderWidth50; + double get widthThin => BorderRawTokens.borderWidth25; } diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_action_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_action_semantic_tokens.dart index a12733ab6..ff6d182b3 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_action_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_action_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; @@ -29,8 +29,6 @@ class WireframeColorActionSemanticTokens extends OudsColorActionSemanticTokens { super.actionHighlightedLight = WireframeColorRawTokens.colorRoyalBlue800, super.actionHoverDark = WireframeColorRawTokens.colorRoyalBlue200, super.actionHoverLight = WireframeColorRawTokens.colorRoyalBlue800, - super.actionIosAccentDark = WireframeColorRawTokens.colorRoyalBlue300, - super.actionIosAccentLight = WireframeColorRawTokens.colorRoyalBlue600, super.actionLoadingDark = WireframeColorRawTokens.colorRoyalBlue100, super.actionLoadingLight = WireframeColorRawTokens.colorRoyalBlue900, super.actionNegativeEnabledDark = ColorRawTokens.colorFunctionalScarlet300, diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_always_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_always_semantic_tokens.dart index d4d8abd3c..99e48b3cd 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_always_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_always_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_bg_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_bg_semantic_tokens.dart index 026abc1de..80239c41f 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_bg_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_bg_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_border_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_border_semantic_tokens.dart index 934250590..55a202cfd 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_border_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_border_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -28,12 +28,12 @@ class WireframeColorBorderSemanticTokens extends OudsColorBorderSemanticTokens { super.borderBrandTertiaryLight = const Color(0x00ff0000), super.borderDefaultDark = WireframeColorRawTokens.colorOpacityWhite200, super.borderDefaultLight = WireframeColorRawTokens.colorOpacityBlack200, - super.borderEmphasizedDark = WireframeColorRawTokens.colorOpacityWhite920, + super.borderEmphasizedDark = WireframeColorRawTokens.colorFunctionalGrayLight160, super.borderEmphasizedLight = WireframeColorRawTokens.colorFunctionalGrayDark960, - super.borderFocusDark = WireframeColorRawTokens.colorFunctionalGrayLight160, + super.borderFocusDark = WireframeColorRawTokens.colorRoyalBlue100, super.borderFocusInsetDark = WireframeColorRawTokens.colorFunctionalGrayDark880, super.borderFocusInsetLight = ColorRawTokens.colorFunctionalWhite, - super.borderFocusLight = WireframeColorRawTokens.colorFunctionalGrayDark960, + super.borderFocusLight = WireframeColorRawTokens.colorRoyalBlue900, super.borderMinimalDark = WireframeColorRawTokens.colorOpacityWhite40, super.borderMinimalLight = WireframeColorRawTokens.colorOpacityBlack40, super.borderMutedDark = WireframeColorRawTokens.colorOpacityWhite80, diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_content_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_content_semantic_tokens.dart index a6aab53b9..cd30c97b7 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_content_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_content_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -80,6 +80,14 @@ class WireframeColorContentSemanticTokens extends OudsColorContentSemanticTokens super.contentStatusAccentLight = WireframeColorRawTokens.colorRustyRed600, super.contentStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, super.contentStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoDark = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusInverseInfoLight = ColorRawTokens.colorFunctionalDodgerBlue300, + super.contentStatusInverseNegativeDark = ColorRawTokens.colorFunctionalScarlet600, + super.contentStatusInverseNegativeLight = ColorRawTokens.colorFunctionalScarlet300, + super.contentStatusInversePositiveDark = ColorRawTokens.colorFunctionalMalachite750, + super.contentStatusInversePositiveLight = ColorRawTokens.colorFunctionalMalachite300, + super.contentStatusInverseWarningDark = ColorRawTokens.colorFunctionalSun750, + super.contentStatusInverseWarningLight = ColorRawTokens.colorFunctionalSun300, super.contentStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.contentStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.contentStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_opacity_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_opacity_semantic_tokens.dart index d541d498c..eda8444ab 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_opacity_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_overlay_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_overlay_semantic_tokens.dart index 5b3090578..12070431a 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_overlay_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_overlay_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; @@ -19,12 +19,14 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class WireframeColorOverlaySemanticTokens extends OudsColorOverlaySemanticTokens { const WireframeColorOverlaySemanticTokens({ + super.overlayBackdropDark = WireframeColorRawTokens.colorOpacityBlack680, + super.overlayBackdropLight = WireframeColorRawTokens.colorOpacityBlack680, super.overlayDragDark = WireframeColorRawTokens.colorOpacityWhite80, super.overlayDragLight = WireframeColorRawTokens.colorOpacityBlack40, super.overlayDropdownDark = WireframeColorRawTokens.colorFunctionalGrayDark560, super.overlayDropdownLight = ColorRawTokens.colorFunctionalWhite, - super.overlayModalDark = WireframeColorRawTokens.colorFunctionalGrayDark720, - super.overlayModalLight = ColorRawTokens.colorFunctionalWhite, + super.overlayModalSheetDark = WireframeColorRawTokens.colorFunctionalGrayDark720, + super.overlayModalSheetLight = ColorRawTokens.colorFunctionalWhite, super.overlayTooltipDark = WireframeColorRawTokens.colorFunctionalGrayDark560, super.overlayTooltipLight = WireframeColorRawTokens.colorFunctionalGrayDark720, }); diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_repository_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_repository_semantic_tokens.dart index 401c96d9f..7b872d069 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_repository_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_repository_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -109,7 +109,8 @@ class WireframeColorRepositorySemanticTokens extends OudsColorRepositorySemantic super.repositoryPrimaryLowest = WireframeColorRawTokens.colorRoyalBlue100, super.repositoryPrimaryMedium = WireframeColorRawTokens.colorRoyalBlue600, super.repositorySecondaryHigh = WireframeColorRawTokens.colorRustyRed700, - super.repositorySecondaryHigher = WireframeColorRawTokens.colorRustyRed800, + super.repositorySecondaryHigherHigh = WireframeColorRawTokens.colorRustyRed800, + super.repositorySecondaryHigherLow = WireframeColorRawTokens.colorRustyRed800, super.repositorySecondaryHighest = const Color(0x00ff0000), super.repositorySecondaryLow = WireframeColorRawTokens.colorRustyRed400, super.repositorySecondaryLower = WireframeColorRawTokens.colorRustyRed300, diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_surface_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_surface_semantic_tokens.dart index 103490f11..54d8539b0 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_surface_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_surface_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_effect_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_effect_semantic_tokens.dart index 8f12172e6..d86e192c1 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_effect_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_effect_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_effect_semantic_tokens.dart'; @@ -18,5 +18,5 @@ import 'package:ouds_global_raw_tokens/effect_raw_tokens.dart'; class WireframeEffectSemanticTokens extends OudsEffectSemanticTokens { @override - int get blurDrag => EffectRawTokens.effectBlur320; + int get blurDrag => EffectRawTokens.effectBlur480; } diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_font_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_font_semantic_tokens.dart index 78d5cbc59..43b1c3d14 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_font_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_font_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_grid_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_grid_semantic_tokens.dart index 5008f6141..61f3ab2ff 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_grid_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_grid_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart'; @@ -18,7 +18,7 @@ import 'package:ouds_global_raw_tokens/grid_raw_tokens.dart'; class WireframeGridSemanticTokens extends OudsGridSemanticTokens { @override - double get compactColumnGap => GridRawTokens.gridColumnGap100; + double get compactColumnGap => GridRawTokens.gridColumnGap200; @override double get compactMargin => GridRawTokens.gridMargin300; @override diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_opacity_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_opacity_semantic_tokens.dart index d7e7ffe16..c96d0e5ec 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_opacity_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_opacity_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart'; diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_size_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_size_semantic_tokens.dart index 0de7c39ed..e58c439b5 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_size_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_size_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart'; @@ -126,7 +126,7 @@ class WireframeSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelLargeSizeSmall => DimensionRawTokens.dimension300; @override - double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension550; + double get iconWithLabelLargeSizeXlarge => DimensionRawTokens.dimension450; @override double get iconWithLabelLargeSizeXsmall => DimensionRawTokens.dimension250; @override @@ -146,67 +146,69 @@ class WireframeSizeSemanticTokens extends OudsSizeSemanticTokens { @override double get iconWithLabelSmallSizeXsmall => DimensionRawTokens.dimensionOutOfSystem250; @override - double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension550; + double get iconWithLabelXlargeSizeLarge => DimensionRawTokens.dimension500; @override - double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension500; + double get iconWithLabelXlargeSizeMedium => DimensionRawTokens.dimension450; @override double get iconWithLabelXlargeSizeSmall => DimensionRawTokens.dimension400; @override - double get maxWidthTypeBodyLargeMobile => DimensionRawTokens.dimension6000; + double get iconWithLabelXlargeSizeXsmall => DimensionRawTokens.dimension350; @override - double get maxWidthTypeBodyLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodyMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthBodyMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeBodySmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthBodySmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeMobile => DimensionRawTokens.dimension9000; + double get maxWidthBodySmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeDisplayLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplayMediumTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallMobile => DimensionRawTokens.dimension9000; + double get maxWidthDisplayMediumTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeDisplaySmallTablet => DimensionRawTokens.dimension9000; + double get maxWidthDisplaySmallMobile => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthDisplaySmallTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingLargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingLargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingMediumMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingLargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeHeadingMediumTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingMediumMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingMediumTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingSmallTablet => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeHeadingXlargeMobile => DimensionRawTokens.dimension7000; + double get maxWidthHeadingSmallTablet => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeHeadingXlargeTablet => DimensionRawTokens.dimension9000; + double get maxWidthHeadingXlargeMobile => DimensionRawTokens.dimension7000; @override - double get maxWidthTypeLabelLargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthHeadingXlargeTablet => DimensionRawTokens.dimension9000; @override - double get maxWidthTypeLabelLargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelLargeTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelMediumTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelMediumTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelSmallTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallMobile => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeMobile => DimensionRawTokens.dimension6000; + double get maxWidthLabelSmallTablet => DimensionRawTokens.dimension6000; @override - double get maxWidthTypeLabelXlargeTablet => DimensionRawTokens.dimension6000; + double get maxWidthLabelXlargeMobile => DimensionRawTokens.dimension6000; + @override + double get maxWidthLabelXlargeTablet => DimensionRawTokens.dimension6000; @override double get minInteractiveArea => DimensionRawTokens.dimension600; } diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_space_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_space_semantic_tokens.dart index 9b8a898bf..c29d0f483 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_space_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_space_semantic_tokens.dart @@ -10,7 +10,7 @@ // Software description: Flutter library of reusable graphical components // -// Wireframe brand tokens version 2.3.0 +// Wireframe brand tokens version 2.4.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart';