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

refactor: [DX-2275] Update list knobs #692

Merged
merged 4 commits into from
Oct 14, 2024
Merged
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
24 changes: 6 additions & 18 deletions optimus_widgetbook/lib/components/buttons/button.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/components/common/common.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -12,16 +12,8 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;

final leadingIcon = k.listOrNull(
label: 'Leading icon',
initialOption: null,
options: exampleIcons,
);
final trailingIcon = k.listOrNull(
label: 'Trailing icon',
initialOption: null,
options: exampleIcons,
);
final leadingIcon = k.optimusIconOrNullKnob(label: 'Leading Icon');
final trailingIcon = k.optimusIconOrNullKnob(label: 'Trailing Icon');

final showBadge = k.boolean(label: 'Show Badge', initialValue: false);
final counter =
Expand All @@ -37,15 +29,11 @@ Widget createDefaultStyle(BuildContext context) {
onPressed: k.boolean(label: 'Enabled', initialValue: true)
? () {}
: null,
size: k.list(
label: 'Size',
initialOption: OptimusWidgetSize.large,
options: OptimusWidgetSize.values,
),
size: k.widgetSizeKnob,
isLoading: k.boolean(label: 'Loading', initialValue: false),
variant: v,
leadingIcon: leadingIcon,
trailingIcon: trailingIcon,
leadingIcon: leadingIcon?.data,
trailingIcon: trailingIcon?.data,
counter: showBadge ? counter : null,
child: Text(k.string(label: 'Text', initialValue: 'Button')),
),
Expand Down
9 changes: 3 additions & 6 deletions optimus_widgetbook/lib/components/buttons/dropdown.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -10,7 +11,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
)
Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;
final isEnabled = k.boolean(label: 'Enabled', initialValue: true);
final isEnabled = k.isEnabledKnob;

