Skip to content

Commit 3a098c4

Browse files
authored
chore: add grid tokens (#42)(#68)
1 parent ded2f0a commit 3a098c4

File tree

14 files changed

+146
-0
lines changed

14 files changed

+146
-0
lines changed

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

99
### Added
1010

11+
- [Library] Add grid tokens ([#42](https://github.com/Orange-OpenSource/ouds-flutter/issues/42))
1112
- [Library] Add size tokens ([#41](https://github.com/Orange-OpenSource/ouds-flutter/issues/41))
1213
- [Library] Add space tokens ([#40](https://github.com/Orange-OpenSource/ouds-flutter/issues/40))
1314
- [Library] Add elevation tokens ([#39](https://github.com/Orange-OpenSource/ouds-flutter/issues/39))

ouds_core/CHANGELOG.md

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

99
### Added
1010

11+
- [Library] Add grid tokens ([#42](https://github.com/Orange-OpenSource/ouds-flutter/issues/42))
12+
- [Library] Add size tokens ([#41](https://github.com/Orange-OpenSource/ouds-flutter/issues/41))
1113
- [Library] Add space tokens ([#40](https://github.com/Orange-OpenSource/ouds-flutter/issues/40))
1214
- [Library] Add elevation tokens ([#39](https://github.com/Orange-OpenSource/ouds-flutter/issues/39))
1315
- [Library] Add border tokens ([#38](https://github.com/Orange-OpenSource/ouds-flutter/issues/38))

ouds_global_raw_tokens/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

99
### Added
1010

11+
- [Library] Add grid tokens ([#42](https://github.com/Orange-OpenSource/ouds-flutter/issues/42))
1112
- [Library] Add size tokens ([#41](https://github.com/Orange-OpenSource/ouds-flutter/issues/41))
1213
- [Library] Add space tokens ([#40](https://github.com/Orange-OpenSource/ouds-flutter/issues/40))
1314
- [Library] Add elevation tokens ([#39](https://github.com/Orange-OpenSource/ouds-flutter/issues/39))

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

99
### Added
1010

11+
- [Library] Add grid tokens ([#42](https://github.com/Orange-OpenSource/ouds-flutter/issues/42))
1112
- [Library] Add size tokens ([#41](https://github.com/Orange-OpenSource/ouds-flutter/issues/41))
1213
- [Library] Add space tokens ([#40](https://github.com/Orange-OpenSource/ouds-flutter/issues/40))
1314
- [Library] Add elevation tokens ([#39](https://github.com/Orange-OpenSource/ouds-flutter/issues/39))

ouds_theme_contract/lib/ouds_theme_contract.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_t
1818
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_semantic_tokens.dart';
1919
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart';
2020
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_font_semantic_tokens.dart';
21+
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart';
2122
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart';
2223
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart';
2324
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart';
@@ -50,6 +51,9 @@ abstract interface class OudsThemeContract {
5051
/// Size semantic tokens values used in the theme
5152
OudsSizeSemanticTokens get sizeTokens;
5253

54+
/// Grid semantic tokens values used in the theme
55+
OudsGridSemanticTokens get gridTokens;
56+
5357
/// Font semantic tokens values used in the theme
5458
OudsFontSemanticTokens get fontTokens;
5559

ouds_theme_contract/lib/ouds_tokens_provider.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:ouds_theme_contract/ouds_color_scheme.dart';
1414
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_tokens.dart';
1515
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart';
1616
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_font_semantic_tokens.dart';
17+
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart';
1718
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart';
1819
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart';
1920
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart';
@@ -30,6 +31,7 @@ class OudsProvidersTokens {
3031
final OudsElevationSemanticTokens elevationTokens;
3132
final OudsSpaceSemanticTokens spaceTokens;
3233
final OudsSizeSemanticTokens sizeTokens;
34+
final OudsGridSemanticTokens gridTokens;
3335
final OudsFontSemanticTokens fontTokens;
3436

3537
OudsProvidersTokens({
@@ -39,6 +41,7 @@ class OudsProvidersTokens {
3941
required this.elevationTokens,
4042
required this.spaceTokens,
4143
required this.sizeTokens,
44+
required this.gridTokens,
4245
required this.fontTokens,
4346
});
4447
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
// Tokens version 0.5.0
14+
// Generated by Tokenator
15+
16+
17+
abstract class OudsGridSemanticTokens {
18+
late double compactColumnGap;
19+
late double compactMargin;
20+
late int compactMaxWidth;
21+
late int compactMinWidth;
22+
late double extraCompactColumnGap;
23+
late double extraCompactMargin;
24+
late int extraCompactMaxWidth;
25+
late int extraCompactMinWidth;
26+
late double mediumColumnGap;
27+
late double mediumMargin;
28+
late int mediumMaxWidth;
29+
late int mediumMinWidth;
30+
}

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

99
### Added
1010

11+
- [Library] Add grid tokens ([#42](https://github.com/Orange-OpenSource/ouds-flutter/issues/42))
1112
- [Library] Add size tokens ([#41](https://github.com/Orange-OpenSource/ouds-flutter/issues/41))
1213
- [Library] Add space tokens ([#40](https://github.com/Orange-OpenSource/ouds-flutter/issues/40))
1314
- [Library] Add elevation tokens ([#39](https://github.com/Orange-OpenSource/ouds-flutter/issues/39))

ouds_theme_orange/lib/orange_theme.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_border_semantic_t
2020
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_color_semantic_tokens.dart';
2121
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_elevation_semantic_tokens.dart';
2222
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_font_semantic_tokens.dart';
23+
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart';
2324
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_opacity_semantic_tokens.dart';
2425
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_size_semantic_tokens.dart';
2526
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_space_semantic_tokens.dart';
@@ -29,6 +30,7 @@ import 'package:ouds_theme_orange/semantic/orange_border_semantic_tokens.dart';
2930
import 'package:ouds_theme_orange/semantic/orange_color_semantic_tokens.dart';
3031
import 'package:ouds_theme_orange/semantic/orange_elevation_semantic_tokens.dart';
3132
import 'package:ouds_theme_orange/semantic/orange_font_semantic_tokens.dart';
33+
import 'package:ouds_theme_orange/semantic/orange_grid_semantic_tokens.dart';
3234
import 'package:ouds_theme_orange/semantic/orange_opacity_semantic_tokens.dart';
3335
import 'package:ouds_theme_orange/semantic/orange_size_semantic_tokens.dart';
3436
import 'package:ouds_theme_orange/semantic/orange_space_semantic_tokens.dart';
@@ -89,6 +91,9 @@ class OrangeTheme implements OudsThemeContract {
8991
@override
9092
OudsSizeSemanticTokens get sizeTokens => OrangeSizeSemanticTokens();
9193

94+
@override
95+
OudsGridSemanticTokens get gridTokens => OrangeGridSemanticTokens();
96+
9297
@override
9398
OudsFontSemanticTokens get fontTokens => OrangeFontSemanticTokens();
9499

@@ -104,6 +109,7 @@ class OrangeTheme implements OudsThemeContract {
104109
elevationTokens: elevationTokens,
105110
spaceTokens: spaceTokens,
106111
sizeTokens: sizeTokens,
112+
gridTokens: gridTokens,
107113
fontTokens: fontTokens);
108114

109115
@override
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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+
// Tokens version 0.5.0
14+
// Generated by Tokenator
15+
16+
import 'package:ouds_theme_contract/theme/tokens/semantic/ouds_grid_semantic_tokens.dart';
17+
import 'package:ouds_global_raw_tokens/grid_raw_tokens.dart';
18+
19+
20+
class OrangeGridSemanticTokens extends OudsGridSemanticTokens {
21+
@override
22+
double get compactColumnGap => GridRawTokens.gridColumnGap100;
23+
@override
24+
double get compactMargin => GridRawTokens.gridMargin300;
25+
@override
26+
int get compactMaxWidth => GridRawTokens.gridMaxWidthCompact;
27+
@override
28+
int get compactMinWidth => GridRawTokens.gridMinWidthCompact;
29+
@override
30+
double get extraCompactColumnGap => GridRawTokens.gridColumnGap100;
31+
@override
32+
double get extraCompactMargin => GridRawTokens.gridMargin100;
33+
@override
34+
int get extraCompactMaxWidth => GridRawTokens.gridMaxWidthExtraCompact;
35+
@override
36+
int get extraCompactMinWidth => GridRawTokens.gridMinWidthExtraCompact;
37+
@override
38+
double get mediumColumnGap => GridRawTokens.gridColumnGap400;
39+
@override
40+
double get mediumMargin => GridRawTokens.gridMargin500;
41+
@override
42+
int get mediumMaxWidth => GridRawTokens.gridMaxWidthMedium;
43+
@override
44+
int get mediumMinWidth => GridRawTokens.gridMinWidthMedium;
45+
}

0 commit comments

Comments
 (0)