Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

### Changed
- [DemoApp][Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713))
- [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
56 changes: 18 additions & 38 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 @@ -61,20 +61,10 @@ class _ChipFilterDemoScreenState extends State<ChipFilterDemoScreen> {
child: Padding(
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
child: Scaffold(
bottomSheet: OudsSheetsBottom(
onExpansionChanged: _onExpansionChanged,
sheetContent: const _CustomizationContent(),
title: context.l10n.app_common_customize_label,
),
bottomSheet: OudsSheetsBottom(onExpansionChanged: _onExpansionChanged, sheetContent: const _CustomizationContent(), title: context.l10n.app_common_customize_label),
extendBodyBehindAppBar: true,
appBar: MainAppBar(
title: context.l10n.app_components_filterChip_label,
showBackButton: true,
previousPageTitle: widget.previousPageTitle,),
body: ExcludeSemantics(
excluding: !_isBottomSheetExpanded,
child: _Body(),
),
appBar: MainAppBar(title: context.l10n.app_components_filterChip_label, showBackButton: true, previousPageTitle: widget.previousPageTitle),
body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()),
),
),
),
Expand All @@ -100,12 +90,8 @@ class _BodyState extends State<_Body> {
children: [
_ChipFilterDemo(),
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
Code(
code: ChipFilterCodeGenerator.updateCode(context),
),
ReferenceDesignVersionComponent(
version: OudsComponentVersion.chip,
)
Code(code: ChipFilterCodeGenerator.updateCode(context)),
ReferenceDesignVersionComponent(version: OudsComponentVersion.filterChip),
],
),
);
Expand Down Expand Up @@ -134,18 +120,17 @@ 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 @@ -207,12 +192,7 @@ class _CustomizationContentState extends State<_CustomizationContent> {
});
},
),
CustomizableTextField(
title: context.l10n.app_components_common_label_label,
text: customizationState.labelText,
focusNode: labelFocus,
fieldType: FieldType.label,
)
CustomizableTextField(title: context.l10n.app_components_common_label_label, text: customizationState.labelText, focusNode: labelFocus, fieldType: FieldType.label),
],
);
}
Expand Down
33 changes: 7 additions & 26 deletions app/lib/ui/components/chip/chip_suggestion_demo_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import 'package:provider/provider.dart';