return SingleChildScrollView(
child: Column(
Expand All @@ -19,11 +20,7 @@ Widget createDefaultStyle(BuildContext context) {
(v) => Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: OptimusDropDownButton<int>(
size: k.list(
label: 'Size',
initialOption: OptimusWidgetSize.large,
options: OptimusWidgetSize.values,
),
size: k.widgetSizeKnob,
items: Iterable<int>.generate(10)
.map(
(i) => ListDropdownTile<int>(
Expand Down
20 changes: 5 additions & 15 deletions optimus_widgetbook/lib/components/buttons/icon.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:dfunc/dfunc.dart';
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/components/common/common.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -13,11 +13,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;

final icon = k.list(
label: 'Icon',
initialOption: OptimusIcons.calendar,
options: exampleIcons,
);
final icon = k.optimusIconKnob(label: 'Icon');

return SingleChildScrollView(
child: Column(
Expand All @@ -26,15 +22,9 @@ Widget createDefaultStyle(BuildContext context) {
(v) => Padding(
padding: const EdgeInsets.all(8),
child: OptimusIconButton(
onPressed: k.boolean(label: 'Enabled', initialValue: true)
? ignore
: null,
icon: Icon(icon),
size: k.list(
label: 'Size',
initialOption: OptimusWidgetSize.large,
options: OptimusWidgetSize.values,
),
onPressed: k.isEnabledKnob ? ignore : null,
icon: Icon(icon.data),
size: k.widgetSizeKnob,
variant: v,
),
),
Expand Down
1 change: 1 addition & 0 deletions optimus_widgetbook/lib/components/buttons/split.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Widget createDefaultStyle(BuildContext context) {
label: 'Size',
initialOption: OptimusWidgetSize.large,
options: OptimusWidgetSize.values,
labelBuilder: (value) => value.name,
),
items: Iterable<int>.generate(10)
.map(
Expand Down
3 changes: 2 additions & 1 deletion optimus_widgetbook/lib/components/buttons/toggle.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -10,7 +11,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
)
Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;
final isEnabled = k.boolean(label: 'Enabled', initialValue: true);
final isEnabled = k.isEnabledKnob;
final size = k.list(
label: 'Size',
labelBuilder: (option) => option.name,
Expand Down
2 changes: 2 additions & 0 deletions optimus_widgetbook/lib/components/chat/bubble.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ Widget createDefaultStyle(BuildContext context) {
label: 'Alignment',
initialOption: MessageAlignment.left,
options: MessageAlignment.values,
labelBuilder: (value) => value.name,
),
state: MessageState.sent,
color: k.list(
label: 'Color',
initialOption: MessageColor.dark,
options: MessageColor.values,
labelBuilder: (value) => value.name,
),
);

Expand Down
2 changes: 1 addition & 1 deletion optimus_widgetbook/lib/components/chat/chat.dart
Original file line number Diff line number Diff line change
Expand Up @@ -231,5 +231,5 @@ const _user1 = OptimusMessageAuthor(
final _user3 = OptimusMessageAuthor(
id: 'user3',
username: 'User 3',
avatar: organisationAvatar,
avatar: organizationAvatar,
);
6 changes: 3 additions & 3 deletions optimus_widgetbook/lib/components/chat/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const avatar3 = OptimusAvatar(
imageUrl: _avatar2Url,
);

final organisationAvatar = Stack(
final organizationAvatar = Stack(
children: [
avatar3,
Positioned(
Expand All @@ -27,7 +27,7 @@ final organisationAvatar = Stack(
decoration: const BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8)),
image: DecorationImage(
image: NetworkImage(_organisationAvatarUrl),
image: NetworkImage(_organizationAvatarUrl),
fit: BoxFit.cover,
),
),
Expand All @@ -41,5 +41,5 @@ const _avatarUrl =
const _avatar2Url =
'https://images.unsplash.com/photo-1543466835-00a7907e9de1?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=512&q=80';

const _organisationAvatarUrl =
const _organizationAvatarUrl =
'https://images.unsplash.com/photo-1599305445671-ac291c95aaa9?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=256&q=80';
17 changes: 0 additions & 17 deletions optimus_widgetbook/lib/components/chip.dart

This file was deleted.

32 changes: 0 additions & 32 deletions optimus_widgetbook/lib/components/common/common.dart

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/components/common/common.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -20,20 +20,17 @@ Widget createDefaultStyle(BuildContext context) {
label: 'Position',
initialOption: OptimusTooltipPosition.top,
options: OptimusTooltipPosition.values,
labelBuilder: (value) => value.name,
);
final size = knobs.list(
label: 'Size',
initialOption: OptimusToolTipSize.small,
options: OptimusToolTipSize.values,
labelBuilder: (value) => value.name,
);
final duration =
knobs.int.slider(label: 'Duration', initialValue: 1, min: 0, max: 5);
final contentAlign = knobs.list(
label: 'Alert icon align:',
description: 'Will replace the input field if set to the center',
options: alignments,
initialOption: Alignment.bottomRight,
);
final contentAlign = knobs.alignmentKnob();

return Padding(
padding: const EdgeInsets.all(16),
Expand Down
1 change: 0 additions & 1 deletion optimus_widgetbook/lib/components/feedback/alert.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class AlertStory extends StatelessWidget {
Widget build(BuildContext context) {
final k = context.knobs;
final title = k.string(label: 'Title', initialValue: 'Title');

final description = k.string(label: 'Description', initialValue: '');
final link = k.string(label: 'Link.string', initialValue: '');
final isDismissible = k.boolean(label: 'Is Dismissible');
Expand Down
7 changes: 4 additions & 3 deletions optimus_widgetbook/lib/components/feedback/chip.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:dfunc/dfunc.dart';
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -11,13 +13,12 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;

final isEnabled = k.boolean(label: 'Enabled', initialValue: true);
final text = k.string(label: 'Chip text', initialValue: 'Chip');
final hasError = k.boolean(label: 'Error', initialValue: false);

return OptimusChip(
isEnabled: isEnabled,
onRemoved: () {},
isEnabled: k.isEnabledKnob,
onRemoved: ignore,
hasError: hasError,
child: Text(text),
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:dfunc/dfunc.dart';
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:widgetbook/widgetbook.dart';
Expand Down Expand Up @@ -35,7 +36,7 @@ Widget createDefaultStyle(BuildContext context) {
link: link.isNotEmpty
? OptimusFeedbackLink(
text: Text(link),
onPressed: () {},
onPressed: ignore,
)
: null,
variant: v,
Expand Down
22 changes: 7 additions & 15 deletions optimus_widgetbook/lib/components/feedback/tags.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/components/common/common.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand All @@ -13,16 +13,8 @@ Widget createDefaultStyle(BuildContext context) {
final k = context.knobs;

final isOutlined = k.boolean(label: 'Outlined', initialValue: false);
final leadingIcon = k.listOrNull(
label: 'Leading icon',
initialOption: null,
options: exampleIcons,
);
final trailingIcon = k.listOrNull(
label: 'Trailing icon',
initialOption: null,
options: exampleIcons,
);
final leadingIcon = k.optimusIconOrNullKnob(label: 'Leading Icon');
final trailingIcon = k.optimusIconOrNullKnob(label: 'Trailing Icon');
final text = k.string(label: 'Text', initialValue: 'Label');

return Column(
Expand All @@ -36,8 +28,8 @@ Widget createDefaultStyle(BuildContext context) {
padding: const EdgeInsets.all(8),
child: OptimusTag(
text: text.isEmpty ? c.name : text,
leadingIcon: leadingIcon,
trailingIcon: trailingIcon,
leadingIcon: leadingIcon?.data,
trailingIcon: trailingIcon?.data,
colorOption: c,
isOutlined: isOutlined,
),
Expand All @@ -54,8 +46,8 @@ Widget createDefaultStyle(BuildContext context) {
padding: const EdgeInsets.all(8),
child: OptimusCategoricalTag(
text: text.isEmpty ? c.name : text,
leadingIcon: leadingIcon,
trailingIcon: trailingIcon,
leadingIcon: leadingIcon?.data,
trailingIcon: trailingIcon?.data,
colorOption: c,
isOutlined: isOutlined,
),
Expand Down
3 changes: 2 additions & 1 deletion optimus_widgetbook/lib/components/forms/checkbox.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/widgets.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand Down Expand Up @@ -29,7 +30,7 @@ class CheckboxStoryState extends State<CheckboxStory> {
return OptimusCheckbox(
label: Text(k.string(label: 'Label', initialValue: 'Checkbox Label')),
error: k.string(label: 'Error'),
isEnabled: k.boolean(label: 'Enabled', initialValue: true),
isEnabled: k.isEnabledKnob,
size: k.list(
label: 'Size',
options: OptimusCheckboxSize.values,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:optimus/optimus.dart';
import 'package:optimus_widgetbook/utils.dart';
import 'package:widgetbook/widgetbook.dart';
import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;

Expand Down Expand Up @@ -30,7 +31,7 @@ class CheckboxGroupUseCaseState extends State<CheckboxGroupUseCase> {
label: k.string(label: 'Label', initialValue: 'Checkbox Group Label'),
error: k.string(label: 'Error'),
onChanged: _handleChanged,
isEnabled: k.boolean(label: 'Enabled', initialValue: true),
isEnabled: k.isEnabledKnob,
values: _checks,
items: const [
OptimusGroupItem(label: Text('Checkbox 1'), value: 0),
Expand Down
Loading
Loading