Skip to content

Commit 0afeb61

Browse files
AhmedAmineZrAhmedAmineZr
committed
Merge branch 'prepare-new-version-2.0.0' into dependabot/pub/dartdoc-9.0.4
2 parents 18630e9 + c346880 commit 0afeb61

247 files changed

Lines changed: 2865 additions & 1911 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.

‎.github/workflows/dartdoc-gh-pages.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
uses: ./.github/actions/setup
101101

102102
- name: Setup Pages
103+
if: github.event_name != 'pull_request'
103104
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
104105

105106
- name: Setup Ruby
@@ -129,6 +130,7 @@ jobs:
129130
130131
# Upload as GitHub Pages artifact (creates a tar archive named "github-pages")
131132
- name: Upload artifact
133+
if: github.event_name != 'pull_request'
132134
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
133135
with:
134136
path: ./docs
@@ -152,6 +154,7 @@ jobs:
152154
if: github.event_name != 'pull_request'
153155
runs-on: ubuntu-latest
154156
needs: build
157+
if: github.event_name != 'pull_request'
155158
permissions:
156159
contents: write
157160
pages: write

‎app/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ 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+
- [DemoApp][Library] update tokens 2.5.0 ([#778](https://github.com/Orange-OpenSource/ouds-flutter/issues/778))
11+
- [DemoApp][Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726))
12+
1013
### Fixed
1114

1215
## [1.3.1](https://github.com/Orange-OpenSource/ouds-flutter/compare/1.3.0...1.3.1) - 2026-05-14

‎app/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '2.1.0'
2+
ext.kotlin_version = '2.2.20'
33
repositories {
44
google()
55
mavenCentral()

‎app/android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version '8.9.1' apply false
22-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
2323
}
2424

2525
include ":app"

‎app/lib/ui/components/chip/chip_filter_demo_sreen.dart‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import 'package:provider/provider.dart';
3737
class ChipFilterDemoScreen extends StatefulWidget {
3838
final String? previousPageTitle;
3939

40-
const ChipFilterDemoScreen({super.key,this.previousPageTitle});
40+
const ChipFilterDemoScreen({super.key, this.previousPageTitle});
4141

4242
@override
4343
State<StatefulWidget> createState() => _ChipFilterDemoScreenState();
@@ -59,7 +59,11 @@ class _ChipFilterDemoScreenState extends State<ChipFilterDemoScreen> {
5959
child: ChipCustomization(
6060
key: _scaffoldKey,
6161
child: Padding(
62-
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
62+
padding: EdgeInsets.only(
63+
bottom: defaultTargetPlatform == TargetPlatform.android
64+
? MediaQuery.of(context).viewPadding.bottom
65+
: OudsTheme.of(context).spaceScheme(context).paddingBlockNone,
66+
),
6367
child: Scaffold(
6468
bottomSheet: OudsSheetsBottom(
6569
onExpansionChanged: _onExpansionChanged,
@@ -70,7 +74,8 @@ class _ChipFilterDemoScreenState extends State<ChipFilterDemoScreen> {
7074
appBar: MainAppBar(
7175
title: context.l10n.app_components_filterChip_label,
7276
showBackButton: true,
73-
previousPageTitle: widget.previousPageTitle,),
77+
previousPageTitle: widget.previousPageTitle,
78+
),
7479
body: ExcludeSemantics(
7580
excluding: !_isBottomSheetExpanded,
7681
child: _Body(),
@@ -93,19 +98,24 @@ class _Body extends StatefulWidget {
9398
class _BodyState extends State<_Body> {
9499
@override
95100
Widget build(BuildContext context) {
96-
ThemeController? themeController = Provider.of<ThemeController>(context, listen: false);
101+
ThemeController? themeController = Provider.of<ThemeController>(
102+
context,
103+
listen: false,
104+
);
97105
return DetailScreenDescription(
98106
description: context.l10n.app_components_chip_filterChip_description_text,
99107
widget: Column(
100108
children: [
101109
_ChipFilterDemo(),
102-
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
103-
Code(
104-
code: ChipFilterCodeGenerator.updateCode(context),
110+
SizedBox(
111+
height: themeController.currentTheme
112+
.spaceScheme(context)
113+
.fixedMedium,
105114
),
115+
Code(code: ChipFilterCodeGenerator.updateCode(context)),
106116
ReferenceDesignVersionComponent(
107-
version: OudsComponentVersion.chip,
108-
)
117+
version: OudsComponentVersion.filterChip,
118+
),
109119
],
110120
),
111121
);
@@ -134,18 +144,20 @@ class _ChipFilterDemoState extends State<_ChipFilterDemo> {
134144

135145
return LightDarkBox(
136146
child: OudsFilterChip(
137-
label: ChipCustomizationUtils.getText(customizationState),
138-
avatar: ChipCustomizationUtils.getIcon(customizationState, themeController!),
139-
selected: customizationState?.hasSelected,
140-
onSelected: customizationState?.hasEnabled == true
141-
? (newValue) {
142-
setState(
143-
() {
144-
customizationState?.hasSelected = newValue;
145-
},
146-
);
147-
}
148-
: null),
147+
label: ChipCustomizationUtils.getText(customizationState),
148+
avatar: ChipCustomizationUtils.getIcon(
149+
customizationState,
150+
themeController!,
151+
),
152+
selected: customizationState?.hasSelected,
153+
onSelected: customizationState?.hasEnabled == true
154+
? (newValue) {
155+
setState(() {
156+
customizationState?.hasSelected = newValue;
157+
});
158+
}
159+
: null,
160+
),
149161
);
150162
}
151163
}
@@ -176,7 +188,9 @@ class _CustomizationContentState extends State<_CustomizationContent> {
176188

177189
@override
178190
Widget build(BuildContext context) {
179-
final ChipCustomizationState? customizationState = ChipCustomization.of(context);
191+
final ChipCustomizationState? customizationState = ChipCustomization.of(
192+
context,
193+
);
180194

181195
return CustomizableSection(
182196
children: [
@@ -212,7 +226,7 @@ class _CustomizationContentState extends State<_CustomizationContent> {
212226
text: customizationState.labelText,
213227
focusNode: labelFocus,
214228
fieldType: FieldType.label,
215-
)
229+
),
216230
],
217231
);
218232
}

‎app/lib/ui/components/chip/chip_suggestion_demo_screen.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ class _BodyState extends State<_Body> {
113113
.fixedMedium,
114114
),
115115
Code(code: ChipSuggestionCodeGenerator.updateCode(context)),
116-
ReferenceDesignVersionComponent(version: OudsComponentVersion.chip),
116+
ReferenceDesignVersionComponent(
117+
version: OudsComponentVersion.suggestionChip,
118+
),
117119
],
118120
),
119121
);

‎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/tag/input_tag_demo_screen.dart‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import 'package:provider/provider.dart';
3333
class InputTagDemoScreen extends StatefulWidget {
3434
final String? previousPageTitle;
3535

36-
const InputTagDemoScreen({super.key,this.previousPageTitle});
36+
const InputTagDemoScreen({super.key, this.previousPageTitle});
3737

3838
@override
3939
State<StatefulWidget> createState() => _InputTagDemoScreenState();
@@ -53,7 +53,11 @@ class _InputTagDemoScreenState extends State<InputTagDemoScreen> {
5353
Widget build(BuildContext context) {
5454
return TagCustomization(
5555
child: Padding(
56-
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
56+
padding: EdgeInsets.only(
57+
bottom: defaultTargetPlatform == TargetPlatform.android
58+
? MediaQuery.of(context).viewPadding.bottom
59+
: OudsTheme.of(context).spaceScheme(context).paddingBlockNone,
60+
),
5761
child: Scaffold(
5862
bottomSheet: OudsSheetsBottom(
5963
onExpansionChanged: _onExpansionChanged,
@@ -63,11 +67,14 @@ class _InputTagDemoScreenState extends State<InputTagDemoScreen> {
6367
key: _scaffoldKey,
6468
extendBodyBehindAppBar: true,
6569
appBar: MainAppBar(
66-
showBackButton: true,
67-
title: context.l10n.app_components_tag_inputTag_label,
68-
previousPageTitle: widget.previousPageTitle,
70+
showBackButton: true,
71+
title: context.l10n.app_components_tag_inputTag_label,
72+
previousPageTitle: widget.previousPageTitle,
73+
),
74+
body: ExcludeSemantics(
75+
excluding: !_isBottomSheetExpanded,
76+
child: _Body(),
6977
),
70-
body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()),
7178
),
7279
),
7380
);
@@ -85,19 +92,24 @@ class _Body extends StatefulWidget {
8592
class _BodyState extends State<_Body> {
8693
@override
8794
Widget build(BuildContext context) {
88-
ThemeController? themeController = Provider.of<ThemeController>(context, listen: false);
95+
ThemeController? themeController = Provider.of<ThemeController>(
96+
context,
97+
listen: false,
98+
);
8999
return DetailScreenDescription(
90100
description: context.l10n.app_components_inputTag_description_text,
91101
widget: Column(
92102
children: [
93103
_InputTagDemo(),
94-
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
95-
Code(
96-
code: InputTagCodeGenerator.updateCode(context),
104+
SizedBox(
105+
height: themeController.currentTheme
106+
.spaceScheme(context)
107+
.fixedMedium,
97108
),
109+
Code(code: InputTagCodeGenerator.updateCode(context)),
98110
ReferenceDesignVersionComponent(
99-
version: OudsComponentVersion.tag,
100-
)
111+
version: OudsComponentVersion.inputTag,
112+
),
101113
],
102114
),
103115
);
@@ -146,7 +158,9 @@ class _CustomizationContentState extends State<_CustomizationContent> {
146158

147159
@override
148160
Widget build(BuildContext context) {
149-
final TagCustomizationState? customizationState = TagCustomization.of(context);
161+
final TagCustomizationState? customizationState = TagCustomization.of(
162+
context,
163+
);
150164
final labelFocus = FocusNode();
151165

152166
return CustomizableSection(
@@ -163,8 +177,8 @@ class _CustomizationContentState extends State<_CustomizationContent> {
163177
text: customizationState.labelText,
164178
focusNode: labelFocus,
165179
fieldType: FieldType.label,
166-
)
180+
),
167181
],
168182
);
169183
}
170-
}
184+
}

‎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
),

0 commit comments

Comments
 (0)