Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

25 ods component navigation rail #325

Merged
merged 10 commits into from
Feb 20, 2024
1 change: 1 addition & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ods-flutter/app/assets/il_dialogs.png
ods-flutter/app/assets/ic_profile.svg
ods-flutter/app/assets/il_menu.png
ods-flutter/app/assets/il_text-fields.png
ods-flutter/app/assets/il_navigation_rail.png

ods-flutter/app/assets/1.5x/il_about.png
ods-flutter/app/assets/1.5x/il_switches.png
Expand Down
1 change: 1 addition & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [Bug]: ODS - Components - Cards - Horizontal card - divider ([#271](https://github.com/Orange-OpenSource/ods-flutter/issues/271))
- ODS - Component - Buttons: Segmented Buttons ([#7](https://github.com/Orange-OpenSource/ods-flutter/issues/7))
- ODS - Component - Buttons: icon Buttons ([#6](https://github.com/Orange-OpenSource/ods-flutter/issues/6))
- ODS - Component - Navigation Rail ([#25](https://github.com/Orange-OpenSource/ods-flutter/issues/25))

## Changed

Expand Down
Binary file added app/assets/il_navigation_rail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions app/lib/l10n/ods_flutter_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
"componentElementTypes": "Types",
"componentElementToggleCount": "Toggle count",
"componentElementEnabled": "Enabled",
"componentTrailing": "Trailing element",
"componentLeading": "Leading",

"@_COMPONENTS_CARDS": {},
"componentCardsTitle": "Cards",
Expand Down Expand Up @@ -262,6 +264,16 @@
"componentMenuIcons" : "Icons",
"componentMenuEnabled" : "Enabled",

"@_COMPONENTS_NAVIGATION_RAIL": {},
"componentNavigationRail": "Navigation rail",
"componentNavigationRailDescription": "Navigation rail is meant to be displayed at the left or right of an app to navigate between a small number of views.",

"@_NAVIGATION_RAIL_VARIANT": {},
"componentNavigationRailSubtitle": "OdsNavigationRail",
"componentNavigationRailLeadingNone": "None",
"componentNavigationRailLeadingFirst": "First",
"componentNavigationRailLeadingSecond": "Second",

"@_COMPONENTS_SHEETS_BOTTOM": {},
"componentSheetsBottomTitle": "Sheets: bottom",
"componentSheetsBottomDescription": "Bottom sheets are surfaces anchored to the bottom of the screen that present users supplemental content.",
Expand Down
28 changes: 13 additions & 15 deletions app/lib/ui/components/components.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import 'package:ods_flutter_demo/ui/components/lists/lists_switches.dart';
import 'package:ods_flutter_demo/ui/components/menus/menu_dropdown.dart';
import 'package:ods_flutter_demo/ui/components/menus/menu_exposed_dropdown.dart';
import 'package:ods_flutter_demo/ui/components/navigation_bar/navigation_bar.dart';
import 'package:ods_flutter_demo/ui/components/navigation_rail/navigation_rail.dart';
import 'package:ods_flutter_demo/ui/components/progress/progress_circular.dart';
import 'package:ods_flutter_demo/ui/components/progress/progress_linear.dart';
import 'package:ods_flutter_demo/ui/components/radio_buttons/radio_buttons.dart';
Expand Down Expand Up @@ -239,6 +240,18 @@ List<Component> components(BuildContext context) {
),
],
),
Component(
AppLocalizations.of(context)!.componentNavigationRail,
'assets/il_navigation_rail.png',
AppLocalizations.of(context)!.componentNavigationRailDescription,
[
Variant(
AppLocalizations.of(context)!.componentNavigationRail,
AppLocalizations.of(context)!.componentNavigationRailSubtitle,
ComponentNavigationRail(),
),
],
),
Component(
AppLocalizations.of(context)!.componentProgressTitle,
'assets/il_progress.png',
Expand Down Expand Up @@ -328,20 +341,5 @@ List<Component> components(BuildContext context) {
),
],
),

/// Delete material 3 demo page
/*
Component(
AppLocalizations.of(context)!.componentMaterialsTitle,
'assets/placeholder.png',
AppLocalizations.of(context)!.componentMaterialsDescription,
[
Variant(
AppLocalizations.of(context)!.materialsVariantTitle,
AppLocalizations.of(context)!.materialsVariantSubtitle,
ComponentMaterial()),
],
),
*/
];
}
Loading
Loading