diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 5640c1c80..85aa3cab7 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed -- [DemoApp][Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672)) +- [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)) ### Fixed diff --git a/ouds_core/CHANGELOG.md b/ouds_core/CHANGELOG.md index bee8ac5a2..24afd63d9 100644 --- a/ouds_core/CHANGELOG.md +++ b/ouds_core/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_contract/CHANGELOG.md b/ouds_theme_contract/CHANGELOG.md index 0b1b88244..c162d1240 100644 --- a/ouds_theme_contract/CHANGELOG.md +++ b/ouds_theme_contract/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_contract/lib/ouds_component_version.dart b/ouds_theme_contract/lib/ouds_component_version.dart index 13b5d9050..9beb006cc 100644 --- a/ouds_theme_contract/lib/ouds_component_version.dart +++ b/ouds_theme_contract/lib/ouds_component_version.dart @@ -16,6 +16,7 @@ class OudsComponentVersion { static const alertMessage = '1.1.0'; static const badge = '1.2.0'; static const bar = '1.0.0'; + static const bulletList = '1.0.0'; static const button = '3.2.0'; static const checkbox = '2.4.0'; static const chip = '1.3.0'; diff --git a/ouds_theme_contract/lib/ouds_tokens_version.dart b/ouds_theme_contract/lib/ouds_tokens_version.dart index 406b5176c..cac791562 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 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 oudsCore = '1.9.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'; } 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 new file mode 100644 index 000000000..c23543b2d --- /dev/null +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart @@ -0,0 +1,24 @@ +// +// 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.3.0 +// Generated by Tokenator + +abstract class OudsBulletListTokens { + late double spaceColumnGapBodyLarge; + late double spaceColumnGapBodyMedium; + late double spacePaddingBlockBodyLarge; + late double spacePaddingBlockBodyMedium; + late double spacePaddingInlineLevel0; + late double spacePaddingInlineLevel1; + late double spacePaddingInlineLevel2; +} diff --git a/ouds_theme_contract/lib/theme/tokens/components/ouds_components_tokens.dart b/ouds_theme_contract/lib/theme/tokens/components/ouds_components_tokens.dart index 28205de6d..a82c8c29f 100644 --- a/ouds_theme_contract/lib/theme/tokens/components/ouds_components_tokens.dart +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_components_tokens.dart @@ -13,12 +13,14 @@ import 'package:ouds_theme_contract/theme/tokens/components/ouds_alert_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_badge_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_bar_tokens.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_buttonMono_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_button_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_checkbox_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_chip_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_divider_tokens.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_inputTag_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_linkMono_tokens.dart'; import 'package:ouds_theme_contract/theme/tokens/components/ouds_link_tokens.dart'; @@ -48,6 +50,8 @@ class OudsComponentsTokens { final OudsLinkMonoTokens linkMono; final OudsBarTokens bar; final OudsAlertTokens alert; + final OudsIconTokens icon; + final OudsBulletListTokens bulletList; const OudsComponentsTokens({ required this.button, @@ -68,5 +72,7 @@ class OudsComponentsTokens { required this.linkMono, required this.bar, required this.alert, + required this.icon, + required this.bulletList, }); } 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 new file mode 100644 index 000000000..53586e73f --- /dev/null +++ b/ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart @@ -0,0 +1,22 @@ +// +// 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.3.0 +// Generated by Tokenator + +import 'package:flutter/material.dart'; + +abstract class OudsIconTokens { + late Color colorContentDefault; + late Color colorContentStatusWarningExternalShape; + late Color colorContentStatusWarningInternalShape; +} diff --git a/ouds_theme_orange/CHANGELOG.md b/ouds_theme_orange/CHANGELOG.md index 2116dcd72..ba725f942 100644 --- a/ouds_theme_orange/CHANGELOG.md +++ b/ouds_theme_orange/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart b/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart new file mode 100644 index 000000000..ba3b96981 --- /dev/null +++ b/ouds_theme_orange/lib/components/orange_bulletList_tokens.dart @@ -0,0 +1,39 @@ +// +// 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.3.0 +// Generated by Tokenator + +import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart'; + +class OrangeBulletListTokens extends OudsBulletListTokens { + final OudsProvidersTokens providersTokens; + + OrangeBulletListTokens(this.providersTokens); + + @override + double get spaceColumnGapBodyLarge => providersTokens.spaceTokens.columnGapSmall; + @override + double get spaceColumnGapBodyMedium => providersTokens.spaceTokens.columnGapSmall; + @override + double get spacePaddingBlockBodyLarge => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingBlockBodyMedium => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingInlineLevel0 => DimensionRawTokens.dimension50; + @override + double get spacePaddingInlineLevel1 => DimensionRawTokens.dimension450; + @override + double get spacePaddingInlineLevel2 => DimensionRawTokens.dimension850; +} diff --git a/ouds_theme_orange/lib/components/orange_icon_tokens.dart b/ouds_theme_orange/lib/components/orange_icon_tokens.dart new file mode 100644 index 000000000..c8097ab25 --- /dev/null +++ b/ouds_theme_orange/lib/components/orange_icon_tokens.dart @@ -0,0 +1,31 @@ +// +// 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.3.0 +// Generated by Tokenator + +import 'package:flutter/material.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart'; + +class OrangeIconTokens extends OudsIconTokens { + final OudsProvidersTokens providersTokens; + + 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); +} diff --git a/ouds_theme_orange/lib/orange_theme.dart b/ouds_theme_orange/lib/orange_theme.dart index 903c9af20..3e8f31705 100644 --- a/ouds_theme_orange/lib/orange_theme.dart +++ b/ouds_theme_orange/lib/orange_theme.dart @@ -32,12 +32,14 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_to import 'package:ouds_theme_orange/components/orange_alert_tokens.dart'; import 'package:ouds_theme_orange/components/orange_badge_tokens.dart'; import 'package:ouds_theme_orange/components/orange_bar_tokens.dart'; +import 'package:ouds_theme_orange/components/orange_bulletList_tokens.dart'; import 'package:ouds_theme_orange/components/orange_buttonMono_tokens.dart'; import 'package:ouds_theme_orange/components/orange_button_tokens.dart'; import 'package:ouds_theme_orange/components/orange_checkbox_tokens.dart'; import 'package:ouds_theme_orange/components/orange_chip_tokens.dart'; import 'package:ouds_theme_orange/components/orange_controlItem_tokens.dart'; import 'package:ouds_theme_orange/components/orange_divider_tokens.dart'; +import 'package:ouds_theme_orange/components/orange_icon_tokens.dart'; import 'package:ouds_theme_orange/components/orange_inputTag_tokens.dart'; import 'package:ouds_theme_orange/components/orange_linkMono_tokens.dart'; import 'package:ouds_theme_orange/components/orange_link_tokens.dart'; @@ -405,6 +407,8 @@ class OrangeTheme implements OudsThemeContract { linkMono: OrangeLinkMonoTokens(providersTokens(context)), bar: OrangeBarTokens(providersTokens(context)), alert: OrangeAlertTokens(providersTokens(context)), + icon: OrangeIconTokens(providersTokens(context)), + bulletList: OrangeBulletListTokens(providersTokens(context)), ); } diff --git a/ouds_theme_orange_compact/CHANGELOG.md b/ouds_theme_orange_compact/CHANGELOG.md index 57f550beb..437a02f35 100644 --- a/ouds_theme_orange_compact/CHANGELOG.md +++ b/ouds_theme_orange_compact/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart new file mode 100644 index 000000000..9dcf5ef4a --- /dev/null +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_bulletList_tokens.dart @@ -0,0 +1,39 @@ +// +// 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 Compact brand tokens version 2.3.0 +// Generated by Tokenator + +import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart'; + +class OrangeCompactBulletListTokens extends OudsBulletListTokens { + final OudsProvidersTokens providersTokens; + + OrangeCompactBulletListTokens(this.providersTokens); + + @override + double get spaceColumnGapBodyLarge => providersTokens.spaceTokens.columnGapSmall; + @override + double get spaceColumnGapBodyMedium => providersTokens.spaceTokens.columnGapSmall; + @override + double get spacePaddingBlockBodyLarge => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingBlockBodyMedium => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingInlineLevel0 => DimensionRawTokens.dimension50; + @override + double get spacePaddingInlineLevel1 => DimensionRawTokens.dimension450; + @override + double get spacePaddingInlineLevel2 => DimensionRawTokens.dimension850; +} diff --git a/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart b/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart new file mode 100644 index 000000000..38bbc6e0f --- /dev/null +++ b/ouds_theme_orange_compact/lib/components/orangeCompact_icon_tokens.dart @@ -0,0 +1,31 @@ +// +// 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 Compact brand tokens version 2.3.0 +// Generated by Tokenator + +import 'package:flutter/material.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart'; + +class OrangeCompactIconTokens extends OudsIconTokens { + final OudsProvidersTokens providersTokens; + + 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); +} diff --git a/ouds_theme_orange_compact/lib/orange_compact_theme.dart b/ouds_theme_orange_compact/lib/orange_compact_theme.dart index 8f53ba9ad..7031fa0dc 100644 --- a/ouds_theme_orange_compact/lib/orange_compact_theme.dart +++ b/ouds_theme_orange_compact/lib/orange_compact_theme.dart @@ -32,12 +32,14 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_to import 'package:ouds_theme_orange_compact/components/orangeCompact_alert_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_badge_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_bar_tokens.dart'; +import 'package:ouds_theme_orange_compact/components/orangeCompact_bulletList_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_buttonMono_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_button_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_checkbox_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_chip_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_controlItem_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_divider_tokens.dart'; +import 'package:ouds_theme_orange_compact/components/orangeCompact_icon_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_inputTag_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_linkMono_tokens.dart'; import 'package:ouds_theme_orange_compact/components/orangeCompact_link_tokens.dart'; @@ -343,6 +345,8 @@ class OrangeCompactTheme implements OudsThemeContract { linkMono: OrangeCompactLinkMonoTokens(providersTokens(context)), bar: OrangeCompactBarTokens(providersTokens(context)), alert: OrangeCompactAlertTokens(providersTokens(context)), + icon: OrangeCompactIconTokens(providersTokens(context)), + bulletList: OrangeCompactBulletListTokens(providersTokens(context)), ); } diff --git a/ouds_theme_sosh/CHANGELOG.md b/ouds_theme_sosh/CHANGELOG.md index bbdc446da..64be6a1fe 100644 --- a/ouds_theme_sosh/CHANGELOG.md +++ b/ouds_theme_sosh/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart b/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart new file mode 100644 index 000000000..1cae52c39 --- /dev/null +++ b/ouds_theme_sosh/lib/components/sosh_bulletList_tokens.dart @@ -0,0 +1,39 @@ +// +// 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 2.3.0 +// Generated by Tokenator + +import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart'; + +class SoshBulletListTokens extends OudsBulletListTokens { + final OudsProvidersTokens providersTokens; + + SoshBulletListTokens(this.providersTokens); + + @override + double get spaceColumnGapBodyLarge => providersTokens.spaceTokens.columnGapSmall; + @override + double get spaceColumnGapBodyMedium => providersTokens.spaceTokens.columnGapSmall; + @override + double get spacePaddingBlockBodyLarge => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingBlockBodyMedium => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingInlineLevel0 => DimensionRawTokens.dimension50; + @override + double get spacePaddingInlineLevel1 => DimensionRawTokens.dimension450; + @override + double get spacePaddingInlineLevel2 => DimensionRawTokens.dimension850; +} diff --git a/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart b/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart new file mode 100644 index 000000000..eeb60d585 --- /dev/null +++ b/ouds_theme_sosh/lib/components/sosh_icon_tokens.dart @@ -0,0 +1,31 @@ +// +// 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 2.3.0 +// Generated by Tokenator + +import 'package:flutter/material.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart'; + +class SoshIconTokens extends OudsIconTokens { + final OudsProvidersTokens providersTokens; + + 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); +} diff --git a/ouds_theme_sosh/lib/ouds_theme_sosh.dart b/ouds_theme_sosh/lib/ouds_theme_sosh.dart index 364c82ef9..15dbae831 100644 --- a/ouds_theme_sosh/lib/ouds_theme_sosh.dart +++ b/ouds_theme_sosh/lib/ouds_theme_sosh.dart @@ -31,12 +31,14 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_to import 'package:ouds_theme_sosh/components/sosh_alert_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_badge_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_bar_tokens.dart'; +import 'package:ouds_theme_sosh/components/sosh_bulletList_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_buttonMono_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_button_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_checkbox_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_chip_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_controlItem_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_divider_tokens.dart'; +import 'package:ouds_theme_sosh/components/sosh_icon_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_inputTag_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_linkMono_tokens.dart'; import 'package:ouds_theme_sosh/components/sosh_link_tokens.dart'; @@ -240,6 +242,8 @@ class SoshTheme implements OudsThemeContract { linkMono: SoshLinkMonoTokens(providersTokens(context)), bar: SoshBarTokens(providersTokens(context)), alert: SoshAlertTokens(providersTokens(context)), + icon: SoshIconTokens(providersTokens(context)), + bulletList: SoshBulletListTokens(providersTokens(context)), ); } diff --git a/ouds_theme_wireframe/CHANGELOG.md b/ouds_theme_wireframe/CHANGELOG.md index 777c86bc2..86a3963df 100644 --- a/ouds_theme_wireframe/CHANGELOG.md +++ b/ouds_theme_wireframe/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- [Library] update tokens 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)) ### Fixed diff --git a/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart new file mode 100644 index 000000000..885433280 --- /dev/null +++ b/ouds_theme_wireframe/lib/components/wireframe_bulletList_tokens.dart @@ -0,0 +1,39 @@ +// +// 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 +// + +// Wireframe brand tokens version 2.3.0 +// Generated by Tokenator + +import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart'; + +class WireframeBulletListTokens extends OudsBulletListTokens { + final OudsProvidersTokens providersTokens; + + WireframeBulletListTokens(this.providersTokens); + + @override + double get spaceColumnGapBodyLarge => providersTokens.spaceTokens.columnGapSmall; + @override + double get spaceColumnGapBodyMedium => providersTokens.spaceTokens.columnGapSmall; + @override + double get spacePaddingBlockBodyLarge => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingBlockBodyMedium => providersTokens.spaceTokens.paddingBlock2xsmall; + @override + double get spacePaddingInlineLevel0 => DimensionRawTokens.dimension50; + @override + double get spacePaddingInlineLevel1 => DimensionRawTokens.dimension450; + @override + double get spacePaddingInlineLevel2 => DimensionRawTokens.dimension850; +} diff --git a/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart b/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart new file mode 100644 index 000000000..5b29b6a93 --- /dev/null +++ b/ouds_theme_wireframe/lib/components/wireframe_icon_tokens.dart @@ -0,0 +1,31 @@ +// +// 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 +// + +// Wireframe brand tokens version 2.3.0 +// Generated by Tokenator + +import 'package:flutter/material.dart'; +import 'package:ouds_theme_contract/ouds_tokens_provider.dart'; +import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart'; + +class WireframeIconTokens extends OudsIconTokens { + final OudsProvidersTokens providersTokens; + + 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); +} diff --git a/ouds_theme_wireframe/lib/ouds_theme_wireframe.dart b/ouds_theme_wireframe/lib/ouds_theme_wireframe.dart index 0434e36f6..3a6d03169 100644 --- a/ouds_theme_wireframe/lib/ouds_theme_wireframe.dart +++ b/ouds_theme_wireframe/lib/ouds_theme_wireframe.dart @@ -31,12 +31,14 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_to import 'package:ouds_theme_wireframe/components/wireframe_alert_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_badge_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_bar_tokens.dart'; +import 'package:ouds_theme_wireframe/components/wireframe_bulletList_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_buttonMono_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_button_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_checkbox_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_chip_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_controlItem_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_divider_tokens.dart'; +import 'package:ouds_theme_wireframe/components/wireframe_icon_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_inputTag_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_linkMono_tokens.dart'; import 'package:ouds_theme_wireframe/components/wireframe_link_tokens.dart'; @@ -246,6 +248,8 @@ class WireframeTheme implements OudsThemeContract { linkMono: WireframeLinkMonoTokens(providersTokens(context)), bar: WireframeBarTokens(providersTokens(context)), alert: WireframeAlertTokens(providersTokens(context)), + icon: WireframeIconTokens(providersTokens(context)), + bulletList: WireframeBulletListTokens(providersTokens(context)), ); }