class ChipSuggestionDemoScreen extends StatefulWidget {
final String? previousPageTitle;
const ChipSuggestionDemoScreen({super.key,this.previousPageTitle});
const ChipSuggestionDemoScreen({super.key, this.previousPageTitle});

@override
State<StatefulWidget> createState() => _ChipSuggestionDemoScreenState();
Expand All @@ -60,20 +60,10 @@ class _ChipSuggestionDemoScreenState extends State<ChipSuggestionDemoScreen> {
child: Padding(
padding: EdgeInsets.only(bottom: defaultTargetPlatform == TargetPlatform.android ? MediaQuery.of(context).viewPadding.bottom : OudsTheme.of(context).spaceScheme(context).paddingBlockNone),
child: Scaffold(
bottomSheet: OudsSheetsBottom(
onExpansionChanged: _onExpansionChanged,
sheetContent: const _CustomizationContent(),
title: context.l10n.app_common_customize_label,
),
bottomSheet: OudsSheetsBottom(onExpansionChanged: _onExpansionChanged, sheetContent: const _CustomizationContent(), title: context.l10n.app_common_customize_label),
extendBodyBehindAppBar: true,
appBar: MainAppBar(
title: context.l10n.app_components_suggestionChip_label,
showBackButton: true,
previousPageTitle: widget.previousPageTitle),
body: ExcludeSemantics(
excluding: !_isBottomSheetExpanded,
child: _Body(),
),
appBar: MainAppBar(title: context.l10n.app_components_suggestionChip_label, showBackButton: true, previousPageTitle: widget.previousPageTitle),
body: ExcludeSemantics(excluding: !_isBottomSheetExpanded, child: _Body()),
),
),
),
Expand All @@ -99,12 +89,8 @@ class _BodyState extends State<_Body> {
children: [
_ChipSuggestionDemo(),
SizedBox(height: themeController.currentTheme.spaceScheme(context).fixedMedium),
Code(
code: ChipSuggestionCodeGenerator.updateCode(context),
),
ReferenceDesignVersionComponent(
version: OudsComponentVersion.chip,
)
Code(code: ChipSuggestionCodeGenerator.updateCode(context)),
ReferenceDesignVersionComponent(version: OudsComponentVersion.suggestionChip),
],
),
);
Expand Down Expand Up @@ -189,12 +175,7 @@ class _CustomizationContentState extends State<_CustomizationContent> {
});
},
),
CustomizableTextField(
title: context.l10n.app_components_common_label_label,
text: customizationState.labelText,
focusNode: labelFocus,
fieldType: FieldType.label,
)
CustomizableTextField(title: context.l10n.app_components_common_label_label, text: customizationState.labelText, focusNode: labelFocus, fieldType: FieldType.label),
],
);
}
Expand Down
1 change: 0 additions & 1 deletion app/lib/ui/tokens/color/color_tokens_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class ColorTokensModel {
ColorTokenItem(name: 'actionSupportLoading', value: theme.colorScheme(context).actionSupportLoading),
ColorTokenItem(name: 'actionSupportPressed', value: theme.colorScheme(context).actionSupportPressed),
ColorTokenItem(name: 'actionVisited', value: theme.colorScheme(context).actionVisited),
ColorTokenItem(name: 'actionAccent', value: theme.colorScheme(context).actionIosAccent),
],
context.l10n.app_tokens_color_always_label: [
ColorTokenItem(name: 'alwaysBlack', value: theme.colorScheme(context).alwaysBlack),
Expand Down
1 change: 1 addition & 0 deletions ouds_core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

### Changed
- [Library] update tokens 2.4.0 ([#713](https://github.com/Orange-OpenSource/ouds-flutter/issues/713))
- [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
46 changes: 35 additions & 11 deletions ouds_core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ It is intended to replace internal frameworks and the previous [ODS](https://git

## Tokens version

- **OUDS core token version**: 1.9.0.
- **OUDS core token version**: 1.10s.0.

## Other OUDS Libraries

Expand All @@ -56,16 +56,32 @@ It is intended to replace internal frameworks and the previous [ODS](https://git
<tbody>
<tr>
<td style="padding-left:10px;">Alert Message</td>
<td>1.1.0</td>
<td>1.1.1</td>
</tr>
<tr>
<td style="padding-left:10px;">Badge</td>
<td>1.2.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Badge Count</td>
<td>1.2.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Badge Icon</td>
<td>1.3.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Bar</td>
<td>1.0.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Bottom Sheet</td>
<td>1.0.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Bullet List</td>
<td>1.1.0</td>
</tr>
<tr>
<td style="padding-left:10px;">Button</td>
<td>3.2.0</td>
Expand All @@ -74,49 +90,57 @@ It is intended to replace internal frameworks and the previous [ODS](https://git
<td style="padding:10px;">Checkbox</td>
<td>2.4.0</td>
</tr>
<tr>
<td style="padding:10px;">Chip</td>
<td>1.3.0</td>
</tr>
<tr>
<td style="padding:10px;">Divider</td>
<td>1.0.0</td>
</tr>
<tr>
<td style="padding:10px;">Filter Chip</td>
<td>1.4.0</td>
</tr>
<tr>
<td style="padding:10px;">Inline Alert</td>
<td>1.0.0</td>
</tr>
<tr>
<td style="padding:10px;">Input Tag</td>
<td>1.2.0</td>
</tr>
<tr>
<td style="padding:10px;">Link</td>
<td>2.2.0</td>
</tr>
<tr>
<td style="padding:10px;">Password Input</td>
<td>1.2.0</td>
<td>1.3.0</td>
</tr>
<tr>
<td style="padding:10px;">Phone Number Input</td>
<td>1.2.0</td>
<td>1.3.0</td>
</tr>
<tr>
<td style="padding:10px;">Pin Code Input</td>
<td>1.2.0</td>
<td>1.3.0</td>
</tr>
<tr>
<td style="padding:10px;">Radio Button</td>
<td>1.4.0</td>
</tr>
<tr>
<td style="padding:10px;">Suggestion Chip</td>
<td>1.4.0</td>
</tr>
<tr>
<td style="padding:10px;">Switch</td>
<td>1.5.0</td>
</tr>
<tr>
<td style="padding:10px;">Tag</td>
<td>1.4.0</td>
<td>1.5.0</td>
</tr>
<tr>
<td style="padding:10px;">Text Input</td>
<td>1.3.0</td>
<td>1.4.0</td>
</tr>
</tbody>
</table>
Expand Down
Loading
Loading