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.

Sign up for GitHub

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

chore: Organize widgetbook #28

Merged
merged 3 commits into from
Feb 26, 2024
Merged

chore: Organize widgetbook #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d49906d
Organise widgetbook
thelukewalton Feb 26, 2024
4a4b0f6
Update github action
thelukewalton Feb 26, 2024
ebf44fa
[automated commit] lint format and import sort
invalid-email-address Feb 26, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: CI - Pull Request
on:
pull_request_target:
types:
- opened
pull_request:

jobs:
up-to-date:
Expand Down Expand Up @@ -62,7 +60,7 @@ jobs:
uses: tj-actions/[email protected]
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.16.x"
flutter-version: "3.19.x"
channel: "stable"
- name: Setup flutter
run: flutter pub get
Expand All @@ -89,9 +87,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.16.x"
flutter-version: "3.19.x"
channel: "stable"
- name: Setup flutter
run: flutter pub get
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,4 @@ $RECYCLE.BIN/
*.msp
*.lnk
**/Generated.xcconfig
.fvmrc
Binary file added example/assets/Omer.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 4 additions & 10 deletions example/lib/pages/components/button_example.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,10 @@ class _ButtonExampleState extends State<ButtonExample> {
Column(children: inputButtons(ZetaWidgetBorder.rounded)),
Text('Sharp Buttons', style: ZetaTextStyles.displayMedium),
Column(children: inputButtons(ZetaWidgetBorder.sharp)),
Text('Floating Action Buttons',
style: ZetaTextStyles.displayMedium),
Text('Tap buttons to change current FAB: ',
style: ZetaTextStyles.bodyMedium),
Wrap(
children:
fabs.divide(SizedBox.square(dimension: 10)).toList()),
]
.divide(const SizedBox.square(dimension: ZetaSpacing.m))
.toList(),
Text('Floating Action Buttons', style: ZetaTextStyles.displayMedium),
Text('Tap buttons to change current FAB: ', style: ZetaTextStyles.bodyMedium),
Wrap(children: fabs.divide(SizedBox.square(dimension: 10)).toList()),
].divide(const SizedBox.square(dimension: ZetaSpacing.m)).toList(),
),
),
Expanded(child: const SizedBox()),
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

COCOAPODS: 1.13.0
COCOAPODS: 1.15.1
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ dev_dependencies:

