diff --git a/.github/workflows/dartdoc-gh-pages.yml b/.github/workflows/dartdoc-gh-pages.yml index 7cf5c0eec..8c7dd9b21 100644 --- a/.github/workflows/dartdoc-gh-pages.yml +++ b/.github/workflows/dartdoc-gh-pages.yml @@ -100,6 +100,7 @@ jobs: uses: ./.github/actions/setup - name: Setup Pages + if: github.event_name != 'pull_request' uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0 - name: Setup Ruby @@ -129,6 +130,7 @@ jobs: # Upload as GitHub Pages artifact (creates a tar archive named "github-pages") - name: Upload artifact + if: github.event_name != 'pull_request' uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1 with: path: ./docs @@ -152,6 +154,7 @@ jobs: if: github.event_name != 'pull_request' runs-on: ubuntu-latest needs: build + if: github.event_name != 'pull_request' permissions: contents: write pages: write diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 31b415efc..5c8a04e5d 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [DemoApp] deps update dependency github.com/apple/swift-protobuf to 1.38.0 ([#773](https://github.com/Orange-OpenSource/ouds-flutter/issues/773)) +- [Library] deps update dependency bump dartdoc to 9.0.4 ([#780](https://github.com/Orange-OpenSource/ouds-flutter/issues/780)) +- [Library] update `Phone number input` component to v1.3 ([#690](https://github.com/Orange-OpenSource/ouds-flutter/issues/690)) +- [Library] update `tag` component to v1.5 ([#694](https://github.com/Orange-OpenSource/ouds-flutter/issues/694)) +- [Library] update `input tag` component to v1.2 ([#695](https://github.com/Orange-OpenSource/ouds-flutter/issues/695)) +- [DemoApp][Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [DemoApp][Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed +- [Library] `Phone number input` Add a hint to explain how to interact with fields ([#571](https://github.com/Orange-OpenSource/ouds-flutter/issues/571)) +- [Library] `input tag` the whole component should have the role button ([#481](https://github.com/Orange-OpenSource/ouds-flutter/issues/481)) ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 ### Added diff --git a/app/android/build.gradle b/app/android/build.gradle index d704c08f2..968ef42b3 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '2.1.0' + ext.kotlin_version = '2.2.20' repositories { google() mavenCentral() diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 11a7a9cf9..86b9d4c7e 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version '8.9.1' apply false - id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" diff --git a/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7b7290f1a..3affbc5e8 100644 --- a/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "ebc7251dd5b37f627c93698e4374084d98409633", - "version" : "1.28.2" + "revision" : "f6506eaa86ed2e01cb0ae14a75035b7fdbf0918f", + "version" : "1.38.0" } } ], diff --git a/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7b7290f1a..3affbc5e8 100644 --- a/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "ebc7251dd5b37f627c93698e4374084d98409633", - "version" : "1.28.2" + "revision" : "f6506eaa86ed2e01cb0ae14a75035b7fdbf0918f", + "version" : "1.38.0" } } ], 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..618875245 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(); @@ -59,7 +59,11 @@ class _ChipFilterDemoScreenState extends State { child: ChipCustomization( key: _scaffoldKey, child: Padding( - padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone), + padding: EdgeInsets.only( + bottom: defaultTargetPlatform == TargetPlatform.android + ? MediaQuery.of(context).viewPadding.bottom + : OudsTheme.of(context).spaceScheme(context).paddingBlockNone, + ), child: Scaffold( bottomSheet: OudsSheetsBottom( onExpansionChanged: _onExpansionChanged, @@ -70,7 +74,8 @@ class _ChipFilterDemoScreenState extends State { appBar: MainAppBar( title: context.l10n.app_components_filterChip_label, showBackButton: true, - previousPageTitle: widget.previousPageTitle,), + previousPageTitle: widget.previousPageTitle, + ), body: ExcludeSemantics( excluding: !_isBottomSheetExpanded, child: _Body(), @@ -93,19 +98,24 @@ class _Body extends StatefulWidget { class _BodyState extends State<_Body> { @override Widget build(BuildContext context) { - ThemeController? themeController = Provider.of(context, listen: false); + ThemeController? themeController = Provider.of( + context, + listen: false, + ); return DetailScreenDescription( description: context.l10n.app_components_chip_filterChip_description_text, widget: Column( children: [ _ChipFilterDemo(), - SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium), - Code( - code: ChipFilterCodeGenerator.updateCode(context), + SizedBox( + height: themeController.currentTheme + .spaceScheme(context) + .fixedMedium, ), + Code(code: ChipFilterCodeGenerator.updateCode(context)), ReferenceDesignVersionComponent( - version: OudsComponentVersion.chip, - ) + version: OudsComponentVersion.filterChip, + ), ], ), ); @@ -134,18 +144,20 @@ 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, + ), ); } } @@ -176,7 +188,9 @@ class _CustomizationContentState extends State<_CustomizationContent> { @override Widget build(BuildContext context) { - final ChipCustomizationState? customizationState = ChipCustomization.of(context); + final ChipCustomizationState? customizationState = ChipCustomization.of( + context, + ); return CustomizableSection( children: [ @@ -212,7 +226,7 @@ class _CustomizationContentState extends State<_CustomizationContent> { 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 2956cf8fc..fe285a826 100644 --- a/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart +++ b/app/lib/ui/components/chip/chip_suggestion_demo_screen.dart @@ -113,7 +113,9 @@ class _BodyState extends State<_Body> { .fixedMedium, ), Code(code: ChipSuggestionCodeGenerator.updateCode(context)), - ReferenceDesignVersionComponent(version: OudsComponentVersion.chip), + ReferenceDesignVersionComponent( + version: OudsComponentVersion.suggestionChip, + ), ], ), ); diff --git a/app/lib/ui/components/navigation/navigation_bar_demo_screen.dart b/app/lib/ui/components/navigation/navigation_bar_demo_screen.dart index fc365b2af..175d59866 100644 --- a/app/lib/ui/components/navigation/navigation_bar_demo_screen.dart +++ b/app/lib/ui/components/navigation/navigation_bar_demo_screen.dart @@ -102,7 +102,7 @@ class _BodyState extends State<_Body> { ), ), ReferenceDesignVersionComponent( - version: OudsComponentVersion.bar, + version: OudsComponentVersion.navigationBar, ) ], ), diff --git a/app/lib/ui/components/tag/input_tag_demo_screen.dart b/app/lib/ui/components/tag/input_tag_demo_screen.dart index b5ad60db6..e36b70f1b 100644 --- a/app/lib/ui/components/tag/input_tag_demo_screen.dart +++ b/app/lib/ui/components/tag/input_tag_demo_screen.dart @@ -33,7 +33,7 @@ import 'package:provider/provider.dart'; class InputTagDemoScreen extends StatefulWidget { final String? previousPageTitle; - const InputTagDemoScreen({super.key,this.previousPageTitle}); + const InputTagDemoScreen({super.key, this.previousPageTitle}); @override State createState() => _InputTagDemoScreenState(); @@ -53,7 +53,11 @@ class _InputTagDemoScreenState extends State { Widget build(BuildContext context) { return TagCustomization( child: Padding( - padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone), + padding: EdgeInsets.only( + bottom: defaultTargetPlatform == TargetPlatform.android + ? MediaQuery.of(context).viewPadding.bottom + : OudsTheme.of(context).spaceScheme(context).paddingBlockNone, + ), child: Scaffold( bottomSheet: OudsSheetsBottom( onExpansionChanged: _onExpansionChanged, @@ -63,11 +67,14 @@ class _InputTagDemoScreenState extends State { key: _scaffoldKey, extendBodyBehindAppBar: true, appBar: MainAppBar( - showBackButton: true, - title: context.l10n.app_components_tag_inputTag_label, - previousPageTitle: widget.previousPageTitle, + showBackButton: true, + title: context.l10n.app_components_tag_inputTag_label, + previousPageTitle: widget.previousPageTitle, + ), + body: ExcludeSemantics( + excluding: !_isBottomSheetExpanded, + child: _Body(), ), - body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()), ), ), ); @@ -85,19 +92,24 @@ class _Body extends StatefulWidget { class _BodyState extends State<_Body> { @override Widget build(BuildContext context) { - ThemeController? themeController = Provider.of(context, listen: false); + ThemeController? themeController = Provider.of( + context, + listen: false, + ); return DetailScreenDescription( description: context.l10n.app_components_inputTag_description_text, widget: Column( children: [ _InputTagDemo(), - SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium), - Code( - code: InputTagCodeGenerator.updateCode(context), + SizedBox( + height: themeController.currentTheme + .spaceScheme(context) + .fixedMedium, ), + Code(code: InputTagCodeGenerator.updateCode(context)), ReferenceDesignVersionComponent( - version: OudsComponentVersion.tag, - ) + version: OudsComponentVersion.inputTag, + ), ], ), ); @@ -146,7 +158,9 @@ class _CustomizationContentState extends State<_CustomizationContent> { @override Widget build(BuildContext context) { - final TagCustomizationState? customizationState = TagCustomization.of(context); + final TagCustomizationState? customizationState = TagCustomization.of( + context, + ); final labelFocus = FocusNode(); return CustomizableSection( @@ -163,8 +177,8 @@ class _CustomizationContentState extends State<_CustomizationContent> { text: customizationState.labelText, focusNode: labelFocus, fieldType: FieldType.label, - ) + ), ], ); } -} \ No newline at end of file +} diff --git a/app/lib/ui/components/top_bar/top_bar_demo_screen.dart b/app/lib/ui/components/top_bar/top_bar_demo_screen.dart index 6eff8c721..cc5697222 100644 --- a/app/lib/ui/components/top_bar/top_bar_demo_screen.dart +++ b/app/lib/ui/components/top_bar/top_bar_demo_screen.dart @@ -118,7 +118,7 @@ class _BodyState extends State<_Body> { code: TopBarCodeGenerator.updateCode(context), ), ReferenceDesignVersionComponent( - version: OudsComponentVersion.bar, + version: OudsComponentVersion.appBar, ) ], ), diff --git a/app/lib/ui/tokens/color/color_tokens_model.dart b/app/lib/ui/tokens/color/color_tokens_model.dart index 526ffc437..ef0563db9 100644 --- a/app/lib/ui/tokens/color/color_tokens_model.dart +++ b/app/lib/ui/tokens/color/color_tokens_model.dart @@ -12,122 +12,424 @@ class ColorTokensModel { Map> get all => _groups; - factory ColorTokensModel.fromTheme(BuildContext context, OudsThemeContract theme) { + factory ColorTokensModel.fromTheme( + BuildContext context, + OudsThemeContract theme, + ) { return ColorTokensModel({ context.l10n.app_tokens_color_action_label: [ - ColorTokenItem(name: 'actionDisabled', value: theme.colorScheme(context).actionDisabled), - ColorTokenItem(name: 'actionEnabled', value: theme.colorScheme(context).actionEnabled), - ColorTokenItem(name: 'actionFocus', value: theme.colorScheme(context).actionFocus), - ColorTokenItem(name: 'actionHighlighted', value: theme.colorScheme(context).actionHighlighted), - ColorTokenItem(name: 'actionHover', value: theme.colorScheme(context).actionHover), - ColorTokenItem(name: 'actionLoading', value: theme.colorScheme(context).actionLoading), - ColorTokenItem(name: 'actionNegativeEnabled', value: theme.colorScheme(context).actionNegativeEnabled), - ColorTokenItem(name: 'actionNegativeFocus', value: theme.colorScheme(context).actionNegativeFocus), - ColorTokenItem(name: 'actionNegativeHover', value: theme.colorScheme(context).actionNegativeHover), - ColorTokenItem(name: 'actionNegativeLoading', value: theme.colorScheme(context).actionNegativeLoading), - ColorTokenItem(name: 'actionNegativePressed', value: theme.colorScheme(context).actionNegativePressed), - ColorTokenItem(name: 'actionPressed', value: theme.colorScheme(context).actionPressed), - ColorTokenItem(name: 'actionReadOnlyPrimary', value: theme.colorScheme(context).actionReadOnlyPrimary), - ColorTokenItem(name: 'actionReadOnlySecondary', value: theme.colorScheme(context).actionReadOnlySecondary), - ColorTokenItem(name: 'actionSelected', value: theme.colorScheme(context).actionSelected), - ColorTokenItem(name: 'actionSupportDisabled ', value: theme.colorScheme(context).actionSupportDisabled), - ColorTokenItem(name: 'actionSupportEnabled', value: theme.colorScheme(context).actionSupportEnabled), - ColorTokenItem(name: 'actionSupportFocus', value: theme.colorScheme(context).actionSupportFocus), - ColorTokenItem(name: 'actionSupportHover', value: theme.colorScheme(context).actionSupportHover), - 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), + ColorTokenItem( + name: 'actionDisabled', + value: theme.colorScheme(context).actionDisabled, + ), + ColorTokenItem( + name: 'actionEnabled', + value: theme.colorScheme(context).actionEnabled, + ), + ColorTokenItem( + name: 'actionFocus', + value: theme.colorScheme(context).actionFocus, + ), + ColorTokenItem( + name: 'actionHighlighted', + value: theme.colorScheme(context).actionHighlighted, + ), + ColorTokenItem( + name: 'actionHover', + value: theme.colorScheme(context).actionHover, + ), + ColorTokenItem( + name: 'actionLoading', + value: theme.colorScheme(context).actionLoading, + ), + ColorTokenItem( + name: 'actionNegativeEnabled', + value: theme.colorScheme(context).actionNegativeEnabled, + ), + ColorTokenItem( + name: 'actionNegativeFocus', + value: theme.colorScheme(context).actionNegativeFocus, + ), + ColorTokenItem( + name: 'actionNegativeHover', + value: theme.colorScheme(context).actionNegativeHover, + ), + ColorTokenItem( + name: 'actionNegativeLoading', + value: theme.colorScheme(context).actionNegativeLoading, + ), + ColorTokenItem( + name: 'actionNegativePressed', + value: theme.colorScheme(context).actionNegativePressed, + ), + ColorTokenItem( + name: 'actionPressed', + value: theme.colorScheme(context).actionPressed, + ), + ColorTokenItem( + name: 'actionReadOnlyPrimary', + value: theme.colorScheme(context).actionReadOnlyPrimary, + ), + ColorTokenItem( + name: 'actionReadOnlySecondary', + value: theme.colorScheme(context).actionReadOnlySecondary, + ), + ColorTokenItem( + name: 'actionSelected', + value: theme.colorScheme(context).actionSelected, + ), + ColorTokenItem( + name: 'actionSupportDisabled ', + value: theme.colorScheme(context).actionSupportDisabled, + ), + ColorTokenItem( + name: 'actionSupportEnabled', + value: theme.colorScheme(context).actionSupportEnabled, + ), + ColorTokenItem( + name: 'actionSupportFocus', + value: theme.colorScheme(context).actionSupportFocus, + ), + ColorTokenItem( + name: 'actionSupportHover', + value: theme.colorScheme(context).actionSupportHover, + ), + ColorTokenItem( + name: 'actionSupportLoading', + value: theme.colorScheme(context).actionSupportLoading, + ), + ColorTokenItem( + name: 'actionSupportPressed', + value: theme.colorScheme(context).actionSupportPressed, + ), + ColorTokenItem( + name: 'actionVisited', + value: theme.colorScheme(context).actionVisited, + ), ], context.l10n.app_tokens_color_always_label: [ - ColorTokenItem(name: 'alwaysBlack', value: theme.colorScheme(context).alwaysBlack), - ColorTokenItem(name: 'alwaysOnBlack', value: theme.colorScheme(context).alwaysOnBlack), - ColorTokenItem(name: 'alwaysOnWhite', value: theme.colorScheme(context).alwaysOnWhite), - ColorTokenItem(name: 'alwaysWhite', value: theme.colorScheme(context).alwaysWhite), + ColorTokenItem( + name: 'alwaysBlack', + value: theme.colorScheme(context).alwaysBlack, + ), + ColorTokenItem( + name: 'alwaysOnBlack', + value: theme.colorScheme(context).alwaysOnBlack, + ), + ColorTokenItem( + name: 'alwaysOnWhite', + value: theme.colorScheme(context).alwaysOnWhite, + ), + ColorTokenItem( + name: 'alwaysWhite', + value: theme.colorScheme(context).alwaysWhite, + ), ], context.l10n.app_tokens_color_background_label: [ - ColorTokenItem(name: 'bgInverseHigh', value: theme.colorScheme(context).bgInverseHigh), - ColorTokenItem(name: 'bgInverseLow', value: theme.colorScheme(context).bgInverseLow), - ColorTokenItem(name: 'bgPrimary', value: theme.colorScheme(context).bgPrimary), - ColorTokenItem(name: 'bgSecondary', value: theme.colorScheme(context).bgSecondary), - ColorTokenItem(name: 'bgTertiary', value: theme.colorScheme(context).bgTertiary), + ColorTokenItem( + name: 'bgInverseHigh', + value: theme.colorScheme(context).bgInverseHigh, + ), + ColorTokenItem( + name: 'bgInverseLow', + value: theme.colorScheme(context).bgInverseLow, + ), + ColorTokenItem( + name: 'bgPrimary', + value: theme.colorScheme(context).bgPrimary, + ), + ColorTokenItem( + name: 'bgSecondary', + value: theme.colorScheme(context).bgSecondary, + ), + ColorTokenItem( + name: 'bgTertiary', + value: theme.colorScheme(context).bgTertiary, + ), ], context.l10n.app_tokens_color_border_label: [ - ColorTokenItem(name: 'borderBrandPrimary', value: theme.colorScheme(context).borderBrandPrimary), - ColorTokenItem(name: 'borderBrandSecondary', value: theme.colorScheme(context).borderBrandSecondary), - ColorTokenItem(name: 'borderBrandTertiary', value: theme.colorScheme(context).borderBrandTertiary), - ColorTokenItem(name: 'borderDefault', value: theme.colorScheme(context).borderDefault), - ColorTokenItem(name: 'borderEmphasized', value: theme.colorScheme(context).borderEmphasized), - ColorTokenItem(name: 'borderFocus', value: theme.colorScheme(context).borderFocus), - ColorTokenItem(name: 'borderFocusInset', value: theme.colorScheme(context).borderFocusInset), - ColorTokenItem(name: 'borderMuted', value: theme.colorScheme(context).borderMuted), - ColorTokenItem(name: 'borderOnBrandPrimary', value: theme.colorScheme(context).borderOnBrandPrimary), - ColorTokenItem(name: 'borderOnBrandSecondary', value: theme.colorScheme(context).borderOnBrandSecondary), - ColorTokenItem(name: 'borderOnBrandTertiary', value: theme.colorScheme(context).borderOnBrandTertiary), - ColorTokenItem(name: 'borderMinimal', value: theme.colorScheme(context).borderMinimal), - ColorTokenItem(name: 'borderStatusAccent', value: theme.colorScheme(context).borderStatusAccent), - ColorTokenItem(name: 'borderStatusInfo', value: theme.colorScheme(context).borderStatusInfo), - ColorTokenItem(name: 'borderStatusNegative', value: theme.colorScheme(context).borderStatusNegative), - ColorTokenItem(name: 'borderStatusPositive', value: theme.colorScheme(context).borderStatusPositive), - ColorTokenItem(name: 'borderStatusWarning', value: theme.colorScheme(context).borderStatusWarning), + ColorTokenItem( + name: 'borderBrandPrimary', + value: theme.colorScheme(context).borderBrandPrimary, + ), + ColorTokenItem( + name: 'borderBrandSecondary', + value: theme.colorScheme(context).borderBrandSecondary, + ), + ColorTokenItem( + name: 'borderBrandTertiary', + value: theme.colorScheme(context).borderBrandTertiary, + ), + ColorTokenItem( + name: 'borderDefault', + value: theme.colorScheme(context).borderDefault, + ), + ColorTokenItem( + name: 'borderEmphasized', + value: theme.colorScheme(context).borderEmphasized, + ), + ColorTokenItem( + name: 'borderFocus', + value: theme.colorScheme(context).borderFocus, + ), + ColorTokenItem( + name: 'borderFocusInset', + value: theme.colorScheme(context).borderFocusInset, + ), + ColorTokenItem( + name: 'borderMuted', + value: theme.colorScheme(context).borderMuted, + ), + ColorTokenItem( + name: 'borderOnBrandPrimary', + value: theme.colorScheme(context).borderOnBrandPrimary, + ), + ColorTokenItem( + name: 'borderOnBrandSecondary', + value: theme.colorScheme(context).borderOnBrandSecondary, + ), + ColorTokenItem( + name: 'borderOnBrandTertiary', + value: theme.colorScheme(context).borderOnBrandTertiary, + ), + ColorTokenItem( + name: 'borderMinimal', + value: theme.colorScheme(context).borderMinimal, + ), + ColorTokenItem( + name: 'borderStatusAccent', + value: theme.colorScheme(context).borderStatusAccent, + ), + ColorTokenItem( + name: 'borderStatusInfo', + value: theme.colorScheme(context).borderStatusInfo, + ), + ColorTokenItem( + name: 'borderStatusNegative', + value: theme.colorScheme(context).borderStatusNegative, + ), + ColorTokenItem( + name: 'borderStatusPositive', + value: theme.colorScheme(context).borderStatusPositive, + ), + ColorTokenItem( + name: 'borderStatusWarning', + value: theme.colorScheme(context).borderStatusWarning, + ), ], context.l10n.app_tokens_color_content_label: [ - ColorTokenItem(name: 'contentBrandPrimary', value: theme.colorScheme(context).contentBrandPrimary), - ColorTokenItem(name: 'contentBrandSecondary', value: theme.colorScheme(context).contentBrandSecondary), - ColorTokenItem(name: 'contentBrandTertiary', value: theme.colorScheme(context).contentBrandTertiary), - ColorTokenItem(name: 'contentDefault', value: theme.colorScheme(context).contentDefault), - ColorTokenItem(name: 'contentDisabled', value: theme.colorScheme(context).contentDisabled), - ColorTokenItem(name: 'contentInverse', value: theme.colorScheme(context).contentInverse), - ColorTokenItem(name: 'contentMuted', value: theme.colorScheme(context).contentMuted), - ColorTokenItem(name: 'contentOnActionDisabled', value: theme.colorScheme(context).contentOnActionDisabled), - ColorTokenItem(name: 'contentOnActionEnabled', value: theme.colorScheme(context).contentOnActionEnabled), - ColorTokenItem(name: 'contentOnActionFocus', value: theme.colorScheme(context).contentOnActionFocus), - ColorTokenItem(name: 'contentOnActionHighlighted', value: theme.colorScheme(context).contentOnActionHighlighted), - ColorTokenItem(name: 'contentOnActionHover', value: theme.colorScheme(context).contentOnActionHover), - ColorTokenItem(name: 'contentOnActionLoading', value: theme.colorScheme(context).contentOnActionLoading), - ColorTokenItem(name: 'contentOnActionPressed', value: theme.colorScheme(context).contentOnActionPressed), - ColorTokenItem(name: 'contentOnActionSelected', value: theme.colorScheme(context).contentOnActionSelected), - ColorTokenItem(name: 'contentOnBrandPrimary', value: theme.colorScheme(context).contentOnBrandPrimary), - ColorTokenItem(name: 'contentOnBrandSecondary', value: theme.colorScheme(context).contentOnBrandSecondary), - ColorTokenItem(name: 'contentOnBrandTertiary', value: theme.colorScheme(context).contentOnBrandTertiary), - ColorTokenItem(name: 'contentOnStatusPositiveEmphasized', value: theme.colorScheme(context).contentOnStatusPositiveEmphasized), - ColorTokenItem(name: 'contentOnStatusInfoEmphasized', value: theme.colorScheme(context).contentOnStatusInfoEmphasized), - ColorTokenItem(name: 'contentOnStatusInfoMuted', value: theme.colorScheme(context).contentOnStatusInfoMuted), - ColorTokenItem(name: 'contentOnStatusNegativeEmphasized', value: theme.colorScheme(context).contentOnStatusNegativeEmphasized), - ColorTokenItem(name: 'contentOnStatusNegativeMuted', value: theme.colorScheme(context).contentOnStatusNegativeMuted), - ColorTokenItem(name: 'contentOnStatusAccentEmphasized', value: theme.colorScheme(context).contentOnStatusAccentEmphasized), - ColorTokenItem(name: 'contentOnStatusAccentMuted', value: theme.colorScheme(context).contentOnStatusAccentMuted), - ColorTokenItem(name: 'contentStatusAccent', value: theme.colorScheme(context).contentStatusAccent), - ColorTokenItem(name: 'contentStatusInfo', value: theme.colorScheme(context).contentStatusInfo), - ColorTokenItem(name: 'contentStatusNegative', value: theme.colorScheme(context).contentStatusNegative), - ColorTokenItem(name: 'contentStatusPositive', value: theme.colorScheme(context).contentStatusPositive), - ColorTokenItem(name: 'contentStatusWarning', value: theme.colorScheme(context).contentStatusWarning), + ColorTokenItem( + name: 'contentBrandPrimary', + value: theme.colorScheme(context).contentBrandPrimary, + ), + ColorTokenItem( + name: 'contentBrandSecondary', + value: theme.colorScheme(context).contentBrandSecondary, + ), + ColorTokenItem( + name: 'contentBrandTertiary', + value: theme.colorScheme(context).contentBrandTertiary, + ), + ColorTokenItem( + name: 'contentDefault', + value: theme.colorScheme(context).contentDefault, + ), + ColorTokenItem( + name: 'contentDisabled', + value: theme.colorScheme(context).contentDisabled, + ), + ColorTokenItem( + name: 'contentInverse', + value: theme.colorScheme(context).contentInverse, + ), + ColorTokenItem( + name: 'contentMuted', + value: theme.colorScheme(context).contentMuted, + ), + ColorTokenItem( + name: 'contentOnActionDisabled', + value: theme.colorScheme(context).contentOnActionDisabled, + ), + ColorTokenItem( + name: 'contentOnActionEnabled', + value: theme.colorScheme(context).contentOnActionEnabled, + ), + ColorTokenItem( + name: 'contentOnActionFocus', + value: theme.colorScheme(context).contentOnActionFocus, + ), + ColorTokenItem( + name: 'contentOnActionHighlighted', + value: theme.colorScheme(context).contentOnActionHighlighted, + ), + ColorTokenItem( + name: 'contentOnActionHover', + value: theme.colorScheme(context).contentOnActionHover, + ), + ColorTokenItem( + name: 'contentOnActionLoading', + value: theme.colorScheme(context).contentOnActionLoading, + ), + ColorTokenItem( + name: 'contentOnActionPressed', + value: theme.colorScheme(context).contentOnActionPressed, + ), + ColorTokenItem( + name: 'contentOnActionSelected', + value: theme.colorScheme(context).contentOnActionSelected, + ), + ColorTokenItem( + name: 'contentOnBrandPrimary', + value: theme.colorScheme(context).contentOnBrandPrimary, + ), + ColorTokenItem( + name: 'contentOnBrandSecondary', + value: theme.colorScheme(context).contentOnBrandSecondary, + ), + ColorTokenItem( + name: 'contentOnBrandTertiary', + value: theme.colorScheme(context).contentOnBrandTertiary, + ), + ColorTokenItem( + name: 'contentOnStatusPositiveEmphasized', + value: theme.colorScheme(context).contentOnStatusPositiveEmphasized, + ), + ColorTokenItem( + name: 'contentOnStatusInfoEmphasized', + value: theme.colorScheme(context).contentOnStatusInfoEmphasized, + ), + ColorTokenItem( + name: 'contentOnStatusInfoMuted', + value: theme.colorScheme(context).contentOnStatusInfoMuted, + ), + ColorTokenItem( + name: 'contentOnStatusNegativeEmphasized', + value: theme.colorScheme(context).contentOnStatusNegativeEmphasized, + ), + ColorTokenItem( + name: 'contentOnStatusNegativeMuted', + value: theme.colorScheme(context).contentOnStatusNegativeMuted, + ), + ColorTokenItem( + name: 'contentOnStatusAccentEmphasized', + value: theme.colorScheme(context).contentOnStatusAccentEmphasized, + ), + ColorTokenItem( + name: 'contentOnStatusAccentMuted', + value: theme.colorScheme(context).contentOnStatusAccentMuted, + ), + ColorTokenItem( + name: 'contentStatusAccent', + value: theme.colorScheme(context).contentStatusAccent, + ), + ColorTokenItem( + name: 'contentStatusInfo', + value: theme.colorScheme(context).contentStatusInfo, + ), + ColorTokenItem( + name: 'contentStatusNegative', + value: theme.colorScheme(context).contentStatusNegative, + ), + ColorTokenItem( + name: 'contentStatusPositive', + value: theme.colorScheme(context).contentStatusPositive, + ), + ColorTokenItem( + name: 'contentStatusWarning', + value: theme.colorScheme(context).contentStatusWarning, + ), ], context.l10n.app_tokens_color_overlay_label: [ - ColorTokenItem(name: 'overlayDropdown', value: theme.colorScheme(context).overlayDropdown), - ColorTokenItem(name: 'overlayTooltip', value: theme.colorScheme(context).overlayTooltip), - ColorTokenItem(name: 'overlayDrag', value: theme.colorScheme(context).overlayDrag), - ColorTokenItem(name: 'overlayModal', value: theme.colorScheme(context).overlayModal), + ColorTokenItem( + name: 'overlayDropdown', + value: theme.colorScheme(context).overlayDropdown, + ), + ColorTokenItem( + name: 'overlayTooltip', + value: theme.colorScheme(context).overlayTooltip, + ), + ColorTokenItem( + name: 'overlayDrag', + value: theme.colorScheme(context).overlayDrag, + ), + ColorTokenItem( + name: 'overlayModal', + value: theme.colorScheme(context).overlayModal, + ), ], context.l10n.app_tokens_color_surface_label: [ - ColorTokenItem(name: 'surfaceBrandPrimary', value: theme.colorScheme(context).surfaceBrandPrimary), - ColorTokenItem(name: 'surfaceBrandSecondary', value: theme.colorScheme(context).surfaceBrandSecondary), - ColorTokenItem(name: 'surfaceBrandTertiary', value: theme.colorScheme(context).surfaceBrandTertiary), - ColorTokenItem(name: 'surfaceInverseHigh', value: theme.colorScheme(context).surfaceInverseHigh), - ColorTokenItem(name: 'surfaceInverseLow', value: theme.colorScheme(context).surfaceInverseLow), - ColorTokenItem(name: 'surfacePrimary', value: theme.colorScheme(context).surfacePrimary), - ColorTokenItem(name: 'surfaceSecondary', value: theme.colorScheme(context).surfaceSecondary), - ColorTokenItem(name: 'surfaceTertiary', value: theme.colorScheme(context).surfaceTertiary), - ColorTokenItem(name: 'surfaceStatusAccentEmphasized', value: theme.colorScheme(context).surfaceStatusAccentEmphasized), - ColorTokenItem(name: 'surfaceStatusAccentMuted', value: theme.colorScheme(context).surfaceStatusAccentMuted), - ColorTokenItem(name: 'surfaceStatusInfoEmphasized', value: theme.colorScheme(context).surfaceStatusInfoEmphasized), - ColorTokenItem(name: 'surfaceStatusInfoMuted', value: theme.colorScheme(context).surfaceStatusInfoMuted), - ColorTokenItem(name: 'surfaceStatusNegativeEmphasized', value: theme.colorScheme(context).surfaceStatusNegativeEmphasized), - ColorTokenItem(name: 'surfaceStatusNegativeMuted', value: theme.colorScheme(context).surfaceStatusNegativeMuted), - ColorTokenItem(name: 'surfaceStatusPositiveEmphasized', value: theme.colorScheme(context).surfaceStatusPositiveEmphasized), - ColorTokenItem(name: 'surfaceStatusPositiveMuted', value: theme.colorScheme(context).surfaceStatusPositiveMuted), - ColorTokenItem(name: 'surfaceStatusWarningEmphasized', value: theme.colorScheme(context).surfaceStatusWarningEmphasized), - ColorTokenItem(name: 'surfaceStatusWarningMuted', value: theme.colorScheme(context).surfaceStatusWarningMuted), + ColorTokenItem( + name: 'surfaceBrandPrimary', + value: theme.colorScheme(context).surfaceBrandPrimary, + ), + ColorTokenItem( + name: 'surfaceBrandSecondary', + value: theme.colorScheme(context).surfaceBrandSecondary, + ), + ColorTokenItem( + name: 'surfaceBrandTertiary', + value: theme.colorScheme(context).surfaceBrandTertiary, + ), + ColorTokenItem( + name: 'surfaceInverseHigh', + value: theme.colorScheme(context).surfaceInverseHigh, + ), + ColorTokenItem( + name: 'surfaceInverseLow', + value: theme.colorScheme(context).surfaceInverseLow, + ), + ColorTokenItem( + name: 'surfacePrimary', + value: theme.colorScheme(context).surfacePrimary, + ), + ColorTokenItem( + name: 'surfaceSecondary', + value: theme.colorScheme(context).surfaceSecondary, + ), + ColorTokenItem( + name: 'surfaceTertiary', + value: theme.colorScheme(context).surfaceTertiary, + ), + ColorTokenItem( + name: 'surfaceStatusAccentEmphasized', + value: theme.colorScheme(context).surfaceStatusAccentEmphasized, + ), + ColorTokenItem( + name: 'surfaceStatusAccentMuted', + value: theme.colorScheme(context).surfaceStatusAccentMuted, + ), + ColorTokenItem( + name: 'surfaceStatusInfoEmphasized', + value: theme.colorScheme(context).surfaceStatusInfoEmphasized, + ), + ColorTokenItem( + name: 'surfaceStatusInfoMuted', + value: theme.colorScheme(context).surfaceStatusInfoMuted, + ), + ColorTokenItem( + name: 'surfaceStatusNegativeEmphasized', + value: theme.colorScheme(context).surfaceStatusNegativeEmphasized, + ), + ColorTokenItem( + name: 'surfaceStatusNegativeMuted', + value: theme.colorScheme(context).surfaceStatusNegativeMuted, + ), + ColorTokenItem( + name: 'surfaceStatusPositiveEmphasized', + value: theme.colorScheme(context).surfaceStatusPositiveEmphasized, + ), + ColorTokenItem( + name: 'surfaceStatusPositiveMuted', + value: theme.colorScheme(context).surfaceStatusPositiveMuted, + ), + ColorTokenItem( + name: 'surfaceStatusWarningEmphasized', + value: theme.colorScheme(context).surfaceStatusWarningEmphasized, + ), + ColorTokenItem( + name: 'surfaceStatusWarningMuted', + value: theme.colorScheme(context).surfaceStatusWarningMuted, + ), ], }); } diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 8bf83b3a0..0bfdbe7e3 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -17,7 +17,7 @@ homepage: https://flutter.unified-design-system.orange.com # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.3.1+120 +version: 2.0.0+120 environment: sdk: ^3.9.0 @@ -52,23 +52,23 @@ dependencies: # URL Lancher. url_launcher: ^6.0.3 # Core - ouds_core: ^1.3.1 + ouds_core: ^2.0.0 # Global raw token - ouds_global_raw_tokens: ^1.3.1 + ouds_global_raw_tokens: ^2.0.0 # Orange Theme contract - ouds_theme_contract: ^1.3.1 + ouds_theme_contract: ^2.0.0 # Orange Theme - ouds_theme_orange: ^1.3.1 + ouds_theme_orange: ^2.0.0 # Orange Compact Theme - ouds_theme_orange_compact: ^1.3.1 + ouds_theme_orange_compact: ^2.0.0 # Sosh Theme - ouds_theme_sosh: ^1.3.1 + ouds_theme_sosh: ^2.0.0 # Wireframe Theme - ouds_theme_wireframe: ^1.3.1 + ouds_theme_wireframe: ^2.0.0 package_info_plus: ^8.3.1 # App Settings - app_settings: ^6.1.1 + app_settings: ^7.0.0 dev_dependencies: flutter_test: diff --git a/ouds_core/CHANGELOG.md b/ouds_core/CHANGELOG.md index c2d8a53be..0bdb85ba6 100644 --- a/ouds_core/CHANGELOG.md +++ b/ouds_core/CHANGELOG.md @@ -7,7 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] deps update dependency bump dartdoc to 9.0.4 ([#780](https://github.com/Orange-OpenSource/ouds-flutter/issues/780)) +- [Library] update `Phone number input` component to v1.3 ([#690](https://github.com/Orange-OpenSource/ouds-flutter/issues/690)) +- [Library] update `tag` component to v1.5 ([#694](https://github.com/Orange-OpenSource/ouds-flutter/issues/694)) +- [Library] update `input tag` component to v1.2 ([#695](https://github.com/Orange-OpenSource/ouds-flutter/issues/695)) +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed +- [Library] `Phone number input` Add a hint to explain how to interact with fields ([#571](https://github.com/Orange-OpenSource/ouds-flutter/issues/571)) +- [Library] `input tag` the whole component should have the role button ([#481](https://github.com/Orange-OpenSource/ouds-flutter/issues/481)) ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 ### Added diff --git a/ouds_core/README.md b/ouds_core/README.md index e544ea5f0..b2006495e 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.10.0. ## Other OUDS Libraries @@ -56,15 +56,31 @@ It is intended to replace internal frameworks and the previous [ODS](https://git Alert Message - 1.1.0 + 1.1.1 + + + App Bar + 1.0.0 Badge 1.2.0 - Bar - 1.0.0 + Badge Count + 1.2.0 + + + Badge Icon + 1.3.0 + + + Bottom Sheet + 0.0.0 + + + Bullet List + 1.1.0 Button @@ -74,49 +90,61 @@ 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 + + Navigation Bar + 1.0.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 @@ -146,17 +174,17 @@ It is intended to replace internal frameworks and the previous [ODS](https://git ```yaml # Core - ouds_core: ^1.3.1 + ouds_core: ^2.0.0 # Orange Theme contract - ouds_theme_contract: ^1.3.1 + ouds_theme_contract: ^2.0.0 # Orange Theme - ouds_theme_orange: ^1.3.1 + ouds_theme_orange: ^2.0.0 # Orange Theme Compact - ouds_theme_orange_compact: ^1.3.1 + ouds_theme_orange_compact: ^2.0.0 # Sosh Theme - ouds_theme_sosh: ^1.3.1 + ouds_theme_sosh: ^2.0.0 # Wireframe Theme - ouds_theme_wireframe: ^1.3.1 + ouds_theme_wireframe: ^2.0.0 dependency_overrides: intl: ^0.20.2 @@ -166,7 +194,7 @@ dependency_overrides: ### Localization -To set up localization for the `ouds_core` library, you need to set the `OudsLocalizations.delegate` in the `localizationsDelegates` properties of the `MaterialApp`. +To set up localization for the `ouds_core` library, you need to set the `OudsLocalizations.delegate` in the `localizationsDelegates` properties of the `MaterialApp`. ### Implementation @@ -188,7 +216,7 @@ To set up localization for the `ouds_core` library, you need to set the `OudsLoc }, ); ``` -### Custom Implementation +### Custom Implementation To customize the Orange theme (e.g., apply rounded corners or adjust spacing), wrap the `OudsTheme` with `OudsThemeConfigModel`. @@ -309,4 +337,4 @@ this SDK does not require any device permission to work. ## Copyright and license Code released under the [MIT License](https://github.com/Orange-OpenSource/ouds-flutter/blob/develop/LICENSE). -For images and other assets, please [refer to the NOTICE.txt](https://github.com/Orange-OpenSource/ouds-flutter/blob/develop/NOTICE.txt). +For images and other assets, please [refer to the NOTICE.txt](https://github.com/Orange-OpenSource/ouds-flutter/blob/develop/NOTICE.txt). \ No newline at end of file diff --git a/ouds_core/lib/components/alert/ouds_alert_message.dart b/ouds_core/lib/components/alert/ouds_alert_message.dart index f4a532909..706bab18f 100644 --- a/ouds_core/lib/components/alert/ouds_alert_message.dart +++ b/ouds_core/lib/components/alert/ouds_alert_message.dart @@ -387,7 +387,7 @@ class _OudsAlertMessageState extends State { ) { final theme = OudsTheme.of(context); final alertMessageStatusModifier = OudsAlertStatusModifier(context); - final maxTextWidth = theme.sizeScheme(context).maxWidthTypeLabelMedium; + final maxTextWidth = theme.sizeScheme(context).maxWidthLabelMedium; final textScaler = MediaQuery.textScalerOf(context); final double iconContainerWidth = textScaler.scale( theme.sizeScheme(context).iconWithLabelMediumSizeMedium, diff --git a/ouds_core/lib/components/alert/ouds_inline_alert.dart b/ouds_core/lib/components/alert/ouds_inline_alert.dart index 4142ae47d..7c4fcab46 100644 --- a/ouds_core/lib/components/alert/ouds_inline_alert.dart +++ b/ouds_core/lib/components/alert/ouds_inline_alert.dart @@ -80,9 +80,7 @@ class _OudsInlineAlertState extends State { Expanded( child: Container( constraints: BoxConstraints( - maxWidth: theme - .sizeSemanticTokens - .maxWidthTypeLabelLargeMobile, // todo maxWidthTypeLabelLarge + maxWidth: theme.sizeScheme(context).maxWidthLabelLarge, ), child: Text( widget.label, diff --git a/ouds_core/lib/components/badge/ouds_badge.dart b/ouds_core/lib/components/badge/ouds_badge.dart index bf37f668d..72825205b 100644 --- a/ouds_core/lib/components/badge/ouds_badge.dart +++ b/ouds_core/lib/components/badge/ouds_badge.dart @@ -23,22 +23,13 @@ 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, -} +@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 } /// @nodoc // deprecation remove : this enum is added only to support the deprecated enum and will be removed after deprecation @@ -60,12 +51,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) /// @@ -207,12 +193,16 @@ enum OudsBadgeSize { /// ``` class OudsBadge extends StatefulWidget { - @Deprecated('Use status of type OudsIconStatus instead. This parameter will be removed in a future version.') + @Deprecated( + 'Use status of type OudsIconStatus instead. This parameter will be removed in a future version.', + ) final OudsBadgeStatus? _deprecatedStatus; final OudsIconStatus? status; final OudsBadgeSize? size; final String? label; - @Deprecated('icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.') + @Deprecated( + 'icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.', + ) final String? icon; final Widget? child; final bool enabled; @@ -220,22 +210,25 @@ 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.') + '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, @@ -245,10 +238,10 @@ class OudsBadge extends StatefulWidget { this.semanticsLabel, this.status, bool withIcon = true, - }) : label = null, - icon = null, - _deprecatedStatus = null, - _withIcon = withIcon; + }) : label = null, + icon = null, + _deprecatedStatus = null, + _withIcon = withIcon; const OudsBadge.standard({ super.key, @@ -257,10 +250,10 @@ class OudsBadge extends StatefulWidget { this.enabled = true, this.semanticsLabel, this.status, - }) : label = null, - icon = null, - _deprecatedStatus = null, - _withIcon = false; + }) : label = null, + icon = null, + _deprecatedStatus = null, + _withIcon = false; const OudsBadge.count({ super.key, @@ -270,9 +263,9 @@ class OudsBadge extends StatefulWidget { this.enabled = true, this.semanticsLabel, this.status, - }) : icon = null, - _deprecatedStatus = null, - _withIcon = false; + }) : icon = null, + _deprecatedStatus = null, + _withIcon = false; @override State createState() => _OudsBadgeState(); @@ -315,15 +308,21 @@ class _OudsBadgeState extends State { final scaledSize = textScaler.scale(badgeSizeModifier.getSize(widget.size)); return Container( - width: type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? null : scaledSize, - height: type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? null : scaledSize, + width: type == _OudsBadgeType.count || type == _OudsBadgeType.standard + ? null + : scaledSize, + height: type == _OudsBadgeType.count || type == _OudsBadgeType.standard + ? null + : scaledSize, constraints: BoxConstraints( minHeight: scaledSize, minWidth: scaledSize, - maxHeight: type == _OudsBadgeType.count || type == _OudsBadgeType.standard + maxHeight: + type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? double.infinity : scaledSize, - maxWidth: type == _OudsBadgeType.count || type == _OudsBadgeType.standard + maxWidth: + type == _OudsBadgeType.count || type == _OudsBadgeType.standard ? double.infinity : scaledSize, ), @@ -336,29 +335,42 @@ class _OudsBadgeState extends State { alignment: widget.size == OudsBadgeSize.large ? AlignmentDirectional(5, -1.5) : widget.size == OudsBadgeSize.medium - ? AlignmentDirectional(2, -1.3) - : null, + ? AlignmentDirectional(2, -1.3) + : null, padding: widget.size == OudsBadgeSize.large ? EdgeInsets.only( - left: badge.spaceInset, right: badge.spaceInset) + left: badge.spaceInsetMediumLarge, + right: badge.spaceInsetMediumLarge, + ) : null, + backgroundColor: badgeStatusModifier.getStatusColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), + widget._deprecatedStatus, + _effectiveStatus, + widget.enabled, + ), child: widget.child, ) : Badge( padding: widget.icon != null || hasIcon ? EdgeInsets.only( - left: badge.spaceInset, right: badge.spaceInset) + 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), + ? EdgeInsets.only( + left: badge.spacePaddingInlineLarge, + right: badge.spacePaddingInlineLarge, + ) + : EdgeInsets.only( + left: badge.spacePaddingInlineMedium, + right: badge.spacePaddingInlineMedium, + ), backgroundColor: badgeStatusModifier.getStatusColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), + widget._deprecatedStatus, + _effectiveStatus, + widget.enabled, + ), label: badgeLabel, child: widget.child, ), @@ -378,19 +390,23 @@ class _OudsBadgeState extends State { _formattedLabel(), style: widget.size == OudsBadgeSize.large ? theme.typographyTokens - .typeLabelDefaultMedium(context) - .copyWith( + .typeLabelDefaultMedium(context) + .copyWith( color: badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, - _effectiveStatus, - widget.enabled)) + widget._deprecatedStatus, + _effectiveStatus, + widget.enabled, + ), + ) : theme.typographyTokens - .typeLabelDefaultSmall(context) - .copyWith( + .typeLabelDefaultSmall(context) + .copyWith( color: badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, - _effectiveStatus, - widget.enabled)), + widget._deprecatedStatus, + _effectiveStatus, + widget.enabled, + ), + ), textAlign: TextAlign.center, ), ) @@ -403,8 +419,10 @@ 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); @@ -421,11 +439,15 @@ class _OudsBadgeState extends State { excludeFromSemantics: true, iconPath, fit: BoxFit.contain, - package: - fixedIcon != null ? OudsTheme.of(context).packageName : null, + package: fixedIcon != null + ? OudsTheme.of(context).packageName + : null, colorFilter: ColorFilter.mode( badgeStatusModifier.getStatusTextAndIconColor( - widget._deprecatedStatus, _effectiveStatus, widget.enabled), + widget._deprecatedStatus, + _effectiveStatus, + widget.enabled, + ), BlendMode.srcIn, ), ), @@ -460,7 +482,8 @@ class _OudsBadgeState extends State { /// - [_OudsBadgeType.standard]: when neither icon nor label applies (fallback case). _OudsBadgeType get type { final isMediumOrLarge = - widget.size == OudsBadgeSize.medium || widget.size == OudsBadgeSize.large; + widget.size == OudsBadgeSize.medium || + widget.size == OudsBadgeSize.large; // Check for the icon property final hasIcon = switch (_effectiveStatus) { 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..0aa9dee81 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 @@ -34,12 +34,17 @@ class OudsControlIndicatorModifier { /// Returns: The size of the indicator as a `double`. double getSizeIndicator(OudsControlItemType type, BuildContext context) { // Check if the type is not switchButton and is radio - if (type != OudsControlItemType.switchButton && type == OudsControlItemType.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 7fcc11461..99bd2b5a1 100644 --- a/ouds_core/lib/components/control/ouds_control_item.dart +++ b/ouds_core/lib/components/control/ouds_control_item.dart @@ -178,7 +178,7 @@ class OudsControlItemState extends State { borderRadius: BorderRadius.circular(borderTokens.radiusNone), ), constraints: BoxConstraints( - minHeight: controlItemTokens.sizeMinHeight, + minHeight: controlItemTokens.sizeMinHeightDefault, minWidth: controlItemTokens.sizeMinWidth, maxWidth: widget.constrainedMaxWidth ? controlItemTokens.sizeMaxWidth @@ -263,7 +263,7 @@ class OudsControlItemState extends State { Padding( padding: EdgeInsetsDirectional.only( start: controlItemTokens.spacePaddingInline, - top: controlItemTokens.spacePaddingBlockTopErrorText, + top: controlItemTokens.spacePaddingBlockTopHelperText, end: controlItemTokens.spacePaddingInline, ), child: Text( @@ -470,6 +470,9 @@ class OudsControlItemState extends State { maxHeight: OudsTheme.of( context, ).componentsTokens(context).controlItem.sizeMaxHeightAssetsContainer, + minHeight: OudsTheme.of( + context, + ).componentsTokens(context).controlItem.sizeIcon, ), alignment: Alignment.center, child: SizedBox( diff --git a/ouds_core/lib/components/form_input/ouds_phone_number_input.dart b/ouds_core/lib/components/form_input/ouds_phone_number_input.dart index 197def7bb..f2886d3ea 100644 --- a/ouds_core/lib/components/form_input/ouds_phone_number_input.dart +++ b/ouds_core/lib/components/form_input/ouds_phone_number_input.dart @@ -28,7 +28,6 @@ import 'package:ouds_core/components/form_input/internal/modifier/ouds_form_inpu import 'package:ouds_core/components/form_input/internal/ouds_form_input_control_state.dart'; import 'package:ouds_core/components/form_input/internal/ouds_form_input_decoration.dart'; import 'package:ouds_core/components/utilities/app_assets.dart'; -import 'package:ouds_core/components/utilities/input_utils.dart'; import 'package:ouds_core/l10n/gen/ouds_localizations.dart'; import 'package:ouds_theme_contract/ouds_theme.dart'; import 'package:ouds_theme_contract/ouds_theme_contract.dart'; @@ -99,7 +98,7 @@ class OudsPhoneNumberInput extends StatefulWidget { final bool? enabled; final bool? readOnly; final TextInputType? keyboardType; - CountrySelector? countrySelector; + final CountrySelector? countrySelector; final OudsInputDecoration decoration; final void Function(String)? onEditingComplete; @@ -158,7 +157,7 @@ class _OudsPhoneNumberInputState extends State { final phoneUtil = PhoneNumberUtil.instance; int? maxLength; - /// Digits tapés par l'utilisateur + /// Digits tapped by user @override void initState() { super.initState(); @@ -260,15 +259,16 @@ class _OudsPhoneNumberInputState extends State { // Check if the input is currently showing an error final isError = widget.decoration.errorText != null; - final l10n = OudsLocalizations.of(context); - String? formattedNumber = ""; String limitedDigits = ""; + final l10n = OudsLocalizations.of(context); + //needed for accessibility final contentText = widget.controller?.text ?? ""; - final prefixText = contentText.isNotEmpty - ? "${(widget.countrySelector != null) ? widget.countrySelector?.selectedCountry?.prefix : widget.decoration.prefix ?? ""}" + + final suffixText = contentText.isNotEmpty + ? ", ${widget.decoration.suffix ?? ""}" : ""; final helperText = isError ? widget.decoration.errorText ?? "" @@ -282,23 +282,32 @@ class _OudsPhoneNumberInputState extends State { : isReadOnly ? l10n?.core_common_disabled_a11y ?? "" : ""; + final hintLabel = contentText.isEmpty + ? widget.decoration.hintText ?? "" + : ""; + + final prefixCountry = (widget.countrySelector != null) + ? widget.countrySelector?.selectedCountry?.prefix + : widget.decoration.prefix; + + final prefixSemantics = contentText.isNotEmpty ? prefixCountry : ""; // Build Semantics value final semanticsValue = [ - l10n?.core_phoneNumberInput_a11y, - prefixText, + l10n?.core_textInput_trait_a11y, + widget.decoration.labelText, + prefixSemantics, contentText, + suffixText, helperText, statusLabel, - contentText.isEmpty && !_isFocused ? l10n?.core_common_hint_a11y : null, + hintLabel, ].where((s) => s != null && s.isNotEmpty).join(", "); return Semantics( - label: l10n?.core_phoneNumberInput_a11y, + label: semanticsValue, + hint: l10n?.core_common_hint_a11y, value: isError ? l10n?.core_common_error_a11y : null, - //hint: widget.decoration.hintText ?? "", // if we want to display value in a11Y activate hint - focused: effectiveFocusNode != null, - focusable: true, child: ConstrainedBox( constraints: BoxConstraints( minWidth: textInput.sizeMinWidth, @@ -353,43 +362,20 @@ class _OudsPhoneNumberInputState extends State { /// Center block: main text input Flexible( fit: FlexFit.loose, - child: widget.readOnly == true - ? IgnorePointer( - child: Semantics( - label: semanticsValue, - focused: effectiveFocusNode != null, - focusable: true, - child: _buildTextField( - inputTextTextModifier, - state, - isError, - effectiveFocusNode, - theme, - context, - textInput, - effectiveIsFocused, - formattedNumber, - limitedDigits, - ), - ), - ) - : Semantics( - label: semanticsValue, - focused: effectiveFocusNode != null, - focusable: true, - child: _buildTextField( - inputTextTextModifier, - state, - isError, - effectiveFocusNode, - theme, - context, - textInput, - effectiveIsFocused, - formattedNumber, - limitedDigits, - ), - ), + child: ExcludeSemantics( + child: _buildTextField( + inputTextTextModifier, + state, + isError, + effectiveFocusNode, + theme, + context, + textInput, + effectiveIsFocused, + formattedNumber, + limitedDigits, + ), + ), ), /// Right block: suffix icon container @@ -446,7 +432,7 @@ class _OudsPhoneNumberInputState extends State { /// - Displays label text if provided, with height constraints and style. /// - Shows hint text if provided or if formattedNumber is available, styled accordingly. /// - Adds a prefix widget if prefix or country selector is present, styled appropriately. - /// - Ensures the text field is dense for compact layout. + /// - Ensures the text field is dense for a compact layout. TextField _buildTextField( OudsFormFieldsTextColorModifier inputTextTextModifier, OudsFormFieldsControlState state, @@ -465,11 +451,12 @@ class _OudsPhoneNumberInputState extends State { focusNode: effectiveFocusNode, keyboardType: widget.keyboardType, style: theme.typographyTokens - .typeLabelDefaultLarge(context) + .typeLabelModerateLarge(context) .copyWith( color: inputTextTextModifier.getTextLabelColor(state, isError), ), enabled: widget.enabled, + readOnly: widget.readOnly ?? false, inputFormatters: [ FilteringTextInputFormatter.digitsOnly, MaxDigitsFormatter( @@ -522,29 +509,13 @@ class _OudsPhoneNumberInputState extends State { // Label text widget, shown if labelText is provided label: widget.decoration.labelText != null - ? Container( - constraints: BoxConstraints( - maxHeight: textInput.sizeLabelMaxHeight, - ), - child: ExcludeSemantics( - child: Text( - maxLines: InputUtils.getLabelMaxLines( - hintText: widget.decoration.hintText, - controller: widget.controller, - isFocused: effectiveIsFocused, + ? Text( + widget.decoration.labelText ?? "", + style: theme.typographyTokens + .typeLabelDefaultLarge(context) + .copyWith( + color: inputTextTextModifier.getTextColor(state, isError), ), - overflow: TextOverflow.ellipsis, - widget.decoration.labelText ?? "", - style: theme.typographyTokens - .typeLabelDefaultLarge(context) - .copyWith( - color: inputTextTextModifier.getTextColor( - state, - isError, - ), - ), - ), - ), ) : null, @@ -725,19 +696,22 @@ class _OudsPhoneNumberInputState extends State { if (prefixToDisplay == null || prefixToDisplay.isEmpty) { return const SizedBox.shrink(); } - return Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - prefixToDisplay, - style: theme.typographyTokens - .typeLabelDefaultLarge(context) - .copyWith( - color: inputTextTextModifier.getSuffixPrefixTextColor(state), - ), - ), - SizedBox(width: textInput.spaceColumnGapInlineText), - ], + return ExcludeSemantics( + excluding: (widget.controller?.text ?? "").isEmpty, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + prefixToDisplay, + style: theme.typographyTokens + .typeLabelDefaultLarge(context) + .copyWith( + color: inputTextTextModifier.getSuffixPrefixTextColor(state), + ), + ), + SizedBox(width: textInput.spaceColumnGapInlineText), + ], + ), ); } 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..9e87df827 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 @@ -26,21 +26,32 @@ class OudsNavigationBarStatusModifier { /// Returns the content color (icon and label) for a navigation destination, /// based on its interaction [state] and whether it is [isSelected]. - Color getTextIconItemColor(OudsNavigationBarControlState state, [bool isSelected = false]) { + 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; + return isSelected + ? barTheme.colorContentSelectedHover + : barTheme.colorContentUnselectedHover; case OudsNavigationBarControlState.focused: - return isSelected ? barTheme.colorContentSelectedFocus : barTheme.colorContentUnselectedFocus; + return isSelected + ? barTheme.colorContentSelectedFocus + : barTheme.colorContentUnselectedFocus; case OudsNavigationBarControlState.pressed: - return isSelected ? barTheme.colorContentSelectedPressed : barTheme.colorContentUnselectedPressed; + return isSelected + ? barTheme.colorContentSelectedPressed + : barTheme.colorContentUnselectedPressed; } } @@ -49,18 +60,29 @@ class OudsNavigationBarStatusModifier { /// /// Note: in Material 3, `indicatorColor` paints the selected indicator behind the destination, /// while `overlayColor` is the transient pressed/hovered/focused overlay shown during interactions. - Color getMaterialIndicatorBarColor(OudsNavigationBarControlState state, [bool isSelected = false]) { + Color getMaterialIndicatorBarColor( + OudsNavigationBarControlState state, [ + bool isSelected = false, + ]) { final barTheme = OudsTheme.of(context).componentsTokens(context).bar; 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 +92,21 @@ 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..c8e56d6f7 100644 --- a/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart +++ b/ouds_core/lib/components/navigation/ouds_navigation_bar_item.dart @@ -102,10 +102,7 @@ class OudsNavigationBarItem { height: 26, //sizeIcon.iconDecorativeExtraSmall, width: 26, //sizeIcon.iconDecorativeExtraSmall, colorFilter: ColorFilter.mode( - modifier.getTextIconItemColor( - controlState, - isSelected, - ), + modifier.getTextIconItemColor(controlState, isSelected), BlendMode.srcIn, ), ); @@ -122,17 +119,27 @@ class OudsNavigationBarItem { } /// Builds the top indicator shown above the icon when the destination is selected. - Container _buildTopIndicatorBar(BuildContext context, OudsBarTokens bar, bool isSelected, OudsNavigationBarControlState controlState) { - final navigationBarStatusModifier = OudsNavigationBarStatusModifier(context); + Container _buildTopIndicatorBar( + BuildContext context, + OudsBarTokens bar, + bool isSelected, + OudsNavigationBarControlState controlState, + ) { + 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, + color: isSelected + ? navigationBarStatusModifier.getIndicatorBarColor(controlState) + : Colors.transparent, borderRadius: BorderRadius.horizontal( - left: Radius.circular(bar.borderRadiusActiveIndicatorCustomTop), - right: Radius.circular(bar.borderRadiusActiveIndicatorCustomTop), + left: Radius.circular(bar.borderRadiusCurrentIndicatorCustomTop), + right: Radius.circular(bar.borderRadiusCurrentIndicatorCustomTop), ), ), ); @@ -164,10 +171,24 @@ class OudsNavigationBarItem { Flexible( child: NavigationDestination( label: label, - icon: _buildBadgeIconNavigationDestination(context, icon, modifier, controlState, badge, isSelected: isSelected), - selectedIcon: _buildBadgeIconNavigationDestination(context, icon, modifier, controlState, badge, isSelected: isSelected), + icon: _buildBadgeIconNavigationDestination( + context, + icon, + modifier, + controlState, + badge, + isSelected: isSelected, + ), + selectedIcon: _buildBadgeIconNavigationDestination( + context, + icon, + modifier, + controlState, + badge, + isSelected: isSelected, + ), ), - ) + ), ], ); } @@ -191,8 +212,22 @@ class OudsNavigationBarItem { return BottomNavigationBarItem( label: label, - icon: _buildBadgeIconBottomNavigationBarItem(context, icon, modifier, controlState, badge, isSelected: isSelected), - activeIcon: _buildBadgeIconBottomNavigationBarItem(context, icon, modifier, controlState, badge, isSelected: isSelected), + icon: _buildBadgeIconBottomNavigationBarItem( + context, + icon, + modifier, + controlState, + badge, + isSelected: isSelected, + ), + activeIcon: _buildBadgeIconBottomNavigationBarItem( + context, + icon, + modifier, + controlState, + badge, + isSelected: isSelected, + ), ); } @@ -227,10 +262,7 @@ class OudsNavigationBarItem { height: 26, //sizeIcon.iconDecorativeExtraSmall, width: 26, //sizeIcon.iconDecorativeExtraSmall, colorFilter: ColorFilter.mode( - modifier.getTextIconItemColor( - controlState, - isSelected, - ), + modifier.getTextIconItemColor(controlState, isSelected), BlendMode.srcIn, ), ); @@ -239,14 +271,14 @@ class OudsNavigationBarItem { ? Column( children: [ _buildTopIndicatorBar(context, bar, isSelected, controlState), - SizedBox( - height: 2, - ), + SizedBox(height: 2), OudsBadge.count( semanticsLabel: badge.contentDescription, label: badge.count.toString(), status: Negative(), - size: badge.hasCount ? OudsBadgeSize.medium : OudsBadgeSize.xsmall, + size: badge.hasCount + ? OudsBadgeSize.medium + : OudsBadgeSize.xsmall, child: widgetIcon, ), ], @@ -254,9 +286,7 @@ class OudsNavigationBarItem { : Column( children: [ _buildTopIndicatorBar(context, bar, isSelected, controlState), - SizedBox( - height: 2, - ), + SizedBox(height: 2), widgetIcon, ], ); 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 14083f3e6..f50f200c3 100644 --- a/ouds_core/lib/components/radio_button/ouds_radio_button.dart +++ b/ouds_core/lib/components/radio_button/ouds_radio_button.dart @@ -198,8 +198,8 @@ class OudsRadioButtonState extends State> { ), child: Center( child: SizedBox( - width: radioButton.sizeIndicator, - height: radioButton.sizeIndicator, + width: controlItem.sizeControlIndicator, + height: controlItem.sizeControlIndicator, child: Stack( fit: StackFit.expand, children: [ diff --git a/ouds_core/lib/components/tag/ouds_input_tag.dart b/ouds_core/lib/components/tag/ouds_input_tag.dart index b8597d743..e6a740005 100644 --- a/ouds_core/lib/components/tag/ouds_input_tag.dart +++ b/ouds_core/lib/components/tag/ouds_input_tag.dart @@ -58,11 +58,7 @@ class OudsInputTag extends StatefulWidget { final String label; final VoidCallback? onPressed; - const OudsInputTag({ - super.key, - required this.label, - this.onPressed, - }); + const OudsInputTag({super.key, required this.label, this.onPressed}); @override State createState() => _OudsInputTagState(); @@ -93,117 +89,158 @@ class _OudsInputTagState extends State { } void _handleFocusChange(bool focus) { - if (widget.onPressed == null) _isFocused = false; // Ignore focus changes if disabled + if (widget.onPressed == null) + _isFocused = false; // Ignore focus changes if disabled setState(() => _isFocused = focus); } @override Widget build(BuildContext context) { final isDisabled = widget.onPressed == null; - final interactionModelHover = OudsInheritedInteractionModel.of(context, InteractionAspect.hover); - final interactionModelPressed = OudsInheritedInteractionModel.of(context, InteractionAspect.pressed); + final interactionModelHover = OudsInheritedInteractionModel.of( + context, + InteractionAspect.hover, + ); + final interactionModelPressed = OudsInheritedInteractionModel.of( + context, + InteractionAspect.pressed, + ); final isHovered = interactionModelHover?.state.isHovered ?? false; final isPressed = interactionModelPressed?.state.isPressed ?? false; - final tagStateDeterminer = OudsTagControlStateDeterminer(enabled: !isDisabled, isPressed: isPressed || _isPressed, isHovered: isHovered || _isHovered, isFocused: _isFocused); + final tagStateDeterminer = OudsTagControlStateDeterminer( + enabled: !isDisabled, + isPressed: isPressed || _isPressed, + isHovered: isHovered || _isHovered, + isFocused: _isFocused, + ); final tagState = tagStateDeterminer.determineControlState(); final tagBorderModifier = OudsInputTagControlBorderModifier(context); final tagTextColorModifier = OudsTagStyleModifier(context); - final tagBackgroundColorModifier = OudsInputTagControlBackgroundColorModifier(context); + final tagBackgroundColorModifier = + OudsInputTagControlBackgroundColorModifier(context); - return Visibility(visible: isVisible, child: _buildInputTag(context, tagBorderModifier, tagTextColorModifier, tagBackgroundColorModifier, tagState, isDisabled)); + return Visibility( + visible: isVisible, + child: _buildInputTag( + context, + tagBorderModifier, + tagTextColorModifier, + tagBackgroundColorModifier, + tagState, + isDisabled, + ), + ); } - Widget _buildInputTag(BuildContext context, OudsInputTagControlBorderModifier tagBorderModifier, OudsTagStyleModifier tagTextColorModifier, - OudsInputTagControlBackgroundColorModifier tagBgColorModifier, OudsTagControlState tagState, bool isDisabled) { + Widget _buildInputTag( + BuildContext context, + OudsInputTagControlBorderModifier tagBorderModifier, + OudsTagStyleModifier tagTextColorModifier, + OudsInputTagControlBackgroundColorModifier tagBgColorModifier, + OudsTagControlState tagState, + bool isDisabled, + ) { final tagToken = OudsTheme.of(context).componentsTokens(context).tag; - final inputTagToken = OudsTheme.of(context).componentsTokens(context).inputTag; + final inputTagToken = OudsTheme.of( + context, + ).componentsTokens(context).inputTag; final borderTokens = OudsTheme.of(context).borderTokens; final l10n = OudsLocalizations.of(context); - return Semantics( - enabled: !isDisabled, - label: l10n?.core_tag_tag_input_role_a11y, - container: true, - button: true, - child: Material( - color: Colors.transparent, - child: Container( - constraints: BoxConstraints( - minHeight: tagToken.sizeMinHeightInteractiveArea, - ), - child: InkWell( - onTap: () { - if (widget.onPressed != null) { - widget.onPressed!.call(); - SemanticsService.announce(l10n?.core_tag_tag_input_removed_a11y(widget.label) ?? '', TextDirection.ltr); - } - }, - focusNode: _focusNode, - canRequestFocus: !isDisabled, - splashColor: Colors.transparent, - highlightColor: Colors.transparent, - focusColor: Colors.transparent, - hoverColor: Colors.transparent, - onHover: (hovering) { - setState(() { - if (!isDisabled) { - _isHovered = hovering; - } - }); - }, - onHighlightChanged: (highlighted) { - setState(() { - if (!isDisabled) { - _isPressed = highlighted; + return MergeSemantics( + child: Semantics( + enabled: !isDisabled, + container: true, + button: true, + child: Material( + color: Colors.transparent, + child: Container( + constraints: BoxConstraints( + minHeight: tagToken.sizeMinHeightInteractiveArea, + ), + child: InkWell( + onTap: () { + if (widget.onPressed != null) { + widget.onPressed!.call(); + SemanticsService.announce( + l10n?.core_tag_tag_input_removed_a11y(widget.label) ?? '', + TextDirection.ltr, + ); } - }); - }, - child: Stack( - clipBehavior: Clip.none, - alignment: Alignment.center, - children: [ - if (_isFocused) - Positioned( - top: borderTokens.widthFocus / 2, - bottom: borderTokens.widthFocus / 2, - left: -borderTokens.widthFocus / 2, + }, + focusNode: _focusNode, + canRequestFocus: !isDisabled, + splashColor: Colors.transparent, + highlightColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + onHover: (hovering) { + setState(() { + if (!isDisabled) { + _isHovered = hovering; + } + }); + }, + onHighlightChanged: (highlighted) { + setState(() { + if (!isDisabled) { + _isPressed = highlighted; + } + }); + }, + child: Stack( + clipBehavior: Clip.none, + alignment: Alignment.center, + children: [ + if (_isFocused) + Positioned( + top: borderTokens.widthFocus / 2, + bottom: borderTokens.widthFocus / 2, + left: -borderTokens.widthFocus / 2, - /// to be changed to enhancement the focus. - right: -borderTokens.widthFocus / 2, + /// to be changed to enhancement the focus. + right: -borderTokens.widthFocus / 2, - /// to be changed to enhancement the focus. - child: Container( - decoration: BoxDecoration( - border: OudsBorder().borderAll( - color: OudsTheme.of(context).colorScheme(context).borderFocus, - width: borderTokens.widthFocus, - ), - borderRadius: BorderRadius.circular( - tagToken.borderRadius + borderTokens.widthFocus, + /// to be changed to enhancement the focus. + child: Container( + decoration: BoxDecoration( + border: OudsBorder().borderAll( + color: OudsTheme.of( + context, + ).colorScheme(context).borderFocus, + width: borderTokens.widthFocus, + ), + borderRadius: BorderRadius.circular( + tagToken.borderRadius + borderTokens.widthFocus, + ), ), ), ), - ), - Container( - decoration: BoxDecoration( - border: OudsBorder().borderAll( - color: _isFocused ? OudsTheme.of(context).colorScheme(context).borderFocusInset : Colors.transparent, - width: inputTagToken.borderWidthDefaultInteraction, + Container( + decoration: BoxDecoration( + border: OudsBorder().borderAll( + color: _isFocused + ? OudsTheme.of( + context, + ).colorScheme(context).borderFocusInset + : Colors.transparent, + width: inputTagToken.borderWidthDefaultInteraction, + ), + borderRadius: BorderRadius.circular( + tagToken.borderRadius, + ), ), - borderRadius: BorderRadius.circular( - tagToken.borderRadius, + child: _buildLayout( + context, + tagBorderModifier, + tagTextColorModifier, + tagBgColorModifier, + tagState, + isDisabled, ), ), - child: _buildLayout( - context, - tagBorderModifier, - tagTextColorModifier, - tagBgColorModifier, - tagState, - isDisabled, - ), - ), - ], + ], + ), ), ), ), @@ -211,8 +248,14 @@ class _OudsInputTagState extends State { ); } - Widget _buildLayout(BuildContext context, OudsInputTagControlBorderModifier tagBorderModifier, OudsTagStyleModifier tagTextColorModifier, - OudsInputTagControlBackgroundColorModifier tagBgColorModifier, OudsTagControlState tagState, bool isDisabled) { + Widget _buildLayout( + BuildContext context, + OudsInputTagControlBorderModifier tagBorderModifier, + OudsTagStyleModifier tagTextColorModifier, + OudsInputTagControlBackgroundColorModifier tagBgColorModifier, + OudsTagControlState tagState, + bool isDisabled, + ) { final tagToken = OudsTheme.of(context).componentsTokens(context).tag; final typographyTokens = OudsTheme.of(context).typographyTokens; @@ -222,18 +265,14 @@ class _OudsInputTagState extends State { child: Container( decoration: BoxDecoration( border: tagBorderModifier.getBorder(tagState), - borderRadius: BorderRadius.circular( - tagToken.borderRadius, - ), + borderRadius: BorderRadius.circular(tagToken.borderRadius), ), ), ), // Content (e.g., Row with icon and label)... ClipRRect( - borderRadius: BorderRadius.circular( - tagToken.borderRadius, - ), + borderRadius: BorderRadius.circular(tagToken.borderRadius), child: Container( color: tagBgColorModifier.getBackgroundColor(tagState), padding: EdgeInsetsDirectional.only( @@ -248,16 +287,22 @@ class _OudsInputTagState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Flexible( - child: Text(widget.label, - textAlign: TextAlign.center, - style: typographyTokens.typeLabelStrongMedium(context).copyWith( - color: tagTextColorModifier.getTextColor(tagState), - )), + child: Text( + widget.label, + textAlign: TextAlign.center, + style: typographyTokens + .typeLabelModerateMedium(context) + .copyWith( + color: tagTextColorModifier.getTextColor(tagState), + ), + ), ), SizedBox(width: tagToken.spaceColumnGapDefault), Semantics( container: true, - label: OudsLocalizations.of(context)?.core_inputTag_delete_a11y, + label: OudsLocalizations.of( + context, + )?.core_inputTag_delete_a11y, button: true, child: SvgPicture.asset( excludeFromSemantics: true, @@ -267,7 +312,9 @@ class _OudsInputTagState extends State { package: OudsTheme.of(context).packageName, fit: BoxFit.contain, colorFilter: ColorFilter.mode( - OudsInputTagControlIconColorModifier(context).getIconColor(tagState)!, + OudsInputTagControlIconColorModifier( + context, + ).getIconColor(tagState)!, BlendMode.srcIn, ), ), diff --git a/ouds_core/lib/components/tag/ouds_tag.dart b/ouds_core/lib/components/tag/ouds_tag.dart index 792671b97..d1d39acb9 100644 --- a/ouds_core/lib/components/tag/ouds_tag.dart +++ b/ouds_core/lib/components/tag/ouds_tag.dart @@ -19,29 +19,21 @@ import 'package:ouds_core/components/tag/internal/ouds_tag_border_modifier.dart' import 'package:ouds_core/components/tag/internal/ouds_tag_size_modifier.dart'; import 'package:ouds_core/components/tag/internal/ouds_tag_status_modifier.dart'; import 'package:ouds_core/components/tag/internal/ouds_tag_text_style_modifier.dart'; +import 'package:ouds_core/components/utilities/app_assets.dart'; import 'package:ouds_core/l10n/gen/ouds_localizations.dart'; import 'package:ouds_theme_contract/ouds_theme.dart'; - ///The [OudsTagLayout] defines the layout of the tag’s content. /// /// This enum controls whether the tag displays text, an icon, a bullet or loader -enum OudsTagLayout { - textOnly, - textAndBullet, - textAndIcon, -} +enum OudsTagLayout { textOnly, textAndBullet, textAndIcon } /// Enum representing the state of the tag control. -@Deprecated('Use OudsIconStatus instead. This enum will be removed in a future version.') -enum OudsTagStatus { - neutral, - accent, - positive, - info, - warning, - negative, -} +@Deprecated( + 'Use OudsIconStatus instead. This enum will be removed in a future version.', +) +enum OudsTagStatus { neutral, accent, positive, info, warning, negative } + /// @nodoc // deprecation remove : this enum is added only to support the deprecated enum and will be removed after deprecation extension OudsTagStatusConverter on OudsTagStatus { @@ -62,16 +54,10 @@ extension OudsTagStatusConverter on OudsTagStatus { } /// The [OudsTagSize] defines the tag's visual size. -enum OudsTagSize { - defaultSize, - small; -} +enum OudsTagSize { defaultSize, small } /// The [OudsTagAppearance] enum defines the visual importance of the tag within the UI. -enum OudsTagAppearance { - emphasized, - muted; -} +enum OudsTagAppearance { emphasized, muted } /// /// [OUDS Tag Design Guidelines](https://r.orange.fr/r/S-ouds-doc-tag) @@ -198,11 +184,15 @@ enum OudsTagAppearance { class OudsTag extends StatefulWidget { final String label; final bool enabled; - @Deprecated('Use status of type OudsIconStatus instead. This parameter will be removed in a future version.') + @Deprecated( + 'Use status of type OudsIconStatus instead. This parameter will be removed in a future version.', + ) final OudsTagStatus? _deprecatedStatus; final OudsTagSize? size; final OudsTagAppearance appearance; - @Deprecated('icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.') + @Deprecated( + 'icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.', + ) final String? icon; final OudsTagLayout layout; final bool loading; @@ -210,95 +200,74 @@ class OudsTag extends StatefulWidget { final bool roundedCorners; /// ⚠️ **DEPRECATED:** Use [OudsTag.text], [OudsTag.icon], or [OudsTag.bullet] constructors instead. - @Deprecated('Use named constructors for clarity: OudsTag.text() for text only type, OudsTag.icon() for text and icon type, or OudsTag.bullet() for text and bullet type.' - ' This constructor will be removed in a future version.') - const OudsTag( - {super.key, - required this.label, - this.enabled = true, - @Deprecated('Use iconStatus instead. This parameter will be removed in a future version.') - final OudsTagStatus? status, - this.appearance = OudsTagAppearance.emphasized, - this.size = OudsTagSize.defaultSize, - @Deprecated('icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.') - this.icon, - this.layout = OudsTagLayout.textOnly, - this.loading = false, - this.roundedCorners = true, - }) : _deprecatedStatus = status, - status = null; - - const OudsTag.text( - {super.key, - required this.label, - this.enabled = true, - required this.status, - this.appearance = OudsTagAppearance.emphasized, - this.size = OudsTagSize.defaultSize, - this.layout = OudsTagLayout.textOnly, - this.loading = false, - this.roundedCorners = true, - }) : icon = null, - _deprecatedStatus = null; + @Deprecated( + 'Use named constructors for clarity: OudsTag.text() for text only type, OudsTag.icon() for text and icon type, or OudsTag.bullet() for text and bullet type.' + ' This constructor will be removed in a future version.', + ) + const OudsTag({ + super.key, + required this.label, + this.enabled = true, + @Deprecated( + 'Use iconStatus instead. This parameter will be removed in a future version.', + ) + final OudsTagStatus? status, + this.appearance = OudsTagAppearance.emphasized, + this.size = OudsTagSize.defaultSize, + @Deprecated( + 'icon is now defined by status (OudsIconStatus). Use Accent(icon: ...) or Neutral(icon: ...) for custom icons.', + ) + this.icon, + this.layout = OudsTagLayout.textOnly, + this.loading = false, + this.roundedCorners = true, + }) : _deprecatedStatus = status, + status = null; - const OudsTag.bullet( - {super.key, - required this.label, - this.enabled = true, - required this.status, - this.appearance = OudsTagAppearance.emphasized, - this.size = OudsTagSize.defaultSize, - this.layout = OudsTagLayout.textAndBullet, - this.loading = false, - this.roundedCorners = true, - }) : icon = null, - _deprecatedStatus = null; + const OudsTag.text({ + super.key, + required this.label, + this.enabled = true, + required this.status, + this.appearance = OudsTagAppearance.emphasized, + this.size = OudsTagSize.defaultSize, + this.layout = OudsTagLayout.textOnly, + this.loading = false, + this.roundedCorners = true, + }) : icon = null, + _deprecatedStatus = null; - const OudsTag.icon( - {super.key, - required this.label, - this.enabled = true, - required this.status, - this.appearance = OudsTagAppearance.emphasized, - this.size = OudsTagSize.defaultSize, - this.layout = OudsTagLayout.textAndIcon, - this.loading = false, - this.roundedCorners = true, - }) : icon = null, - _deprecatedStatus = null; - - //deprecation remove: The param state will be removed after deprecation - static Widget buildIcon( - BuildContext context, - String? assetName, - OudsTagStatus? state, - OudsIconStatus? status, - OudsTagAppearance hierarchy, - bool isEnabled) { - final statusModifier = OudsTagStatusModifier(context); - - //get the asset name from status for neutral and accent status (icon defined by user) - final assetIconName = statusModifier.getAssetsName(status); - final icon = statusModifier.getStatusIcon(state, status); + const OudsTag.bullet({ + super.key, + required this.label, + this.enabled = true, + required this.status, + this.appearance = OudsTagAppearance.emphasized, + this.size = OudsTagSize.defaultSize, + this.layout = OudsTagLayout.textAndBullet, + this.loading = false, + this.roundedCorners = true, + }) : icon = null, + _deprecatedStatus = null; - return SvgPicture.asset( - excludeFromSemantics: true, - icon ?? assetName ?? assetIconName ?? "", - package: icon != null ? OudsTheme.of(context).packageName : null, - fit: BoxFit.contain, - colorFilter: ColorFilter.mode( - statusModifier.getStatusIconColor(state,status, hierarchy, isEnabled), - BlendMode.srcIn, - ), - ); - } + const OudsTag.icon({ + super.key, + required this.label, + this.enabled = true, + required this.status, + this.appearance = OudsTagAppearance.emphasized, + this.size = OudsTagSize.defaultSize, + this.layout = OudsTagLayout.textAndIcon, + this.loading = false, + this.roundedCorners = true, + }) : icon = null, + _deprecatedStatus = null; @override State createState() => _OudsTagState(); } class _OudsTagState extends State { - OudsIconStatus? get _effectiveStatus => widget.status ?? widget._deprecatedStatus?.toIconStatus(); @@ -315,27 +284,124 @@ class _OudsTagState extends State { final l10n = OudsLocalizations.of(context); return Semantics( - label: widget.loading ? "${l10n?.core_common_loading_a11y}, ${widget.label}" : widget.label, + label: widget.loading + ? "${l10n?.core_common_loading_a11y}, ${widget.label}" + : widget.label, enabled: widget.enabled, child: Material( color: Colors.transparent, - child: ExcludeSemantics(child: _buildTag(context, tagStatusModifier, tagSizeModifier, tagStyleModifier)), + child: ExcludeSemantics( + child: _buildTag( + context, + tagStatusModifier, + tagSizeModifier, + tagStyleModifier, + ), + ), ), ); } - Widget _buildTag(BuildContext context, OudsTagStatusModifier tagStatusModifier, OudsTagSizeModifier tagSizeModifier, tagStyleModifier) { + Widget _buildTag( + BuildContext context, + OudsTagStatusModifier tagStatusModifier, + OudsTagSizeModifier tagSizeModifier, + tagStyleModifier, + ) { if (widget.loading) { - return _buildTagTextAndLoader(context, tagStatusModifier, tagSizeModifier, tagStyleModifier); + return _buildTagTextAndLoader( + context, + tagStatusModifier, + tagSizeModifier, + tagStyleModifier, + ); } return switch (widget.layout) { - OudsTagLayout.textOnly => _buildTagTextOnly(context, tagStatusModifier, tagSizeModifier, tagStyleModifier), - OudsTagLayout.textAndBullet => _buildTagTextAndBullet(context, tagStatusModifier, tagSizeModifier, tagStyleModifier), - OudsTagLayout.textAndIcon => _buildTagTextAndIcon(context, tagStatusModifier, tagSizeModifier, tagStyleModifier), + OudsTagLayout.textOnly => _buildTagTextOnly( + context, + tagStatusModifier, + tagSizeModifier, + tagStyleModifier, + ), + OudsTagLayout.textAndBullet => _buildTagTextAndBullet( + context, + tagStatusModifier, + tagSizeModifier, + tagStyleModifier, + ), + OudsTagLayout.textAndIcon => _buildTagTextAndIcon( + context, + tagStatusModifier, + tagSizeModifier, + tagStyleModifier, + ), }; } + //deprecation remove: The param state will be removed after deprecation + Widget _buildIcon( + BuildContext context, + String? assetName, + OudsTagStatus? state, + OudsIconStatus? status, + OudsTagAppearance hierarchy, + bool isEnabled, + ) { + final statusModifier = OudsTagStatusModifier(context); + + //get the asset name from status for neutral and accent status (icon defined by user) + final assetIconName = statusModifier.getAssetsName(status); + final icon = statusModifier.getStatusIcon(state, status); + + if (hierarchy == OudsTagAppearance.muted && + (status is Warning || state == OudsTagStatus.warning)) { + final iconTokens = OudsTheme.of(context).componentsTokens(context).icon; + + return Stack( + alignment: Alignment.center, + children: [ + // Background shape + SizedBox.expand( + child: SvgPicture.asset( + excludeFromSemantics: true, + fit: BoxFit.contain, + AppAssets.icons.componentAlertWarningExternalShape, + colorFilter: ColorFilter.mode( + iconTokens.colorContentStatusWarningExternalShape, + BlendMode.srcIn, + ), + package: OudsTheme.of(context).packageName, + ), + ), + // Foreground shape + SizedBox.expand( + child: SvgPicture.asset( + excludeFromSemantics: true, + fit: BoxFit.contain, + AppAssets.icons.componentAlertWarningInternalShape, + colorFilter: ColorFilter.mode( + iconTokens.colorContentStatusWarningInternalShape, + BlendMode.srcIn, + ), + package: OudsTheme.of(context).packageName, + ), + ), + ], + ); + } + return SvgPicture.asset( + excludeFromSemantics: true, + icon ?? assetName ?? assetIconName ?? "", + package: icon != null ? OudsTheme.of(context).packageName : null, + fit: BoxFit.contain, + colorFilter: ColorFilter.mode( + statusModifier.getStatusIconColor(state, status, hierarchy, isEnabled), + BlendMode.srcIn, + ), + ); + } + Widget _buildTagTextAndLoader( BuildContext context, OudsTagStatusModifier tagStatusModifier, @@ -343,82 +409,135 @@ class _OudsTagState extends State { OudsTagStyleModifier tagStyleModifier, ) { final minWidthAndHeight = tagSizeModifier.getMinWidthAndHeight(widget.size); - final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize(widget.size); + final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize( + widget.size, + ); return Container( decoration: BoxDecoration( - borderRadius: OudsTagControlBorderModifier.getBorderRadius(context,widget.roundedCorners), + borderRadius: OudsTagControlBorderModifier.getBorderRadius( + context, + widget.roundedCorners, + ), color: OudsTheme.of(context).colorScheme(context).surfaceSecondary, ), - constraints: BoxConstraints(minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0), + constraints: BoxConstraints( + minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, + minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0, + ), padding: tagSizeModifier.getPadding(widget.size, true), child: Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox( - width: widthAndHeightAssetsContainer[OudsTagDimensions.width.name], - height: widthAndHeightAssetsContainer[OudsTagDimensions.height.name], + width: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.width.name] ?? + 0.0, + ), + height: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.height.name] ?? + 0.0, + ), child: Semantics( child: CircularProgressIndicator( padding: tagSizeModifier.getLoadingAssetsPadding(widget.size), - color: OudsTheme.of(context).colorScheme(context).contentDefault, - strokeWidth: OudsTheme.of(context).spaceScheme(context).scaledThreeExtraSmall, + color: OudsTheme.of( + context, + ).colorScheme(context).contentDefault, + strokeWidth: MediaQuery.textScalerOf(context).scale( + OudsTheme.of( + context, + ).spaceScheme(context).scaledThreeExtraSmall, + ), ), ), ), SizedBox(width: tagSizeModifier.getSizeColumnGap(widget.size)), Flexible( - child: - Text(widget.label, - textAlign: TextAlign.center, - style: tagStyleModifier.buildTagTextStyle( - appearance: widget.appearance, - state: widget._deprecatedStatus, - status: _effectiveStatus, - size: widget.size ?? OudsTagSize.defaultSize, - isLoading: widget.loading, - isEnabled: widget.enabled)), + child: Text( + widget.label, + textAlign: TextAlign.center, + style: tagStyleModifier.buildTagTextStyle( + appearance: widget.appearance, + state: widget._deprecatedStatus, + status: _effectiveStatus, + size: widget.size ?? OudsTagSize.defaultSize, + isLoading: widget.loading, + isEnabled: widget.enabled, + ), + ), ), ], ), ); } - Widget _buildTagTextAndIcon(BuildContext context, OudsTagStatusModifier tagStatusModifier, OudsTagSizeModifier tagSizeModifier, OudsTagStyleModifier tagStyleModifier) { + Widget _buildTagTextAndIcon( + BuildContext context, + OudsTagStatusModifier tagStatusModifier, + OudsTagSizeModifier tagSizeModifier, + OudsTagStyleModifier tagStyleModifier, + ) { final minWidthAndHeight = tagSizeModifier.getMinWidthAndHeight(widget.size); - final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize(widget.size); + final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize( + widget.size, + ); return Container( decoration: BoxDecoration( - borderRadius: OudsTagControlBorderModifier.getBorderRadius(context,widget.roundedCorners), - color: tagStatusModifier.getStatusColor(widget._deprecatedStatus,_effectiveStatus, widget.appearance, widget.enabled), + borderRadius: OudsTagControlBorderModifier.getBorderRadius( + context, + widget.roundedCorners, + ), + color: tagStatusModifier.getStatusColor( + widget._deprecatedStatus, + _effectiveStatus, + widget.appearance, + widget.enabled, + ), + ), + constraints: BoxConstraints( + minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, + minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0, ), - constraints: BoxConstraints(minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0), padding: tagSizeModifier.getPadding(widget.size, true), child: Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - padding: tagSizeModifier.getAssetsPadding(widget.size, OudsTagLayout.textAndIcon), - width: widthAndHeightAssetsContainer[OudsTagDimensions.width.name], - height: widthAndHeightAssetsContainer[OudsTagDimensions.height.name], - child: OudsTag.buildIcon( - context, widget.icon, widget._deprecatedStatus,_effectiveStatus, - widget.appearance, widget.enabled), - ), - SizedBox( - width: tagSizeModifier.getSizeColumnGap(widget.size), + padding: tagSizeModifier.getAssetsPadding( + widget.size, + OudsTagLayout.textAndIcon, + ), + width: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.width.name] ?? 00, + ), + height: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.height.name] ?? + 00, + ), + child: _buildIcon( + context, + widget.icon, + widget._deprecatedStatus, + _effectiveStatus, + widget.appearance, + widget.enabled, + ), ), + SizedBox(width: tagSizeModifier.getSizeColumnGap(widget.size)), Flexible( child: Text( widget.label, textAlign: TextAlign.center, style: tagStyleModifier.buildTagTextStyle( - appearance: widget.appearance, state: widget._deprecatedStatus, - status: _effectiveStatus, size: widget.size, isEnabled: widget.enabled), + appearance: widget.appearance, + state: widget._deprecatedStatus, + status: _effectiveStatus, + size: widget.size, + isEnabled: widget.enabled, + ), ), ), ], @@ -426,69 +545,119 @@ class _OudsTagState extends State { ); } - Widget _buildTagTextAndBullet(BuildContext context, OudsTagStatusModifier tagStatusModifier, OudsTagSizeModifier tagSizeModifier, OudsTagStyleModifier tagStyleModifier) { + Widget _buildTagTextAndBullet( + BuildContext context, + OudsTagStatusModifier tagStatusModifier, + OudsTagSizeModifier tagSizeModifier, + OudsTagStyleModifier tagStyleModifier, + ) { final tagToken = OudsTheme.of(context).componentsTokens(context).tag; final minWidthAndHeight = tagSizeModifier.getMinWidthAndHeight(widget.size); - final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize(widget.size); + final widthAndHeightAssetsContainer = tagSizeModifier.getAssetsSize( + widget.size, + ); return Container( decoration: BoxDecoration( - borderRadius: OudsTagControlBorderModifier.getBorderRadius(context,widget.roundedCorners), - color: tagStatusModifier.getStatusColor(widget._deprecatedStatus, _effectiveStatus, widget.appearance, widget.enabled), + borderRadius: OudsTagControlBorderModifier.getBorderRadius( + context, + widget.roundedCorners, + ), + color: tagStatusModifier.getStatusColor( + widget._deprecatedStatus, + _effectiveStatus, + widget.appearance, + widget.enabled, + ), + ), + constraints: BoxConstraints( + minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, + minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0, ), - constraints: BoxConstraints(minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0), padding: tagSizeModifier.getPadding(widget.size, true), child: Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - padding: tagSizeModifier.getAssetsPadding(widget.size, OudsTagLayout.textAndBullet), - width: widthAndHeightAssetsContainer[OudsTagDimensions.width.name], - height: widthAndHeightAssetsContainer[OudsTagDimensions.height.name], + padding: tagSizeModifier.getAssetsPadding( + widget.size, + OudsTagLayout.textAndBullet, + ), + width: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.width.name] ?? 0, + ), + height: MediaQuery.textScalerOf(context).scale( + widthAndHeightAssetsContainer[OudsTagDimensions.height.name] ?? 0, + ), child: Container( width: 10, height: 10, decoration: BoxDecoration( color: tagStatusModifier.getStatusIconColor( - widget._deprecatedStatus, _effectiveStatus, - widget.appearance, widget.enabled), + widget._deprecatedStatus, + _effectiveStatus, + widget.appearance, + widget.enabled, + ), shape: BoxShape.circle, ), ), ), SizedBox( - width: widget.size == OudsTagSize.small ? tagToken.spaceColumnGapSmall : tagToken.spaceColumnGapDefault, + width: widget.size == OudsTagSize.small + ? tagToken.spaceColumnGapSmall + : tagToken.spaceColumnGapDefault, ), Flexible( child: Text( - widget.label, textAlign: TextAlign.center, - style: tagStyleModifier.buildTagTextStyle( - appearance: widget.appearance, state: widget._deprecatedStatus, - status: _effectiveStatus, size: widget.size, - isEnabled: widget.enabled)), + widget.label, + textAlign: TextAlign.center, + style: tagStyleModifier.buildTagTextStyle( + appearance: widget.appearance, + state: widget._deprecatedStatus, + status: _effectiveStatus, + size: widget.size, + isEnabled: widget.enabled, + ), + ), ), ], ), ); } - Widget _buildTagTextOnly(BuildContext context, OudsTagStatusModifier tagStatusModifier, OudsTagSizeModifier tagSizeModifier, OudsTagStyleModifier tagStyleModifier) { + Widget _buildTagTextOnly( + BuildContext context, + OudsTagStatusModifier tagStatusModifier, + OudsTagSizeModifier tagSizeModifier, + OudsTagStyleModifier tagStyleModifier, + ) { final minWidthAndHeight = tagSizeModifier.getMinWidthAndHeight(widget.size); return Semantics( child: Stack( children: [ ClipRRect( - borderRadius: OudsTagControlBorderModifier.getBorderRadius(context,widget.roundedCorners), + borderRadius: OudsTagControlBorderModifier.getBorderRadius( + context, + widget.roundedCorners, + ), child: Container( - constraints: BoxConstraints(minHeight: minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, minWidth: minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0), - color: tagStatusModifier.getStatusColor(widget._deprecatedStatus, - _effectiveStatus, widget.appearance, widget.enabled), + constraints: BoxConstraints( + minHeight: + minWidthAndHeight[OudsTagDimensions.height.name] ?? 0.0, + minWidth: + minWidthAndHeight[OudsTagDimensions.width.name] ?? 0.0, + ), + color: tagStatusModifier.getStatusColor( + widget._deprecatedStatus, + _effectiveStatus, + widget.appearance, + widget.enabled, + ), padding: tagSizeModifier.getPadding(widget.size, false), child: Row( mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Flexible( @@ -496,8 +665,12 @@ class _OudsTagState extends State { widget.label, textAlign: TextAlign.center, style: tagStyleModifier.buildTagTextStyle( - appearance: widget.appearance, state: widget._deprecatedStatus, - status: _effectiveStatus, size: widget.size, isEnabled: widget.enabled), + appearance: widget.appearance, + state: widget._deprecatedStatus, + status: _effectiveStatus, + size: widget.size, + isEnabled: widget.enabled, + ), ), ), ], diff --git a/ouds_core/pubspec.yaml b/ouds_core/pubspec.yaml index 965b886e5..f89115b94 100644 --- a/ouds_core/pubspec.yaml +++ b/ouds_core/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_core -description: 'Contains the main elements of the OUDS Android library.' -version: 1.3.1 +description: 'Contains the main elements of the OUDS Flutter library.' repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -20,14 +20,14 @@ dependencies: # Flutter svg flutter_svg: ^2.2.3 # ouds_theme_contract - ouds_theme_contract: ^1.3.1 + ouds_theme_contract: ^2.0.0 # ouds_accessibility_plugin ouds_accessibility_plugin: ^0.2.0 # phone number handling dlibphonenumber: ^1.1.51 dev_dependencies: # dartdoc - dartdoc: ^8.3.4 + dartdoc: ^9.0.4 flutter_test: sdk: flutter flutter_lints: ^6.0.0 diff --git a/ouds_global_raw_tokens/CHANGELOG.md b/ouds_global_raw_tokens/CHANGELOG.md index db1167f29..6e35b8922 100644 --- a/ouds_global_raw_tokens/CHANGELOG.md +++ b/ouds_global_raw_tokens/CHANGELOG.md @@ -7,12 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 diff --git a/ouds_global_raw_tokens/README.md b/ouds_global_raw_tokens/README.md index 41feb73f1..d6e48be73 100644 --- a/ouds_global_raw_tokens/README.md +++ b/ouds_global_raw_tokens/README.md @@ -14,7 +14,7 @@ To use **Ouds Global Raw Tokens**, add it as a dependency in your `pubspec.yaml` ```yaml dependencies: - ouds_global_raw_tokens: ^1.3.1 + ouds_global_raw_tokens: ^2.0.0 ``` ## Additional information 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_global_raw_tokens/pubspec.yaml b/ouds_global_raw_tokens/pubspec.yaml index c81a0560b..e6340fe60 100644 --- a/ouds_global_raw_tokens/pubspec.yaml +++ b/ouds_global_raw_tokens/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_global_raw_tokens description: 'Raw tokens are basic design values (e.g., colors, typography) used to create a flexible and consistent theme' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 diff --git a/ouds_theme_contract/CHANGELOG.md b/ouds_theme_contract/CHANGELOG.md index e9ca22073..c1bf8577d 100644 --- a/ouds_theme_contract/CHANGELOG.md +++ b/ouds_theme_contract/CHANGELOG.md @@ -7,17 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) - [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/README.md b/ouds_theme_contract/README.md index 18726f2d1..b17b3fef0 100644 --- a/ouds_theme_contract/README.md +++ b/ouds_theme_contract/README.md @@ -14,7 +14,7 @@ To use **Ouds Theme Contract**, add it as a dependency in your `pubspec.yaml` fi ```yaml dependencies: - ouds_theme_contract: ^1.3.1 + ouds_theme_contract: ^2.0.0 ``` ## Package Structure diff --git a/ouds_theme_contract/lib/ouds_component_version.dart b/ouds_theme_contract/lib/ouds_component_version.dart index 5f6d0e61d..a789b2f99 100644 --- a/ouds_theme_contract/lib/ouds_component_version.dart +++ b/ouds_theme_contract/lib/ouds_component_version.dart @@ -13,23 +13,28 @@ // Generated by Tokenator class OudsComponentVersion { - static const alertMessage = '1.1.1'; - static const badge = '1.2.0'; - static const bar = '1.0.0'; - static const bottomSheet = '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.1'; + static const appBar = '1.0.0'; + static const badge = '1.2.0'; + static const badgeCount = '1.2.0'; + static const badgeIcon = '1.3.0'; + static const bottomSheet = '0.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 navigationBar = '1.0.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..f16bb4299 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.5.0'; + static const orangeCompactBrand = '2.5.0'; + static const soshCore = '1.4.0'; + static const soshBrand = '2.5.0'; + static const wireframeCore = '1.4.0'; + static const wireframeBrand = '2.5.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..e6b476f74 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. /// @@ -41,7 +38,10 @@ class OudsColorScheme { required OudsColorSemanticTokens colorTokens, }) { final themeMode = OudsTheme.modeOf(context); - final isDark = themeMode == ThemeMode.system ? WidgetsBinding.instance.platformDispatcher.platformBrightness == Brightness.dark : themeMode == ThemeMode.dark; + final isDark = themeMode == ThemeMode.system + ? WidgetsBinding.instance.platformDispatcher.platformBrightness == + Brightness.dark + : themeMode == ThemeMode.dark; return OudsColorScheme(colorTokens: colorTokens, isDarkTheme: isDark); } @@ -50,51 +50,93 @@ class OudsColorScheme { T lightDark(T light, T dark) => isDarkTheme ? dark : light; /// Color - Action - Color get actionDisabled => isDarkTheme ? colorTokens.actionColorTokens.actionDisabledDark : colorTokens.actionColorTokens.actionDisabledLight; + Color get actionDisabled => isDarkTheme + ? colorTokens.actionColorTokens.actionDisabledDark + : colorTokens.actionColorTokens.actionDisabledLight; - Color get actionEnabled => isDarkTheme ? colorTokens.actionColorTokens.actionEnabledDark : colorTokens.actionColorTokens.actionEnabledLight; + Color get actionEnabled => isDarkTheme + ? colorTokens.actionColorTokens.actionEnabledDark + : colorTokens.actionColorTokens.actionEnabledLight; - Color get actionFocus => isDarkTheme ? colorTokens.actionColorTokens.actionFocusDark : colorTokens.actionColorTokens.actionFocusLight; + Color get actionFocus => isDarkTheme + ? colorTokens.actionColorTokens.actionFocusDark + : colorTokens.actionColorTokens.actionFocusLight; - Color get actionHighlighted => isDarkTheme ? colorTokens.actionColorTokens.actionHighlightedDark : colorTokens.actionColorTokens.actionHighlightedLight; + Color get actionHighlighted => isDarkTheme + ? colorTokens.actionColorTokens.actionHighlightedDark + : colorTokens.actionColorTokens.actionHighlightedLight; - Color get actionHover => isDarkTheme ? colorTokens.actionColorTokens.actionHoverDark : colorTokens.actionColorTokens.actionHoverLight; + Color get actionHover => isDarkTheme + ? colorTokens.actionColorTokens.actionHoverDark + : colorTokens.actionColorTokens.actionHoverLight; - Color get actionLoading => isDarkTheme ? colorTokens.actionColorTokens.actionLoadingDark : colorTokens.actionColorTokens.actionLoadingLight; + Color get actionLoading => isDarkTheme + ? colorTokens.actionColorTokens.actionLoadingDark + : colorTokens.actionColorTokens.actionLoadingLight; - Color get actionNegativeEnabled => isDarkTheme ? colorTokens.actionColorTokens.actionNegativeEnabledDark : colorTokens.actionColorTokens.actionNegativeEnabledLight; + Color get actionNegativeEnabled => isDarkTheme + ? colorTokens.actionColorTokens.actionNegativeEnabledDark + : colorTokens.actionColorTokens.actionNegativeEnabledLight; - Color get actionNegativeFocus => isDarkTheme ? colorTokens.actionColorTokens.actionNegativeFocusDark : colorTokens.actionColorTokens.actionNegativeFocusLight; + Color get actionNegativeFocus => isDarkTheme + ? colorTokens.actionColorTokens.actionNegativeFocusDark + : colorTokens.actionColorTokens.actionNegativeFocusLight; - Color get actionNegativeHover => isDarkTheme ? colorTokens.actionColorTokens.actionNegativeHoverDark : colorTokens.actionColorTokens.actionNegativeHoverLight; + Color get actionNegativeHover => isDarkTheme + ? colorTokens.actionColorTokens.actionNegativeHoverDark + : colorTokens.actionColorTokens.actionNegativeHoverLight; - Color get actionNegativeLoading => isDarkTheme ? colorTokens.actionColorTokens.actionNegativeLoadingDark : colorTokens.actionColorTokens.actionNegativeLoadingLight; + Color get actionNegativeLoading => isDarkTheme + ? colorTokens.actionColorTokens.actionNegativeLoadingDark + : colorTokens.actionColorTokens.actionNegativeLoadingLight; - Color get actionNegativePressed => isDarkTheme ? colorTokens.actionColorTokens.actionNegativePressedDark : colorTokens.actionColorTokens.actionNegativePressedLight; + Color get actionNegativePressed => isDarkTheme + ? colorTokens.actionColorTokens.actionNegativePressedDark + : colorTokens.actionColorTokens.actionNegativePressedLight; - Color get actionPressed => isDarkTheme ? colorTokens.actionColorTokens.actionPressedDark : colorTokens.actionColorTokens.actionPressedLight; + 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 actionSelected => isDarkTheme ? colorTokens.actionColorTokens.actionSelectedDark : colorTokens.actionColorTokens.actionSelectedLight; + Color get actionSupportEnabled => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportEnabledDark + : colorTokens.actionColorTokens.actionSupportEnabledLight; - Color get actionSupportEnabled => isDarkTheme ? colorTokens.actionColorTokens.actionSupportEnabledDark : colorTokens.actionColorTokens.actionSupportEnabledLight; + Color get actionSupportDisabled => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportDisabledDark + : colorTokens.actionColorTokens.actionSupportDisabledLight; - Color get actionSupportDisabled => isDarkTheme ? colorTokens.actionColorTokens.actionSupportDisabledDark : colorTokens.actionColorTokens.actionSupportDisabledLight; + Color get actionSupportFocus => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportFocusDark + : colorTokens.actionColorTokens.actionSupportFocusLight; - Color get actionSupportFocus => isDarkTheme ? colorTokens.actionColorTokens.actionSupportFocusDark : colorTokens.actionColorTokens.actionSupportFocusLight; + Color get actionSupportHover => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportHoverDark + : colorTokens.actionColorTokens.actionSupportHoverLight; - Color get actionSupportHover => isDarkTheme ? colorTokens.actionColorTokens.actionSupportHoverDark : colorTokens.actionColorTokens.actionSupportHoverLight; + Color get actionSupportLoading => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportLoadingDark + : colorTokens.actionColorTokens.actionSupportLoadingLight; - Color get actionSupportLoading => isDarkTheme ? colorTokens.actionColorTokens.actionSupportLoadingDark : colorTokens.actionColorTokens.actionSupportLoadingLight; + Color get actionSupportPressed => isDarkTheme + ? colorTokens.actionColorTokens.actionSupportPressedDark + : colorTokens.actionColorTokens.actionSupportPressedLight; - Color get actionSupportPressed => isDarkTheme ? colorTokens.actionColorTokens.actionSupportPressedDark : colorTokens.actionColorTokens.actionSupportPressedLight; + Color get actionVisited => isDarkTheme + ? colorTokens.actionColorTokens.actionVisitedDark + : colorTokens.actionColorTokens.actionVisitedLight; - Color get actionVisited => isDarkTheme ? colorTokens.actionColorTokens.actionVisitedDark : colorTokens.actionColorTokens.actionVisitedLight; + Color get actionReadOnlyPrimary => isDarkTheme + ? colorTokens.actionColorTokens.actionReadOnlyPrimaryDark + : colorTokens.actionColorTokens.actionReadOnlyPrimaryLight; - Color get actionReadOnlyPrimary => isDarkTheme ? colorTokens.actionColorTokens.actionReadOnlyPrimaryDark : colorTokens.actionColorTokens.actionReadOnlyPrimaryLight; - - Color get actionReadOnlySecondary => isDarkTheme ? colorTokens.actionColorTokens.actionReadOnlySecondaryDark : colorTokens.actionColorTokens.actionReadOnlySecondaryLight; + Color get actionReadOnlySecondary => isDarkTheme + ? colorTokens.actionColorTokens.actionReadOnlySecondaryDark + : colorTokens.actionColorTokens.actionReadOnlySecondaryLight; /// Color - Always Color get alwaysBlack => colorTokens.alwaysColorTokens.alwaysBlack; @@ -107,315 +149,545 @@ class OudsColorScheme { /// Color - Background - Color get bgInverseHigh => isDarkTheme ? colorTokens.backgroundColorTokens.bgInverseHighDark : colorTokens.backgroundColorTokens.bgInverseHighLight; + Color get bgInverseHigh => isDarkTheme + ? colorTokens.backgroundColorTokens.bgInverseHighDark + : colorTokens.backgroundColorTokens.bgInverseHighLight; - Color get bgInverseLow => isDarkTheme ? colorTokens.backgroundColorTokens.bgInverseLowDark : colorTokens.backgroundColorTokens.bgInverseLowLight; + Color get bgInverseLow => isDarkTheme + ? colorTokens.backgroundColorTokens.bgInverseLowDark + : colorTokens.backgroundColorTokens.bgInverseLowLight; - Color get bgPrimary => isDarkTheme ? colorTokens.backgroundColorTokens.bgPrimaryDark : colorTokens.backgroundColorTokens.bgPrimaryLight; + Color get bgPrimary => isDarkTheme + ? colorTokens.backgroundColorTokens.bgPrimaryDark + : colorTokens.backgroundColorTokens.bgPrimaryLight; - Color get bgSecondary => isDarkTheme ? colorTokens.backgroundColorTokens.bgSecondaryDark : colorTokens.backgroundColorTokens.bgSecondaryLight; + Color get bgSecondary => isDarkTheme + ? colorTokens.backgroundColorTokens.bgSecondaryDark + : colorTokens.backgroundColorTokens.bgSecondaryLight; - Color get bgTertiary => isDarkTheme ? colorTokens.backgroundColorTokens.bgTertiaryDark : colorTokens.backgroundColorTokens.bgTertiaryLight; + Color get bgTertiary => isDarkTheme + ? colorTokens.backgroundColorTokens.bgTertiaryDark + : colorTokens.backgroundColorTokens.bgTertiaryLight; /// Color - Border - Color get borderBrandPrimary => isDarkTheme ? colorTokens.borderColorTokens.borderBrandPrimaryDark : colorTokens.borderColorTokens.borderBrandPrimaryLight; + Color get borderBrandPrimary => isDarkTheme + ? colorTokens.borderColorTokens.borderBrandPrimaryDark + : colorTokens.borderColorTokens.borderBrandPrimaryLight; - Color get borderBrandSecondary => isDarkTheme ? colorTokens.borderColorTokens.borderBrandSecondaryDark : colorTokens.borderColorTokens.borderBrandSecondaryLight; + Color get borderBrandSecondary => isDarkTheme + ? colorTokens.borderColorTokens.borderBrandSecondaryDark + : colorTokens.borderColorTokens.borderBrandSecondaryLight; - Color get borderBrandTertiary => isDarkTheme ? colorTokens.borderColorTokens.borderBrandTertiaryDark : colorTokens.borderColorTokens.borderBrandTertiaryLight; + Color get borderBrandTertiary => isDarkTheme + ? colorTokens.borderColorTokens.borderBrandTertiaryDark + : colorTokens.borderColorTokens.borderBrandTertiaryLight; - Color get borderDefault => isDarkTheme ? colorTokens.borderColorTokens.borderDefaultDark : colorTokens.borderColorTokens.borderDefaultLight; + Color get borderDefault => isDarkTheme + ? colorTokens.borderColorTokens.borderDefaultDark + : colorTokens.borderColorTokens.borderDefaultLight; - Color get borderEmphasized => isDarkTheme ? colorTokens.borderColorTokens.borderEmphasizedDark : colorTokens.borderColorTokens.borderEmphasizedLight; + Color get borderEmphasized => isDarkTheme + ? colorTokens.borderColorTokens.borderEmphasizedDark + : colorTokens.borderColorTokens.borderEmphasizedLight; - Color get borderFocus => isDarkTheme ? colorTokens.borderColorTokens.borderFocusDark : colorTokens.borderColorTokens.borderFocusLight; + Color get borderFocus => isDarkTheme + ? colorTokens.borderColorTokens.borderFocusDark + : colorTokens.borderColorTokens.borderFocusLight; - Color get borderFocusInset => isDarkTheme ? colorTokens.borderColorTokens.borderFocusInsetDark : colorTokens.borderColorTokens.borderFocusInsetLight; + Color get borderFocusInset => isDarkTheme + ? colorTokens.borderColorTokens.borderFocusInsetDark + : colorTokens.borderColorTokens.borderFocusInsetLight; - Color get borderMuted => isDarkTheme ? colorTokens.borderColorTokens.borderMutedDark : colorTokens.borderColorTokens.borderMutedLight; + Color get borderMuted => isDarkTheme + ? colorTokens.borderColorTokens.borderMutedDark + : colorTokens.borderColorTokens.borderMutedLight; - Color get borderOnBrandPrimary => isDarkTheme ? colorTokens.borderColorTokens.borderOnBrandPrimaryDark : colorTokens.borderColorTokens.borderOnBrandPrimaryLight; + Color get borderOnBrandPrimary => isDarkTheme + ? colorTokens.borderColorTokens.borderOnBrandPrimaryDark + : colorTokens.borderColorTokens.borderOnBrandPrimaryLight; - Color get borderOnBrandSecondary => isDarkTheme ? colorTokens.borderColorTokens.borderOnBrandSecondaryDark : colorTokens.borderColorTokens.borderOnBrandSecondaryLight; + Color get borderOnBrandSecondary => isDarkTheme + ? colorTokens.borderColorTokens.borderOnBrandSecondaryDark + : colorTokens.borderColorTokens.borderOnBrandSecondaryLight; - Color get borderOnBrandTertiary => isDarkTheme ? colorTokens.borderColorTokens.borderOnBrandTertiaryDark : colorTokens.borderColorTokens.borderOnBrandTertiaryLight; + Color get borderOnBrandTertiary => isDarkTheme + ? colorTokens.borderColorTokens.borderOnBrandTertiaryDark + : colorTokens.borderColorTokens.borderOnBrandTertiaryLight; - Color get borderMinimal => isDarkTheme ? colorTokens.borderColorTokens.borderMinimalDark : colorTokens.borderColorTokens.borderMinimalLight; + Color get borderMinimal => isDarkTheme + ? colorTokens.borderColorTokens.borderMinimalDark + : colorTokens.borderColorTokens.borderMinimalLight; - Color get borderStatusAccent => isDarkTheme ? colorTokens.borderColorTokens.borderStatusAccentDark : colorTokens.borderColorTokens.borderStatusAccentLight; + Color get borderStatusAccent => isDarkTheme + ? colorTokens.borderColorTokens.borderStatusAccentDark + : colorTokens.borderColorTokens.borderStatusAccentLight; - Color get borderStatusInfo => isDarkTheme ? colorTokens.borderColorTokens.borderStatusInfoDark : colorTokens.borderColorTokens.borderStatusInfoLight; + Color get borderStatusInfo => isDarkTheme + ? colorTokens.borderColorTokens.borderStatusInfoDark + : colorTokens.borderColorTokens.borderStatusInfoLight; - Color get borderStatusNegative => isDarkTheme ? colorTokens.borderColorTokens.borderStatusNegativeDark : colorTokens.borderColorTokens.borderStatusNegativeLight; + Color get borderStatusNegative => isDarkTheme + ? colorTokens.borderColorTokens.borderStatusNegativeDark + : colorTokens.borderColorTokens.borderStatusNegativeLight; - Color get borderStatusPositive => isDarkTheme ? colorTokens.borderColorTokens.borderStatusPositiveDark : colorTokens.borderColorTokens.borderStatusPositiveLight; + Color get borderStatusPositive => isDarkTheme + ? colorTokens.borderColorTokens.borderStatusPositiveDark + : colorTokens.borderColorTokens.borderStatusPositiveLight; - Color get borderStatusWarning => isDarkTheme ? colorTokens.borderColorTokens.borderStatusWarningDark : colorTokens.borderColorTokens.borderStatusWarningLight; + Color get borderStatusWarning => isDarkTheme + ? colorTokens.borderColorTokens.borderStatusWarningDark + : colorTokens.borderColorTokens.borderStatusWarningLight; /// Color - Content - Color get contentBrandPrimary => isDarkTheme ? colorTokens.contentColorTokens.contentBrandPrimaryDark : colorTokens.contentColorTokens.contentBrandPrimaryLight; + Color get contentBrandPrimary => isDarkTheme + ? colorTokens.contentColorTokens.contentBrandPrimaryDark + : colorTokens.contentColorTokens.contentBrandPrimaryLight; - Color get contentBrandSecondary => isDarkTheme ? colorTokens.contentColorTokens.contentBrandSecondaryDark : colorTokens.contentColorTokens.contentBrandSecondaryLight; + Color get contentBrandSecondary => isDarkTheme + ? colorTokens.contentColorTokens.contentBrandSecondaryDark + : colorTokens.contentColorTokens.contentBrandSecondaryLight; - Color get contentBrandTertiary => isDarkTheme ? colorTokens.contentColorTokens.contentBrandTertiaryDark : colorTokens.contentColorTokens.contentBrandTertiaryLight; + Color get contentBrandTertiary => isDarkTheme + ? colorTokens.contentColorTokens.contentBrandTertiaryDark + : colorTokens.contentColorTokens.contentBrandTertiaryLight; - Color get contentInverse => isDarkTheme ? colorTokens.contentColorTokens.contentInverseDark : colorTokens.contentColorTokens.contentInverseLight; + Color get contentInverse => isDarkTheme + ? colorTokens.contentColorTokens.contentInverseDark + : colorTokens.contentColorTokens.contentInverseLight; - Color get contentDefault => isDarkTheme ? colorTokens.contentColorTokens.contentDefaultDark : colorTokens.contentColorTokens.contentDefaultLight; + Color get contentDefault => isDarkTheme + ? colorTokens.contentColorTokens.contentDefaultDark + : colorTokens.contentColorTokens.contentDefaultLight; - Color get contentDisabled => isDarkTheme ? colorTokens.contentColorTokens.contentDisabledDark : colorTokens.contentColorTokens.contentDisabledLight; + Color get contentDisabled => isDarkTheme + ? colorTokens.contentColorTokens.contentDisabledDark + : colorTokens.contentColorTokens.contentDisabledLight; - Color get contentMuted => isDarkTheme ? colorTokens.contentColorTokens.contentMutedDark : colorTokens.contentColorTokens.contentMutedLight; + Color get contentMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentMutedDark + : colorTokens.contentColorTokens.contentMutedLight; - Color get contentOnActionDisabled => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionDisabledDark : colorTokens.contentColorTokens.contentOnActionDisabledLight; + Color get contentOnActionDisabled => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionDisabledDark + : colorTokens.contentColorTokens.contentOnActionDisabledLight; - Color get contentOnActionEnabled => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionEnabledDark : colorTokens.contentColorTokens.contentOnActionEnabledLight; + Color get contentOnActionEnabled => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionEnabledDark + : colorTokens.contentColorTokens.contentOnActionEnabledLight; - Color get contentOnActionFocus => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionFocusDark : colorTokens.contentColorTokens.contentOnActionFocusLight; + Color get contentOnActionFocus => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionFocusDark + : colorTokens.contentColorTokens.contentOnActionFocusLight; - Color get contentOnActionHighlighted => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionHighlightedDark : colorTokens.contentColorTokens.contentOnActionHighlightedLight; + Color get contentOnActionHighlighted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionHighlightedDark + : colorTokens.contentColorTokens.contentOnActionHighlightedLight; - Color get contentOnActionHover => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionHoverDark : colorTokens.contentColorTokens.contentOnActionHoverLight; + Color get contentOnActionHover => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionHoverDark + : colorTokens.contentColorTokens.contentOnActionHoverLight; - Color get contentOnActionLoading => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionLoadingDark : colorTokens.contentColorTokens.contentOnActionLoadingLight; + Color get contentOnActionLoading => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionLoadingDark + : colorTokens.contentColorTokens.contentOnActionLoadingLight; - Color get contentOnActionPressed => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionPressedDark : colorTokens.contentColorTokens.contentOnActionPressedLight; + Color get contentOnActionPressed => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionPressedDark + : colorTokens.contentColorTokens.contentOnActionPressedLight; - Color get contentOnActionSelected => isDarkTheme ? colorTokens.contentColorTokens.contentOnActionSelectedDark : colorTokens.contentColorTokens.contentOnActionSelectedLight; + Color get contentOnActionSelected => isDarkTheme + ? colorTokens.contentColorTokens.contentOnActionSelectedDark + : colorTokens.contentColorTokens.contentOnActionSelectedLight; - Color get contentOnBrandPrimary => isDarkTheme ? colorTokens.contentColorTokens.contentOnBrandPrimaryDark : colorTokens.contentColorTokens.contentOnBrandPrimaryLight; + Color get contentOnBrandPrimary => isDarkTheme + ? colorTokens.contentColorTokens.contentOnBrandPrimaryDark + : colorTokens.contentColorTokens.contentOnBrandPrimaryLight; - Color get contentOnBrandSecondary => isDarkTheme ? colorTokens.contentColorTokens.contentOnBrandSecondaryDark : colorTokens.contentColorTokens.contentOnBrandSecondaryLight; + Color get contentOnBrandSecondary => isDarkTheme + ? colorTokens.contentColorTokens.contentOnBrandSecondaryDark + : colorTokens.contentColorTokens.contentOnBrandSecondaryLight; - Color get contentOnBrandTertiary => isDarkTheme ? colorTokens.contentColorTokens.contentOnBrandTertiaryDark : colorTokens.contentColorTokens.contentOnBrandTertiaryLight; + Color get contentOnBrandTertiary => isDarkTheme + ? colorTokens.contentColorTokens.contentOnBrandTertiaryDark + : colorTokens.contentColorTokens.contentOnBrandTertiaryLight; - Color get contentOnStatusPositiveEmphasized => - isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusPositiveEmphasizedDark : colorTokens.contentColorTokens.contentOnStatusPositiveEmphasizedLight; + Color get contentOnStatusPositiveEmphasized => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusPositiveEmphasizedDark + : colorTokens.contentColorTokens.contentOnStatusPositiveEmphasizedLight; - Color get contentOnStatusPositiveMuted => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusPositiveMutedDark : colorTokens.contentColorTokens.contentOnStatusPositiveMutedLight; + Color get contentOnStatusPositiveMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusPositiveMutedDark + : colorTokens.contentColorTokens.contentOnStatusPositiveMutedLight; - Color get contentOnStatusWarningEmphasized => - isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusWarningEmphasizedDark : colorTokens.contentColorTokens.contentOnStatusWarningEmphasizedLight; + Color get contentOnStatusWarningEmphasized => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusWarningEmphasizedDark + : colorTokens.contentColorTokens.contentOnStatusWarningEmphasizedLight; - Color get contentOnStatusWarningMuted => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusWarningMutedDark : colorTokens.contentColorTokens.contentOnStatusWarningMutedLight; + Color get contentOnStatusWarningMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusWarningMutedDark + : colorTokens.contentColorTokens.contentOnStatusWarningMutedLight; - Color get contentOnStatusInfoEmphasized => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusInfoEmphasizedDark : colorTokens.contentColorTokens.contentOnStatusInfoEmphasizedLight; + Color get contentOnStatusInfoEmphasized => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusInfoEmphasizedDark + : colorTokens.contentColorTokens.contentOnStatusInfoEmphasizedLight; - Color get contentOnStatusInfoMuted => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusInfoMutedDark : colorTokens.contentColorTokens.contentOnStatusInfoMutedLight; + Color get contentOnStatusInfoMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusInfoMutedDark + : colorTokens.contentColorTokens.contentOnStatusInfoMutedLight; - Color get contentOnStatusNegativeEmphasized => - isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusNegativeEmphasizedDark : colorTokens.contentColorTokens.contentOnStatusNegativeEmphasizedLight; + Color get contentOnStatusNegativeEmphasized => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusNegativeEmphasizedDark + : colorTokens.contentColorTokens.contentOnStatusNegativeEmphasizedLight; - Color get contentOnStatusNegativeMuted => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusNegativeMutedDark : colorTokens.contentColorTokens.contentOnStatusNegativeMutedLight; + Color get contentOnStatusNegativeMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusNegativeMutedDark + : colorTokens.contentColorTokens.contentOnStatusNegativeMutedLight; - Color get contentOnStatusAccentEmphasized => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusAccentEmphasizedDark : colorTokens.contentColorTokens.contentOnStatusAccentEmphasizedLight; + Color get contentOnStatusAccentEmphasized => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusAccentEmphasizedDark + : colorTokens.contentColorTokens.contentOnStatusAccentEmphasizedLight; - Color get contentOnStatusAccentMuted => isDarkTheme ? colorTokens.contentColorTokens.contentOnStatusAccentMutedDark : colorTokens.contentColorTokens.contentOnStatusAccentMutedLight; + Color get contentOnStatusAccentMuted => isDarkTheme + ? colorTokens.contentColorTokens.contentOnStatusAccentMutedDark + : colorTokens.contentColorTokens.contentOnStatusAccentMutedLight; - Color get contentStatusAccent => isDarkTheme ? colorTokens.contentColorTokens.contentStatusAccentDark : colorTokens.contentColorTokens.contentStatusAccentLight; + Color get contentStatusAccent => isDarkTheme + ? colorTokens.contentColorTokens.contentStatusAccentDark + : colorTokens.contentColorTokens.contentStatusAccentLight; - Color get contentStatusInfo => isDarkTheme ? colorTokens.contentColorTokens.contentStatusInfoDark : colorTokens.contentColorTokens.contentStatusInfoLight; + Color get contentStatusInfo => isDarkTheme + ? colorTokens.contentColorTokens.contentStatusInfoDark + : colorTokens.contentColorTokens.contentStatusInfoLight; - Color get contentStatusNegative => isDarkTheme ? colorTokens.contentColorTokens.contentStatusNegativeDark : colorTokens.contentColorTokens.contentStatusNegativeLight; + Color get contentStatusNegative => isDarkTheme + ? colorTokens.contentColorTokens.contentStatusNegativeDark + : colorTokens.contentColorTokens.contentStatusNegativeLight; - Color get contentStatusPositive => isDarkTheme ? colorTokens.contentColorTokens.contentStatusPositiveDark : colorTokens.contentColorTokens.contentStatusPositiveLight; + Color get contentStatusPositive => isDarkTheme + ? colorTokens.contentColorTokens.contentStatusPositiveDark + : colorTokens.contentColorTokens.contentStatusPositiveLight; - Color get contentStatusWarning => isDarkTheme ? colorTokens.contentColorTokens.contentStatusWarningDark : colorTokens.contentColorTokens.contentStatusWarningLight; + Color get contentStatusWarning => isDarkTheme + ? colorTokens.contentColorTokens.contentStatusWarningDark + : colorTokens.contentColorTokens.contentStatusWarningLight; /// Color - Opacity - Color get opacityLowest => isDarkTheme ? colorTokens.opacityColorTokens.opacityLowestDark : colorTokens.opacityColorTokens.opacityLowestLight; + Color get opacityLowest => isDarkTheme + ? colorTokens.opacityColorTokens.opacityLowestDark + : colorTokens.opacityColorTokens.opacityLowestLight; - Color get opacityLower => isDarkTheme ? colorTokens.opacityColorTokens.opacityLowerDark : colorTokens.opacityColorTokens.opacityLowerLight; + Color get opacityLower => isDarkTheme + ? colorTokens.opacityColorTokens.opacityLowerDark + : colorTokens.opacityColorTokens.opacityLowerLight; - Color get opacityTransparent => isDarkTheme ? colorTokens.opacityColorTokens.opacityTransparentDark : colorTokens.opacityColorTokens.opacityTransparentLight; + Color get opacityTransparent => isDarkTheme + ? colorTokens.opacityColorTokens.opacityTransparentDark + : colorTokens.opacityColorTokens.opacityTransparentLight; /// Color - Overlay - Color get overlayDropdown => isDarkTheme ? colorTokens.overlayColorTokens.overlayDropdownDark : colorTokens.overlayColorTokens.overlayDropdownLight; + Color get overlayDropdown => isDarkTheme + ? colorTokens.overlayColorTokens.overlayDropdownDark + : colorTokens.overlayColorTokens.overlayDropdownLight; - Color get overlayTooltip => isDarkTheme ? colorTokens.overlayColorTokens.overlayTooltipDark : colorTokens.overlayColorTokens.overlayTooltipLight; + Color get overlayTooltip => isDarkTheme + ? colorTokens.overlayColorTokens.overlayTooltipDark + : colorTokens.overlayColorTokens.overlayTooltipLight; - Color get overlayDrag => isDarkTheme ? colorTokens.overlayColorTokens.overlayDragDark : colorTokens.overlayColorTokens.overlayDragLight; + 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 - Color get repositoryAccentMedium => colorTokens.repositoryColorTokens.repositoryAccentMedium; + Color get repositoryAccentMedium => + colorTokens.repositoryColorTokens.repositoryAccentMedium; + + Color get repositoryAccentHighest => + colorTokens.repositoryColorTokens.repositoryAccentHighest; - Color get repositoryAccentHighest => colorTokens.repositoryColorTokens.repositoryAccentHighest; + Color get repositoryAccentLow => + colorTokens.repositoryColorTokens.repositoryAccentLow; - Color get repositoryAccentLow => colorTokens.repositoryColorTokens.repositoryAccentLow; + Color get repositoryAccentLowest => + colorTokens.repositoryColorTokens.repositoryAccentLowest; - Color get repositoryAccentLowest => colorTokens.repositoryColorTokens.repositoryAccentLowest; + Color get repositoryInfoMedium => + colorTokens.repositoryColorTokens.repositoryInfoMedium; - Color get repositoryInfoMedium => colorTokens.repositoryColorTokens.repositoryInfoMedium; + Color get repositoryInfoHigh => + colorTokens.repositoryColorTokens.repositoryInfoHigh; - Color get repositoryInfoHigh => colorTokens.repositoryColorTokens.repositoryInfoHigh; + Color get repositoryInfoHighest => + colorTokens.repositoryColorTokens.repositoryInfoHighest; - Color get repositoryInfoHighest => colorTokens.repositoryColorTokens.repositoryInfoHighest; + Color get repositoryInfoLow => + colorTokens.repositoryColorTokens.repositoryInfoLow; - Color get repositoryInfoLow => colorTokens.repositoryColorTokens.repositoryInfoLow; + Color get repositoryInfoLowest => + colorTokens.repositoryColorTokens.repositoryInfoLowest; - Color get repositoryInfoLowest => colorTokens.repositoryColorTokens.repositoryInfoLowest; + Color get repositoryNegativeMedium => + colorTokens.repositoryColorTokens.repositoryNegativeMedium; - Color get repositoryNegativeMedium => colorTokens.repositoryColorTokens.repositoryNegativeMedium; + Color get repositoryNegativeHigh => + colorTokens.repositoryColorTokens.repositoryNegativeHigh; - Color get repositoryNegativeHigh => colorTokens.repositoryColorTokens.repositoryNegativeHigh; + Color get repositoryNegativeHigher => + colorTokens.repositoryColorTokens.repositoryNegativeHigher; - Color get repositoryNegativeHigher => colorTokens.repositoryColorTokens.repositoryNegativeHigher; + Color get repositoryNegativeHighest => + colorTokens.repositoryColorTokens.repositoryNegativeHighest; - Color get repositoryNegativeHighest => colorTokens.repositoryColorTokens.repositoryNegativeHighest; + Color get repositoryNegativeLow => + colorTokens.repositoryColorTokens.repositoryNegativeLow; - Color get repositoryNegativeLow => colorTokens.repositoryColorTokens.repositoryNegativeLow; + Color get repositoryNegativeLower => + colorTokens.repositoryColorTokens.repositoryNegativeLower; - Color get repositoryNegativeLower => colorTokens.repositoryColorTokens.repositoryNegativeLower; + Color get repositoryNegativeLowest => + colorTokens.repositoryColorTokens.repositoryNegativeLowest; - Color get repositoryNegativeLowest => colorTokens.repositoryColorTokens.repositoryNegativeLowest; + Color get repositoryNeutralEmphasizedBlack => + colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedBlack; - Color get repositoryNeutralEmphasizedBlack => colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedBlack; + Color get repositoryNeutralEmphasizedHigh => + colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHigh; - Color get repositoryNeutralEmphasizedHigh => colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHigh; + Color get repositoryNeutralEmphasizedHigher => + colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHigher; - Color get repositoryNeutralEmphasizedHigher => colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHigher; + Color get repositoryNeutralEmphasizedHighest => + colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHighest; - Color get repositoryNeutralEmphasizedHighest => colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedHighest; + Color get repositoryNeutralEmphasizedMedium => + colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedMedium; - Color get repositoryNeutralEmphasizedMedium => colorTokens.repositoryColorTokens.repositoryNeutralEmphasizedMedium; + Color get repositoryNeutralMutedLower => + colorTokens.repositoryColorTokens.repositoryNeutralMutedLower; - Color get repositoryNeutralMutedLower => colorTokens.repositoryColorTokens.repositoryNeutralMutedLower; + Color get repositoryNeutralMutedLowest => + colorTokens.repositoryColorTokens.repositoryNeutralMutedLowest; - Color get repositoryNeutralMutedLowest => colorTokens.repositoryColorTokens.repositoryNeutralMutedLowest; + Color get repositoryNeutralMutedWhite => + colorTokens.repositoryColorTokens.repositoryNeutralMutedWhite; - Color get repositoryNeutralMutedWhite => colorTokens.repositoryColorTokens.repositoryNeutralMutedWhite; + Color get repositoryOpacityBlackHigh => + colorTokens.repositoryColorTokens.repositoryOpacityBlackHigh; - Color get repositoryOpacityBlackHigh => colorTokens.repositoryColorTokens.repositoryOpacityBlackHigh; + Color get repositoryOpacityBlackHigher => + colorTokens.repositoryColorTokens.repositoryOpacityBlackHigher; - Color get repositoryOpacityBlackHigher => colorTokens.repositoryColorTokens.repositoryOpacityBlackHigher; + Color get repositoryOpacityBlackHighest => + colorTokens.repositoryColorTokens.repositoryOpacityBlackHighest; - Color get repositoryOpacityBlackHighest => colorTokens.repositoryColorTokens.repositoryOpacityBlackHighest; + Color get repositoryOpacityBlackLow => + colorTokens.repositoryColorTokens.repositoryOpacityBlackLow; - Color get repositoryOpacityBlackLow => colorTokens.repositoryColorTokens.repositoryOpacityBlackLow; + Color get repositoryOpacityBlackLower => + colorTokens.repositoryColorTokens.repositoryOpacityBlackLower; - Color get repositoryOpacityBlackLower => colorTokens.repositoryColorTokens.repositoryOpacityBlackLower; + Color get repositoryOpacityBlackLowest => + colorTokens.repositoryColorTokens.repositoryOpacityBlackLowest; - Color get repositoryOpacityBlackLowest => colorTokens.repositoryColorTokens.repositoryOpacityBlackLowest; + Color get repositoryOpacityBlackMedium => + colorTokens.repositoryColorTokens.repositoryOpacityBlackMedium; - Color get repositoryOpacityBlackMedium => colorTokens.repositoryColorTokens.repositoryOpacityBlackMedium; + Color get repositoryOpacityBlackMediumLow => + colorTokens.repositoryColorTokens.repositoryOpacityBlackMediumLow; - Color get repositoryOpacityBlackMediumLow => colorTokens.repositoryColorTokens.repositoryOpacityBlackMediumLow; + Color get repositoryOpacityBlackMediumHigh => + colorTokens.repositoryColorTokens.repositoryOpacityBlackMediumHigh; - Color get repositoryOpacityBlackMediumHigh => colorTokens.repositoryColorTokens.repositoryOpacityBlackMediumHigh; + Color get repositoryOpacityBlackTransparent => + colorTokens.repositoryColorTokens.repositoryOpacityBlackTransparent; - Color get repositoryOpacityBlackTransparent => colorTokens.repositoryColorTokens.repositoryOpacityBlackTransparent; + Color get repositoryOpacityWhiteHigh => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteHigh; - Color get repositoryOpacityWhiteHigh => colorTokens.repositoryColorTokens.repositoryOpacityWhiteHigh; + Color get repositoryOpacityWhiteHigher => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteHigher; - Color get repositoryOpacityWhiteHigher => colorTokens.repositoryColorTokens.repositoryOpacityWhiteHigher; + Color get repositoryOpacityWhiteHighest => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteHighest; - Color get repositoryOpacityWhiteHighest => colorTokens.repositoryColorTokens.repositoryOpacityWhiteHighest; + Color get repositoryOpacityWhiteMedium => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteMedium; - Color get repositoryOpacityWhiteMedium => colorTokens.repositoryColorTokens.repositoryOpacityWhiteMedium; + Color get repositoryOpacityWhiteMediumLow => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteMediumLow; - Color get repositoryOpacityWhiteMediumLow => colorTokens.repositoryColorTokens.repositoryOpacityWhiteMediumLow; + Color get repositoryOpacityWhiteLow => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteLow; - Color get repositoryOpacityWhiteLow => colorTokens.repositoryColorTokens.repositoryOpacityWhiteLow; + Color get repositoryOpacityWhiteLower => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteLower; - Color get repositoryOpacityWhiteLower => colorTokens.repositoryColorTokens.repositoryOpacityWhiteLower; + Color get repositoryOpacityWhiteLowest => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteLowest; - Color get repositoryOpacityWhiteLowest => colorTokens.repositoryColorTokens.repositoryOpacityWhiteLowest; + Color get repositoryOpacityWhiteTransparent => + colorTokens.repositoryColorTokens.repositoryOpacityWhiteTransparent; - Color get repositoryOpacityWhiteTransparent => colorTokens.repositoryColorTokens.repositoryOpacityWhiteTransparent; + Color get repositoryOpacityPrimaryHigh => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryHigh; - Color get repositoryOpacityPrimaryHigh => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryHigh; + Color get repositoryOpacityPrimaryHigher => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryHigher; - Color get repositoryOpacityPrimaryHigher => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryHigher; + Color get repositoryOpacityPrimaryLowest => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLowest; - Color get repositoryOpacityPrimaryLowest => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLowest; + Color get repositoryOpacityPrimaryLower => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLower; - Color get repositoryOpacityPrimaryLower => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLower; + Color get repositoryOpacityPrimaryLow => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLow; - Color get repositoryOpacityPrimaryLow => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryLow; + Color get repositoryOpacityPrimaryMedium => + colorTokens.repositoryColorTokens.repositoryOpacityPrimaryMedium; - Color get repositoryOpacityPrimaryMedium => colorTokens.repositoryColorTokens.repositoryOpacityPrimaryMedium; + Color get repositoryPositiveMedium => + colorTokens.repositoryColorTokens.repositoryPositiveMedium; - Color get repositoryPositiveMedium => colorTokens.repositoryColorTokens.repositoryPositiveMedium; + Color get repositoryPositiveHigh => + colorTokens.repositoryColorTokens.repositoryPositiveHigh; - Color get repositoryPositiveHigh => colorTokens.repositoryColorTokens.repositoryPositiveHigh; + Color get repositoryPositiveHigher => + colorTokens.repositoryColorTokens.repositoryPositiveHigher; - Color get repositoryPositiveHigher => colorTokens.repositoryColorTokens.repositoryPositiveHigher; + Color get repositoryPositiveHighest => + colorTokens.repositoryColorTokens.repositoryPositiveHighest; - Color get repositoryPositiveHighest => colorTokens.repositoryColorTokens.repositoryPositiveHighest; + Color get repositoryPositiveLow => + colorTokens.repositoryColorTokens.repositoryPositiveLow; - Color get repositoryPositiveLow => colorTokens.repositoryColorTokens.repositoryPositiveLow; + Color get repositoryPositiveLowest => + colorTokens.repositoryColorTokens.repositoryPositiveLowest; - Color get repositoryPositiveLowest => colorTokens.repositoryColorTokens.repositoryPositiveLowest; + Color get repositoryPrimaryMedium => + colorTokens.repositoryColorTokens.repositoryPrimaryMedium; - Color get repositoryPrimaryMedium => colorTokens.repositoryColorTokens.repositoryPrimaryMedium; + Color get repositoryPrimaryLow => + colorTokens.repositoryColorTokens.repositoryPrimaryLow; - Color get repositoryPrimaryLow => colorTokens.repositoryColorTokens.repositoryPrimaryLow; + Color get repositoryPrimaryLower => + colorTokens.repositoryColorTokens.repositoryPrimaryLower; - Color get repositoryPrimaryLower => colorTokens.repositoryColorTokens.repositoryPrimaryLower; + Color get repositoryPrimaryHigh => + colorTokens.repositoryColorTokens.repositoryPrimaryHigh; - Color get repositoryPrimaryHigh => colorTokens.repositoryColorTokens.repositoryPrimaryHigh; + Color get repositorySecondaryLow => + colorTokens.repositoryColorTokens.repositorySecondaryLow; - Color get repositorySecondaryLow => colorTokens.repositoryColorTokens.repositorySecondaryLow; + Color get repositorySecondaryLower => + colorTokens.repositoryColorTokens.repositorySecondaryLower; - Color get repositorySecondaryLower => colorTokens.repositoryColorTokens.repositorySecondaryLower; + Color get repositorySecondaryLowest => + colorTokens.repositoryColorTokens.repositorySecondaryLowest; - Color get repositorySecondaryLowest => colorTokens.repositoryColorTokens.repositorySecondaryLowest; + Color get repositorySecondaryHigh => + colorTokens.repositoryColorTokens.repositorySecondaryHigh; - Color get repositorySecondaryHigh => colorTokens.repositoryColorTokens.repositorySecondaryHigh; + Color get repositorySecondaryHigherHigh => + colorTokens.repositoryColorTokens.repositorySecondaryHigherHigh; - Color get repositorySecondaryHigher => colorTokens.repositoryColorTokens.repositorySecondaryHigher; + Color get repositorySecondaryHigherLow => + colorTokens.repositoryColorTokens.repositorySecondaryHigherLow; - Color get repositorySecondaryMedium => colorTokens.repositoryColorTokens.repositorySecondaryMedium; + Color get repositorySecondaryMedium => + colorTokens.repositoryColorTokens.repositorySecondaryMedium; - Color get repositoryWarningMedium => colorTokens.repositoryColorTokens.repositoryWarningMedium; + Color get repositoryWarningMedium => + colorTokens.repositoryColorTokens.repositoryWarningMedium; - Color get repositoryWarningHigh => colorTokens.repositoryColorTokens.repositoryWarningHigh; + Color get repositoryWarningHigh => + colorTokens.repositoryColorTokens.repositoryWarningHigh; - Color get repositoryWarningHighest => colorTokens.repositoryColorTokens.repositoryWarningHighest; + Color get repositoryWarningHighest => + colorTokens.repositoryColorTokens.repositoryWarningHighest; - Color get repositoryWarningLow => colorTokens.repositoryColorTokens.repositoryWarningLow; + Color get repositoryWarningLow => + colorTokens.repositoryColorTokens.repositoryWarningLow; - Color get repositoryWarningLowest => colorTokens.repositoryColorTokens.repositoryWarningLowest; + Color get repositoryWarningLowest => + colorTokens.repositoryColorTokens.repositoryWarningLowest; /// Color - Surface - Color get surfaceBrandPrimary => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceBrandPrimaryDark : colorTokens.surfaceColorTokens.surfaceBrandPrimaryLight; + Color get surfaceBrandPrimary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceBrandPrimaryDark + : colorTokens.surfaceColorTokens.surfaceBrandPrimaryLight; - Color get surfaceBrandSecondary => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceBrandSecondaryDark : colorTokens.surfaceColorTokens.surfaceBrandSecondaryLight; + Color get surfaceBrandSecondary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceBrandSecondaryDark + : colorTokens.surfaceColorTokens.surfaceBrandSecondaryLight; - Color get surfaceBrandTertiary => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceBrandTertiaryDark : colorTokens.surfaceColorTokens.surfaceBrandTertiaryLight; + Color get surfaceBrandTertiary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceBrandTertiaryDark + : colorTokens.surfaceColorTokens.surfaceBrandTertiaryLight; - Color get surfaceInverseHigh => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceInverseHighDark : colorTokens.surfaceColorTokens.surfaceInverseHighLight; + Color get surfaceInverseHigh => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceInverseHighDark + : colorTokens.surfaceColorTokens.surfaceInverseHighLight; - Color get surfaceInverseLow => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceInverseLowDark : colorTokens.surfaceColorTokens.surfaceInverseLowLight; + Color get surfaceInverseLow => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceInverseLowDark + : colorTokens.surfaceColorTokens.surfaceInverseLowLight; - Color get surfacePrimary => isDarkTheme ? colorTokens.surfaceColorTokens.surfacePrimaryDark : colorTokens.surfaceColorTokens.surfacePrimaryLight; + Color get surfacePrimary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfacePrimaryDark + : colorTokens.surfaceColorTokens.surfacePrimaryLight; - Color get surfaceSecondary => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceSecondaryDark : colorTokens.surfaceColorTokens.surfaceSecondaryLight; + Color get surfaceSecondary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceSecondaryDark + : colorTokens.surfaceColorTokens.surfaceSecondaryLight; - Color get surfaceTertiary => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceTertiaryDark : colorTokens.surfaceColorTokens.surfaceTertiaryLight; + Color get surfaceTertiary => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceTertiaryDark + : colorTokens.surfaceColorTokens.surfaceTertiaryLight; - Color get surfaceStatusAccentEmphasized => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusAccentEmphasizedDark : colorTokens.surfaceColorTokens.surfaceStatusAccentEmphasizedLight; + Color get surfaceStatusAccentEmphasized => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusAccentEmphasizedDark + : colorTokens.surfaceColorTokens.surfaceStatusAccentEmphasizedLight; - Color get surfaceStatusAccentMuted => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusAccentMutedDark : colorTokens.surfaceColorTokens.surfaceStatusAccentMutedLight; + Color get surfaceStatusAccentMuted => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusAccentMutedDark + : colorTokens.surfaceColorTokens.surfaceStatusAccentMutedLight; - Color get surfaceStatusInfoEmphasized => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusInfoEmphasizedDark : colorTokens.surfaceColorTokens.surfaceStatusInfoEmphasizedLight; + Color get surfaceStatusInfoEmphasized => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusInfoEmphasizedDark + : colorTokens.surfaceColorTokens.surfaceStatusInfoEmphasizedLight; - Color get surfaceStatusInfoMuted => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusInfoMutedDark : colorTokens.surfaceColorTokens.surfaceStatusInfoMutedLight; + Color get surfaceStatusInfoMuted => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusInfoMutedDark + : colorTokens.surfaceColorTokens.surfaceStatusInfoMutedLight; - Color get surfaceStatusNegativeEmphasized => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusNegativeEmphasizedDark : colorTokens.surfaceColorTokens.surfaceStatusNegativeEmphasizedLight; + Color get surfaceStatusNegativeEmphasized => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusNegativeEmphasizedDark + : colorTokens.surfaceColorTokens.surfaceStatusNegativeEmphasizedLight; - Color get surfaceStatusNegativeMuted => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusNegativeMutedDark : colorTokens.surfaceColorTokens.surfaceStatusNegativeMutedLight; + Color get surfaceStatusNegativeMuted => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusNegativeMutedDark + : colorTokens.surfaceColorTokens.surfaceStatusNegativeMutedLight; - Color get surfaceStatusPositiveEmphasized => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusPositiveEmphasizedDark : colorTokens.surfaceColorTokens.surfaceStatusPositiveEmphasizedLight; + Color get surfaceStatusPositiveEmphasized => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusPositiveEmphasizedDark + : colorTokens.surfaceColorTokens.surfaceStatusPositiveEmphasizedLight; - Color get surfaceStatusPositiveMuted => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusPositiveMutedDark : colorTokens.surfaceColorTokens.surfaceStatusPositiveMutedLight; + Color get surfaceStatusPositiveMuted => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusPositiveMutedDark + : colorTokens.surfaceColorTokens.surfaceStatusPositiveMutedLight; - Color get surfaceStatusWarningEmphasized => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusWarningEmphasizedDark : colorTokens.surfaceColorTokens.surfaceStatusWarningEmphasizedLight; + Color get surfaceStatusWarningEmphasized => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusWarningEmphasizedDark + : colorTokens.surfaceColorTokens.surfaceStatusWarningEmphasizedLight; - Color get surfaceStatusWarningMuted => isDarkTheme ? colorTokens.surfaceColorTokens.surfaceStatusWarningMutedDark : colorTokens.surfaceColorTokens.surfaceStatusWarningMutedLight; + Color get surfaceStatusWarningMuted => isDarkTheme + ? colorTokens.surfaceColorTokens.surfaceStatusWarningMutedDark + : colorTokens.surfaceColorTokens.surfaceStatusWarningMutedLight; } 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 c7addcd32..b9d87ac2c 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 @@ -199,107 +199,96 @@ class OudsSizeScheme { tablet: sizeTokens.iconWithHeadingXlargeSizeLargeTablet, ); - /// MaxWidthTypeDisplay - double get maxWidthTypeDisplaySmall => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplaySmallMobile, - tablet: sizeTokens.maxWidthTypeDisplaySmallTablet, - ); + /// MaxWidthDisplay + double get maxWidthDisplaySmall => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthDisplaySmallMobile, + tablet: sizeTokens.maxWidthDisplaySmallTablet, + ); - double get maxWidthTypeDisplayMedium => + double get maxWidthDisplayMedium => OudsWindowSizeClassUtil.selectMobileTablet( sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplayMediumMobile, - tablet: sizeTokens.maxWidthTypeDisplayMediumTablet, + mobile: sizeTokens.maxWidthDisplayMediumMobile, + tablet: sizeTokens.maxWidthDisplayMediumTablet, ); - double get maxWidthTypeDisplayLarge => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeDisplayLargeMobile, - tablet: sizeTokens.maxWidthTypeDisplayLargeTablet, - ); + double get maxWidthDisplayLarge => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthDisplayLargeMobile, + tablet: sizeTokens.maxWidthDisplayLargeTablet, + ); - /// MaxWidthTypeHeading - double get maxWidthTypeHeadingSmall => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingSmallMobile, - tablet: sizeTokens.maxWidthTypeHeadingSmallTablet, - ); + /// MaxWidthHeading + double get maxWidthHeadingSmall => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthHeadingSmallMobile, + tablet: sizeTokens.maxWidthHeadingSmallTablet, + ); - double get maxWidthTypeHeadingMedium => + double get maxWidthHeadingMedium => OudsWindowSizeClassUtil.selectMobileTablet( sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingMediumMobile, - tablet: sizeTokens.maxWidthTypeHeadingMediumTablet, + mobile: sizeTokens.maxWidthHeadingMediumMobile, + tablet: sizeTokens.maxWidthHeadingMediumTablet, ); - double get maxWidthTypeHeadingLarge => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingLargeMobile, - tablet: sizeTokens.maxWidthTypeHeadingLargeTablet, - ); + double get maxWidthHeadingLarge => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthHeadingLargeMobile, + tablet: sizeTokens.maxWidthHeadingLargeTablet, + ); - double get maxWidthTypeHeadingExtraLarge => + double get maxWidthHeadingExtraLarge => OudsWindowSizeClassUtil.selectMobileTablet( sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeHeadingXlargeMobile, - tablet: sizeTokens.maxWidthTypeHeadingXlargeTablet, + mobile: sizeTokens.maxWidthHeadingXlargeMobile, + tablet: sizeTokens.maxWidthHeadingXlargeTablet, ); - /// MaxWidthTypeBody - double get maxWidthTypeBodySmall => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodySmallMobile, - tablet: sizeTokens.maxWidthTypeBodySmallTablet, - ); + /// MaxWidthBody + double get maxWidthBodySmall => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthBodySmallMobile, + tablet: sizeTokens.maxWidthBodySmallTablet, + ); - double get maxWidthTypeBodyMedium => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodyMediumMobile, - tablet: sizeTokens.maxWidthTypeBodyMediumTablet, - ); + double get maxWidthBodyMedium => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthBodyMediumMobile, + tablet: sizeTokens.maxWidthBodyMediumTablet, + ); - double get maxWidthTypeBodyLarge => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeBodyLargeMobile, - tablet: sizeTokens.maxWidthTypeBodyLargeTablet, - ); + double get maxWidthBodyLarge => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthBodyLargeMobile, + tablet: sizeTokens.maxWidthBodyLargeTablet, + ); - /// MaxWidthTypeLabel - double get maxWidthTypeLabelSmall => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeLabelSmallMobile, - tablet: sizeTokens.maxWidthTypeLabelSmallTablet, - ); + /// MaxWidthLabel + double get maxWidthLabelSmall => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthLabelSmallMobile, + tablet: sizeTokens.maxWidthLabelSmallTablet, + ); - double get maxWidthTypeLabelMedium => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeLabelMediumMobile, - tablet: sizeTokens.maxWidthTypeLabelMediumTablet, - ); + double get maxWidthLabelMedium => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthLabelMediumMobile, + tablet: sizeTokens.maxWidthLabelMediumTablet, + ); - double get maxWidthTypeLabelLarge => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeLabelLargeMobile, - tablet: sizeTokens.maxWidthTypeLabelLargeTablet, - ); + double get maxWidthLabelLarge => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthLabelLargeMobile, + tablet: sizeTokens.maxWidthLabelLargeTablet, + ); - double get maxWidthTypeLabelXlarge => - OudsWindowSizeClassUtil.selectMobileTablet( - sizeClass: sizeClass, - mobile: sizeTokens.maxWidthTypeLabelXlargeMobile, - tablet: sizeTokens.maxWidthTypeLabelXlargeTablet, - ); + double get maxWidthLabelXLarge => OudsWindowSizeClassUtil.selectMobileTablet( + sizeClass: sizeClass, + mobile: sizeTokens.maxWidthLabelXlargeMobile, + tablet: sizeTokens.maxWidthLabelXlargeTablet, + ); /// 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..0522469e8 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.5.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..b0de74ab3 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.5.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..ca34f9e85 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.5.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..ff62fdb16 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.5.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..d8f7eecc3 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.5.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..9f164f936 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.5.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..56cb487b3 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.5.0 // Generated by Tokenator abstract class OudsCheckboxTokens { @@ -23,6 +23,9 @@ abstract class OudsCheckboxTokens { late double borderWidthUnselectedFocus; late double borderWidthUnselectedHover; late double borderWidthUnselectedPressed; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double sizeIndicator; late double sizeMaxHeight; late double sizeMinHeight; 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..027b2a51b 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.5.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..f9f1e296e 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,106 @@ // Software description: Flutter library of reusable graphical components // -// Orange brand tokens version 2.3.0 +// Orange brand tokens version 2.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; abstract class OudsControlItemTokens { - late double borderRadius; + late double borderRadiusCurrentIndicator; + late double borderRadiusDefault; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double borderRadiusItemOnly; + 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; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late Color colorBgFocus; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late Color colorBgHover; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late Color colorBgLoading; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late Color colorBgPressed; + late Color colorContentCurrentDisabled; + late Color colorContentCurrentEnabled; + late Color colorContentCurrentFocus; + late Color colorContentCurrentHover; + late Color colorContentCurrentPressed; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late Color colorContentLoader; + 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; + + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double sizeErrorIcon; + late double sizeFlagHeight; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double sizeIcon; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double sizeLoader; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double sizeMaxHeightAssetsContainer; late double sizeMaxWidth; - late double sizeMinHeight; + late double sizeMinHeightCompact; + late double sizeMinHeightDefault; late double sizeMinWidth; late double spaceColumnGap; + late double spacePaddingBlockBottomSlot; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) late double spacePaddingBlockDefault; - late double spacePaddingBlockTopErrorText; + 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; + @Deprecated( + "This token is deprecated and will be removed in a future version.", + ) 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..7a65c6e24 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.5.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..55b1fc773 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.5.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..3a1cd6332 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.5.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..b19e73239 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.5.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..eee238dfd 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.5.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..995bd4e3e 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.5.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..6b5bb322c 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.5.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..a82345cf4 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.5.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..45033e609 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.5.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..5ce8d0cad 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.5.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..8126bb5e8 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.5.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..d79b7ab0b 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.5.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..2a616bc67 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.5.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..a8113000a 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.5.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..256e64286 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.5.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..7d575eb0b 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.5.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..416ebe4f8 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart deleted file mode 100644 index a882ff5bb..000000000 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart +++ /dev/null @@ -1,116 +0,0 @@ -// -// Software Name: OUDS Flutter -// SPDX-FileCopyrightText: Copyright (c) Orange SA -// SPDX-License-Identifier: MIT -// -// This software is distributed under the MIT license, -// the text of which is available at https://opensource.org/license/MIT/ -// or see the "LICENSE" file for more details. -// -// Software description: Flutter library of reusable graphical components -// - -// Orange brand tokens version 1.5.0 -// Generated by Tokenator - -import 'package:flutter/material.dart'; - -abstract class OudsColorDecorativeSemanticTokens { - final Color decorativeAccent1Default; - final Color decorativeAccent1Emphasized; - final Color decorativeAccent1Muted; - final Color decorativeAccent2Default; - final Color decorativeAccent2Emphasized; - final Color decorativeAccent2Muted; - final Color decorativeAccent3Default; - final Color decorativeAccent3Emphasized; - final Color decorativeAccent3Muted; - final Color decorativeAccent4Default; - final Color decorativeAccent4Emphasized; - final Color decorativeAccent4Muted; - final Color decorativeAccent5Default; - final Color decorativeAccent5Emphasized; - final Color decorativeAccent5Muted; - final Color decorativeBrandPrimary; - final Color decorativeBrandPrimaryEmphasized; - final Color decorativeBrandPrimaryMuted; - final Color decorativeBrandSecondary; - final Color decorativeBrandSecondaryEmphasized; - final Color decorativeBrandSecondaryMuted; - final Color decorativeBrandTertiary; - final Color decorativeBrandTertiaryEmphasized; - final Color decorativeBrandTertiaryMuted; - final Color decorativeNeutralEmphasizedHigh; - final Color decorativeNeutralEmphasizedHigher; - final Color decorativeNeutralEmphasizedHighest; - final Color decorativeNeutralEmphasizedLow; - final Color decorativeNeutralEmphasizedLower; - final Color decorativeNeutralEmphasizedLowest; - final Color decorativeNeutralEmphasizedMedium; - final Color decorativeNeutralMutedHigh; - final Color decorativeNeutralMutedHigher; - final Color decorativeNeutralMutedHighest; - final Color decorativeNeutralMutedLow; - final Color decorativeNeutralMutedLower; - final Color decorativeNeutralMutedLowest; - final Color decorativeNeutralMutedMedium; - final Color decorativeSkinTint100; - final Color decorativeSkinTint200; - final Color decorativeSkinTint300; - final Color decorativeSkinTint400; - final Color decorativeSkinTint500; - final Color decorativeSkinTint600; - final Color decorativeSkinTint700; - final Color decorativeSkinTint800; - final Color decorativeSkinTint900; - - const OudsColorDecorativeSemanticTokens({ - required this.decorativeAccent1Default, - required this.decorativeAccent1Emphasized, - required this.decorativeAccent1Muted, - required this.decorativeAccent2Default, - required this.decorativeAccent2Emphasized, - required this.decorativeAccent2Muted, - required this.decorativeAccent3Default, - required this.decorativeAccent3Emphasized, - required this.decorativeAccent3Muted, - required this.decorativeAccent4Default, - required this.decorativeAccent4Emphasized, - required this.decorativeAccent4Muted, - required this.decorativeAccent5Default, - required this.decorativeAccent5Emphasized, - required this.decorativeAccent5Muted, - required this.decorativeBrandPrimary, - required this.decorativeBrandPrimaryEmphasized, - required this.decorativeBrandPrimaryMuted, - required this.decorativeBrandSecondary, - required this.decorativeBrandSecondaryEmphasized, - required this.decorativeBrandSecondaryMuted, - required this.decorativeBrandTertiary, - required this.decorativeBrandTertiaryEmphasized, - required this.decorativeBrandTertiaryMuted, - required this.decorativeNeutralEmphasizedHigh, - required this.decorativeNeutralEmphasizedHigher, - required this.decorativeNeutralEmphasizedHighest, - required this.decorativeNeutralEmphasizedLow, - required this.decorativeNeutralEmphasizedLower, - required this.decorativeNeutralEmphasizedLowest, - required this.decorativeNeutralEmphasizedMedium, - required this.decorativeNeutralMutedHigh, - required this.decorativeNeutralMutedHigher, - required this.decorativeNeutralMutedHighest, - required this.decorativeNeutralMutedLow, - required this.decorativeNeutralMutedLower, - required this.decorativeNeutralMutedLowest, - required this.decorativeNeutralMutedMedium, - required this.decorativeSkinTint100, - required this.decorativeSkinTint200, - required this.decorativeSkinTint300, - required this.decorativeSkinTint400, - required this.decorativeSkinTint500, - required this.decorativeSkinTint600, - required this.decorativeSkinTint700, - required this.decorativeSkinTint800, - required this.decorativeSkinTint900, - }); -} 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..82b79bc84 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.5.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..c0db1f251 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.5.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..5cec4cef0 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.5.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_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_semantic_tokens.dart index 5d284f425..7e2707913 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_color_semantic_tokens.dart @@ -15,7 +15,6 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_always_sema import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_bg_semantic_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_border_semantic_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_content_semantic_tokens.dart'; -import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_overlay_semantic_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_repository_semantic_tokens.dart'; @@ -27,7 +26,6 @@ class OudsColorSemanticTokens { final OudsColorBgSemanticTokens backgroundColorTokens; final OudsColorBorderSemanticTokens borderColorTokens; final OudsColorContentSemanticTokens contentColorTokens; - final OudsColorDecorativeSemanticTokens? decorativeColorTokens; final OudsColorOpacitySemanticTokens opacityColorTokens; final OudsColorOverlaySemanticTokens overlayColorTokens; final OudsColorSurfaceSemanticTokens surfaceColorTokens; @@ -39,7 +37,6 @@ class OudsColorSemanticTokens { required this.backgroundColorTokens, required this.borderColorTokens, required this.contentColorTokens, - this.decorativeColorTokens, required this.opacityColorTokens, required this.overlayColorTokens, required this.surfaceColorTokens, 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..f0503e404 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.5.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..c81544ca3 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.5.0 // Generated by Tokenator abstract class OudsEffectSemanticTokens { diff --git a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart index da9c5d5a9..2aeba45a6 100644 --- a/ouds_theme_contract/lib/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart @@ -13,6 +13,8 @@ // Android system tokens version 1.2.0 // Generated by Tokenator +/// TODO: Remove this class in Token version 2.5.0 + abstract class OudsElevationSemanticTokens { late double default_; late double drag; 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..b11ddb440 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.5.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..c234f0017 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.5.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..828c37b81 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.5.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..f45552218 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.5.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..a6be9934b 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.5.0 // Generated by Tokenator abstract class OudsSpaceSemanticTokens { diff --git a/ouds_theme_contract/pubspec.yaml b/ouds_theme_contract/pubspec.yaml index 53bb525f8..019b4b65c 100644 --- a/ouds_theme_contract/pubspec.yaml +++ b/ouds_theme_contract/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_theme_contract description: 'Defines the interface for theming in the OUDS framework, ensuring consistent application of design tokens.' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -13,7 +13,8 @@ resolution: workspace dependencies: flutter: sdk: flutter - ouds_global_raw_tokens: ^1.3.1 + # Global raw token + ouds_global_raw_tokens: ^2.0.0 dev_dependencies: flutter_test: diff --git a/ouds_theme_orange/CHANGELOG.md b/ouds_theme_orange/CHANGELOG.md index 6ec18b514..ab77f1f22 100644 --- a/ouds_theme_orange/CHANGELOG.md +++ b/ouds_theme_orange/CHANGELOG.md @@ -7,17 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) - [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/README.md b/ouds_theme_orange/README.md index 49b504446..6f2d547fa 100644 --- a/ouds_theme_orange/README.md +++ b/ouds_theme_orange/README.md @@ -15,7 +15,7 @@ dependency in your `pubspec.yaml` file. ```yaml dependencies: - ouds_theme_orange: ^1.3.1 + ouds_theme_orange: ^2.0.0 ``` ## Additional information diff --git a/ouds_theme_orange/lib/components/orange_alert_tokens.dart b/ouds_theme_orange/lib/components/orange_alert_tokens.dart index d4f145093..6b067638b 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.5.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..55c9dd1ca 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.5.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..4f5807962 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.5.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..b9f9d61a9 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.5.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..bd1e21de3 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.5.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..0a892a839 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.5.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..3d8148ead 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -39,6 +39,7 @@ class OrangeCheckboxTokens extends OudsCheckboxTokens { double get borderWidthUnselectedHover => providersTokens.borderTokens.widthMedium; @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override diff --git a/ouds_theme_orange/lib/components/orange_chip_tokens.dart b/ouds_theme_orange/lib/components/orange_chip_tokens.dart index f037b07ef..2e3256b87 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.5.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..6ae30bec3 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.5.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,41 +25,131 @@ class OrangeControlItemTokens extends OudsControlItemTokens { OrangeControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusNone; + @override + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; @override + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; + @override + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; + @override + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; + @override + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; + @override + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; + @override + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; + @override + Color get colorBgCurrentEnabled => providersTokens.colorScheme.lightDark(providersTokens.colorScheme.actionSupportEnabled, providersTokens.colorScheme.actionSupportHover); + @override + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgPressed => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorContentLoader => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; @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 spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; + @override + 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; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; @override diff --git a/ouds_theme_orange/lib/components/orange_divider_tokens.dart b/ouds_theme_orange/lib/components/orange_divider_tokens.dart index a16fddf7f..c0f4d395e 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.5.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..051bf0c9c 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.5.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..27cdad996 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.5.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..f71bfdc1b 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.5.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..2fc612ec7 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.5.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..ed7c2114e 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.5.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..bad1878cf 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.5.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..ea67e3e9a 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.5.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..95bb94b61 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.5.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..a71b73b30 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.5.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..68c1bfedb 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.5.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/material/orange_material_color_tokens.dart b/ouds_theme_orange/lib/material/orange_material_color_tokens.dart index 5a24cd69a..d6afdc334 100644 --- a/ouds_theme_orange/lib/material/orange_material_color_tokens.dart +++ b/ouds_theme_orange/lib/material/orange_material_color_tokens.dart @@ -13,6 +13,7 @@ // Android system tokens version 1.2.0 // Generated by Tokenator +import 'package:flutter/material.dart'; import 'package:ouds_theme_contract/theme/tokens/material/ouds_material_color_tokens.dart'; import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; @@ -20,7 +21,7 @@ class OrangeMaterialColorTokens extends OudsMaterialColorTokens { const OrangeMaterialColorTokens({ super.backgroundDark = ColorRawTokens.colorFunctionalGrayDark880, super.backgroundLight = ColorRawTokens.colorFunctionalWhite, - super.errorContainerDark = ColorRawTokens.colorFunctionalScarlet900, + super.errorContainerDark = const Color(0x00ff0000), super.errorContainerLight = ColorRawTokens.colorFunctionalScarlet100, super.errorDark = ColorRawTokens.colorFunctionalScarlet300, super.errorLight = ColorRawTokens.colorFunctionalScarlet600, 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..112ead527 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.5.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..335f168ee 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.5.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..6007affb9 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.5.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..fc0ca3f8a 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.5.0 // Generated by Tokenator import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; @@ -27,7 +27,7 @@ class OrangeColorBgSemanticTokens extends OudsColorBgSemanticTokens { super.bgPrimaryLight = ColorRawTokens.colorFunctionalWhite, super.bgSecondaryDark = ColorRawTokens.colorFunctionalGrayDark800, super.bgSecondaryLight = ColorRawTokens.colorFunctionalGrayLight80, - super.bgTertiaryDark = OrangeColorRawTokens.colorWarmGray900, + super.bgTertiaryDark = OrangeColorRawTokens.colorWarmGray1000, super.bgTertiaryLight = OrangeColorRawTokens.colorWarmGray100, }); } 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..545b1b768 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.5.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..018309959 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; diff --git a/ouds_theme_orange/lib/semantic/orange_color_decorative_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_decorative_semantic_tokens.dart deleted file mode 100644 index 9927c2998..000000000 --- a/ouds_theme_orange/lib/semantic/orange_color_decorative_semantic_tokens.dart +++ /dev/null @@ -1,71 +0,0 @@ -// -// Software Name: OUDS Flutter -// SPDX-FileCopyrightText: Copyright (c) Orange SA -// SPDX-License-Identifier: MIT -// -// This software is distributed under the MIT license, -// the text of which is available at https://opensource.org/license/MIT/ -// or see the "LICENSE" file for more details. -// -// Software description: Flutter library of reusable graphical components -// - -// Orange brand tokens version 1.5.0 -// Generated by Tokenator - -import 'package:flutter/material.dart'; -import 'package:ouds_theme_orange/raw/orange_color_raw_tokens.dart'; -import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart'; -import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; - -class OrangeColorDecorativeSemanticTokens extends OudsColorDecorativeSemanticTokens { - const OrangeColorDecorativeSemanticTokens({ - super.decorativeAccent1Default = OrangeColorRawTokens.colorDecorativeEmerald500, - super.decorativeAccent1Emphasized = OrangeColorRawTokens.colorDecorativeEmerald700, - super.decorativeAccent1Muted = OrangeColorRawTokens.colorDecorativeEmerald200, - super.decorativeAccent2Default = OrangeColorRawTokens.colorDecorativeSky400, - super.decorativeAccent2Emphasized = OrangeColorRawTokens.colorDecorativeSky700, - super.decorativeAccent2Muted = OrangeColorRawTokens.colorDecorativeSky200, - super.decorativeAccent3Default = ColorRawTokens.colorFunctionalSun500, - super.decorativeAccent3Emphasized = OrangeColorRawTokens.colorDecorativeAmber500, - super.decorativeAccent3Muted = ColorRawTokens.colorFunctionalSun200, - super.decorativeAccent4Default = OrangeColorRawTokens.colorDecorativeAmethyst400, - super.decorativeAccent4Emphasized = OrangeColorRawTokens.colorDecorativeAmethyst800, - super.decorativeAccent4Muted = OrangeColorRawTokens.colorDecorativeAmethyst200, - super.decorativeAccent5Default = OrangeColorRawTokens.colorDecorativeShockingPink200, - super.decorativeAccent5Emphasized = OrangeColorRawTokens.colorDecorativeShockingPink300, - super.decorativeAccent5Muted = OrangeColorRawTokens.colorDecorativeShockingPink100, - super.decorativeBrandPrimary = OrangeColorRawTokens.colorOrange500, - super.decorativeBrandPrimaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandPrimaryMuted = const Color(0x00ff0000), - super.decorativeBrandSecondary = ColorRawTokens.colorFunctionalBlack, - super.decorativeBrandSecondaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandSecondaryMuted = const Color(0x00ff0000), - super.decorativeBrandTertiary = ColorRawTokens.colorFunctionalWhite, - super.decorativeBrandTertiaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandTertiaryMuted = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedHigh = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedHigher = ColorRawTokens.colorFunctionalGrayDark640, - super.decorativeNeutralEmphasizedHighest = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedLow = ColorRawTokens.colorFunctionalGrayDark400, - super.decorativeNeutralEmphasizedLower = ColorRawTokens.colorFunctionalGrayDark320, - super.decorativeNeutralEmphasizedLowest = ColorRawTokens.colorFunctionalGrayDark240, - super.decorativeNeutralEmphasizedMedium = const Color(0x00ff0000), - super.decorativeNeutralMutedHigh = ColorRawTokens.colorFunctionalGrayLight400, - super.decorativeNeutralMutedHigher = ColorRawTokens.colorFunctionalGrayLight800, - super.decorativeNeutralMutedHighest = ColorRawTokens.colorFunctionalGrayLight960, - super.decorativeNeutralMutedLow = ColorRawTokens.colorFunctionalGrayLight240, - super.decorativeNeutralMutedLower = ColorRawTokens.colorFunctionalGrayLight160, - super.decorativeNeutralMutedLowest = ColorRawTokens.colorFunctionalGrayLight80, - super.decorativeNeutralMutedMedium = ColorRawTokens.colorFunctionalGrayLight320, - super.decorativeSkinTint100 = OrangeColorRawTokens.colorDecorativeDeepPeach100, - super.decorativeSkinTint200 = OrangeColorRawTokens.colorDecorativeDeepPeach200, - super.decorativeSkinTint300 = OrangeColorRawTokens.colorDecorativeDeepPeach300, - super.decorativeSkinTint400 = OrangeColorRawTokens.colorDecorativeDeepPeach400, - super.decorativeSkinTint500 = OrangeColorRawTokens.colorDecorativeDeepPeach500, - super.decorativeSkinTint600 = OrangeColorRawTokens.colorDecorativeDeepPeach600, - super.decorativeSkinTint700 = OrangeColorRawTokens.colorDecorativeDeepPeach700, - super.decorativeSkinTint800 = OrangeColorRawTokens.colorDecorativeDeepPeach800, - super.decorativeSkinTint900 = OrangeColorRawTokens.colorDecorativeDeepPeach900, - }); -} 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..b9be93958 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.5.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..c04241866 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.5.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..25cf635fb 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -29,14 +29,14 @@ class OrangeColorRepositorySemanticTokens extends OudsColorRepositorySemanticTok super.repositoryAccentMedium = OrangeColorRawTokens.colorOrange550, super.repositoryInfoHigh = ColorRawTokens.colorFunctionalDodgerBlue700, super.repositoryInfoHigher = const Color(0x00ff0000), - super.repositoryInfoHighest = ColorRawTokens.colorFunctionalDodgerBlue900, + super.repositoryInfoHighest = const Color(0x00ff0000), super.repositoryInfoLow = ColorRawTokens.colorFunctionalDodgerBlue300, super.repositoryInfoLower = const Color(0x00ff0000), - super.repositoryInfoLowest = ColorRawTokens.colorFunctionalDodgerBlue100, + super.repositoryInfoLowest = const Color(0x00ff0000), super.repositoryInfoMedium = const Color(0x00ff0000), super.repositoryNegativeHigh = ColorRawTokens.colorFunctionalScarlet700, super.repositoryNegativeHigher = ColorRawTokens.colorFunctionalScarlet800, - super.repositoryNegativeHighest = ColorRawTokens.colorFunctionalScarlet900, + super.repositoryNegativeHighest = const Color(0x00ff0000), super.repositoryNegativeLow = ColorRawTokens.colorFunctionalScarlet300, super.repositoryNegativeLower = ColorRawTokens.colorFunctionalScarlet200, super.repositoryNegativeLowest = ColorRawTokens.colorFunctionalScarlet100, @@ -96,10 +96,10 @@ class OrangeColorRepositorySemanticTokens extends OudsColorRepositorySemanticTok super.repositoryOpacityWhiteTransparent = ColorRawTokens.colorOpacityWhite0, super.repositoryPositiveHigh = ColorRawTokens.colorFunctionalMalachite700, super.repositoryPositiveHigher = ColorRawTokens.colorFunctionalMalachite750, - super.repositoryPositiveHighest = ColorRawTokens.colorFunctionalMalachite900, + super.repositoryPositiveHighest = const Color(0x00ff0000), super.repositoryPositiveLow = ColorRawTokens.colorFunctionalMalachite300, super.repositoryPositiveLower = const Color(0x00ff0000), - super.repositoryPositiveLowest = ColorRawTokens.colorFunctionalMalachite100, + super.repositoryPositiveLowest = const Color(0x00ff0000), super.repositoryPositiveMedium = ColorRawTokens.colorFunctionalMalachite600, super.repositoryPrimaryHigh = const Color(0x00ff0000), super.repositoryPrimaryHigher = const Color(0x00ff0000), @@ -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), @@ -124,10 +125,10 @@ class OrangeColorRepositorySemanticTokens extends OudsColorRepositorySemanticTok super.repositoryTertiaryMedium = const Color(0x00ff0000), super.repositoryWarningHigh = ColorRawTokens.colorFunctionalSun750, super.repositoryWarningHigher = const Color(0x00ff0000), - super.repositoryWarningHighest = ColorRawTokens.colorFunctionalSun900, + super.repositoryWarningHighest = const Color(0x00ff0000), super.repositoryWarningLow = ColorRawTokens.colorFunctionalSun300, super.repositoryWarningLower = const Color(0x00ff0000), - super.repositoryWarningLowest = ColorRawTokens.colorFunctionalSun100, + super.repositoryWarningLowest = const Color(0x00ff0000), super.repositoryWarningMedium = ColorRawTokens.colorFunctionalSun500, }); } diff --git a/ouds_theme_orange/lib/semantic/orange_color_semantic_tokens.dart b/ouds_theme_orange/lib/semantic/orange_color_semantic_tokens.dart index bfe4d8a6a..846680d16 100644 --- a/ouds_theme_orange/lib/semantic/orange_color_semantic_tokens.dart +++ b/ouds_theme_orange/lib/semantic/orange_color_semantic_tokens.dart @@ -4,7 +4,6 @@ import 'package:ouds_theme_orange/semantic/orange_color_always_semantic_tokens.d import 'package:ouds_theme_orange/semantic/orange_color_bg_semantic_tokens.dart'; import 'package:ouds_theme_orange/semantic/orange_color_border_semantic_tokens.dart'; import 'package:ouds_theme_orange/semantic/orange_color_content_semantic_tokens.dart'; -import 'package:ouds_theme_orange/semantic/orange_color_decorative_semantic_tokens.dart'; import 'package:ouds_theme_orange/semantic/orange_color_opacity_semantic_tokens.dart'; import 'package:ouds_theme_orange/semantic/orange_color_overlay_semantic_tokens.dart'; import 'package:ouds_theme_orange/semantic/orange_color_repository_semantic_tokens.dart'; @@ -17,7 +16,6 @@ class OrangeColorSemanticTokens extends OudsColorSemanticTokens { OrangeColorBgSemanticTokens backgroundColorTokens = const OrangeColorBgSemanticTokens(), OrangeColorBorderSemanticTokens borderColorTokens = const OrangeColorBorderSemanticTokens(), OrangeColorContentSemanticTokens contentColorTokens = const OrangeColorContentSemanticTokens(), - OrangeColorDecorativeSemanticTokens decorativeColorTokens = const OrangeColorDecorativeSemanticTokens(), OrangeColorOpacitySemanticTokens opacityColorTokens = const OrangeColorOpacitySemanticTokens(), OrangeColorOverlaySemanticTokens overlayColorTokens = const OrangeColorOverlaySemanticTokens(), OrangeColorSurfaceSemanticTokens surfaceColorTokens = const OrangeColorSurfaceSemanticTokens(), @@ -28,7 +26,6 @@ class OrangeColorSemanticTokens extends OudsColorSemanticTokens { backgroundColorTokens: backgroundColorTokens, borderColorTokens: borderColorTokens, contentColorTokens: contentColorTokens, - decorativeColorTokens: decorativeColorTokens, opacityColorTokens: opacityColorTokens, overlayColorTokens: overlayColorTokens, surfaceColorTokens: surfaceColorTokens, 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..410824ab1 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.5.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..44c6a89ab 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.5.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..16b1d4ff9 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.5.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..7d395f2d9 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.5.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..9faa076f7 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.5.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..8a36d3ec2 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.5.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..7e0ccc701 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_orange/pubspec.yaml b/ouds_theme_orange/pubspec.yaml index d503417fd..52e41599f 100644 --- a/ouds_theme_orange/pubspec.yaml +++ b/ouds_theme_orange/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_theme_orange description: 'Orange theme implementation for OUDS, with branding-specific design tokens.' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -13,9 +13,13 @@ resolution: workspace dependencies: flutter: sdk: flutter - ouds_core: ^1.3.1 - ouds_theme_contract: ^1.3.1 - ouds_global_raw_tokens: ^1.3.1 + # Core + ouds_core: ^2.0.0 + # Theme contract + ouds_theme_contract: ^2.0.0 + # Global raw token + ouds_global_raw_tokens: ^2.0.0 + path_provider: ^2.0.0 http: ^1.6.0 diff --git a/ouds_theme_orange_compact/CHANGELOG.md b/ouds_theme_orange_compact/CHANGELOG.md index 5509ac31a..5daea2173 100644 --- a/ouds_theme_orange_compact/CHANGELOG.md +++ b/ouds_theme_orange_compact/CHANGELOG.md @@ -7,17 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) - [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/README.md b/ouds_theme_orange_compact/README.md index 7112d46c2..6e6de7de2 100644 --- a/ouds_theme_orange_compact/README.md +++ b/ouds_theme_orange_compact/README.md @@ -14,7 +14,7 @@ To use **Theme Orange Compact**, add it as a dependency in your `pubspec.yaml` f ```yaml dependencies: - ouds_theme_orange_compact: ^1.3.1 + ouds_theme_orange_compact: ^2.0.0 ``` ## Other OUDS Libraries 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..70c0814a4 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.5.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..bc63f9e01 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.5.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..3eb93cb44 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.5.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..3a7a42d06 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.5.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..42b562f6c 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.5.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..3bdbb138a 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.5.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..0a2eaaa16 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -39,6 +39,7 @@ class OrangeCompactCheckboxTokens extends OudsCheckboxTokens { double get borderWidthUnselectedHover => providersTokens.borderTokens.widthMedium; @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override 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..ca726eb56 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.5.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..7f4af6e9e 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.5.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,41 +25,131 @@ class OrangeCompactControlItemTokens extends OudsControlItemTokens { OrangeCompactControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusNone; + @override + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; @override + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; + @override + double get borderRadiusRounded => providersTokens.borderTokens.radiusMedium; + @override + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; + @override + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; + @override + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; + @override + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; + @override + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSupportEnabled; + @override + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgPressed => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorContentLoader => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1000; @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 spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock4xsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; + @override + 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; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; @override 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..172ba5ef0 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.5.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..674693257 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.5.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..27d9e6bd5 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.5.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..a600e45e1 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.5.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..3d65432c3 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.5.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..4df026333 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.5.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..2f4037335 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.5.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..c659be89d 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.5.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..f3cf2bfe5 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.5.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..a24e4181f 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.5.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..400b754ba 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.5.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/material/orangeCompact_material_color_tokens.dart b/ouds_theme_orange_compact/lib/material/orangeCompact_material_color_tokens.dart index a13d83d70..f42b622be 100644 --- a/ouds_theme_orange_compact/lib/material/orangeCompact_material_color_tokens.dart +++ b/ouds_theme_orange_compact/lib/material/orangeCompact_material_color_tokens.dart @@ -13,6 +13,7 @@ // Android system tokens version 1.2.0 // Generated by Tokenator +import 'package:flutter/material.dart'; import 'package:ouds_theme_contract/theme/tokens/material/ouds_material_color_tokens.dart'; import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; @@ -20,7 +21,7 @@ class OrangeCompactMaterialColorTokens extends OudsMaterialColorTokens { const OrangeCompactMaterialColorTokens({ super.backgroundDark = ColorRawTokens.colorFunctionalGrayDark880, super.backgroundLight = ColorRawTokens.colorFunctionalWhite, - super.errorContainerDark = ColorRawTokens.colorFunctionalScarlet900, + super.errorContainerDark = const Color(0x00ff0000), super.errorContainerLight = ColorRawTokens.colorFunctionalScarlet100, super.errorDark = ColorRawTokens.colorFunctionalScarlet300, super.errorLight = ColorRawTokens.colorFunctionalScarlet600, 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..57268062b 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.5.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..719c31489 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.5.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..c621f68f5 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.5.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..90611b759 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.5.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..043d2dffb 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.5.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..6b946a5ee 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; 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..4f9954609 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.5.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..f95532c9f 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.5.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..243d8ed3d 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -29,14 +29,14 @@ class OrangeCompactColorRepositorySemanticTokens extends OudsColorRepositorySema super.repositoryAccentMedium = OrangeColorRawTokens.colorOrange550, super.repositoryInfoHigh = ColorRawTokens.colorFunctionalDodgerBlue700, super.repositoryInfoHigher = const Color(0x00ff0000), - super.repositoryInfoHighest = ColorRawTokens.colorFunctionalDodgerBlue900, + super.repositoryInfoHighest = const Color(0x00ff0000), super.repositoryInfoLow = ColorRawTokens.colorFunctionalDodgerBlue300, super.repositoryInfoLower = const Color(0x00ff0000), - super.repositoryInfoLowest = ColorRawTokens.colorFunctionalDodgerBlue100, + super.repositoryInfoLowest = const Color(0x00ff0000), super.repositoryInfoMedium = const Color(0x00ff0000), super.repositoryNegativeHigh = ColorRawTokens.colorFunctionalScarlet700, super.repositoryNegativeHigher = ColorRawTokens.colorFunctionalScarlet800, - super.repositoryNegativeHighest = ColorRawTokens.colorFunctionalScarlet900, + super.repositoryNegativeHighest = const Color(0x00ff0000), super.repositoryNegativeLow = ColorRawTokens.colorFunctionalScarlet300, super.repositoryNegativeLower = ColorRawTokens.colorFunctionalScarlet200, super.repositoryNegativeLowest = ColorRawTokens.colorFunctionalScarlet100, @@ -96,10 +96,10 @@ class OrangeCompactColorRepositorySemanticTokens extends OudsColorRepositorySema super.repositoryOpacityWhiteTransparent = ColorRawTokens.colorOpacityWhite0, super.repositoryPositiveHigh = ColorRawTokens.colorFunctionalMalachite700, super.repositoryPositiveHigher = ColorRawTokens.colorFunctionalMalachite750, - super.repositoryPositiveHighest = ColorRawTokens.colorFunctionalMalachite900, + super.repositoryPositiveHighest = const Color(0x00ff0000), super.repositoryPositiveLow = ColorRawTokens.colorFunctionalMalachite300, super.repositoryPositiveLower = const Color(0x00ff0000), - super.repositoryPositiveLowest = ColorRawTokens.colorFunctionalMalachite100, + super.repositoryPositiveLowest = const Color(0x00ff0000), super.repositoryPositiveMedium = ColorRawTokens.colorFunctionalMalachite600, super.repositoryPrimaryHigh = const Color(0x00ff0000), super.repositoryPrimaryHigher = const Color(0x00ff0000), @@ -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), @@ -124,10 +125,10 @@ class OrangeCompactColorRepositorySemanticTokens extends OudsColorRepositorySema super.repositoryTertiaryMedium = const Color(0x00ff0000), super.repositoryWarningHigh = ColorRawTokens.colorFunctionalSun750, super.repositoryWarningHigher = const Color(0x00ff0000), - super.repositoryWarningHighest = ColorRawTokens.colorFunctionalSun900, + super.repositoryWarningHighest = const Color(0x00ff0000), super.repositoryWarningLow = ColorRawTokens.colorFunctionalSun300, super.repositoryWarningLower = const Color(0x00ff0000), - super.repositoryWarningLowest = ColorRawTokens.colorFunctionalSun100, + super.repositoryWarningLowest = const Color(0x00ff0000), super.repositoryWarningMedium = ColorRawTokens.colorFunctionalSun500, }); } 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..22d99dd4c 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.5.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..9c97de83d 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.5.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..cb3629e16 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.5.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..d7a59fa12 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.5.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..d908c1ff2 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.5.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..c3f113079 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.5.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..926b63a01 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_orange_compact/pubspec.yaml b/ouds_theme_orange_compact/pubspec.yaml index 3615b354f..ef692e320 100644 --- a/ouds_theme_orange_compact/pubspec.yaml +++ b/ouds_theme_orange_compact/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_theme_orange_compact description: 'Orange Compact theme implementation for OUDS, with branding-specific design tokens optimized for compact displays.' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -13,10 +13,16 @@ resolution: workspace dependencies: flutter: sdk: flutter - ouds_core: ^1.3.1 - ouds_theme_contract: ^1.3.1 - ouds_global_raw_tokens: ^1.3.1 - ouds_theme_orange: ^1.3.1 + + # Core + ouds_core: ^2.0.0 + # Theme contract + ouds_theme_contract: ^2.0.0 + # Global raw token + ouds_global_raw_tokens: ^2.0.0 + # Orange Theme + ouds_theme_orange: ^2.0.0 + dev_dependencies: flutter_test: sdk: flutter diff --git a/ouds_theme_sosh/CHANGELOG.md b/ouds_theme_sosh/CHANGELOG.md index 4a9842932..ea0914b49 100644 --- a/ouds_theme_sosh/CHANGELOG.md +++ b/ouds_theme_sosh/CHANGELOG.md @@ -7,17 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) - [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/README.md b/ouds_theme_sosh/README.md index 0c84d48df..5fb56842c 100644 --- a/ouds_theme_sosh/README.md +++ b/ouds_theme_sosh/README.md @@ -14,7 +14,7 @@ To use **Theme Sosh**, add it as a dependency in your `pubspec.yaml` file. ```yaml dependencies: - ouds_theme_sosh: ^1.3.1 + ouds_theme_sosh: ^2.0.0 ``` ## Other OUDS Libraries diff --git a/ouds_theme_sosh/lib/components/ouds_tag_tokens.dart b/ouds_theme_sosh/lib/components/ouds_tag_tokens.dart deleted file mode 100644 index a8460a4a3..000000000 --- a/ouds_theme_sosh/lib/components/ouds_tag_tokens.dart +++ /dev/null @@ -1,39 +0,0 @@ -// -// Software Name: OUDS Flutter -// SPDX-FileCopyrightText: Copyright (c) Orange SA -// SPDX-License-Identifier: MIT -// -// This software is distributed under the MIT license, -// the text of which is available at https://opensource.org/license/MIT/ -// or see the "LICENSE" file for more details. -// -// Software description: Flutter library of reusable graphical components -// - -// Orange brand tokens version 2.0.1 -// Generated by Tokenator - -abstract class OudsTagTokens { - late double borderRadius; - late double sizeAssetDefault; - late double sizeAssetSmall; - late double sizeMinHeightDefault; - late double sizeMinHeightInteractiveArea; - late double sizeMinHeightSmall; - late double sizeMinWidthDefault; - late double sizeMinWidthSmall; - late double spaceColumnGapDefault; - late double spaceColumnGapSmall; - late double spaceInsetBulletDefault; - late double spaceInsetBulletSmall; - late double spaceInsetIconDefault; - late double spaceInsetIconSmall; - late double spaceInsetLoaderDefault; - late double spaceInsetLoaderSmall; - late double spacePaddingBlockDefault; - late double spacePaddingBlockSmall; - late double spacePaddingInlineAssetDefault; - late double spacePaddingInlineAssetSmall; - late double spacePaddingInlineDefault; - late double spacePaddingInlineSmall; -} diff --git a/ouds_theme_sosh/lib/components/ouds_textInput_tokens.dart b/ouds_theme_sosh/lib/components/ouds_textInput_tokens.dart deleted file mode 100644 index e060bd7b5..000000000 --- a/ouds_theme_sosh/lib/components/ouds_textInput_tokens.dart +++ /dev/null @@ -1,44 +0,0 @@ -// -// Software Name: OUDS Flutter -// SPDX-FileCopyrightText: Copyright (c) Orange SA -// SPDX-License-Identifier: MIT -// -// This software is distributed under the MIT license, -// the text of which is available at https://opensource.org/license/MIT/ -// or see the "LICENSE" file for more details. -// -// Software description: Flutter library of reusable graphical components -// - -// Orange brand tokens version 2.0.1 -// Generated by Tokenator - -import 'package:flutter/material.dart'; - -abstract class OudsTextInputTokens { - late double borderRadiusDefault; - late double borderRadiusRounded; - late double borderWidthDefault; - late double borderWidthFocus; - late Color colorBorderEnabled; - late Color colorBorderFocus; - late Color colorBorderHover; - late Color colorBorderLoading; - late double sizeCountrySelectorFlagHeight; - late double sizeLabelMaxHeight; - late double sizeLeadingIcon; - late double sizeMaxWidth; - late double sizeMinHeight; - late double sizeMinWidth; - late double sizeVerticalDividerHeight; - late double spaceColumnGapDefault; - late double spaceColumnGapInlineText; - late double spaceColumnGapTrailingErrorAction; - late double spacePaddingBlockDefault; - late double spacePaddingBlockTopHelperText; - late double spacePaddingInlineCountrySelectorEnd; - late double spacePaddingInlineCountrySelectorStart; - late double spacePaddingInlineDefault; - late double spacePaddingInlineTrailingAction; - late double spaceRowGapLabelInput; -} diff --git a/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart b/ouds_theme_sosh/lib/components/sosh_alert_tokens.dart index 885c44938..be449dad3 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.5.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..3b395e259 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.5.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..1b7ec89d0 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.5.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.colorOpacityLochmaraDark960800; @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..298c41965 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.5.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..696ca1661 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.5.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..df457c5e8 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.5.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..445491a78 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -39,6 +39,7 @@ class SoshCheckboxTokens extends OudsCheckboxTokens { double get borderWidthUnselectedHover => providersTokens.borderTokens.widthMedium; @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override diff --git a/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart b/ouds_theme_sosh/lib/components/sosh_chip_tokens.dart index 2a388462f..0994ba861 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.5.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..7fedfffcd 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.5.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,41 +25,131 @@ class SoshControlItemTokens extends OudsControlItemTokens { SoshControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; @override + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusRounded => providersTokens.borderTokens.radiusDefault; + @override + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; + @override + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; + @override + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; + @override + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionSupportDisabled; + @override + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSupportEnabled; + @override + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionSupportFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionSupportHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionSupportPressed; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgPressed => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorContentLoader => 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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; @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 spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; + @override + 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; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; @override diff --git a/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart b/ouds_theme_sosh/lib/components/sosh_divider_tokens.dart index 3276a956f..3888bd7a4 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.5.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..14eaf9eb0 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.5.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..a2bd89612 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.5.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..dab480c01 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.5.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..07a4e5952 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.5.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..41f98fdd3 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.5.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..3ad21f276 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.5.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..9984a305b 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.5.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..efe03167c 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.5.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..aec879c77 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.5.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..dc18ac4f2 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.5.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/material/sosh_material_color_tokens.dart b/ouds_theme_sosh/lib/material/sosh_material_color_tokens.dart index ca4ac5f27..9a884db76 100644 --- a/ouds_theme_sosh/lib/material/sosh_material_color_tokens.dart +++ b/ouds_theme_sosh/lib/material/sosh_material_color_tokens.dart @@ -13,14 +13,16 @@ // Android system tokens version 1.2.0 // Generated by Tokenator +import 'package:flutter/material.dart'; import 'package:ouds_theme_contract/theme/tokens/material/ouds_material_color_tokens.dart'; import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; +import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; class SoshMaterialColorTokens extends OudsMaterialColorTokens { const SoshMaterialColorTokens({ - super.backgroundDark = ColorRawTokens.colorFunctionalGrayDark880, + super.backgroundDark = SoshColorRawTokens.colorFunctionalGrayDark880, super.backgroundLight = ColorRawTokens.colorFunctionalWhite, - super.errorContainerDark = ColorRawTokens.colorFunctionalScarlet900, + super.errorContainerDark = const Color(0x00ff0000), super.errorContainerLight = ColorRawTokens.colorFunctionalScarlet100, super.errorDark = ColorRawTokens.colorFunctionalScarlet300, super.errorLight = ColorRawTokens.colorFunctionalScarlet600, @@ -28,11 +30,11 @@ class SoshMaterialColorTokens extends OudsMaterialColorTokens { super.inverseOnSurfaceLight = ColorRawTokens.colorFunctionalWhite, super.inversePrimaryDark = ColorRawTokens.colorFunctionalBlack, super.inversePrimaryLight = ColorRawTokens.colorFunctionalWhite, - super.inverseSurfaceDark = ColorRawTokens.colorFunctionalGrayLight160, - super.inverseSurfaceLight = ColorRawTokens.colorFunctionalGrayDark720, - super.onBackgroundDark = ColorRawTokens.colorFunctionalGrayLight160, + super.inverseSurfaceDark = SoshColorRawTokens.colorFunctionalGrayLight160, + super.inverseSurfaceLight = SoshColorRawTokens.colorFunctionalGrayDark720, + super.onBackgroundDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onBackgroundLight = ColorRawTokens.colorFunctionalBlack, - super.onErrorContainerDark = ColorRawTokens.colorFunctionalGrayLight160, + super.onErrorContainerDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onErrorContainerLight = ColorRawTokens.colorFunctionalBlack, super.onErrorDark = ColorRawTokens.colorFunctionalBlack, super.onErrorLight = ColorRawTokens.colorFunctionalWhite, @@ -41,36 +43,36 @@ class SoshMaterialColorTokens extends OudsMaterialColorTokens { super.onPrimaryDark = ColorRawTokens.colorFunctionalBlack, super.onPrimaryFixedDark = ColorRawTokens.colorFunctionalWhite, super.onPrimaryFixedLight = ColorRawTokens.colorFunctionalWhite, - super.onPrimaryFixedVariantDark = ColorRawTokens.colorOpacityWhite640, - super.onPrimaryFixedVariantLight = ColorRawTokens.colorOpacityWhite640, - super.onPrimaryLight = ColorRawTokens.colorFunctionalGrayLight160, - super.onSecondaryContainerDark = ColorRawTokens.colorFunctionalGrayLight160, + super.onPrimaryFixedVariantDark = SoshColorRawTokens.colorOpacityWhite640, + super.onPrimaryFixedVariantLight = SoshColorRawTokens.colorOpacityWhite640, + super.onPrimaryLight = SoshColorRawTokens.colorFunctionalGrayLight160, + super.onSecondaryContainerDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onSecondaryContainerLight = ColorRawTokens.colorFunctionalBlack, super.onSecondaryDark = ColorRawTokens.colorFunctionalBlack, super.onSecondaryFixedDark = ColorRawTokens.colorFunctionalWhite, super.onSecondaryFixedLight = ColorRawTokens.colorFunctionalWhite, - super.onSecondaryFixedVariantDark = ColorRawTokens.colorOpacityWhite640, - super.onSecondaryFixedVariantLight = ColorRawTokens.colorOpacityWhite640, - super.onSecondaryLight = ColorRawTokens.colorFunctionalGrayLight160, - super.onSurfaceDark = ColorRawTokens.colorFunctionalGrayLight160, + super.onSecondaryFixedVariantDark = SoshColorRawTokens.colorOpacityWhite640, + super.onSecondaryFixedVariantLight = SoshColorRawTokens.colorOpacityWhite640, + super.onSecondaryLight = SoshColorRawTokens.colorFunctionalGrayLight160, + super.onSurfaceDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onSurfaceLight = ColorRawTokens.colorFunctionalBlack, - super.onSurfaceVariantDark = ColorRawTokens.colorOpacityWhite640, - super.onSurfaceVariantLight = ColorRawTokens.colorOpacityBlack680, - super.onTertiaryContainerDark = ColorRawTokens.colorFunctionalGrayLight160, + super.onSurfaceVariantDark = SoshColorRawTokens.colorOpacityWhite640, + super.onSurfaceVariantLight = SoshColorRawTokens.colorOpacityBlack720, + super.onTertiaryContainerDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onTertiaryContainerLight = ColorRawTokens.colorFunctionalBlack, - super.onTertiaryDark = ColorRawTokens.colorFunctionalGrayLight160, + super.onTertiaryDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.onTertiaryFixedDark = ColorRawTokens.colorFunctionalBlack, super.onTertiaryFixedLight = ColorRawTokens.colorFunctionalBlack, - super.onTertiaryFixedVariantDark = ColorRawTokens.colorOpacityBlack680, - super.onTertiaryFixedVariantLight = ColorRawTokens.colorOpacityBlack680, + super.onTertiaryFixedVariantDark = SoshColorRawTokens.colorOpacityBlack720, + super.onTertiaryFixedVariantLight = SoshColorRawTokens.colorOpacityBlack720, super.onTertiaryLight = ColorRawTokens.colorFunctionalBlack, - super.outlineDark = ColorRawTokens.colorFunctionalGrayLight160, + super.outlineDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.outlineLight = ColorRawTokens.colorFunctionalBlack, - super.outlineVariantDark = ColorRawTokens.colorOpacityWhite200, - super.outlineVariantLight = ColorRawTokens.colorOpacityBlack200, - super.primaryContainerDark = ColorRawTokens.colorFunctionalGrayLight160, + super.outlineVariantDark = SoshColorRawTokens.colorOpacityWhite200, + super.outlineVariantLight = SoshColorRawTokens.colorOpacityBlack200, + super.primaryContainerDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.primaryContainerLight = ColorRawTokens.colorFunctionalBlack, - super.primaryDark = ColorRawTokens.colorFunctionalGrayLight160, + super.primaryDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.primaryFixedDark = ColorRawTokens.colorFunctionalBlack, super.primaryFixedDimDark = ColorRawTokens.colorFunctionalBlack, super.primaryFixedDimLight = ColorRawTokens.colorFunctionalBlack, @@ -78,40 +80,40 @@ class SoshMaterialColorTokens extends OudsMaterialColorTokens { super.primaryLight = ColorRawTokens.colorFunctionalBlack, super.scrimDark = ColorRawTokens.colorFunctionalBlack, super.scrimLight = ColorRawTokens.colorFunctionalBlack, - super.secondaryContainerDark = ColorRawTokens.colorOpacityWhite80, - super.secondaryContainerLight = ColorRawTokens.colorOpacityBlack40, - super.secondaryDark = ColorRawTokens.colorFunctionalGrayLight160, + super.secondaryContainerDark = SoshColorRawTokens.colorOpacityWhite80, + super.secondaryContainerLight = SoshColorRawTokens.colorOpacityBlack40, + super.secondaryDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.secondaryFixedDark = ColorRawTokens.colorFunctionalBlack, super.secondaryFixedDimDark = ColorRawTokens.colorFunctionalBlack, super.secondaryFixedDimLight = ColorRawTokens.colorFunctionalBlack, super.secondaryFixedLight = ColorRawTokens.colorFunctionalBlack, super.secondaryLight = ColorRawTokens.colorFunctionalBlack, - super.surfaceBrightDark = ColorRawTokens.colorFunctionalGrayDark640, + super.surfaceBrightDark = SoshColorRawTokens.colorFunctionalGrayDark640, super.surfaceBrightLight = ColorRawTokens.colorFunctionalWhite, - super.surfaceDark = ColorRawTokens.colorFunctionalGrayDark880, + super.surfaceDark = SoshColorRawTokens.colorFunctionalGrayDark880, super.surfaceDimDark = ColorRawTokens.colorFunctionalBlack, - super.surfaceDimLight = ColorRawTokens.colorFunctionalGrayLight80, + super.surfaceDimLight = SoshColorRawTokens.colorFunctionalGrayLight80, super.surfaceLight = ColorRawTokens.colorFunctionalWhite, - super.surfaceTintDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfaceTintLight = ColorRawTokens.colorFunctionalGrayLight80, - super.surfaceVariantDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfaceVariantLight = ColorRawTokens.colorFunctionalGrayLight80, - super.surfContainerDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfContainerHighDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfContainerHighestDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfContainerHighestLight = ColorRawTokens.colorFunctionalGrayLight80, - super.surfContainerHighLight = ColorRawTokens.colorFunctionalGrayLight80, - super.surfContainerLight = ColorRawTokens.colorFunctionalGrayLight80, - super.surfContainerLowDark = ColorRawTokens.colorFunctionalGrayDark720, - super.surfContainerLowestDark = ColorRawTokens.colorFunctionalGrayDark720, + super.surfaceTintDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfaceTintLight = SoshColorRawTokens.colorFunctionalGrayLight80, + super.surfaceVariantDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfaceVariantLight = SoshColorRawTokens.colorFunctionalGrayLight80, + super.surfContainerDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfContainerHighDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfContainerHighestDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfContainerHighestLight = SoshColorRawTokens.colorFunctionalGrayLight80, + super.surfContainerHighLight = SoshColorRawTokens.colorFunctionalGrayLight80, + super.surfContainerLight = SoshColorRawTokens.colorFunctionalGrayLight80, + super.surfContainerLowDark = SoshColorRawTokens.colorFunctionalGrayDark720, + super.surfContainerLowestDark = SoshColorRawTokens.colorFunctionalGrayDark720, super.surfContainerLowestLight = ColorRawTokens.colorFunctionalWhite, super.surfContainerLowLight = ColorRawTokens.colorFunctionalWhite, - super.tertiaryContainerDark = ColorRawTokens.colorFunctionalGrayDark880, + super.tertiaryContainerDark = SoshColorRawTokens.colorFunctionalGrayDark880, super.tertiaryContainerLight = ColorRawTokens.colorFunctionalWhite, - super.tertiaryDark = ColorRawTokens.colorFunctionalGrayDark880, + super.tertiaryDark = SoshColorRawTokens.colorFunctionalGrayDark880, super.tertiaryFixedDark = ColorRawTokens.colorFunctionalWhite, - super.tertiaryFixedDimDark = ColorRawTokens.colorFunctionalGrayLight80, - super.tertiaryFixedDimLight = ColorRawTokens.colorFunctionalGrayLight80, + super.tertiaryFixedDimDark = SoshColorRawTokens.colorFunctionalGrayLight80, + super.tertiaryFixedDimLight = SoshColorRawTokens.colorFunctionalGrayLight80, super.tertiaryFixedLight = ColorRawTokens.colorFunctionalWhite, super.tertiaryLight = ColorRawTokens.colorFunctionalWhite, }); 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..b81903ee2 100644 --- a/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart +++ b/ouds_theme_sosh/lib/raw/sosh_color_raw_tokens.dart @@ -10,59 +10,139 @@ // Software description: Flutter library of reusable graphical components // -// Sosh core tokens version 1.2.0 +// Sosh core tokens version 1.4.0 // Generated by Tokenator import 'package:flutter/material.dart'; class SoshColorRawTokens { - static const colorBlueDuckDark80 = Color(0xff33b1c1); - static const colorBlueDuckDark160 = Color(0xff2fa3b1); - static const colorBlueDuckDark240 = Color(0xff2b94a1); - static const colorBlueDuckDark320 = Color(0xff26828e); - static const colorBlueDuckDark400 = Color(0xff247a85); - static const colorBlueDuckDark480 = Color(0xff1e6771); - static const colorBlueDuckDark560 = Color(0xff1a5961); - static const colorBlueDuckDark640 = Color(0xff154a51); - static const colorBlueDuckDark720 = Color(0xff113b40); - static const colorBlueDuckDark800 = Color(0xff0e2f34); - static const colorBlueDuckDark880 = Color(0xff0b2428); - static const colorBlueDuckDark960 = Color(0xff061618); - static const colorBlueDuckLight80 = Color(0xfff0f7fa); - static const colorBlueDuckLight160 = Color(0xffdff4f6); - static const colorBlueDuckLight240 = Color(0xffcfeef2); - static const colorBlueDuckLight320 = Color(0xffbfe8ee); - static const colorBlueDuckLight400 = Color(0xffaee3ea); - static const colorBlueDuckLight480 = Color(0xff9edde5); - static const colorBlueDuckLight560 = Color(0xff8ed8e1); - static const colorBlueDuckLight640 = Color(0xff7ed2dd); - static const colorBlueDuckLight720 = Color(0xff6eccd8); - static const colorBlueDuckLight800 = Color(0xff5ec7d4); - static const colorBlueDuckLight880 = Color(0xff4ec1d0); - static const colorBlueDuckLight960 = Color(0xff3ebbcc); - static const colorCitrine50 = Color(0xfff6f5ee); - static const colorCitrine100 = Color(0xfffff6cc); - static const colorCitrine200 = Color(0xffffec99); - static const colorCitrine300 = Color(0xffffe366); - static const colorCitrine400 = Color(0xffffd92e); - static const colorCitrine500 = Color(0xfffbcd00); - static const colorCitrine600 = Color(0xffc7a200); - static const colorCitrine700 = Color(0xff997d00); - static const colorCitrine800 = Color(0xff665300); - static const colorCitrine900 = Color(0xff332a00); - static const colorCitrine950 = Color(0xff241d00); - static const colorCitrine1000 = Color(0xff191500); - static const colorMagenta50 = Color(0xfffce9ee); - static const colorMagenta100 = Color(0xfff8d3dc); - static const colorMagenta200 = Color(0xfff2a6b9); - static const colorMagenta300 = Color(0xffeb7a96); - static const colorMagenta400 = Color(0xffe55277); - static const colorMagenta500 = Color(0xffd5204e); /** Test for support Figma */ - static const colorMagenta600 = Color(0xffb61b42); - static const colorMagenta700 = Color(0xff851430); - static const colorMagenta800 = Color(0xff590d20); - static const colorMagenta900 = Color(0xff2c0710); - static const colorMagenta950 = Color(0xff160308); - static const colorOpacityMagenta120 = Color(0x1fe55277); /** Test for support Figma */ - static const colorOpacityMagenta640 = Color(0xa3851430); /** Test for support Figma */ + static const colorFunctionalGrayDark80 = Color(0xff5e8097); + static const colorFunctionalGrayDark160 = Color(0xff56758a); + static const colorFunctionalGrayDark240 = Color(0xff4e6b7e); + static const colorFunctionalGrayDark320 = Color(0xff476071); + static const colorFunctionalGrayDark400 = Color(0xff3f5564); + static const colorFunctionalGrayDark480 = Color(0xff374b58); + static const colorFunctionalGrayDark560 = Color(0xff2f404b); + static const colorFunctionalGrayDark640 = Color(0xff27353f); + static const colorFunctionalGrayDark720 = Color(0xff1f2b32); + static const colorFunctionalGrayDark800 = Color(0xff182026); + static const colorFunctionalGrayDark880 = Color(0xff101519); + static const colorFunctionalGrayDark960 = Color(0xff080b0d); + static const colorFunctionalGrayLight80 = Color(0xfff7f9fa); + static const colorFunctionalGrayLight160 = Color(0xffe9eef1); + static const colorFunctionalGrayLight240 = Color(0xffd9e2e7); + static const colorFunctionalGrayLight320 = Color(0xffcdd8e0); + static const colorFunctionalGrayLight400 = Color(0xffc0ced8); + static const colorFunctionalGrayLight480 = Color(0xffb4c5d0); + static const colorFunctionalGrayLight560 = Color(0xffa7bbc8); + static const colorFunctionalGrayLight640 = Color(0xff9bb1c0); + static const colorFunctionalGrayLight720 = Color(0xff8ea7b8); + static const colorFunctionalGrayLight800 = Color(0xff819eb1); + static const colorFunctionalGrayLight880 = Color(0xff7594a9); + static const colorFunctionalGrayLight960 = Color(0xff688aa1); + static const colorLochmaraDark80 = Color(0xff0191f4); + static const colorLochmaraDark160 = Color(0xff0182da); + static const colorLochmaraDark240 = Color(0xff0173c1); + static const colorLochmaraDark320 = Color(0xff016ab2); + static const colorLochmaraDark400 = Color(0xff0161a2); + static const colorLochmaraDark480 = Color(0xff01558e); + static const colorLochmaraDark560 = Color(0xff01487a); + static const colorLochmaraDark640 = Color(0xff003c66); + static const colorLochmaraDark720 = Color(0xff003051); + static const colorLochmaraDark800 = Color(0xff002742); + static const colorLochmaraDark880 = Color(0xff002138); + static const colorLochmaraDark960 = Color(0xff001524); + static const colorLochmaraLight80 = Color(0xffedf6fd); + static const colorLochmaraLight160 = Color(0xffd6eeff); + static const colorLochmaraLight240 = Color(0xffc2e6ff); + static const colorLochmaraLight320 = Color(0xffaedeff); + static const colorLochmaraLight400 = Color(0xff99d5ff); + static const colorLochmaraLight480 = Color(0xff85cdfe); + static const colorLochmaraLight560 = Color(0xff71c5fe); + static const colorLochmaraLight640 = Color(0xff5dbcfe); + static const colorLochmaraLight720 = Color(0xff48b4fe); + static const colorLochmaraLight800 = Color(0xff34acfe); + static const colorLochmaraLight880 = Color(0xff20a3fe); + static const colorLochmaraLight960 = Color(0xff0b9bfe); + static const colorOpacityBlack0 = Color(0x00000f19); + static const colorOpacityBlack40 = Color(0x0a000f19); + static const colorOpacityBlack80 = Color(0x14000f19); + static const colorOpacityBlack120 = Color(0x1f000f19); + static const colorOpacityBlack160 = Color(0x29000f19); + static const colorOpacityBlack200 = Color(0x33000f19); + static const colorOpacityBlack240 = Color(0x3d000f19); + static const colorOpacityBlack280 = Color(0x47000f19); + static const colorOpacityBlack320 = Color(0x52000f19); + static const colorOpacityBlack360 = Color(0x5c000f19); + static const colorOpacityBlack400 = Color(0x66000f19); + static const colorOpacityBlack440 = Color(0x70000f19); + static const colorOpacityBlack480 = Color(0x7a000f19); + static const colorOpacityBlack520 = Color(0x85000f19); + static const colorOpacityBlack560 = Color(0x8f000f19); + static const colorOpacityBlack600 = Color(0x99000f19); + static const colorOpacityBlack640 = Color(0xa3000f19); + static const colorOpacityBlack680 = Color(0xad000f19); + static const colorOpacityBlack720 = Color(0xb8000f19); + static const colorOpacityBlack760 = Color(0xc2000f19); + static const colorOpacityBlack800 = Color(0xcc000f19); + static const colorOpacityBlack840 = Color(0xd6000f19); + static const colorOpacityBlack880 = Color(0xe0000f19); + static const colorOpacityBlack920 = Color(0xeb000f19); + static const colorOpacityBlack960 = Color(0xf5000f19); + static const colorOpacityLochmaraDark880520 = Color(0x8501558e); + static const colorOpacityLochmaraDark960800 = Color(0xcc001524); + static const colorOpacityLochmaraLight80080 = Color(0x1434acfe); + static const colorOpacityRaspberry100 = Color(0x1afc6999); /** Test for support Figma */ + static const colorOpacityRaspberry640 = Color(0xa3960333); /** Test for support Figma */ + static const colorOpacityTurbo160 = Color(0x29ffe500); /** Test for support Figma */ + static const colorOpacityTurbo480 = Color(0x7a665c00); /** Test for support Figma */ + static const colorOpacityWhite0 = Color(0x00edf6fc); + static const colorOpacityWhite40 = Color(0x0aedf6fc); + static const colorOpacityWhite80 = Color(0x14edf6fc); + static const colorOpacityWhite120 = Color(0x1fedf6fc); + static const colorOpacityWhite160 = Color(0x29edf6fc); + static const colorOpacityWhite200 = Color(0x33edf6fc); + static const colorOpacityWhite240 = Color(0x3dedf6fc); + static const colorOpacityWhite280 = Color(0x47edf6fc); + static const colorOpacityWhite320 = Color(0x52edf6fc); + static const colorOpacityWhite360 = Color(0x5cedf6fc); + static const colorOpacityWhite400 = Color(0x66edf6fc); + static const colorOpacityWhite440 = Color(0x70edf6fc); + static const colorOpacityWhite480 = Color(0x7aedf6fc); + static const colorOpacityWhite520 = Color(0x85edf6fc); + static const colorOpacityWhite560 = Color(0x8fedf6fc); + static const colorOpacityWhite600 = Color(0x99edf6fc); + static const colorOpacityWhite640 = Color(0xa3edf6fc); + static const colorOpacityWhite680 = Color(0xadedf6fc); + static const colorOpacityWhite720 = Color(0xb8edf6fc); + static const colorOpacityWhite760 = Color(0xc2edf6fc); + static const colorOpacityWhite800 = Color(0xccedf6fc); + static const colorOpacityWhite840 = Color(0xd6edf6fc); + static const colorOpacityWhite880 = Color(0xe0edf6fc); + static const colorOpacityWhite920 = Color(0xebedf6fc); + static const colorOpacityWhite960 = Color(0xf5edf6fc); + static const colorRaspberry50 = Color(0xffffe6ee); + static const colorRaspberry100 = Color(0xfffecddd); + static const colorRaspberry200 = Color(0xfffd9bbb); + static const colorRaspberry300 = Color(0xfffc6999); + static const colorRaspberry400 = Color(0xfffb226a); + static const colorRaspberry500 = Color(0xffde034b); + static const colorRaspberry600 = Color(0xffbf0341); + static const colorRaspberry700 = Color(0xff960333); + static const colorRaspberry800 = Color(0xff640222); + static const colorRaspberry900 = Color(0xff320111); + static const colorRaspberry950 = Color(0xff190009); + static const colorTurbo50 = Color(0xfffcfae8); + static const colorTurbo100 = Color(0xfffffacc); + static const colorTurbo200 = Color(0xfffff599); + static const colorTurbo300 = Color(0xffffef66); + static const colorTurbo400 = Color(0xffffea33); + static const colorTurbo500 = Color(0xffffe500); + static const colorTurbo600 = Color(0xffccb700); + static const colorTurbo700 = Color(0xff998900); + static const colorTurbo750 = Color(0xff7a6e00); + static const colorTurbo800 = Color(0xff665c00); + static const colorTurbo900 = Color(0xff332e00); + static const colorTurbo950 = Color(0xff221f02); + static const colorTurbo1000 = Color(0xff1a1700); } \ 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..ca121f3cf 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.5.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..1e5d2f6d0 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,20 +19,18 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorActionSemanticTokens extends OudsColorActionSemanticTokens { const SoshColorActionSemanticTokens({ - super.actionDisabledDark = ColorRawTokens.colorOpacityWhite200, - super.actionDisabledLight = ColorRawTokens.colorOpacityBlack200, - super.actionEnabledDark = SoshColorRawTokens.colorBlueDuckLight800, - super.actionEnabledLight = SoshColorRawTokens.colorMagenta500, - super.actionFocusDark = ColorRawTokens.colorFunctionalGrayLight160, + super.actionDisabledDark = SoshColorRawTokens.colorOpacityWhite200, + super.actionDisabledLight = SoshColorRawTokens.colorOpacityBlack200, + super.actionEnabledDark = SoshColorRawTokens.colorLochmaraLight640, + super.actionEnabledLight = SoshColorRawTokens.colorRaspberry500, + super.actionFocusDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.actionFocusLight = ColorRawTokens.colorFunctionalBlack, - super.actionHighlightedDark = ColorRawTokens.colorFunctionalGrayLight160, - super.actionHighlightedLight = SoshColorRawTokens.colorBlueDuckDark400, - super.actionHoverDark = ColorRawTokens.colorFunctionalGrayLight160, + super.actionHighlightedDark = SoshColorRawTokens.colorFunctionalGrayLight160, + super.actionHighlightedLight = SoshColorRawTokens.colorLochmaraDark240, + super.actionHoverDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.actionHoverLight = ColorRawTokens.colorFunctionalBlack, - super.actionIosAccentDark = SoshColorRawTokens.colorBlueDuckLight800, - super.actionIosAccentLight = SoshColorRawTokens.colorMagenta500, - super.actionLoadingDark = SoshColorRawTokens.colorCitrine300, - super.actionLoadingLight = SoshColorRawTokens.colorBlueDuckDark400, + super.actionLoadingDark = SoshColorRawTokens.colorTurbo300, + super.actionLoadingLight = SoshColorRawTokens.colorLochmaraDark240, super.actionNegativeEnabledDark = ColorRawTokens.colorFunctionalScarlet300, super.actionNegativeEnabledLight = ColorRawTokens.colorFunctionalScarlet600, super.actionNegativeFocusDark = ColorRawTokens.colorFunctionalScarlet200, @@ -43,26 +41,26 @@ class SoshColorActionSemanticTokens extends OudsColorActionSemanticTokens { super.actionNegativeLoadingLight = ColorRawTokens.colorFunctionalScarlet800, super.actionNegativePressedDark = ColorRawTokens.colorFunctionalScarlet100, super.actionNegativePressedLight = ColorRawTokens.colorFunctionalScarlet800, - super.actionPressedDark = SoshColorRawTokens.colorCitrine300, - super.actionPressedLight = SoshColorRawTokens.colorBlueDuckDark400, - super.actionReadOnlyPrimaryDark = ColorRawTokens.colorFunctionalGrayLight160, + super.actionPressedDark = SoshColorRawTokens.colorTurbo300, + super.actionPressedLight = SoshColorRawTokens.colorLochmaraDark240, + super.actionReadOnlyPrimaryDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.actionReadOnlyPrimaryLight = ColorRawTokens.colorFunctionalBlack, - super.actionReadOnlySecondaryDark = ColorRawTokens.colorOpacityWhite200, - super.actionReadOnlySecondaryLight = ColorRawTokens.colorOpacityBlack200, - super.actionSelectedDark = SoshColorRawTokens.colorBlueDuckLight800, - super.actionSelectedLight = SoshColorRawTokens.colorMagenta500, - super.actionSupportDisabledDark = ColorRawTokens.colorOpacityWhite40, - super.actionSupportDisabledLight = ColorRawTokens.colorOpacityBlack40, - super.actionSupportEnabledDark = ColorRawTokens.colorOpacityWhite40, - super.actionSupportEnabledLight = ColorRawTokens.colorOpacityBlack40, - super.actionSupportFocusDark = ColorRawTokens.colorOpacityWhite80, - super.actionSupportFocusLight = ColorRawTokens.colorOpacityBlack80, - super.actionSupportHoverDark = ColorRawTokens.colorOpacityWhite80, - super.actionSupportHoverLight = ColorRawTokens.colorOpacityBlack80, - super.actionSupportLoadingDark = ColorRawTokens.colorOpacityWhite120, - super.actionSupportLoadingLight = ColorRawTokens.colorOpacityBlack120, - super.actionSupportPressedDark = ColorRawTokens.colorOpacityWhite120, - super.actionSupportPressedLight = ColorRawTokens.colorOpacityBlack120, + super.actionReadOnlySecondaryDark = SoshColorRawTokens.colorOpacityWhite200, + super.actionReadOnlySecondaryLight = SoshColorRawTokens.colorOpacityBlack200, + super.actionSelectedDark = SoshColorRawTokens.colorLochmaraLight640, + super.actionSelectedLight = SoshColorRawTokens.colorRaspberry500, + super.actionSupportDisabledDark = SoshColorRawTokens.colorOpacityWhite40, + super.actionSupportDisabledLight = SoshColorRawTokens.colorOpacityBlack40, + super.actionSupportEnabledDark = SoshColorRawTokens.colorOpacityWhite40, + super.actionSupportEnabledLight = SoshColorRawTokens.colorOpacityBlack40, + super.actionSupportFocusDark = SoshColorRawTokens.colorOpacityWhite80, + super.actionSupportFocusLight = SoshColorRawTokens.colorOpacityBlack80, + super.actionSupportHoverDark = SoshColorRawTokens.colorOpacityWhite80, + super.actionSupportHoverLight = SoshColorRawTokens.colorOpacityBlack80, + super.actionSupportLoadingDark = SoshColorRawTokens.colorOpacityWhite120, + super.actionSupportLoadingLight = SoshColorRawTokens.colorOpacityBlack120, + super.actionSupportPressedDark = SoshColorRawTokens.colorOpacityWhite120, + super.actionSupportPressedLight = SoshColorRawTokens.colorOpacityBlack120, super.actionVisitedDark = ColorRawTokens.colorFunctionalAmethyst400, super.actionVisitedLight = ColorRawTokens.colorFunctionalAmethyst600, }); 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..ca21e60bd 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,16 +10,17 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.5.0 // Generated by Tokenator +import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_always_semantic_tokens.dart'; import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorAlwaysSemanticTokens extends OudsColorAlwaysSemanticTokens { const SoshColorAlwaysSemanticTokens({ super.alwaysBlack = ColorRawTokens.colorFunctionalBlack, - super.alwaysOnBlack = ColorRawTokens.colorFunctionalGrayLight160, + super.alwaysOnBlack = SoshColorRawTokens.colorFunctionalGrayLight160, super.alwaysOnWhite = ColorRawTokens.colorFunctionalBlack, super.alwaysWhite = ColorRawTokens.colorFunctionalWhite, }); 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..67dc794b5 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,15 +19,15 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorBgSemanticTokens extends OudsColorBgSemanticTokens { const SoshColorBgSemanticTokens({ - super.bgInverseHighDark = ColorRawTokens.colorFunctionalGrayLight160, - super.bgInverseHighLight = SoshColorRawTokens.colorBlueDuckDark880, - super.bgInverseLowDark = SoshColorRawTokens.colorBlueDuckDark720, - super.bgInverseLowLight = SoshColorRawTokens.colorBlueDuckDark880, - super.bgPrimaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.bgInverseHighDark = SoshColorRawTokens.colorLochmaraLight80, + super.bgInverseHighLight = SoshColorRawTokens.colorLochmaraDark880, + super.bgInverseLowDark = SoshColorRawTokens.colorLochmaraDark720, + super.bgInverseLowLight = SoshColorRawTokens.colorLochmaraDark880, + super.bgPrimaryDark = SoshColorRawTokens.colorLochmaraDark960, super.bgPrimaryLight = ColorRawTokens.colorFunctionalWhite, - super.bgSecondaryDark = SoshColorRawTokens.colorBlueDuckDark880, - super.bgSecondaryLight = SoshColorRawTokens.colorBlueDuckLight80, - super.bgTertiaryDark = SoshColorRawTokens.colorCitrine950, - super.bgTertiaryLight = SoshColorRawTokens.colorCitrine50, + super.bgSecondaryDark = SoshColorRawTokens.colorLochmaraDark880, + super.bgSecondaryLight = SoshColorRawTokens.colorLochmaraLight80, + super.bgTertiaryDark = SoshColorRawTokens.colorTurbo950, + super.bgTertiaryLight = SoshColorRawTokens.colorTurbo50, }); } 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..f6a3c6fe4 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,39 +19,39 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorBorderSemanticTokens extends OudsColorBorderSemanticTokens { const SoshColorBorderSemanticTokens({ - super.borderBrandPrimaryDark = SoshColorRawTokens.colorMagenta300, - super.borderBrandPrimaryLight = SoshColorRawTokens.colorMagenta500, - super.borderBrandSecondaryDark = SoshColorRawTokens.colorBlueDuckLight800, - super.borderBrandSecondaryLight = SoshColorRawTokens.colorBlueDuckDark400, - super.borderBrandTertiaryDark = SoshColorRawTokens.colorCitrine300, - super.borderBrandTertiaryLight = SoshColorRawTokens.colorCitrine500, - super.borderDefaultDark = ColorRawTokens.colorOpacityWhite200, - super.borderDefaultLight = ColorRawTokens.colorOpacityBlack200, - super.borderEmphasizedDark = ColorRawTokens.colorOpacityWhite920, + super.borderBrandPrimaryDark = SoshColorRawTokens.colorRaspberry300, + super.borderBrandPrimaryLight = SoshColorRawTokens.colorRaspberry500, + super.borderBrandSecondaryDark = SoshColorRawTokens.colorLochmaraLight640, + super.borderBrandSecondaryLight = SoshColorRawTokens.colorLochmaraDark240, + super.borderBrandTertiaryDark = SoshColorRawTokens.colorTurbo300, + super.borderBrandTertiaryLight = SoshColorRawTokens.colorTurbo500, + super.borderDefaultDark = SoshColorRawTokens.colorOpacityWhite200, + super.borderDefaultLight = SoshColorRawTokens.colorOpacityBlack200, + super.borderEmphasizedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.borderEmphasizedLight = ColorRawTokens.colorFunctionalBlack, - super.borderFocusDark = ColorRawTokens.colorFunctionalGrayLight160, - super.borderFocusInsetDark = ColorRawTokens.colorFunctionalGrayDark880, + super.borderFocusDark = SoshColorRawTokens.colorFunctionalGrayLight160, + super.borderFocusInsetDark = SoshColorRawTokens.colorFunctionalGrayDark880, super.borderFocusInsetLight = ColorRawTokens.colorFunctionalWhite, super.borderFocusLight = ColorRawTokens.colorFunctionalBlack, - super.borderMinimalDark = ColorRawTokens.colorOpacityWhite40, - super.borderMinimalLight = ColorRawTokens.colorOpacityBlack40, - super.borderMutedDark = ColorRawTokens.colorOpacityWhite80, - super.borderMutedLight = ColorRawTokens.colorOpacityBlack80, - super.borderOnBrandPrimaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.borderMinimalDark = SoshColorRawTokens.colorOpacityWhite40, + super.borderMinimalLight = SoshColorRawTokens.colorOpacityBlack40, + super.borderMutedDark = SoshColorRawTokens.colorOpacityWhite80, + super.borderMutedLight = SoshColorRawTokens.colorOpacityBlack80, + super.borderOnBrandPrimaryDark = SoshColorRawTokens.colorLochmaraDark960, super.borderOnBrandPrimaryLight = ColorRawTokens.colorFunctionalWhite, - super.borderOnBrandSecondaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.borderOnBrandSecondaryDark = SoshColorRawTokens.colorLochmaraDark960, super.borderOnBrandSecondaryLight = ColorRawTokens.colorFunctionalWhite, - super.borderOnBrandTertiaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.borderOnBrandTertiaryDark = SoshColorRawTokens.colorLochmaraDark960, super.borderOnBrandTertiaryLight = ColorRawTokens.colorFunctionalBlack, - super.borderStatusAccentDark = SoshColorRawTokens.colorMagenta300, - super.borderStatusAccentLight = SoshColorRawTokens.colorMagenta500, - super.borderStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, - super.borderStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.borderStatusAccentDark = SoshColorRawTokens.colorRaspberry300, + super.borderStatusAccentLight = SoshColorRawTokens.colorRaspberry500, + super.borderStatusInfoDark = SoshColorRawTokens.colorLochmaraLight400, + super.borderStatusInfoLight = SoshColorRawTokens.colorLochmaraDark240, super.borderStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.borderStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.borderStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, super.borderStatusPositiveLight = ColorRawTokens.colorFunctionalMalachite750, - super.borderStatusWarningDark = ColorRawTokens.colorFunctionalSun300, - super.borderStatusWarningLight = ColorRawTokens.colorFunctionalSun500, + super.borderStatusWarningDark = SoshColorRawTokens.colorTurbo300, + super.borderStatusWarningLight = SoshColorRawTokens.colorTurbo500, }); } 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..28d167ec8 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,71 +19,71 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorContentSemanticTokens extends OudsColorContentSemanticTokens { const SoshColorContentSemanticTokens({ - super.contentBrandPrimaryDark = SoshColorRawTokens.colorMagenta300, - super.contentBrandPrimaryLight = SoshColorRawTokens.colorMagenta500, - super.contentBrandSecondaryDark = SoshColorRawTokens.colorBlueDuckLight800, - super.contentBrandSecondaryLight = SoshColorRawTokens.colorBlueDuckDark400, - super.contentBrandTertiaryDark = SoshColorRawTokens.colorCitrine300, - super.contentBrandTertiaryLight = SoshColorRawTokens.colorCitrine500, - super.contentDefaultDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentBrandPrimaryDark = SoshColorRawTokens.colorRaspberry300, + super.contentBrandPrimaryLight = SoshColorRawTokens.colorRaspberry500, + super.contentBrandSecondaryDark = SoshColorRawTokens.colorLochmaraLight640, + super.contentBrandSecondaryLight = SoshColorRawTokens.colorLochmaraDark240, + super.contentBrandTertiaryDark = SoshColorRawTokens.colorTurbo300, + super.contentBrandTertiaryLight = SoshColorRawTokens.colorTurbo500, + super.contentDefaultDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentDefaultLight = ColorRawTokens.colorFunctionalBlack, - super.contentDisabledDark = ColorRawTokens.colorOpacityWhite200, - super.contentDisabledLight = ColorRawTokens.colorOpacityBlack200, + super.contentDisabledDark = SoshColorRawTokens.colorOpacityWhite200, + super.contentDisabledLight = SoshColorRawTokens.colorOpacityBlack200, super.contentInverseDark = ColorRawTokens.colorFunctionalBlack, super.contentInverseLight = ColorRawTokens.colorFunctionalWhite, - super.contentMutedDark = ColorRawTokens.colorOpacityWhite640, - super.contentMutedLight = ColorRawTokens.colorOpacityBlack680, - super.contentOnActionDisabledDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentMutedDark = SoshColorRawTokens.colorOpacityWhite640, + super.contentMutedLight = SoshColorRawTokens.colorOpacityBlack720, + super.contentOnActionDisabledDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionDisabledLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionEnabledDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionEnabledDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionEnabledLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionFocusDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionFocusDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionFocusLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionHighlightedDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionHighlightedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionHighlightedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionHoverDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionHoverDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionHoverLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionLoadingDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionLoadingDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionLoadingLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionPressedDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionPressedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionPressedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnActionSelectedDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnActionSelectedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnActionSelectedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnBrandPrimaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnBrandPrimaryDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnBrandPrimaryLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnBrandSecondaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnBrandSecondaryDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnBrandSecondaryLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnBrandTertiaryDark = SoshColorRawTokens.colorBlueDuckDark960, + super.contentOnBrandTertiaryDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnBrandTertiaryLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusAccentEmphasizedDark = ColorRawTokens.colorFunctionalBlack, + super.contentOnStatusAccentEmphasizedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnStatusAccentEmphasizedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnStatusAccentMutedDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentOnStatusAccentMutedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentOnStatusAccentMutedLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusInfoEmphasizedDark = ColorRawTokens.colorFunctionalBlack, + super.contentOnStatusInfoEmphasizedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnStatusInfoEmphasizedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnStatusInfoMutedDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentOnStatusInfoMutedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentOnStatusInfoMutedLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusNegativeEmphasizedDark = ColorRawTokens.colorFunctionalBlack, + super.contentOnStatusNegativeEmphasizedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnStatusNegativeEmphasizedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnStatusNegativeMutedDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentOnStatusNegativeMutedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentOnStatusNegativeMutedLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusPositiveEmphasizedDark = ColorRawTokens.colorFunctionalBlack, + super.contentOnStatusPositiveEmphasizedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnStatusPositiveEmphasizedLight = ColorRawTokens.colorFunctionalWhite, - super.contentOnStatusPositiveMutedDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentOnStatusPositiveMutedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentOnStatusPositiveMutedLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusWarningEmphasizedDark = ColorRawTokens.colorFunctionalBlack, + super.contentOnStatusWarningEmphasizedDark = SoshColorRawTokens.colorLochmaraDark960, super.contentOnStatusWarningEmphasizedLight = ColorRawTokens.colorFunctionalBlack, - super.contentOnStatusWarningMutedDark = ColorRawTokens.colorFunctionalGrayLight160, + super.contentOnStatusWarningMutedDark = SoshColorRawTokens.colorFunctionalGrayLight160, super.contentOnStatusWarningMutedLight = ColorRawTokens.colorFunctionalBlack, - super.contentStatusAccentDark = SoshColorRawTokens.colorMagenta300, - super.contentStatusAccentLight = SoshColorRawTokens.colorMagenta500, - super.contentStatusInfoDark = ColorRawTokens.colorFunctionalDodgerBlue300, - super.contentStatusInfoLight = ColorRawTokens.colorFunctionalDodgerBlue700, + super.contentStatusAccentDark = SoshColorRawTokens.colorRaspberry300, + super.contentStatusAccentLight = SoshColorRawTokens.colorRaspberry500, + super.contentStatusInfoDark = SoshColorRawTokens.colorLochmaraLight400, + super.contentStatusInfoLight = SoshColorRawTokens.colorLochmaraDark240, super.contentStatusNegativeDark = ColorRawTokens.colorFunctionalScarlet300, super.contentStatusNegativeLight = ColorRawTokens.colorFunctionalScarlet600, super.contentStatusPositiveDark = ColorRawTokens.colorFunctionalMalachite300, super.contentStatusPositiveLight = ColorRawTokens.colorFunctionalMalachite750, - super.contentStatusWarningDark = ColorRawTokens.colorFunctionalSun300, - super.contentStatusWarningLight = ColorRawTokens.colorFunctionalSun750, + super.contentStatusWarningDark = SoshColorRawTokens.colorTurbo300, + super.contentStatusWarningLight = SoshColorRawTokens.colorTurbo750, }); } diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_decorative_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_decorative_semantic_tokens.dart deleted file mode 100644 index 18333eda0..000000000 --- a/ouds_theme_sosh/lib/semantic/sosh_color_decorative_semantic_tokens.dart +++ /dev/null @@ -1,71 +0,0 @@ -// -// Software Name: OUDS Flutter -// SPDX-FileCopyrightText: Copyright (c) Orange SA -// SPDX-License-Identifier: MIT -// -// This software is distributed under the MIT license, -// the text of which is available at https://opensource.org/license/MIT/ -// or see the "LICENSE" file for more details. -// -// Software description: Flutter library of reusable graphical components -// - -// Sosh brand tokens version 1.5.0 -// Generated by Tokenator - -import 'package:flutter/material.dart'; -import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; -import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_decorative_semantic_tokens.dart'; -import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; - -class SoshColorDecorativeSemanticTokens extends OudsColorDecorativeSemanticTokens { - const SoshColorDecorativeSemanticTokens({ - super.decorativeAccent1Default = const Color(0x00ff0000), - super.decorativeAccent1Emphasized = const Color(0x00ff0000), - super.decorativeAccent1Muted = const Color(0x00ff0000), - super.decorativeAccent2Default = const Color(0x00ff0000), - super.decorativeAccent2Emphasized = const Color(0x00ff0000), - super.decorativeAccent2Muted = const Color(0x00ff0000), - super.decorativeAccent3Default = const Color(0x00ff0000), - super.decorativeAccent3Emphasized = const Color(0x00ff0000), - super.decorativeAccent3Muted = const Color(0x00ff0000), - super.decorativeAccent4Default = const Color(0x00ff0000), - super.decorativeAccent4Emphasized = const Color(0x00ff0000), - super.decorativeAccent4Muted = const Color(0x00ff0000), - super.decorativeAccent5Default = const Color(0x00ff0000), - super.decorativeAccent5Emphasized = const Color(0x00ff0000), - super.decorativeAccent5Muted = const Color(0x00ff0000), - super.decorativeBrandPrimary = SoshColorRawTokens.colorMagenta500, - super.decorativeBrandPrimaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandPrimaryMuted = const Color(0x00ff0000), - super.decorativeBrandSecondary = SoshColorRawTokens.colorBlueDuckLight480, - super.decorativeBrandSecondaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandSecondaryMuted = const Color(0x00ff0000), - super.decorativeBrandTertiary = SoshColorRawTokens.colorCitrine500, - super.decorativeBrandTertiaryEmphasized = const Color(0x00ff0000), - super.decorativeBrandTertiaryMuted = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedHigh = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedHigher = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedHighest = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedLow = ColorRawTokens.colorFunctionalGrayDark400, - super.decorativeNeutralEmphasizedLower = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedLowest = const Color(0x00ff0000), - super.decorativeNeutralEmphasizedMedium = const Color(0x00ff0000), - super.decorativeNeutralMutedHigh = const Color(0x00ff0000), - super.decorativeNeutralMutedHigher = const Color(0x00ff0000), - super.decorativeNeutralMutedHighest = const Color(0x00ff0000), - super.decorativeNeutralMutedLow = const Color(0x00ff0000), - super.decorativeNeutralMutedLower = ColorRawTokens.colorFunctionalGrayLight160, - super.decorativeNeutralMutedLowest = const Color(0x00ff0000), - super.decorativeNeutralMutedMedium = ColorRawTokens.colorFunctionalGrayLight400, - super.decorativeSkinTint100 = const Color(0x00ff0000), - super.decorativeSkinTint200 = const Color(0x00ff0000), - super.decorativeSkinTint300 = const Color(0x00ff0000), - super.decorativeSkinTint400 = const Color(0x00ff0000), - super.decorativeSkinTint500 = const Color(0x00ff0000), - super.decorativeSkinTint600 = const Color(0x00ff0000), - super.decorativeSkinTint700 = const Color(0x00ff0000), - super.decorativeSkinTint800 = const Color(0x00ff0000), - super.decorativeSkinTint900 = const Color(0x00ff0000), - }); -} 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..2a52ceea9 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,19 +10,19 @@ // Software description: Flutter library of reusable graphical components // -// Sosh brand tokens version 2.3.0 +// Sosh brand tokens version 2.5.0 // Generated by Tokenator +import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_opacity_semantic_tokens.dart'; -import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorOpacitySemanticTokens extends OudsColorOpacitySemanticTokens { const SoshColorOpacitySemanticTokens({ - super.opacityLowerDark = ColorRawTokens.colorOpacityWhite80, - super.opacityLowerLight = ColorRawTokens.colorOpacityBlack80, - super.opacityLowestDark = ColorRawTokens.colorOpacityWhite40, - super.opacityLowestLight = ColorRawTokens.colorOpacityBlack40, - super.opacityTransparentDark = ColorRawTokens.colorOpacityWhite0, - super.opacityTransparentLight = ColorRawTokens.colorOpacityBlack0, + super.opacityLowerDark = SoshColorRawTokens.colorOpacityWhite80, + super.opacityLowerLight = SoshColorRawTokens.colorOpacityBlack80, + super.opacityLowestDark = SoshColorRawTokens.colorOpacityWhite40, + super.opacityLowestLight = SoshColorRawTokens.colorOpacityBlack40, + super.opacityTransparentDark = SoshColorRawTokens.colorOpacityWhite0, + super.opacityTransparentLight = SoshColorRawTokens.colorOpacityBlack0, }); } 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..67f35d94e 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,13 +19,15 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorOverlaySemanticTokens extends OudsColorOverlaySemanticTokens { const SoshColorOverlaySemanticTokens({ - super.overlayDragDark = ColorRawTokens.colorOpacityWhite80, - super.overlayDragLight = ColorRawTokens.colorOpacityBlack40, - super.overlayDropdownDark = ColorRawTokens.colorFunctionalGrayDark560, + super.overlayBackdropDark = SoshColorRawTokens.colorOpacityBlack720, + super.overlayBackdropLight = SoshColorRawTokens.colorOpacityBlack720, + super.overlayDragDark = SoshColorRawTokens.colorOpacityWhite80, + super.overlayDragLight = SoshColorRawTokens.colorOpacityBlack40, + super.overlayDropdownDark = SoshColorRawTokens.colorFunctionalGrayDark560, super.overlayDropdownLight = ColorRawTokens.colorFunctionalWhite, - super.overlayModalDark = SoshColorRawTokens.colorBlueDuckDark720, - super.overlayModalLight = ColorRawTokens.colorFunctionalWhite, - super.overlayTooltipDark = ColorRawTokens.colorFunctionalGrayDark560, - super.overlayTooltipLight = ColorRawTokens.colorFunctionalGrayDark720, + super.overlayModalSheetDark = SoshColorRawTokens.colorLochmaraDark800, + super.overlayModalSheetLight = ColorRawTokens.colorFunctionalWhite, + super.overlayTooltipDark = SoshColorRawTokens.colorFunctionalGrayDark560, + super.overlayTooltipLight = SoshColorRawTokens.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..f1f37520b 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -22,55 +22,55 @@ class SoshColorRepositorySemanticTokens extends OudsColorRepositorySemanticToken const SoshColorRepositorySemanticTokens({ super.repositoryAccentHigh = const Color(0x00ff0000), super.repositoryAccentHigher = const Color(0x00ff0000), - super.repositoryAccentHighest = SoshColorRawTokens.colorMagenta800, - super.repositoryAccentLow = SoshColorRawTokens.colorMagenta300, + super.repositoryAccentHighest = SoshColorRawTokens.colorRaspberry800, + super.repositoryAccentLow = SoshColorRawTokens.colorRaspberry300, super.repositoryAccentLower = const Color(0x00ff0000), - super.repositoryAccentLowest = SoshColorRawTokens.colorMagenta50, - super.repositoryAccentMedium = SoshColorRawTokens.colorMagenta500, - super.repositoryInfoHigh = ColorRawTokens.colorFunctionalDodgerBlue700, + super.repositoryAccentLowest = SoshColorRawTokens.colorRaspberry50, + super.repositoryAccentMedium = SoshColorRawTokens.colorRaspberry500, + super.repositoryInfoHigh = SoshColorRawTokens.colorLochmaraDark240, super.repositoryInfoHigher = const Color(0x00ff0000), - super.repositoryInfoHighest = ColorRawTokens.colorFunctionalDodgerBlue900, - super.repositoryInfoLow = ColorRawTokens.colorFunctionalDodgerBlue300, + super.repositoryInfoHighest = const Color(0x00ff0000), + super.repositoryInfoLow = SoshColorRawTokens.colorLochmaraLight400, super.repositoryInfoLower = const Color(0x00ff0000), - super.repositoryInfoLowest = ColorRawTokens.colorFunctionalDodgerBlue100, + super.repositoryInfoLowest = const Color(0x00ff0000), super.repositoryInfoMedium = const Color(0x00ff0000), super.repositoryNegativeHigh = ColorRawTokens.colorFunctionalScarlet700, super.repositoryNegativeHigher = ColorRawTokens.colorFunctionalScarlet800, - super.repositoryNegativeHighest = ColorRawTokens.colorFunctionalScarlet900, + super.repositoryNegativeHighest = const Color(0x00ff0000), super.repositoryNegativeLow = ColorRawTokens.colorFunctionalScarlet300, super.repositoryNegativeLower = ColorRawTokens.colorFunctionalScarlet200, super.repositoryNegativeLowest = ColorRawTokens.colorFunctionalScarlet100, super.repositoryNegativeMedium = ColorRawTokens.colorFunctionalScarlet600, super.repositoryNeutralEmphasizedBlack = ColorRawTokens.colorFunctionalBlack, - super.repositoryNeutralEmphasizedHigh = ColorRawTokens.colorFunctionalGrayDark720, - super.repositoryNeutralEmphasizedHigher = ColorRawTokens.colorFunctionalGrayDark800, - super.repositoryNeutralEmphasizedHighest = ColorRawTokens.colorFunctionalGrayDark880, - super.repositoryNeutralEmphasizedLow = ColorRawTokens.colorFunctionalGrayDark560, + super.repositoryNeutralEmphasizedHigh = SoshColorRawTokens.colorFunctionalGrayDark720, + super.repositoryNeutralEmphasizedHigher = SoshColorRawTokens.colorFunctionalGrayDark800, + super.repositoryNeutralEmphasizedHighest = SoshColorRawTokens.colorFunctionalGrayDark880, + super.repositoryNeutralEmphasizedLow = SoshColorRawTokens.colorFunctionalGrayDark560, super.repositoryNeutralEmphasizedLower = const Color(0x00ff0000), super.repositoryNeutralEmphasizedLowest = const Color(0x00ff0000), - super.repositoryNeutralEmphasizedMedium = ColorRawTokens.colorFunctionalGrayDark640, + super.repositoryNeutralEmphasizedMedium = SoshColorRawTokens.colorFunctionalGrayDark640, super.repositoryNeutralMutedHigh = const Color(0x00ff0000), super.repositoryNeutralMutedHigher = const Color(0x00ff0000), super.repositoryNeutralMutedHighest = const Color(0x00ff0000), super.repositoryNeutralMutedLow = const Color(0x00ff0000), - super.repositoryNeutralMutedLower = ColorRawTokens.colorFunctionalGrayLight160, - super.repositoryNeutralMutedLowest = ColorRawTokens.colorFunctionalGrayLight80, + super.repositoryNeutralMutedLower = SoshColorRawTokens.colorFunctionalGrayLight160, + super.repositoryNeutralMutedLowest = SoshColorRawTokens.colorFunctionalGrayLight80, super.repositoryNeutralMutedMedium = const Color(0x00ff0000), super.repositoryNeutralMutedWhite = ColorRawTokens.colorFunctionalWhite, - super.repositoryOpacityAccentLow = SoshColorRawTokens.colorOpacityMagenta120, - super.repositoryOpacityAccentMedium = SoshColorRawTokens.colorOpacityMagenta640, - super.repositoryOpacityBlackHigh = ColorRawTokens.colorOpacityBlack520, - super.repositoryOpacityBlackHigher = ColorRawTokens.colorOpacityBlack680, - super.repositoryOpacityBlackHighest = ColorRawTokens.colorOpacityBlack840, - super.repositoryOpacityBlackLow = ColorRawTokens.colorOpacityBlack120, - super.repositoryOpacityBlackLower = ColorRawTokens.colorOpacityBlack80, - super.repositoryOpacityBlackLowest = ColorRawTokens.colorOpacityBlack40, - super.repositoryOpacityBlackMedium = ColorRawTokens.colorOpacityBlack280, - super.repositoryOpacityBlackMediumHigh = ColorRawTokens.colorOpacityBlack440, - super.repositoryOpacityBlackMediumLow = ColorRawTokens.colorOpacityBlack200, - super.repositoryOpacityBlackTransparent = ColorRawTokens.colorOpacityBlack0, - super.repositoryOpacityInfoLow = ColorRawTokens.colorOpacityDodgerBlue80, - super.repositoryOpacityInfoMedium = ColorRawTokens.colorOpacityDodgerBlue520, + super.repositoryOpacityAccentLow = SoshColorRawTokens.colorOpacityRaspberry100, + super.repositoryOpacityAccentMedium = SoshColorRawTokens.colorOpacityRaspberry640, + super.repositoryOpacityBlackHigh = SoshColorRawTokens.colorOpacityBlack520, + super.repositoryOpacityBlackHigher = SoshColorRawTokens.colorOpacityBlack720, + super.repositoryOpacityBlackHighest = SoshColorRawTokens.colorOpacityBlack920, + super.repositoryOpacityBlackLow = SoshColorRawTokens.colorOpacityBlack120, + super.repositoryOpacityBlackLower = SoshColorRawTokens.colorOpacityBlack80, + super.repositoryOpacityBlackLowest = SoshColorRawTokens.colorOpacityBlack40, + super.repositoryOpacityBlackMedium = SoshColorRawTokens.colorOpacityBlack280, + super.repositoryOpacityBlackMediumHigh = SoshColorRawTokens.colorOpacityBlack440, + super.repositoryOpacityBlackMediumLow = SoshColorRawTokens.colorOpacityBlack200, + super.repositoryOpacityBlackTransparent = SoshColorRawTokens.colorOpacityBlack0, + super.repositoryOpacityInfoLow = SoshColorRawTokens.colorOpacityLochmaraLight80080, + super.repositoryOpacityInfoMedium = SoshColorRawTokens.colorOpacityLochmaraDark880520, super.repositoryOpacityNegativeLow = ColorRawTokens.colorOpacityScarlet80, super.repositoryOpacityNegativeMedium = ColorRawTokens.colorOpacityScarlet320, super.repositoryOpacityPositiveLow = ColorRawTokens.colorOpacityMalachite120, @@ -83,51 +83,52 @@ class SoshColorRepositorySemanticTokens extends OudsColorRepositorySemanticToken super.repositoryOpacityPrimaryLowest = const Color(0x00ff0000), super.repositoryOpacityPrimaryMedium = const Color(0x00ff0000), super.repositoryOpacityPrimaryTransparent = const Color(0x00ff0000), - super.repositoryOpacityWarningLow = ColorRawTokens.colorOpacitySun160, - super.repositoryOpacityWarningMedium = ColorRawTokens.colorOpacitySun480, - super.repositoryOpacityWhiteHigh = ColorRawTokens.colorOpacityWhite640, - super.repositoryOpacityWhiteHigher = ColorRawTokens.colorOpacityWhite800, - super.repositoryOpacityWhiteHighest = ColorRawTokens.colorOpacityWhite920, - super.repositoryOpacityWhiteLow = ColorRawTokens.colorOpacityWhite120, - super.repositoryOpacityWhiteLower = ColorRawTokens.colorOpacityWhite80, - super.repositoryOpacityWhiteLowest = ColorRawTokens.colorOpacityWhite40, - super.repositoryOpacityWhiteMedium = ColorRawTokens.colorOpacityWhite440, - super.repositoryOpacityWhiteMediumLow = ColorRawTokens.colorOpacityWhite200, - super.repositoryOpacityWhiteTransparent = ColorRawTokens.colorOpacityWhite0, + super.repositoryOpacityWarningLow = SoshColorRawTokens.colorOpacityTurbo160, + super.repositoryOpacityWarningMedium = SoshColorRawTokens.colorOpacityTurbo480, + super.repositoryOpacityWhiteHigh = SoshColorRawTokens.colorOpacityWhite640, + super.repositoryOpacityWhiteHigher = SoshColorRawTokens.colorOpacityWhite800, + super.repositoryOpacityWhiteHighest = SoshColorRawTokens.colorOpacityWhite920, + super.repositoryOpacityWhiteLow = SoshColorRawTokens.colorOpacityWhite120, + super.repositoryOpacityWhiteLower = SoshColorRawTokens.colorOpacityWhite80, + super.repositoryOpacityWhiteLowest = SoshColorRawTokens.colorOpacityWhite40, + super.repositoryOpacityWhiteMedium = SoshColorRawTokens.colorOpacityWhite440, + super.repositoryOpacityWhiteMediumLow = SoshColorRawTokens.colorOpacityWhite200, + super.repositoryOpacityWhiteTransparent = SoshColorRawTokens.colorOpacityWhite0, super.repositoryPositiveHigh = ColorRawTokens.colorFunctionalMalachite700, super.repositoryPositiveHigher = ColorRawTokens.colorFunctionalMalachite750, - super.repositoryPositiveHighest = ColorRawTokens.colorFunctionalMalachite900, + super.repositoryPositiveHighest = const Color(0x00ff0000), super.repositoryPositiveLow = ColorRawTokens.colorFunctionalMalachite300, super.repositoryPositiveLower = const Color(0x00ff0000), - super.repositoryPositiveLowest = ColorRawTokens.colorFunctionalMalachite100, + super.repositoryPositiveLowest = const Color(0x00ff0000), super.repositoryPositiveMedium = ColorRawTokens.colorFunctionalMalachite600, super.repositoryPrimaryHigh = const Color(0x00ff0000), super.repositoryPrimaryHigher = const Color(0x00ff0000), - super.repositoryPrimaryHighest = SoshColorRawTokens.colorMagenta800, - super.repositoryPrimaryLow = SoshColorRawTokens.colorMagenta300, + super.repositoryPrimaryHighest = const Color(0x00ff0000), + super.repositoryPrimaryLow = SoshColorRawTokens.colorRaspberry300, super.repositoryPrimaryLower = const Color(0x00ff0000), - super.repositoryPrimaryLowest = SoshColorRawTokens.colorMagenta50, - super.repositoryPrimaryMedium = SoshColorRawTokens.colorMagenta500, - super.repositorySecondaryHigh = SoshColorRawTokens.colorBlueDuckDark720, - super.repositorySecondaryHigher = SoshColorRawTokens.colorBlueDuckDark880, - super.repositorySecondaryHighest = SoshColorRawTokens.colorBlueDuckDark960, - super.repositorySecondaryLow = SoshColorRawTokens.colorBlueDuckDark400, - super.repositorySecondaryLower = SoshColorRawTokens.colorBlueDuckLight800, - super.repositorySecondaryLowest = SoshColorRawTokens.colorBlueDuckLight80, - super.repositorySecondaryMedium = SoshColorRawTokens.colorBlueDuckDark560, + super.repositoryPrimaryLowest = const Color(0x00ff0000), + super.repositoryPrimaryMedium = SoshColorRawTokens.colorRaspberry500, + super.repositorySecondaryHigh = SoshColorRawTokens.colorLochmaraDark720, + super.repositorySecondaryHigherHigh = SoshColorRawTokens.colorLochmaraDark880, + super.repositorySecondaryHigherLow = SoshColorRawTokens.colorLochmaraDark800, + super.repositorySecondaryHighest = SoshColorRawTokens.colorLochmaraDark960, + super.repositorySecondaryLow = SoshColorRawTokens.colorLochmaraDark240, + super.repositorySecondaryLower = SoshColorRawTokens.colorLochmaraLight640, + super.repositorySecondaryLowest = SoshColorRawTokens.colorLochmaraLight80, + super.repositorySecondaryMedium = SoshColorRawTokens.colorLochmaraDark480, super.repositoryTertiaryHigh = const Color(0x00ff0000), super.repositoryTertiaryHigher = const Color(0x00ff0000), - super.repositoryTertiaryHighest = SoshColorRawTokens.colorCitrine950, - super.repositoryTertiaryLow = SoshColorRawTokens.colorCitrine300, + super.repositoryTertiaryHighest = SoshColorRawTokens.colorTurbo950, + super.repositoryTertiaryLow = SoshColorRawTokens.colorTurbo300, super.repositoryTertiaryLower = const Color(0x00ff0000), - super.repositoryTertiaryLowest = SoshColorRawTokens.colorCitrine50, - super.repositoryTertiaryMedium = SoshColorRawTokens.colorCitrine500, - super.repositoryWarningHigh = ColorRawTokens.colorFunctionalSun750, + super.repositoryTertiaryLowest = SoshColorRawTokens.colorTurbo50, + super.repositoryTertiaryMedium = SoshColorRawTokens.colorTurbo500, + super.repositoryWarningHigh = SoshColorRawTokens.colorTurbo750, super.repositoryWarningHigher = const Color(0x00ff0000), - super.repositoryWarningHighest = ColorRawTokens.colorFunctionalSun900, - super.repositoryWarningLow = ColorRawTokens.colorFunctionalSun300, + super.repositoryWarningHighest = const Color(0x00ff0000), + super.repositoryWarningLow = SoshColorRawTokens.colorTurbo300, super.repositoryWarningLower = const Color(0x00ff0000), - super.repositoryWarningLowest = ColorRawTokens.colorFunctionalSun100, - super.repositoryWarningMedium = ColorRawTokens.colorFunctionalSun500, + super.repositoryWarningLowest = const Color(0x00ff0000), + super.repositoryWarningMedium = SoshColorRawTokens.colorTurbo500, }); } diff --git a/ouds_theme_sosh/lib/semantic/sosh_color_semantic_tokens.dart b/ouds_theme_sosh/lib/semantic/sosh_color_semantic_tokens.dart index e9f3d4f35..b6a386a1d 100644 --- a/ouds_theme_sosh/lib/semantic/sosh_color_semantic_tokens.dart +++ b/ouds_theme_sosh/lib/semantic/sosh_color_semantic_tokens.dart @@ -4,7 +4,6 @@ import 'package:ouds_theme_sosh/semantic/sosh_color_always_semantic_tokens.dart' import 'package:ouds_theme_sosh/semantic/sosh_color_bg_semantic_tokens.dart'; import 'package:ouds_theme_sosh/semantic/sosh_color_border_semantic_tokens.dart'; import 'package:ouds_theme_sosh/semantic/sosh_color_content_semantic_tokens.dart'; -import 'package:ouds_theme_sosh/semantic/sosh_color_decorative_semantic_tokens.dart'; import 'package:ouds_theme_sosh/semantic/sosh_color_opacity_semantic_tokens.dart'; import 'package:ouds_theme_sosh/semantic/sosh_color_overlay_semantic_tokens.dart'; import 'package:ouds_theme_sosh/semantic/sosh_color_repository_semantic_tokens.dart'; @@ -17,7 +16,6 @@ class SoshColorSemanticTokens extends OudsColorSemanticTokens { SoshColorBgSemanticTokens backgroundColorTokens = const SoshColorBgSemanticTokens(), SoshColorBorderSemanticTokens borderColorTokens = const SoshColorBorderSemanticTokens(), SoshColorContentSemanticTokens contentColorTokens = const SoshColorContentSemanticTokens(), - SoshColorDecorativeSemanticTokens decorativeColorTokens = const SoshColorDecorativeSemanticTokens(), SoshColorOpacitySemanticTokens opacityColorTokens = const SoshColorOpacitySemanticTokens(), SoshColorOverlaySemanticTokens overlayColorTokens = const SoshColorOverlaySemanticTokens(), SoshColorSurfaceSemanticTokens surfaceColorTokens = const SoshColorSurfaceSemanticTokens(), @@ -28,7 +26,6 @@ class SoshColorSemanticTokens extends OudsColorSemanticTokens { backgroundColorTokens: backgroundColorTokens, borderColorTokens: borderColorTokens, contentColorTokens: contentColorTokens, - decorativeColorTokens: decorativeColorTokens, opacityColorTokens: opacityColorTokens, overlayColorTokens: overlayColorTokens, surfaceColorTokens: surfaceColorTokens, 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..5ce1ebfa2 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.5.0 // Generated by Tokenator import 'package:ouds_theme_sosh/raw/sosh_color_raw_tokens.dart'; @@ -19,28 +19,28 @@ import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; class SoshColorSurfaceSemanticTokens extends OudsColorSurfaceSemanticTokens { const SoshColorSurfaceSemanticTokens({ - super.surfaceBrandPrimaryDark = SoshColorRawTokens.colorMagenta300, - super.surfaceBrandPrimaryLight = SoshColorRawTokens.colorMagenta500, - super.surfaceBrandSecondaryDark = SoshColorRawTokens.colorBlueDuckLight800, - super.surfaceBrandSecondaryLight = SoshColorRawTokens.colorBlueDuckDark400, - super.surfaceBrandTertiaryDark = SoshColorRawTokens.colorCitrine300, - super.surfaceBrandTertiaryLight = SoshColorRawTokens.colorCitrine500, - super.surfaceInverseHighDark = ColorRawTokens.colorFunctionalGrayLight160, - super.surfaceInverseHighLight = ColorRawTokens.colorFunctionalGrayDark720, - super.surfaceInverseLowDark = ColorRawTokens.colorOpacityWhite120, - super.surfaceInverseLowLight = ColorRawTokens.colorFunctionalGrayDark720, - super.surfacePrimaryDark = ColorRawTokens.colorOpacityWhite40, + super.surfaceBrandPrimaryDark = SoshColorRawTokens.colorRaspberry300, + super.surfaceBrandPrimaryLight = SoshColorRawTokens.colorRaspberry500, + super.surfaceBrandSecondaryDark = SoshColorRawTokens.colorLochmaraLight640, + super.surfaceBrandSecondaryLight = SoshColorRawTokens.colorLochmaraDark240, + super.surfaceBrandTertiaryDark = SoshColorRawTokens.colorTurbo300, + super.surfaceBrandTertiaryLight = SoshColorRawTokens.colorTurbo500, + super.surfaceInverseHighDark = SoshColorRawTokens.colorLochmaraLight80, + super.surfaceInverseHighLight = SoshColorRawTokens.colorLochmaraDark880, + super.surfaceInverseLowDark = SoshColorRawTokens.colorOpacityWhite120, + super.surfaceInverseLowLight = SoshColorRawTokens.colorLochmaraDark880, + super.surfacePrimaryDark = SoshColorRawTokens.colorOpacityWhite40, super.surfacePrimaryLight = ColorRawTokens.colorFunctionalWhite, - super.surfaceSecondaryDark = ColorRawTokens.colorOpacityWhite80, - super.surfaceSecondaryLight = ColorRawTokens.colorOpacityBlack40, - super.surfaceStatusAccentEmphasizedDark = SoshColorRawTokens.colorMagenta300, - super.surfaceStatusAccentEmphasizedLight = SoshColorRawTokens.colorMagenta500, - super.surfaceStatusAccentMutedDark = SoshColorRawTokens.colorOpacityMagenta640, - super.surfaceStatusAccentMutedLight = SoshColorRawTokens.colorOpacityMagenta120, - super.surfaceStatusInfoEmphasizedDark = ColorRawTokens.colorFunctionalDodgerBlue300, - super.surfaceStatusInfoEmphasizedLight = ColorRawTokens.colorFunctionalDodgerBlue700, - super.surfaceStatusInfoMutedDark = ColorRawTokens.colorOpacityDodgerBlue520, - super.surfaceStatusInfoMutedLight = ColorRawTokens.colorOpacityDodgerBlue80, + super.surfaceSecondaryDark = SoshColorRawTokens.colorOpacityWhite80, + super.surfaceSecondaryLight = SoshColorRawTokens.colorOpacityBlack40, + super.surfaceStatusAccentEmphasizedDark = SoshColorRawTokens.colorRaspberry300, + super.surfaceStatusAccentEmphasizedLight = SoshColorRawTokens.colorRaspberry500, + super.surfaceStatusAccentMutedDark = SoshColorRawTokens.colorOpacityRaspberry640, + super.surfaceStatusAccentMutedLight = SoshColorRawTokens.colorOpacityRaspberry100, + super.surfaceStatusInfoEmphasizedDark = SoshColorRawTokens.colorLochmaraLight400, + super.surfaceStatusInfoEmphasizedLight = SoshColorRawTokens.colorLochmaraDark240, + super.surfaceStatusInfoMutedDark = SoshColorRawTokens.colorOpacityLochmaraDark880520, + super.surfaceStatusInfoMutedLight = SoshColorRawTokens.colorOpacityLochmaraLight80080, super.surfaceStatusNegativeEmphasizedDark = ColorRawTokens.colorFunctionalScarlet300, super.surfaceStatusNegativeEmphasizedLight = ColorRawTokens.colorFunctionalScarlet600, super.surfaceStatusNegativeMutedDark = ColorRawTokens.colorOpacityScarlet320, @@ -49,11 +49,11 @@ class SoshColorSurfaceSemanticTokens extends OudsColorSurfaceSemanticTokens { super.surfaceStatusPositiveEmphasizedLight = ColorRawTokens.colorFunctionalMalachite750, super.surfaceStatusPositiveMutedDark = ColorRawTokens.colorOpacityMalachite640, super.surfaceStatusPositiveMutedLight = ColorRawTokens.colorOpacityMalachite120, - super.surfaceStatusWarningEmphasizedDark = ColorRawTokens.colorFunctionalSun300, - super.surfaceStatusWarningEmphasizedLight = ColorRawTokens.colorFunctionalSun500, - super.surfaceStatusWarningMutedDark = ColorRawTokens.colorOpacitySun480, - super.surfaceStatusWarningMutedLight = ColorRawTokens.colorOpacitySun160, - super.surfaceTertiaryDark = SoshColorRawTokens.colorOpacityMagenta640, - super.surfaceTertiaryLight = SoshColorRawTokens.colorOpacityMagenta120, + super.surfaceStatusWarningEmphasizedDark = SoshColorRawTokens.colorTurbo300, + super.surfaceStatusWarningEmphasizedLight = SoshColorRawTokens.colorTurbo500, + super.surfaceStatusWarningMutedDark = SoshColorRawTokens.colorOpacityTurbo480, + super.surfaceStatusWarningMutedLight = SoshColorRawTokens.colorOpacityTurbo160, + super.surfaceTertiaryDark = SoshColorRawTokens.colorOpacityRaspberry640, + super.surfaceTertiaryLight = SoshColorRawTokens.colorOpacityRaspberry100, }); } 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..0eda2df9c 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.5.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..abac17f2c 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.5.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..7e930c4ce 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.5.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..c9b1adaea 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.5.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..c548bccec 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.5.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..cfabf1d3c 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_sosh/pubspec.yaml b/ouds_theme_sosh/pubspec.yaml index 2baa52ef0..a40db3758 100644 --- a/ouds_theme_sosh/pubspec.yaml +++ b/ouds_theme_sosh/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_theme_sosh description: 'Sosh theme implementation for OUDS, with branding-specific design tokens.' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -13,9 +13,12 @@ resolution: workspace dependencies: flutter: sdk: flutter - ouds_core: ^1.3.1 - ouds_theme_contract: ^1.3.1 - ouds_global_raw_tokens: ^1.3.1 + # Core + ouds_core: ^2.0.0 + # Theme contract + ouds_theme_contract: ^2.0.0 + # Global raw token + ouds_global_raw_tokens: ^2.0.0 dev_dependencies: flutter_test: diff --git a/ouds_theme_wireframe/CHANGELOG.md b/ouds_theme_wireframe/CHANGELOG.md index 97a764355..864a935d5 100644 --- a/ouds_theme_wireframe/CHANGELOG.md +++ b/ouds_theme_wireframe/CHANGELOG.md @@ -7,17 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop) ### Added ### Changed +- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778)) +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) + ### Fixed ## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14 -### Added -### Changed -### Fixed ## [1.3.0](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.2.0...1.3.0) - 2026-05-08 ### Added ### Changed +- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726)) - [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/README.md b/ouds_theme_wireframe/README.md index 7f10c20a7..56810d13a 100644 --- a/ouds_theme_wireframe/README.md +++ b/ouds_theme_wireframe/README.md @@ -14,7 +14,7 @@ To use **Theme Wireframe**, add it as a dependency in your `pubspec.yaml` file. ```yaml dependencies: - ouds_theme_wireframe: ^1.3.1 + ouds_theme_wireframe: ^2.0.0 ``` ## Other OUDS Libraries diff --git a/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_alert_tokens.dart index 9bbf5d78d..f3992fc8e 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.5.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..272c21f40 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.5.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..1f36ed13b 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.5.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..57318f473 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.5.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..2686c5d80 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.5.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..5ca972542 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.5.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..f70f0c93e 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; @@ -39,6 +39,7 @@ class WireframeCheckboxTokens extends OudsCheckboxTokens { double get borderWidthUnselectedHover => providersTokens.borderTokens.widthMedium; @override double get borderWidthUnselectedPressed => providersTokens.borderTokens.widthMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeIndicator => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; @override diff --git a/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_chip_tokens.dart index 9aab2e068..8f3a855ae 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.5.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..10b84fd8f 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.5.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,41 +25,131 @@ class WireframeControlItemTokens extends OudsControlItemTokens { WireframeControlItemTokens(this.providersTokens); @override - double get borderRadius => providersTokens.borderTokens.radiusNone; + double get borderRadiusCurrentIndicator => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusDefault => providersTokens.borderTokens.radiusDefault; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get borderRadiusItemOnly => providersTokens.borderTokens.radiusDefault; @override + double get borderRadiusMedia => providersTokens.borderTokens.radiusDefault; + @override + double get borderRadiusMediaRoundedCorner => providersTokens.borderTokens.radiusSmall; + @override + double get borderRadiusRounded => providersTokens.borderTokens.radiusDefault; + @override + double get borderWidthCurrentPage => providersTokens.borderTokens.widthMedium; + @override + double get borderWidthDefault => providersTokens.borderTokens.widthDefault; + @override + Color get colorBadgeSafetyArea => providersTokens.colorScheme.bgPrimary; + @override + Color get colorBgCurrentDisabled => providersTokens.colorScheme.actionDisabled; + @override + Color get colorBgCurrentEnabled => providersTokens.colorScheme.actionSelected; + @override + Color get colorBgCurrentFocus => providersTokens.colorScheme.actionFocus; + @override + Color get colorBgCurrentHover => providersTokens.colorScheme.actionHover; + @override + Color get colorBgCurrentPressed => providersTokens.colorScheme.actionPressed; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorBgFocus => providersTokens.colorScheme.actionSupportFocus; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgHover => providersTokens.colorScheme.actionSupportHover; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgLoading => providersTokens.colorScheme.actionSupportLoading; + @Deprecated("This token is deprecated and will be removed in a future version.") @override Color get colorBgPressed => providersTokens.colorScheme.actionSupportPressed; @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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override Color get colorContentLoader => providersTokens.colorScheme.actionLoading; @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; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeErrorIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; @override + double get sizeFlagHeight => providersTokens.sizeTokens.iconWithLabelLargeSizeXsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get sizeIcon => providersTokens.sizeTokens.iconWithLabelLargeSizeMedium; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeLoader => providersTokens.sizeTokens.iconWithLabelLargeSizeSmall; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get sizeMaxHeightAssetsContainer => DimensionRawTokens.dimension1200; @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 spacePaddingBlockBottomSlot => providersTokens.spaceTokens.paddingBlock3xsmall; + @Deprecated("This token is deprecated and will be removed in a future version.") + @override double get spacePaddingBlockDefault => providersTokens.spaceTokens.paddingBlockMedium; @override - double get spacePaddingBlockTopErrorText => providersTokens.spaceTokens.paddingBlockXsmall; + double get spacePaddingBlockDensityCompact => providersTokens.spaceTokens.paddingBlockXsmall; + @override + double get spacePaddingBlockDensityCompactBottomExpandContainer => providersTokens.spaceTokens.paddingBlock2xlarge; + @override + double get spacePaddingBlockDensityCompactTopAlignmentTopCounterweight => providersTokens.spaceTokens.paddingBlockXsmall; + @override + 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; + @Deprecated("This token is deprecated and will be removed in a future version.") @override double get spacePaddingInlineErrorIcon => providersTokens.spaceTokens.paddingInline4xsmall; @override diff --git a/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_divider_tokens.dart index 003f0a3e2..076bc7154 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.5.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..173ff30f9 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.5.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..347c29eee 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.5.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..362e8b98a 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.5.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..687b86257 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.5.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..377a83435 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.5.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..d69bc5351 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.5.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..d6efcd5fe 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.5.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..7e360da97 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.5.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..4ae971642 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.5.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..f9b4877bd 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.5.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/material/wireframe_material_color_tokens.dart b/ouds_theme_wireframe/lib/material/wireframe_material_color_tokens.dart index 8a632cf77..ab9860ddd 100644 --- a/ouds_theme_wireframe/lib/material/wireframe_material_color_tokens.dart +++ b/ouds_theme_wireframe/lib/material/wireframe_material_color_tokens.dart @@ -13,6 +13,7 @@ // Android system tokens version 1.2.0 // Generated by Tokenator +import 'package:flutter/material.dart'; import 'package:ouds_theme_contract/theme/tokens/material/ouds_material_color_tokens.dart'; import 'package:ouds_global_raw_tokens/color_raw_tokens.dart'; import 'package:ouds_theme_wireframe/raw/wireframe_color_raw_tokens.dart'; @@ -21,7 +22,7 @@ class WireframeMaterialColorTokens extends OudsMaterialColorTokens { const WireframeMaterialColorTokens({ super.backgroundDark = WireframeColorRawTokens.colorFunctionalGrayDark880, super.backgroundLight = ColorRawTokens.colorFunctionalWhite, - super.errorContainerDark = ColorRawTokens.colorFunctionalScarlet900, + super.errorContainerDark = const Color(0x00ff0000), super.errorContainerLight = ColorRawTokens.colorFunctionalScarlet100, super.errorDark = ColorRawTokens.colorFunctionalScarlet300, super.errorLight = ColorRawTokens.colorFunctionalScarlet600, 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..9634df981 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.5.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..a0d7b51f0 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.5.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..d215a94c7 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.5.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..c57b653c5 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.5.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..124ab317d 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.5.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..d5c6f421d 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; 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..d81a433ed 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.5.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..732c11e78 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.5.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..0787124cc 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.5.0 // Generated by Tokenator import 'package:flutter/material.dart'; @@ -29,14 +29,14 @@ class WireframeColorRepositorySemanticTokens extends OudsColorRepositorySemantic super.repositoryAccentMedium = WireframeColorRawTokens.colorRustyRed600, super.repositoryInfoHigh = ColorRawTokens.colorFunctionalDodgerBlue700, super.repositoryInfoHigher = const Color(0x00ff0000), - super.repositoryInfoHighest = ColorRawTokens.colorFunctionalDodgerBlue900, + super.repositoryInfoHighest = const Color(0x00ff0000), super.repositoryInfoLow = ColorRawTokens.colorFunctionalDodgerBlue300, super.repositoryInfoLower = const Color(0x00ff0000), - super.repositoryInfoLowest = ColorRawTokens.colorFunctionalDodgerBlue100, + super.repositoryInfoLowest = const Color(0x00ff0000), super.repositoryInfoMedium = const Color(0x00ff0000), super.repositoryNegativeHigh = ColorRawTokens.colorFunctionalScarlet700, super.repositoryNegativeHigher = ColorRawTokens.colorFunctionalScarlet800, - super.repositoryNegativeHighest = ColorRawTokens.colorFunctionalScarlet900, + super.repositoryNegativeHighest = const Color(0x00ff0000), super.repositoryNegativeLow = ColorRawTokens.colorFunctionalScarlet300, super.repositoryNegativeLower = ColorRawTokens.colorFunctionalScarlet200, super.repositoryNegativeLowest = ColorRawTokens.colorFunctionalScarlet100, @@ -96,10 +96,10 @@ class WireframeColorRepositorySemanticTokens extends OudsColorRepositorySemantic super.repositoryOpacityWhiteTransparent = WireframeColorRawTokens.colorOpacityWhite0, super.repositoryPositiveHigh = ColorRawTokens.colorFunctionalMalachite700, super.repositoryPositiveHigher = ColorRawTokens.colorFunctionalMalachite750, - super.repositoryPositiveHighest = ColorRawTokens.colorFunctionalMalachite900, + super.repositoryPositiveHighest = const Color(0x00ff0000), super.repositoryPositiveLow = ColorRawTokens.colorFunctionalMalachite300, super.repositoryPositiveLower = const Color(0x00ff0000), - super.repositoryPositiveLowest = ColorRawTokens.colorFunctionalMalachite100, + super.repositoryPositiveLowest = const Color(0x00ff0000), super.repositoryPositiveMedium = ColorRawTokens.colorFunctionalMalachite600, super.repositoryPrimaryHigh = WireframeColorRawTokens.colorRoyalBlue800, super.repositoryPrimaryHigher = WireframeColorRawTokens.colorRoyalBlue900, @@ -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, @@ -124,10 +125,10 @@ class WireframeColorRepositorySemanticTokens extends OudsColorRepositorySemantic super.repositoryTertiaryMedium = const Color(0x00ff0000), super.repositoryWarningHigh = ColorRawTokens.colorFunctionalSun750, super.repositoryWarningHigher = const Color(0x00ff0000), - super.repositoryWarningHighest = ColorRawTokens.colorFunctionalSun900, + super.repositoryWarningHighest = const Color(0x00ff0000), super.repositoryWarningLow = ColorRawTokens.colorFunctionalSun300, super.repositoryWarningLower = const Color(0x00ff0000), - super.repositoryWarningLowest = ColorRawTokens.colorFunctionalSun100, + super.repositoryWarningLowest = const Color(0x00ff0000), super.repositoryWarningMedium = ColorRawTokens.colorFunctionalSun500, }); } diff --git a/ouds_theme_wireframe/lib/semantic/wireframe_color_semantic_tokens.dart b/ouds_theme_wireframe/lib/semantic/wireframe_color_semantic_tokens.dart index 72676179b..72375a871 100644 --- a/ouds_theme_wireframe/lib/semantic/wireframe_color_semantic_tokens.dart +++ b/ouds_theme_wireframe/lib/semantic/wireframe_color_semantic_tokens.dart @@ -16,7 +16,6 @@ class WireframeColorSemanticTokens extends OudsColorSemanticTokens { WireframeColorBgSemanticTokens backgroundColorTokens = const WireframeColorBgSemanticTokens(), WireframeColorBorderSemanticTokens borderColorTokens = const WireframeColorBorderSemanticTokens(), WireframeColorContentSemanticTokens contentColorTokens = const WireframeColorContentSemanticTokens(), - //WireframeColorDecorativeSemanticTokens decorativeColorTokens = const WireframeColorDecorativeSemanticTokens(), WireframeColorOpacitySemanticTokens opacityColorTokens = const WireframeColorOpacitySemanticTokens(), WireframeColorOverlaySemanticTokens overlayColorTokens = const WireframeColorOverlaySemanticTokens(), WireframeColorSurfaceSemanticTokens surfaceColorTokens = const WireframeColorSurfaceSemanticTokens(), @@ -27,7 +26,6 @@ class WireframeColorSemanticTokens extends OudsColorSemanticTokens { backgroundColorTokens: backgroundColorTokens, borderColorTokens: borderColorTokens, contentColorTokens: contentColorTokens, - //decorativeColorTokens: decorativeColorTokens, opacityColorTokens: opacityColorTokens, overlayColorTokens: overlayColorTokens, surfaceColorTokens: surfaceColorTokens, 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..2ed3eef6f 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.5.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..0c92a17e6 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.5.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..2da031ca4 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.5.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..54b459d4c 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.5.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..2c224b753 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.5.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..93d8308e1 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.5.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..76d65697a 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.5.0 // Generated by Tokenator import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart'; diff --git a/ouds_theme_wireframe/pubspec.yaml b/ouds_theme_wireframe/pubspec.yaml index 8c3da1362..f99b16fc3 100644 --- a/ouds_theme_wireframe/pubspec.yaml +++ b/ouds_theme_wireframe/pubspec.yaml @@ -1,8 +1,8 @@ name: ouds_theme_wireframe description: 'Wireframe theme implementation for OUDS, with branding-specific design tokens.' -version: 1.3.1 repository: https://github.com/Orange-OpenSource/ouds-flutter homepage: https://flutter.unified-design-system.orange.com +version: 2.0.0 environment: sdk: ^3.9.0 @@ -13,9 +13,12 @@ resolution: workspace dependencies: flutter: sdk: flutter - ouds_core: ^1.3.1 - ouds_theme_contract: ^1.3.1 - ouds_global_raw_tokens: ^1.3.1 + # Core + ouds_core: ^2.0.0 + # Theme contract + ouds_theme_contract: ^2.0.0 + # Global raw token + ouds_global_raw_tokens: ^2.0.0 dev_dependencies: flutter_test: diff --git a/pubspec.lock b/pubspec.lock index 8a5e12e0b..b9c8b3771 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f + sha256: "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc" url: "https://pub.dev" source: hosted - version: "85.0.0" + version: "96.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d" + sha256: "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0" url: "https://pub.dev" source: hosted - version: "7.7.1" + version: "10.2.0" app_settings: dependency: transitive description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" clock: dependency: transitive description: @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: dartdoc - sha256: f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be + sha256: c60c01dc5aeb095a3b7b875150fe0e50b46330aec5d3417e7bae235ccd8a00ab url: "https://pub.dev" source: hosted - version: "8.3.4" + version: "9.0.4" dlibphonenumber: dependency: transitive description: @@ -289,26 +289,26 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.19" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.18.0" nested: dependency: transitive description: @@ -510,10 +510,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.11" typed_data: dependency: transitive description: