Skip to content

Commit ca70299

Browse files
AhmedAmineZrAhmedAmineZr
committed
Merge branch 'prepare-new-version-2.0.0' into 633-for-tab-bar-component-update-the-animation-of-the-selected-tab-indicator
# Conflicts: # app/CHANGELOG.md # ouds_core/CHANGELOG.md
2 parents 716e8ae + c346880 commit ca70299

205 files changed

Lines changed: 896 additions & 1402 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/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
### Changed
1010
- [Library] For tab bar component, update the animation of the selected tab indicator ([#633](https://github.com/Orange-OpenSource/ouds-flutter/issues/633))
11+
- [DemoApp][Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778))
1112
- [DemoApp][Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726))
1213

1314
### Fixed

‎app/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- app_settings (5.1.1):
2+
- app_settings (6.1.2):
33
- Flutter
44
- Flutter (1.0.0)
55
- package_info_plus (0.4.5):
@@ -36,7 +36,7 @@ EXTERNAL SOURCES:
3636
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
3737

3838
SPEC CHECKSUMS:
39-
app_settings: 58017cd26b604ae98c3e65acbdd8ba173703cc82
39+
app_settings: 9217ccbe946aa9a3751b5459dcf50dabc87517b2
4040
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
4141
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
4242
path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba

‎app/lib/ui/components/navigation/navigation_bar_demo_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class _BodyState extends State<_Body> {
102102
),
103103
),
104104
ReferenceDesignVersionComponent(
105-
version: OudsComponentVersion.bar,
105+
version: OudsComponentVersion.navigationBar,
106106
)
107107
],
108108
),

‎app/lib/ui/components/top_bar/top_bar_demo_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class _BodyState extends State<_Body> {
118118
code: TopBarCodeGenerator.updateCode(context),
119119
),
120120
ReferenceDesignVersionComponent(
121-
version: OudsComponentVersion.bar,
121+
version: OudsComponentVersion.appBar,
122122
)
123123
],
124124
),

‎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
### Changed
1010
- [Library] For tab bar component, update the animation of the selected tab indicator ([#633](https://github.com/Orange-OpenSource/ouds-flutter/issues/633))
11+
- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778))
1112
- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726))
1213

1314
### Fixed

‎ouds_core/README.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ It is intended to replace internal frameworks and the previous [ODS](https://git
5858
<td style="padding-left:10px;">Alert Message</td>
5959
<td>1.1.1</td>
6060
</tr>
61+
<tr>
62+
<td style="padding-left:10px;">App Bar</td>
63+
<td>1.0.0</td>
64+
</tr>
6165
<tr>
6266
<td style="padding-left:10px;">Badge</td>
6367
<td>1.2.0</td>
@@ -70,13 +74,9 @@ It is intended to replace internal frameworks and the previous [ODS](https://git
7074
<td style="padding-left:10px;">Badge Icon</td>
7175
<td>1.3.0</td>
7276
</tr>
73-
<tr>
74-
<td style="padding-left:10px;">Bar</td>
75-
<td>1.0.0</td>
76-
</tr>
7777
<tr>
7878
<td style="padding-left:10px;">Bottom Sheet</td>
79-
<td>1.0.0</td>
79+
<td>0.0.0</td>
8080
</tr>
8181
<tr>
8282
<td style="padding-left:10px;">Bullet List</td>
@@ -110,6 +110,10 @@ It is intended to replace internal frameworks and the previous [ODS](https://git
110110
<td style="padding:10px;">Link</td>
111111
<td>2.2.0</td>
112112
</tr>
113+
<tr>
114+
<td style="padding:10px;">Navigation Bar</td>
115+
<td>1.0.0</td>
116+
</tr>
113117
<tr>
114118
<td style="padding:10px;">Password Input</td>
115119
<td>1.3.0</td>

‎ouds_theme_contract/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.1...develop)
88
### Added
99
### Changed
10+
- [Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778))
1011
- [Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726))
1112

1213
### Fixed

‎ouds_theme_contract/lib/ouds_component_version.dart‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,28 @@
1313
// Generated by Tokenator
1414

1515
class OudsComponentVersion {
16-
static const alertMessage = '1.1.1';
17-
static const badge = '1.2.0';
18-
static const badgeCount = '1.2.0';
19-
static const badgeIcon = '1.3.0';
20-
static const bar = '1.0.0';
21-
static const bottomSheet = '1.0.0';
22-
static const bulletList = '1.1.0';
23-
static const button = '3.2.0';
24-
static const checkbox = '2.4.0';
25-
static const divider = '1.0.0';
26-
static const filterChip = '1.4.0';
27-
static const inlineAlert = '1.0.0';
28-
static const inputTag = '1.2.0';
29-
static const link = '2.2.0';
30-
static const passwordInput = '1.3.0';
31-
static const phoneNumberInput = '1.3.0';
32-
static const pinCodeInput = '1.3.0';
33-
static const radioButton = '1.4.0';
34-
static const skeleton = '1.0.0';
35-
static const suggestionChip = '1.4.0';
36-
static const switchButton = '1.5.0';
37-
static const tag = '1.5.0';
38-
static const textInput = '1.4.0';
16+
static const alertMessage = '1.1.1';
17+
static const appBar = '1.0.0';
18+
static const badge = '1.2.0';
19+
static const badgeCount = '1.2.0';
20+
static const badgeIcon = '1.3.0';
21+
static const bottomSheet = '0.0.0';
22+
static const bulletList = '1.1.0';
23+
static const button = '3.2.0';
24+
static const checkbox = '2.4.0';
25+
static const divider = '1.0.0';
26+
static const filterChip = '1.4.0';
27+
static const inlineAlert = '1.0.0';
28+
static const inputTag = '1.2.0';
29+
static const link = '2.2.0';
30+
static const navigationBar = '1.0.0';
31+
static const passwordInput = '1.3.0';
32+
static const phoneNumberInput = '1.3.0';
33+
static const pinCodeInput = '1.3.0';
34+
static const radioButton = '1.4.0';
35+
static const skeleton = '1.0.0';
36+
static const suggestionChip = '1.4.0';
37+
static const switchButton = '1.5.0';
38+
static const tag = '1.5.0';
39+
static const textInput = '1.4.0';
3940
}

‎ouds_theme_contract/lib/ouds_tokens_version.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class OudsTokensVersion {
1717
static const androidCore = '1.0.0';
1818
static const androidSystem = '1.2.0';
1919
static const orangeCore = '1.2.0';
20-
static const orangeBrand = '2.4.0';
21-
static const orangeCompactBrand = '2.4.0';
22-
static const soshCore = '1.3.0';
23-
static const soshBrand = '2.4.0';
20+
static const orangeBrand = '2.5.0';
21+
static const orangeCompactBrand = '2.5.0';
22+
static const soshCore = '1.4.0';
23+
static const soshBrand = '2.5.0';
2424
static const wireframeCore = '1.4.0';
25-
static const wireframeBrand = '2.4.0';
25+
static const wireframeBrand = '2.5.0';
2626
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Software description: Flutter library of reusable graphical components
1111
//
1212

13-
// Orange brand tokens version 2.4.0
13+
// Orange brand tokens version 2.5.0
1414
// Generated by Tokenator
1515

1616
abstract class OudsAlertTokens {

0 commit comments

Comments
 (0)