Skip to content

Commit bb84fc7

Browse files
BirjuVachhaniSaadArdati
BirjuVachhani
authored and
SaadArdati
committed
Refactor code
1 parent b66e6c8 commit bb84fc7

14 files changed

+118
-84
lines changed

‎lib/src/transformers/node_transformers/passive_app_bar_transformer.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ class PassiveAppBarTransformer extends NodeWidgetTransformer<AppBarNode> {
3131
if (!executed && context.mounted) Navigator.of(context).maybePop();
3232
}
3333

34-
PreferredSizeWidget buildAppBarWidgetFromProps({
34+
PreferredSizeWidget buildFromProps(
35+
BuildContext context, {
3536
required AppBarProperties props,
37+
double width = 250,
38+
double height = kAppBarDefaultHeight,
3639
WidgetBuildSettings settings = const WidgetBuildSettings(
3740
debugLabel: 'buildPreview',
3841
replaceVariablesWithSymbols: true,
@@ -41,7 +44,7 @@ class PassiveAppBarTransformer extends NodeWidgetTransformer<AppBarNode> {
4144
final node = AppBarNode(
4245
id: '',
4346
name: 'AppBar',
44-
basicBoxLocal: NodeBox(0, 0, 250, kAppBarDefaultHeight),
47+
basicBoxLocal: NodeBox(0, 0, width, height),
4548
properties: props,
4649
);
4750
return PassiveAppBarWidget(
@@ -84,7 +87,6 @@ class PassiveAppBarWidget extends StatelessWidget
8487
implements PreferredSizeWidget {
8588
final AppBarNode node;
8689
final double? elevation;
87-
final bool useIconFonts;
8890
final WidgetBuildSettings settings;
8991
final Function(BuildContext context, List<Reaction> reactions)?
9092
onLeadingPressed;
@@ -96,7 +98,6 @@ class PassiveAppBarWidget extends StatelessWidget
9698
super.key,
9799
required this.node,
98100
this.elevation,
99-
this.useIconFonts = false,
100101
required this.settings,
101102
this.onLeadingPressed,
102103
this.onActionPressed,
@@ -107,7 +108,7 @@ class PassiveAppBarWidget extends StatelessWidget
107108
Widget build(BuildContext context) {
108109
final Widget? leading = node.properties.leading.icon.show &&
109110
!node.properties.automaticallyImplyLeading
110-
? retrieveIconWidget(node.properties.leading.icon, null, useIconFonts)
111+
? retrieveIconWidget(node.properties.leading.icon, null)
111112
: null;
112113

113114
final Widget? title = node.properties.title.trim().isEmpty
@@ -156,9 +157,8 @@ class PassiveAppBarWidget extends StatelessWidget
156157
// splashRadius: 20,
157158
iconSize: item.icon.size,
158159
tooltip: item.tooltip,
159-
icon:
160-
retrieveIconWidget(item.icon, item.icon.size, useIconFonts) ??
161-
const SizedBox.shrink(),
160+
icon: retrieveIconWidget(item.icon, item.icon.size) ??
161+
const SizedBox.shrink(),
162162
),
163163
],
164164
),

‎lib/src/transformers/node_transformers/passive_button_transformer.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class PassiveButtonTransformer extends NodeWidgetTransformer<ButtonNode> {
2121
);
2222
}
2323

24-
Widget buildButtonWidgetFromProps(
24+
Widget buildFromProps(
2525
BuildContext context, {
2626
required ButtonProperties props,
2727
required double height,
@@ -74,7 +74,6 @@ class PassiveButtonWidget extends StatelessWidget {
7474
final void Function(BuildContext context)? onPressed;
7575
final void Function(BuildContext context)? onLongPress;
7676
final double? elevation;
77-
final bool useIconFonts;
7877

7978
PassiveButtonWidget({
8079
super.key,
@@ -84,7 +83,6 @@ class PassiveButtonWidget extends StatelessWidget {
8483
this.onPressed,
8584
this.onLongPress,
8685
this.elevation,
87-
this.useIconFonts = false,
8886
}) : variablesOverrides = variables ?? [];
8987

9088
@override
@@ -98,8 +96,8 @@ class PassiveButtonWidget extends StatelessWidget {
9896
);
9997
final double effectiveIconSize =
10098
min(node.properties.icon.size ?? 24, node.basicBoxLocal.height);
101-
Widget? iconWidget = retrieveIconWidget(
102-
node.properties.icon, effectiveIconSize, useIconFonts);
99+
Widget? iconWidget =
100+
retrieveIconWidget(node.properties.icon, effectiveIconSize);
103101

104102
final bool enabled = PropertyValueDelegate.getPropertyValue<bool>(
105103
node,

‎lib/src/transformers/node_transformers/passive_canvas_transformer.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class PassiveCanvasTransformer extends NodeWidgetTransformer<CanvasNode> {
8383
return PassiveFloatingActionButtonWidget.buildFAB(
8484
node.id,
8585
node.properties.floatingActionButton!,
86-
useFonts: false,
8786
onPressed: () => onFaBPressed(context, node),
8887
);
8988
}

‎lib/src/transformers/node_transformers/passive_divider_transformer.dart‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ class PassiveDividerTransformer extends NodeWidgetTransformer<DividerNode> {
1616
return buildFromNode(node);
1717
}
1818

19-
Widget buildFromProps({
19+
Widget buildFromProps(
20+
BuildContext context, {
2021
required DividerProperties props,
2122
required double height,
2223
required double width,
24+
WidgetBuildSettings settings =
25+
const WidgetBuildSettings(debugLabel: 'buildFromProps'),
2326
}) {
2427
final node = DividerNode(
2528
id: '',
@@ -28,7 +31,7 @@ class PassiveDividerTransformer extends NodeWidgetTransformer<DividerNode> {
2831
retainedOuterBoxLocal: NodeBox(0, 0, width, height),
2932
properties: props,
3033
);
31-
return buildFromNode(node);
34+
return buildFromNode(node, settings: settings);
3235
}
3336

3437
Widget buildPreview({
@@ -37,6 +40,8 @@ class PassiveDividerTransformer extends NodeWidgetTransformer<DividerNode> {
3740
double? height,
3841
double? width,
3942
ValueChanged<bool>? onChanged,
43+
WidgetBuildSettings settings =
44+
const WidgetBuildSettings(debugLabel: 'buildPreview'),
4045
}) {
4146
final previewNode = DividerNode(
4247
properties: properties ?? node?.properties ?? DividerProperties(),
@@ -48,13 +53,19 @@ class PassiveDividerTransformer extends NodeWidgetTransformer<DividerNode> {
4853
return PassiveDividerWidget(
4954
node: previewNode,
5055
onChanged: onChanged,
56+
settings: settings,
5157
);
5258
}
5359

54-
Widget buildFromNode(DividerNode node) {
60+
Widget buildFromNode(
61+
DividerNode node, {
62+
WidgetBuildSettings settings =
63+
const WidgetBuildSettings(debugLabel: 'buildFromNode'),
64+
}) {
5565
return PassiveDividerWidget(
5666
node: node,
5767
onChanged: (value) => onChanged(node.reactions),
68+
settings: settings,
5869
);
5970
}
6071

@@ -76,12 +87,14 @@ class PassiveDividerWidget extends StatelessWidget {
7687
final DividerNode node;
7788
final List<VariableData> variables;
7889
final ValueChanged<bool>? onChanged;
90+
final WidgetBuildSettings settings;
7991

8092
const PassiveDividerWidget({
8193
super.key,
8294
required this.node,
8395
required this.onChanged,
8496
this.variables = const [],
97+
required this.settings,
8598
});
8699

87100
@override

‎lib/src/transformers/node_transformers/passive_dropdown_transformer.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class PassiveDropdownTransformer extends NodeWidgetTransformer<DropdownNode> {
6565
class PassiveDropdownWidget extends StatelessWidget {
6666
final DropdownNode node;
6767
final VoidCallback? onTap;
68-
final bool useIconFonts;
6968
final ValueChanged<int>? onChanged;
7069
final int? initialValue;
7170
final WidgetBuildSettings settings;
@@ -74,7 +73,6 @@ class PassiveDropdownWidget extends StatelessWidget {
7473
super.key,
7574
required this.node,
7675
this.onTap,
77-
this.useIconFonts = false,
7876
this.onChanged,
7977
this.initialValue,
8078
required this.settings,
@@ -214,7 +212,7 @@ class PassiveDropdownWidget extends StatelessWidget {
214212
iconEnabledColor: node.properties.iconEnabledColor.toFlutterColor(),
215213
iconSize: node.properties.iconSize,
216214
icon: retrieveIconWidget(
217-
node.properties.icon, node.properties.iconSize, useIconFonts),
215+
node.properties.icon, node.properties.iconSize),
218216
dropdownColor: node.properties.dropdownColor.toFlutterColor(),
219217
focusColor: node.properties.focusColor.toFlutterColor(),
220218
elevation: node.properties.elevation,

‎lib/src/transformers/node_transformers/passive_expansion_tile_transformer.dart‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ class PassiveExpansionTileTransformer
2323
);
2424
}
2525

26-
Widget buildFromProps({
26+
Widget buildFromProps(
27+
BuildContext context, {
2728
required ExpansionTileProperties props,
2829
required double height,
2930
required double width,
@@ -40,8 +41,9 @@ class PassiveExpansionTileTransformer
4041
return buildFromNode(node, settings: settings);
4142
}
4243

43-
Widget buildPreview({
44-
ExpansionTileProperties? properties,
44+
Widget buildPreview(
45+
BuildContext context, {
46+
ExpansionTileProperties? props,
4547
ExpansionTileNode? node,
4648
double height = kDefaultListTileHeight * 2,
4749
double width = kDefaultListTileWidth,
@@ -74,7 +76,7 @@ class PassiveExpansionTileTransformer
7476
basicBoxLocal: NodeBox(0, 0, width, height),
7577
retainedOuterBoxLocal: NodeBox(0, 0, width, height),
7678
verticalFit: SizeFit.shrinkWrap,
77-
properties: (properties ??
79+
properties: (props ??
7880
node?.properties ??
7981
ExpansionTileProperties(
8082
controlAffinity: controlAffinity,

‎lib/src/transformers/node_transformers/passive_floating_action_button_transformer.dart‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,40 @@ class PassiveFloatingActionButtonTransformer
1414
BuildContext context,
1515
WidgetBuildSettings settings,
1616
) {
17-
return buildFromNode(context, node, useFonts: false);
17+
return buildFromNode(context, node);
1818
}
1919

2020
Widget buildFromProps(
2121
BuildContext context, {
2222
required FloatingActionButtonProperties props,
2323
double? width,
24-
required bool useFonts,
24+
double? height,
25+
WidgetBuildSettings settings =
26+
const WidgetBuildSettings(debugLabel: 'buildFromProps'),
2527
}) {
2628
final node = FloatingActionButtonNode(
2729
id: '',
2830
name: 'FAB',
29-
basicBoxLocal: NodeBox(0, 0, width ?? props.type.size, props.type.size),
31+
basicBoxLocal:
32+
NodeBox(0, 0, width ?? props.type.size, height ?? props.type.size),
3033
retainedOuterBoxLocal:
3134
NodeBox(0, 0, width ?? props.type.size, props.type.size),
3235
properties: props,
3336
);
34-
return buildFromNode(context, node, useFonts: useFonts);
37+
return buildFromNode(
38+
context,
39+
node,
40+
settings: settings,
41+
);
3542
}
3643

3744
Widget buildPreview({
3845
FloatingActionButtonProperties? properties,
3946
FloatingActionButtonNode? node,
4047
double? width,
4148
VoidCallback? onPressed,
49+
WidgetBuildSettings settings =
50+
const WidgetBuildSettings(debugLabel: 'buildPreview'),
4251
}) {
4352
properties =
4453
properties ?? node?.properties ?? FloatingActionButtonProperties();
@@ -54,19 +63,20 @@ class PassiveFloatingActionButtonTransformer
5463
return PassiveFloatingActionButtonWidget(
5564
node: previewNode,
5665
onPressed: onPressed,
57-
useFonts: true,
66+
settings: settings,
5867
);
5968
}
6069

6170
Widget buildFromNode(
6271
BuildContext context,
6372
FloatingActionButtonNode node, {
64-
required bool useFonts,
73+
WidgetBuildSettings settings =
74+
const WidgetBuildSettings(debugLabel: 'buildFromNode'),
6575
}) {
6676
return PassiveFloatingActionButtonWidget(
6777
node: node,
6878
onPressed: () => onPressed(context, node.reactions),
69-
useFonts: useFonts,
79+
settings: settings,
7080
);
7181
}
7282

@@ -79,14 +89,14 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
7989
final FloatingActionButtonNode node;
8090
final VoidCallback? onPressed;
8191
final double? elevation;
82-
final bool useFonts;
92+
final WidgetBuildSettings settings;
8393

8494
const PassiveFloatingActionButtonWidget({
8595
super.key,
8696
required this.node,
8797
this.onPressed,
8898
this.elevation,
89-
required this.useFonts,
99+
required this.settings,
90100
});
91101

92102
@override
@@ -100,7 +110,6 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
100110
fab,
101111
onPressed: onPressed,
102112
elevation: elevation,
103-
useFonts: useFonts,
104113
),
105114
);
106115
}
@@ -110,7 +119,6 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
110119
FloatingActionButtonProperties fab, {
111120
VoidCallback? onPressed,
112121
double? elevation,
113-
required bool useFonts,
114122
}) {
115123
final ShapeBorder? shape = getFABShape(fab);
116124
switch (fab.type) {
@@ -128,7 +136,7 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
128136
hoverColor: fab.hoverColor?.toFlutterColor(),
129137
splashColor: fab.splashColor?.toFlutterColor(),
130138
shape: shape,
131-
child: getFABIcon(fab, useFonts: useFonts),
139+
child: getFABIcon(fab),
132140
);
133141
case FloatingActionButtonType.regular:
134142
return FloatingActionButton(
@@ -144,7 +152,7 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
144152
hoverColor: fab.hoverColor?.toFlutterColor(),
145153
splashColor: fab.splashColor?.toFlutterColor(),
146154
shape: shape,
147-
child: getFABIcon(fab, useFonts: useFonts),
155+
child: getFABIcon(fab),
148156
);
149157
case FloatingActionButtonType.large:
150158
return FloatingActionButton.large(
@@ -160,7 +168,7 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
160168
hoverColor: fab.hoverColor?.toFlutterColor(),
161169
splashColor: fab.splashColor?.toFlutterColor(),
162170
shape: shape,
163-
child: getFABIcon(fab, useFonts: useFonts),
171+
child: getFABIcon(fab),
164172
);
165173
case FloatingActionButtonType.extended:
166174
return FloatingActionButton.extended(
@@ -181,20 +189,16 @@ class PassiveFloatingActionButtonWidget extends StatelessWidget {
181189
extendedTextStyle:
182190
TextUtils.retrieveTextStyleFromProp(fab.labelStyle),
183191
shape: shape,
184-
icon: !fab.icon.show ? null : getFABIcon(fab, useFonts: useFonts),
192+
icon: !fab.icon.show ? null : getFABIcon(fab),
185193
label: Text(fab.label),
186194
);
187195
}
188196
}
189197

190-
static Widget? getFABIcon(
191-
FloatingActionButtonProperties fab, {
192-
required bool useFonts,
193-
}) {
198+
static Widget? getFABIcon(FloatingActionButtonProperties fab) {
194199
return retrieveIconWidget(
195200
fab.icon,
196201
null,
197-
useFonts,
198202
fab.foregroundColor.toFlutterColor(),
199203
);
200204
}

0 commit comments

Comments
 (0)