flutter:
uses-material-design: true
assets:
- assets/
19 changes: 12 additions & 7 deletions example/widgetbook/pages/assets/icon_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@ WidgetbookComponent iconWidgetbook() {
name: 'All Icons',
builder: (context) {
Map<String, IconData> icons =
(context.knobs.boolean(label: 'Rounded', initialValue: true)) ? iconsRounded : iconsSharp;
((context.knobs.boolean(label: 'Rounded', initialValue: true)) ? iconsRounded : iconsSharp);

final Map<String, IconData> sortedIcons = Map.fromEntries(icons.entries.toList()
..sort((a, b) {
final _a = (a.key.split('_')..removeLast()).join();
final _b = (b.key.split('_')..removeLast()).join();
return _a.compareTo(_b);
}));

return WidgetbookTestWidget(
removeBody: true,
widget: SingleChildScrollView(
key: PageStorageKey(0),
child: Center(
child: Column(
children: [
Expand All @@ -27,9 +35,9 @@ WidgetbookComponent iconWidgetbook() {
Wrap(
spacing: ZetaSpacing.l,
runSpacing: ZetaSpacing.l,
children: icons.entries.map(
children: sortedIcons.entries.map(
(e) {
final nameArr = e.key.split('_')..removeLast();
final nameArr = (e.key.split('_')..removeLast()).join(' ').capitalize();
return Container(
width: 100,
height: 100,
Expand All @@ -41,10 +49,7 @@ WidgetbookComponent iconWidgetbook() {
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(e.value, size: 40),
Text(nameArr.join(' '), textAlign: TextAlign.center)
],
children: [Icon(e.value, size: 40), Text(nameArr, textAlign: TextAlign.center)],
),
),
);
Expand Down
1 change: 0 additions & 1 deletion example/widgetbook/pages/components/accordion_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ WidgetbookComponent accordionWidgetBook() {
),
title: context.knobs.string(label: 'Accordion Title', initialValue: 'Title'),
contained: context.knobs.boolean(label: 'Contained', initialValue: false),
isOpen: context.knobs.boolean(label: 'Open', initialValue: false),
rounded: context.knobs.boolean(label: 'Rounded', initialValue: false),
),
),
Expand Down
14 changes: 11 additions & 3 deletions example/widgetbook/pages/components/avatar_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ WidgetbookComponent avatarWidgetBook() {
WidgetbookUseCase(
name: 'Image Avatar',
builder: (context) {
final Widget image = Image.network('https://i.ytimg.com/vi/KItsWUzFUOs/maxresdefault.jpg', fit: BoxFit.cover);
final Widget image = Image.asset('assets/Omer.jpg', fit: BoxFit.cover);

return WidgetbookTestWidget(
widget: Column(
Expand All @@ -21,7 +21,11 @@ WidgetbookComponent avatarWidgetBook() {
padding: const EdgeInsets.all(20),
child: ZetaAvatar.image(
image: context.knobs.boolean(label: 'Image') ? image : null,
size: context.knobs.list(label: 'Size', options: ZetaAvatarSize.values),
size: context.knobs.list(
label: 'Size',
options: ZetaAvatarSize.values,
labelBuilder: (value) => value.name.split('.').last.toUpperCase(),
),
lowerBadge:
context.knobs.boolean(label: 'Status Badge', initialValue: false) ? ZetaIndicator.icon() : null,
borderColor: context.knobs.colorOrNull(label: 'Outline', initialValue: null),
Expand All @@ -46,7 +50,11 @@ WidgetbookComponent avatarWidgetBook() {
child: ZetaAvatar.initials(
backgroundColor: context.knobs.colorOrNull(label: 'Background color', initialValue: null),
initials: context.knobs.stringOrNull(label: 'Initials', initialValue: 'AB'),
size: context.knobs.list(label: 'Size', options: ZetaAvatarSize.values),
size: context.knobs.list(
label: 'Size',
options: ZetaAvatarSize.values,
labelBuilder: (value) => value.name.split('.').last.toUpperCase(),
),
lowerBadge: context.knobs.boolean(label: 'Status badge', initialValue: false)
? ZetaIndicator.notification()
: null,
Expand Down
42 changes: 35 additions & 7 deletions example/widgetbook/pages/components/badges_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ WidgetbookComponent badgeWidgetBook() {
child: ZetaStatusLabel(
label: context.knobs.string(label: 'Label', initialValue: 'Label'),
rounded: context.knobs.boolean(label: 'Rounded'),
status: context.knobs.list(label: 'Status', options: ZetaWidgetStatus.values),
status: context.knobs.list(
label: 'Status',
labelBuilder: (value) => value.name.split('.').last.capitalize(),
options: ZetaWidgetStatus.values,
),
customIcon: context.knobs.list(
label: 'Icon',
options: [
Expand Down Expand Up @@ -72,7 +76,11 @@ WidgetbookComponent badgeWidgetBook() {
child: ZetaBadge(
label: context.knobs.string(label: 'Label', initialValue: 'Label'),
rounded: context.knobs.boolean(label: 'Rounded'),
status: context.knobs.list(label: 'Status', options: ZetaWidgetStatus.values),
status: context.knobs.list(
label: 'Status',
options: ZetaWidgetStatus.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
),
),
],
Expand All @@ -88,7 +96,11 @@ WidgetbookComponent badgeWidgetBook() {
Padding(
padding: EdgeInsets.all(20),
child: ZetaIndicator(
type: context.knobs.list(label: 'Type', options: ZetaIndicatorType.values),
type: context.knobs.list(
label: 'Type',
options: ZetaIndicatorType.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
icon: context.knobs.list(
label: 'Icon',
options: [
Expand All @@ -106,7 +118,11 @@ WidgetbookComponent badgeWidgetBook() {
},
),
inverse: context.knobs.boolean(label: 'Inverse Border'),
size: context.knobs.list(label: 'Size', options: ZetaWidgetSize.values),
size: context.knobs.list(
label: 'Size',
labelBuilder: (value) => value.name.split('.').last.capitalize(),
options: ZetaWidgetSize.values,
),
value: context.knobs.int.slider(label: 'Value'),
),
),
Expand All @@ -125,7 +141,11 @@ WidgetbookComponent badgeWidgetBook() {
child: ZetaTag(
label: context.knobs.string(label: 'Label', initialValue: 'Tag'),
rounded: context.knobs.boolean(label: 'Rounded'),
direction: context.knobs.list(label: 'Direction', options: ZetaTagDirection.values),
direction: context.knobs.list(
label: 'Direction',
options: ZetaTagDirection.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
),
)
],
Expand All @@ -146,8 +166,16 @@ WidgetbookComponent badgeWidgetBook() {
child: ZetaWorkcloudIndicator(
index: context.knobs.string(label: 'Index', initialValue: '1'),
label: context.knobs.string(label: 'Label', initialValue: 'Label'),
prioritySize: context.knobs.list(label: 'Size', options: ZetaWidgetSize.values),
priorityType: context.knobs.list(label: 'Type', options: ZetaWorkcloudIndicatorType.values),
prioritySize: context.knobs.list(
label: 'Size',
labelBuilder: (value) => value.name.split('.').last.capitalize(),
options: ZetaWidgetSize.values,
),
priorityType: context.knobs.list(
label: 'Type',
labelBuilder: (value) => value.name.split('.').last.capitalize(),
options: ZetaWorkcloudIndicatorType.values,
),
icon: context.knobs.listOrNull(
label: 'Icon',
options: [
Expand Down
12 changes: 10 additions & 2 deletions example/widgetbook/pages/components/banner_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ WidgetbookComponent bannerWidgetBook() {
ZetaSystemBanner(
context: context,
title: context.knobs.string(label: 'Title', initialValue: 'Banner Title'),
type: context.knobs.list(label: 'Type', options: ZetaSystemBannerStatus.values),
type: context.knobs.list(
label: 'Type',
options: ZetaSystemBannerStatus.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
leadingIcon: context.knobs.list(
label: 'Icon',
options: [
Expand Down Expand Up @@ -61,7 +65,11 @@ WidgetbookComponent bannerWidgetBook() {
'Lorem ipsum dolor sit amet, conse ctetur cididunt ut labore et do lore magna aliqua.',
),
),
status: context.knobs.list(label: 'Severity', options: ZetaWidgetStatus.values),
status: context.knobs.list(
label: 'Severity',
options: ZetaWidgetStatus.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
onClose: context.knobs.boolean(label: 'Show Close icon') ? () {} : null,
title: context.knobs.string(label: 'Title', initialValue: 'Title'),
rounded: context.knobs.boolean(label: 'Rounded'),
Expand Down
78 changes: 72 additions & 6 deletions example/widgetbook/pages/components/button_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,62 @@ WidgetbookComponent buttonWidgetBook() {
onPressed: context.knobs.boolean(label: 'Disabled') ? null : () {},
borderType:
context.knobs.boolean(label: 'Rounded') ? ZetaWidgetBorder.rounded : ZetaWidgetBorder.sharp,
size: context.knobs.list(label: 'Size', options: ZetaWidgetSize.values),
type: context.knobs.list(label: 'Type', options: ZetaButtonType.values),
size: context.knobs.list(
label: 'Size',
options: ZetaWidgetSize.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
type: context.knobs.list(
label: 'Type',
options: ZetaButtonType.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
),
),
],
),
);
},
),
WidgetbookUseCase(
name: 'Icon Button',
builder: (context) {
return WidgetbookTestWidget(
widget: Row(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: EdgeInsets.all(20),
child: ZetaIconButton(
icon: context.knobs.list(
label: 'Icon',
options: [
ZetaIcons.star_half_round,
ZetaIcons.add_alert_round,
ZetaIcons.add_box_round,
ZetaIcons.barcode_round,
],
labelBuilder: (value) {
if (value == ZetaIcons.star_half_round) return 'ZetaIcons.star_half_round';
if (value == ZetaIcons.add_alert_round) return 'ZetaIcons.add_alert_round';
if (value == ZetaIcons.add_box_round) return 'ZetaIcons.add_box_round';
if (value == ZetaIcons.barcode_round) return 'ZetaIcons.barcode_round';
return '';
},
),
onPressed: context.knobs.boolean(label: 'Disabled') ? null : () {},
borderType:
context.knobs.boolean(label: 'Rounded') ? ZetaWidgetBorder.rounded : ZetaWidgetBorder.sharp,
size: context.knobs.list(
label: 'Size',
labelBuilder: (value) => value.name.split('.').last.capitalize(),
options: ZetaWidgetSize.values,
),
type: context.knobs.list(
label: 'Type',
options: ZetaButtonType.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
),
),
],
Expand All @@ -37,7 +91,7 @@ WidgetbookComponent buttonWidgetBook() {
builder: (context) => WidgetbookTestWidget(
widget: Padding(padding: EdgeInsets.all(20), child: FabWidget(context)),
),
)
),
],
);
}
Expand Down Expand Up @@ -97,9 +151,21 @@ class _FabWidgetState extends State<FabWidget> {
return '';
},
),
shape: widget.c.knobs.list(label: 'Shape', options: ZetaWidgetBorder.values),
size: widget.c.knobs.list(label: 'Shape', options: ZetaFabSize.values),
type: widget.c.knobs.list(label: 'Shape', options: ZetaFabType.values),
shape: widget.c.knobs.list(
label: 'Shape',
options: ZetaWidgetBorder.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
size: widget.c.knobs.list(
label: 'Shape',
options: ZetaFabSize.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
type: widget.c.knobs.list(
label: 'Shape',
options: ZetaFabType.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
),
),
);
Expand Down
6 changes: 5 additions & 1 deletion example/widgetbook/pages/components/password_input_widgetbook.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ class _PasswordState extends State<_Password> {
rounded: context.knobs.boolean(label: 'Rounded'),
enabled: context.knobs.boolean(label: 'Enabled', initialValue: true),
obscureText: context.knobs.boolean(label: 'Obscure text', initialValue: true),
size: context.knobs.list(label: 'Size', options: ZetaWidgetSize.values),
size: context.knobs.list(
label: 'Size',
options: ZetaWidgetSize.values,
labelBuilder: (value) => value.name.split('.').last.capitalize(),
),
footerIcon: context.knobs.listOrNull(
label: 'Icon',
options: [
Expand Down
Loading