Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2e93482
chore: update tokens
boosted-bot May 5, 2026
b9f40b9
chore: update tokens with version 2.4.0
AhmedAmineZr May 5, 2026
b7493bd
chore: update tokens with version 2.4.0
AhmedAmineZr May 5, 2026
1a17b38
Merge remote-tracking branch 'origin/tokenator-update-tokens-20260505…
nouha06 May 5, 2026
60038af
Merge branch 'develop' into tokenator-update-tokens-20260505120328
nouha06 May 8, 2026
1aee47c
feat(tag): update tag component to v1.5.0
nouha06 May 8, 2026
a41022c
feat(input-tag): update input tag component to v1.2.0
nouha06 May 8, 2026
1d222ab
Merge branch 'develop' into 694-for-tag-component-update-to-v15
nouha06 May 8, 2026
3a92614
merge: fix conflicts
nouha06 May 8, 2026
53733c5
chore: update version components
AhmedAmineZr May 8, 2026
9f93946
Merge branch 'tokenator-update-tokens-20260505120328' of https://gith…
AhmedAmineZr May 8, 2026
9121be7
Merge branch 'develop' into tokenator-update-tokens-20260505120328
AhmedAmineZr May 8, 2026
0e7bc7c
Merge branch 'develop' into tokenator-update-tokens-20260505120328
AhmedAmineZr May 8, 2026
1657cc3
chore(version): prepare version 2.0.0 (#747)
AhmedAmineZr May 11, 2026
e00a5d5
Merge branch 'develop' into tokenator-update-tokens-20260505120328
nouha06 May 13, 2026
57f6ed4
Merge branch 'refs/heads/tokenator-update-tokens-20260505120328' into…
nouha06 May 14, 2026
d349dbc
fix(input-tag): the whole component should have the role button acces…
nouha06 May 15, 2026
56bcfd0
Merge branch 'prepare-new-version-2.0.0' into 694-for-tag-component-u…
nouha06 May 20, 2026
ba33846
feat(tag): fix the warning icon and color for tag component
nouha06 May 20, 2026
903de3e
Merge branch 'prepare-new-version-2.0.0' into 694-for-tag-component-u…
nouha06 May 20, 2026
ae4acad
Merge branch 'prepare-new-version-2.0.0' into 694-for-tag-component-u…
nouha06 May 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [Library] `Filter chip` Apply high contrast theme to filter chip (selected) ([#494](https://github.com/Orange-OpenSource/ouds-flutter/issues/494))

### Changed
- [Library] update `tag` component to v1.5 ([#694](https://github.com/Orange-OpenSource/ouds-flutter/issues/694))
- [Library] update `input tag` component to v1.2 ([#695](https://github.com/Orange-OpenSource/ouds-flutter/issues/695))
- [DemoApp][Library] update tokens 2.4.0 ([#726](https://github.com/Orange-OpenSource/ouds-flutter/issues/726))
- [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))

Expand Down
60 changes: 37 additions & 23 deletions app/lib/ui/components/chip/chip_filter_demo_sreen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import 'package:provider/provider.dart';
class ChipFilterDemoScreen extends StatefulWidget {
final String? previousPageTitle;

const ChipFilterDemoScreen({super.key,this.previousPageTitle});
const ChipFilterDemoScreen({super.key, this.previousPageTitle});

@override
State<StatefulWidget> createState() => _ChipFilterDemoScreenState();
Expand All @@ -59,7 +59,11 @@ class _ChipFilterDemoScreenState extends State<ChipFilterDemoScreen> {
child: ChipCustomization(
key: _scaffoldKey,
child: Padding(
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
padding: EdgeInsets.only(
bottom: defaultTargetPlatform == TargetPlatform.android
? MediaQuery.of(context).viewPadding.bottom
: OudsTheme.of(context).spaceScheme(context).paddingBlockNone,
),
child: Scaffold(
bottomSheet: OudsSheetsBottom(
onExpansionChanged: _onExpansionChanged,
Expand All @@ -70,7 +74,8 @@ class _ChipFilterDemoScreenState extends State<ChipFilterDemoScreen> {
appBar: MainAppBar(
title: context.l10n.app_components_filterChip_label,
showBackButton: true,
previousPageTitle: widget.previousPageTitle,),
previousPageTitle: widget.previousPageTitle,
),
body: ExcludeSemantics(
excluding: !_isBottomSheetExpanded,
child: _Body(),
Expand All @@ -93,19 +98,24 @@ class _Body extends StatefulWidget {
class _BodyState extends State<_Body> {
@override
Widget build(BuildContext context) {
ThemeController? themeController = Provider.of<ThemeController>(context, listen: false);
ThemeController? themeController = Provider.of<ThemeController>(
context,
listen: false,
);
return DetailScreenDescription(
description: context.l10n.app_components_chip_filterChip_description_text,
widget: Column(
children: [
_ChipFilterDemo(),
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
Code(
code: ChipFilterCodeGenerator.updateCode(context),
SizedBox(
height: themeController.currentTheme
.spaceScheme(context)
.fixedMedium,
),
Code(code: ChipFilterCodeGenerator.updateCode(context)),
ReferenceDesignVersionComponent(
version: OudsComponentVersion.chip,
)
version: OudsComponentVersion.filterChip,
),
],
),
);
Expand Down Expand Up @@ -134,18 +144,20 @@ class _ChipFilterDemoState extends State<_ChipFilterDemo> {

return LightDarkBox(
child: OudsFilterChip(
label: ChipCustomizationUtils.getText(customizationState),
avatar: ChipCustomizationUtils.getIcon(customizationState, themeController!),
selected: customizationState?.hasSelected,
onSelected: customizationState?.hasEnabled == true
? (newValue) {
setState(
() {
customizationState?.hasSelected = newValue;
},
);
}
: null),
label: ChipCustomizationUtils.getText(customizationState),
avatar: ChipCustomizationUtils.getIcon(
customizationState,
themeController!,
),
selected: customizationState?.hasSelected,
onSelected: customizationState?.hasEnabled == true
? (newValue) {
setState(() {
customizationState?.hasSelected = newValue;
});
}
: null,
),
);
}
}
Expand Down Expand Up @@ -176,7 +188,9 @@ class _CustomizationContentState extends State<_CustomizationContent> {

@override
Widget build(BuildContext context) {
final ChipCustomizationState? customizationState = ChipCustomization.of(context);
final ChipCustomizationState? customizationState = ChipCustomization.of(
context,
);

return CustomizableSection(
children: [
Expand Down Expand Up @@ -212,7 +226,7 @@ class _CustomizationContentState extends State<_CustomizationContent> {
text: customizationState.labelText,
focusNode: labelFocus,
fieldType: FieldType.label,
)
),
],
);
}
Expand Down
4 changes: 3 additions & 1 deletion app/lib/ui/components/chip/chip_suggestion_demo_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ class _BodyState extends State<_Body> {
.fixedMedium,
),
Code(code: ChipSuggestionCodeGenerator.updateCode(context)),
ReferenceDesignVersionComponent(version: OudsComponentVersion.chip),
ReferenceDesignVersionComponent(
version: OudsComponentVersion.suggestionChip,
),
],
),
);
Expand Down
44 changes: 29 additions & 15 deletions app/lib/ui/components/tag/input_tag_demo_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import 'package:provider/provider.dart';
class InputTagDemoScreen extends StatefulWidget {
final String? previousPageTitle;

const InputTagDemoScreen({super.key,this.previousPageTitle});
const InputTagDemoScreen({super.key, this.previousPageTitle});

@override
State<StatefulWidget> createState() => _InputTagDemoScreenState();
Expand All @@ -53,7 +53,11 @@ class _InputTagDemoScreenState extends State<InputTagDemoScreen> {
Widget build(BuildContext context) {
return TagCustomization(
child: Padding(
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
padding: EdgeInsets.only(
bottom: defaultTargetPlatform == TargetPlatform.android
? MediaQuery.of(context).viewPadding.bottom
: OudsTheme.of(context).spaceScheme(context).paddingBlockNone,
),
child: Scaffold(
bottomSheet: OudsSheetsBottom(
onExpansionChanged: _onExpansionChanged,
Expand All @@ -63,11 +67,14 @@ class _InputTagDemoScreenState extends State<InputTagDemoScreen> {
key: _scaffoldKey,
extendBodyBehindAppBar: true,
appBar: MainAppBar(
showBackButton: true,
title: context.l10n.app_components_tag_inputTag_label,
previousPageTitle: widget.previousPageTitle,
showBackButton: true,
title: context.l10n.app_components_tag_inputTag_label,
previousPageTitle: widget.previousPageTitle,
),
body: ExcludeSemantics(
excluding: !_isBottomSheetExpanded,
child: _Body(),
),
body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()),
),
),
);
Expand All @@ -85,19 +92,24 @@ class _Body extends StatefulWidget {
class _BodyState extends State<_Body> {
@override
Widget build(BuildContext context) {
ThemeController? themeController = Provider.of<ThemeController>(context, listen: false);
ThemeController? themeController = Provider.of<ThemeController>(
context,
listen: false,
);
return DetailScreenDescription(
description: context.l10n.app_components_inputTag_description_text,
widget: Column(
children: [
_InputTagDemo(),
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
Code(
code: InputTagCodeGenerator.updateCode(context),
SizedBox(
height: themeController.currentTheme
.spaceScheme(context)
.fixedMedium,
),
Code(code: InputTagCodeGenerator.updateCode(context)),
ReferenceDesignVersionComponent(
version: OudsComponentVersion.tag,
)
version: OudsComponentVersion.inputTag,
),
],
),
);
Expand Down Expand Up @@ -146,7 +158,9 @@ class _CustomizationContentState extends State<_CustomizationContent> {

@override
Widget build(BuildContext context) {
final TagCustomizationState? customizationState = TagCustomization.of(context);
final TagCustomizationState? customizationState = TagCustomization.of(
context,
);
final labelFocus = FocusNode();

return CustomizableSection(
Expand All @@ -163,8 +177,8 @@ class _CustomizationContentState extends State<_CustomizationContent> {
text: customizationState.labelText,
focusNode: labelFocus,
fieldType: FieldType.label,
)
),
],
);
}
}
}
Loading
Loading