Skip to content

Commit c195843

Browse files
nouha06nouha06
committed
Merge branch 'develop' into 670-component-alert-message
2 parents f6b8703 + 4cf1d19 commit c195843

24 files changed

Lines changed: 367 additions & 11 deletions

‎app/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
### Added
88

99
### Changed
10-
- [DemoApp][Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672))
10+
- [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710))
11+
- [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672))
1112

1213
### Fixed
1314

‎ouds_core/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
### Added
99

1010
### Changed
11+
- [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710))
1112
- [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672))
1213

1314
### Fixed

‎ouds_theme_contract/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
### Added
99

1010
### Changed
11+
- [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710))
1112
- [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672))
1213

1314
### Fixed

‎ouds_theme_contract/lib/ouds_component_version.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class OudsComponentVersion {
1616
static const alertMessage = '1.1.0';
1717
static const badge = '1.2.0';
1818
static const bar = '1.0.0';
19+
static const bulletList = '1.0.0';
1920
static const button = '3.2.0';
2021
static const checkbox = '2.4.0';
2122
static const chip = '1.3.0';

‎ouds_theme_contract/lib/ouds_tokens_version.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
// Generated by Tokenator
1414

1515
class OudsTokensVersion {
16-
static const oudsCore = '1.9.0';
17-
static const androidCore = '1.0.0';
18-
static const androidSystem = '1.2.0';
19-
static const orangeCore = '1.2.0';
20-
static const orangeBrand = '2.3.0';
21-
static const orangeCompactBrand = '2.3.0';
22-
static const soshCore = '1.2.0';
23-
static const soshBrand = '2.3.0';
24-
static const wireframeCore = '1.3.0';
25-
static const wireframeBrand = '2.3.0';
16+
static const oudsCore = '1.9.0';
17+
static const androidCore = '1.0.0';
18+
static const androidSystem = '1.2.0';
19+
static const orangeCore = '1.2.0';
20+
static const orangeBrand = '2.3.0';
21+
static const orangeCompactBrand = '2.3.0';
22+
static const soshCore = '1.2.0';
23+
static const soshBrand = '2.3.0';
24+
static const wireframeCore = '1.3.0';
25+
static const wireframeBrand = '2.3.0';
2626
}

‎ouds_theme_contract/lib/theme/tokens/components/ouds_bulletList_tokens.dart‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// Software Name: OUDS Flutter
3+
// SPDX-FileCopyrightText: Copyright (c) Orange SA
4+
// SPDX-License-Identifier: MIT
5+
//
6+
// This software is distributed under the MIT license,
7+
// the text of which is available at https://opensource.org/license/MIT/
8+
// or see the "LICENSE" file for more details.
9+
//
10+
// Software description: Flutter library of reusable graphical components
11+
//
12+
13+
// Orange brand tokens version 2.3.0
14+
// Generated by Tokenator
15+
16+
abstract class OudsBulletListTokens {
17+
late double spaceColumnGapBodyLarge;
18+
late double spaceColumnGapBodyMedium;
19+
late double spacePaddingBlockBodyLarge;
20+
late double spacePaddingBlockBodyMedium;
21+
late double spacePaddingInlineLevel0;
22+
late double spacePaddingInlineLevel1;
23+
late double spacePaddingInlineLevel2;
24+
}

‎ouds_theme_contract/lib/theme/tokens/components/ouds_components_tokens.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
import 'package:ouds_theme_contract/theme/tokens/components/ouds_alert_tokens.dart';
1414
import 'package:ouds_theme_contract/theme/tokens/components/ouds_badge_tokens.dart';
1515
import 'package:ouds_theme_contract/theme/tokens/components/ouds_bar_tokens.dart';
16+
import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart';
1617
import 'package:ouds_theme_contract/theme/tokens/components/ouds_buttonMono_tokens.dart';
1718
import 'package:ouds_theme_contract/theme/tokens/components/ouds_button_tokens.dart';
1819
import 'package:ouds_theme_contract/theme/tokens/components/ouds_checkbox_tokens.dart';
1920
import 'package:ouds_theme_contract/theme/tokens/components/ouds_chip_tokens.dart';
2021
import 'package:ouds_theme_contract/theme/tokens/components/ouds_controlItem_tokens.dart';
2122
import 'package:ouds_theme_contract/theme/tokens/components/ouds_divider_tokens.dart';
23+
import 'package:ouds_theme_contract/theme/tokens/components/ouds_icon_tokens.dart';
2224
import 'package:ouds_theme_contract/theme/tokens/components/ouds_inputTag_tokens.dart';
2325
import 'package:ouds_theme_contract/theme/tokens/components/ouds_linkMono_tokens.dart';
2426
import 'package:ouds_theme_contract/theme/tokens/components/ouds_link_tokens.dart';
@@ -48,6 +50,8 @@ class OudsComponentsTokens {
4850
final OudsLinkMonoTokens linkMono;
4951
final OudsBarTokens bar;
5052
final OudsAlertTokens alert;
53+
final OudsIconTokens icon;
54+
final OudsBulletListTokens bulletList;
5155

5256
const OudsComponentsTokens({
5357
required this.button,
@@ -68,5 +72,7 @@ class OudsComponentsTokens {
6872
required this.linkMono,
6973
required this.bar,
7074
required this.alert,
75+
required this.icon,
76+
required this.bulletList,
7177
});
7278
}

‎ouds_theme_contract/lib/theme/tokens/components/ouds_icon_tokens.dart‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// Software Name: OUDS Flutter
3+
// SPDX-FileCopyrightText: Copyright (c) Orange SA
4+
// SPDX-License-Identifier: MIT
5+
//
6+
// This software is distributed under the MIT license,
7+
// the text of which is available at https://opensource.org/license/MIT/
8+
// or see the "LICENSE" file for more details.
9+
//
10+
// Software description: Flutter library of reusable graphical components
11+
//
12+
13+
// Orange brand tokens version 2.3.0
14+
// Generated by Tokenator
15+
16+
import 'package:flutter/material.dart';
17+
18+
abstract class OudsIconTokens {
19+
late Color colorContentDefault;
20+
late Color colorContentStatusWarningExternalShape;
21+
late Color colorContentStatusWarningInternalShape;
22+
}

‎ouds_theme_orange/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
### Added
99

1010
### Changed
11+
- [Library] update tokens 1.9.0 - Component Bullet List ([#710](https://github.com/Orange-OpenSource/ouds-flutter/issues/710))
1112
- [Library] update tokens 1.9.0 - Component Alert ([#672](https://github.com/Orange-OpenSource/ouds-flutter/issues/672))
1213

1314
### Fixed

‎ouds_theme_orange/lib/components/orange_bulletList_tokens.dart‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//
2+
// Software Name: OUDS Flutter
3+
// SPDX-FileCopyrightText: Copyright (c) Orange SA
4+
// SPDX-License-Identifier: MIT
5+
//
6+
// This software is distributed under the MIT license,
7+
// the text of which is available at https://opensource.org/license/MIT/
8+
// or see the "LICENSE" file for more details.
9+
//
10+
// Software description: Flutter library of reusable graphical components
11+
//
12+
13+
// Orange brand tokens version 2.3.0
14+
// Generated by Tokenator
15+
16+
import 'package:ouds_global_raw_tokens/dimension_raw_tokens.dart';
17+
import 'package:ouds_theme_contract/ouds_tokens_provider.dart';
18+
import 'package:ouds_theme_contract/theme/tokens/components/ouds_bulletList_tokens.dart';
19+
20+
class OrangeBulletListTokens extends OudsBulletListTokens {
21+
final OudsProvidersTokens providersTokens;
22+
23+
OrangeBulletListTokens(this.providersTokens);
24+
25+
@override
26+
double get spaceColumnGapBodyLarge => providersTokens.spaceTokens.columnGapSmall;
27+
@override
28+
double get spaceColumnGapBodyMedium => providersTokens.spaceTokens.columnGapSmall;
29+
@override
30+
double get spacePaddingBlockBodyLarge => providersTokens.spaceTokens.paddingBlock2xsmall;
31+
@override
32+
double get spacePaddingBlockBodyMedium => providersTokens.spaceTokens.paddingBlock2xsmall;
33+
@override
34+
double get spacePaddingInlineLevel0 => DimensionRawTokens.dimension50;
35+
@override
36+
double get spacePaddingInlineLevel1 => DimensionRawTokens.dimension450;
37+
@override
38+
double get spacePaddingInlineLevel2 => DimensionRawTokens.dimension850;
39+
}

0 commit comments

Comments
 (0)