Skip to content

Commit c42003a

Browse files
polina-cpolina-c
authored
Cleanup. (#493)
1 parent 34acb73 commit c42003a

File tree

24 files changed

+176
-177
lines changed

24 files changed

+176
-177
lines changed

‎examples/travel_app/lib/src/catalog/input_group.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ final inputGroup = CatalogItem(
118118
],
119119
name: 'InputGroup',
120120
dataSchema: _schema,
121-
widgetBuilder: (context) {
121+
widgetBuilder: (itemContext) {
122122
final inputGroupData = _InputGroupData.fromMap(
123-
context.data as Map<String, Object?>,
123+
itemContext.data as Map<String, Object?>,
124124
);
125125

126-
final notifier = context.dataContext.subscribeToString(
126+
final notifier = itemContext.dataContext.subscribeToString(
127127
inputGroupData.submitLabel,
128128
);
129129

@@ -134,7 +134,7 @@ final inputGroup = CatalogItem(
134134
(actionData['context'] as List<Object?>?) ?? <Object?>[];
135135

136136
return Card(
137-
color: Theme.of(context.buildContext).colorScheme.primaryContainer,
137+
color: Theme.of(itemContext.buildContext).colorScheme.primaryContainer,
138138
child: Padding(
139139
padding: const EdgeInsets.all(8.0),
140140
child: Column(
@@ -143,7 +143,7 @@ final inputGroup = CatalogItem(
143143
Wrap(
144144
runSpacing: 16.0,
145145
spacing: 8.0,
146-
children: children.map(context.buildChild).toList(),
146+
children: children.map(itemContext.buildChild).toList(),
147147
),
148148
const SizedBox(height: 16.0),
149149
ValueListenableBuilder<String?>(
@@ -152,13 +152,13 @@ final inputGroup = CatalogItem(
152152
return ElevatedButton(
153153
onPressed: () {
154154
final resolvedContext = resolveContext(
155-
context.dataContext,
155+
itemContext.dataContext,
156156
contextDefinition,
157157
);
158-
context.dispatchEvent(
158+
itemContext.dispatchEvent(
159159
UserActionEvent(
160160
name: name,
161-
sourceComponentId: context.id,
161+
sourceComponentId: itemContext.id,
162162
context: resolvedContext,
163163
),
164164
);

‎examples/travel_app/lib/src/catalog/trailhead.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ final trailhead = CatalogItem(
7070
]
7171
''',
7272
],
73-
widgetBuilder: (context) {
73+
widgetBuilder: (itemContext) {
7474
final trailheadData = _TrailheadData.fromMap(
75-
context.data as Map<String, Object?>,
75+
itemContext.data as Map<String, Object?>,
7676
);
7777
return _Trailhead(
7878
topics: trailheadData.topics,
7979
action: trailheadData.action,
80-
widgetId: context.id,
81-
dispatchEvent: context.dispatchEvent,
82-
dataContext: context.dataContext,
80+
widgetId: itemContext.id,
81+
dispatchEvent: itemContext.dispatchEvent,
82+
dataContext: itemContext.dataContext,
8383
);
8484
},
8585
);

‎examples/travel_app/lib/src/catalog/travel_carousel.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ final _schema = S.object(
6565
final travelCarousel = CatalogItem(
6666
name: 'TravelCarousel',
6767
dataSchema: _schema,
68-
widgetBuilder: (context) {
68+
widgetBuilder: (itemContext) {
6969
final carouselData = _TravelCarouselData.fromMap(
70-
context.data as Map<String, Object?>,
70+
itemContext.data as Map<String, Object?>,
7171
);
7272

73-
final titleNotifier = context.dataContext.subscribeToString(
73+
final titleNotifier = itemContext.dataContext.subscribeToString(
7474
carouselData.title,
7575
);
7676

7777
final items = carouselData.items.map((item) {
78-
final descriptionNotifier = context.dataContext.subscribeToString(
78+
final descriptionNotifier = itemContext.dataContext.subscribeToString(
7979
item.description,
8080
);
8181

8282
return _TravelCarouselItemData(
8383
descriptionNotifier: descriptionNotifier,
84-
imageChild: context.buildChild(item.imageChildId),
84+
imageChild: itemContext.buildChild(item.imageChildId),
8585
listingSelectionId: item.listingSelectionId,
8686
action: item.action,
8787
);
@@ -93,9 +93,9 @@ final travelCarousel = CatalogItem(
9393
return _TravelCarousel(
9494
title: title,
9595
items: items,
96-
widgetId: context.id,
97-
dispatchEvent: context.dispatchEvent,
98-
dataContext: context.dataContext,
96+
widgetId: itemContext.id,
97+
dispatchEvent: itemContext.dispatchEvent,
98+
dataContext: itemContext.dataContext,
9999
);
100100
},
101101
);

‎packages/flutter_genui/lib/src/catalog/core_widgets/audio_player.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final _schema = S.object(
2828
final audioPlayer = CatalogItem(
2929
name: 'AudioPlayer',
3030
dataSchema: _schema,
31-
widgetBuilder: (context) {
31+
widgetBuilder: (itemContext) {
3232
return ConstrainedBox(
3333
constraints: const BoxConstraints(maxWidth: 200, maxHeight: 100),
3434
child: const Placeholder(child: Center(child: Text('AudioPlayer'))),

‎packages/flutter_genui/lib/src/catalog/core_widgets/button.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ extension type _ButtonData.fromMap(JsonMap _json) {
6060
final button = CatalogItem(
6161
name: 'Button',
6262
dataSchema: _schema,
63-
widgetBuilder: (context) {
64-
final buttonData = _ButtonData.fromMap(context.data as JsonMap);
65-
final child = context.buildChild(buttonData.child);
63+
widgetBuilder: (itemContext) {
64+
final buttonData = _ButtonData.fromMap(itemContext.data as JsonMap);
65+
final child = itemContext.buildChild(buttonData.child);
6666
final actionData = buttonData.action;
6767
final actionName = actionData['name'] as String;
6868
final contextDefinition =
6969
(actionData['context'] as List<Object?>?) ?? <Object?>[];
7070

7171
genUiLogger.info('Building Button with child: ${buttonData.child}');
72-
final colorScheme = Theme.of(context.buildContext).colorScheme;
72+
final colorScheme = Theme.of(itemContext.buildContext).colorScheme;
7373
final primary = buttonData.primary;
7474

7575
return ElevatedButton(
@@ -81,13 +81,13 @@ final button = CatalogItem(
8181
),
8282
onPressed: () {
8383
final resolvedContext = resolveContext(
84-
context.dataContext,
84+
itemContext.dataContext,
8585
contextDefinition,
8686
);
87-
context.dispatchEvent(
87+
itemContext.dispatchEvent(
8888
UserActionEvent(
8989
name: actionName,
90-
sourceComponentId: context.id,
90+
sourceComponentId: itemContext.id,
9191
context: resolvedContext,
9292
),
9393
);

‎packages/flutter_genui/lib/src/catalog/core_widgets/card.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ extension type _CardData.fromMap(JsonMap _json) {
3333
final card = CatalogItem(
3434
name: 'Card',
3535
dataSchema: _schema,
36-
widgetBuilder: (context) {
37-
final cardData = _CardData.fromMap(context.data as JsonMap);
38-
return Card(child: context.buildChild(cardData.child));
36+
widgetBuilder: (itemContext) {
37+
final cardData = _CardData.fromMap(itemContext.data as JsonMap);
38+
return Card(child: itemContext.buildChild(cardData.child));
3939
},
4040
exampleData: [
4141
() => '''

‎packages/flutter_genui/lib/src/catalog/core_widgets/check_box.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ extension type _CheckBoxData.fromMap(JsonMap _json) {
4040
final checkBox = CatalogItem(
4141
name: 'CheckBox',
4242
dataSchema: _schema,
43-
widgetBuilder: (context) {
44-
final checkBoxData = _CheckBoxData.fromMap(context.data as JsonMap);
45-
final labelNotifier = context.dataContext.subscribeToString(
43+
widgetBuilder: (itemContext) {
44+
final checkBoxData = _CheckBoxData.fromMap(itemContext.data as JsonMap);
45+
final labelNotifier = itemContext.dataContext.subscribeToString(
4646
checkBoxData.label,
4747
);
48-
final valueNotifier = context.dataContext.subscribeToBool(
48+
final valueNotifier = itemContext.dataContext.subscribeToBool(
4949
checkBoxData.value,
5050
);
5151
return ValueListenableBuilder<String?>(
5252
valueListenable: labelNotifier,
53-
builder: (bcontext, label, child) {
53+
builder: (context, label, child) {
5454
return ValueListenableBuilder<bool?>(
5555
valueListenable: valueNotifier,
56-
builder: (bcontext, value, child) {
56+
builder: (context, value, child) {
5757
return CheckboxListTile(
5858
title: Text(label ?? ''),
5959
value: value ?? false,
6060
onChanged: (newValue) {
6161
final path = checkBoxData.value['path'] as String?;
6262
if (path != null) {
63-
context.dataContext.update(DataPath(path), newValue);
63+
itemContext.dataContext.update(DataPath(path), newValue);
6464
}
6565
},
6666
);

‎packages/flutter_genui/lib/src/catalog/core_widgets/column.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ CrossAxisAlignment _parseCrossAxisAlignment(String? alignment) {
105105
final column = CatalogItem(
106106
name: 'Column',
107107
dataSchema: _schema,
108-
widgetBuilder: (context) {
109-
final columnData = _ColumnData.fromMap(context.data as JsonMap);
108+
widgetBuilder: (itemContext) {
109+
final columnData = _ColumnData.fromMap(itemContext.data as JsonMap);
110110
return ComponentChildrenBuilder(
111111
childrenData: columnData.children,
112-
dataContext: context.dataContext,
113-
buildChild: context.buildChild,
114-
getComponent: context.getComponent,
112+
dataContext: itemContext.dataContext,
113+
buildChild: itemContext.buildChild,
114+
getComponent: itemContext.getComponent,
115115
explicitListBuilder: (childIds, buildChild, getComponent, dataContext) {
116116
return Column(
117117
mainAxisAlignment: _parseMainAxisAlignment(columnData.distribution),
@@ -129,7 +129,7 @@ final column = CatalogItem(
129129
.toList(),
130130
);
131131
},
132-
templateListWidgetBuilder: (bcontext, list, componentId, dataBinding) {
132+
templateListWidgetBuilder: (context, list, componentId, dataBinding) {
133133
return Column(
134134
mainAxisAlignment: _parseMainAxisAlignment(columnData.distribution),
135135
crossAxisAlignment: _parseCrossAxisAlignment(columnData.alignment),
@@ -138,11 +138,11 @@ final column = CatalogItem(
138138
for (var i = 0; i < list.length; i++) ...[
139139
buildWeightedChild(
140140
componentId: componentId,
141-
dataContext: context.dataContext.nested(
141+
dataContext: itemContext.dataContext.nested(
142142
DataPath('$dataBinding/$i'),
143143
),
144-
buildChild: context.buildChild,
145-
component: context.getComponent(componentId),
144+
buildChild: itemContext.buildChild,
145+
component: itemContext.getComponent(componentId),
146146
),
147147
],
148148
],

‎packages/flutter_genui/lib/src/catalog/core_widgets/date_time_input.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ extension type _DateTimeInputData.fromMap(JsonMap _json) {
5959
final dateTimeInput = CatalogItem(
6060
name: 'DateTimeInput',
6161
dataSchema: _schema,
62-
widgetBuilder: (context) {
62+
widgetBuilder: (itemContext) {
6363
final dateTimeInputData = _DateTimeInputData.fromMap(
64-
context.data as JsonMap,
64+
itemContext.data as JsonMap,
6565
);
66-
final valueNotifier = context.dataContext.subscribeToString(
66+
final valueNotifier = itemContext.dataContext.subscribeToString(
6767
dateTimeInputData.value,
6868
);
6969

7070
return ValueListenableBuilder<String?>(
7171
valueListenable: valueNotifier,
72-
builder: (bcontext, value, child) {
72+
builder: (context, value, child) {
7373
return ListTile(
7474
title: Text(value ?? 'Select a date/time'),
7575
onTap: () async {
@@ -79,27 +79,27 @@ final dateTimeInput = CatalogItem(
7979
}
8080
if (dateTimeInputData.enableDate) {
8181
final date = await showDatePicker(
82-
context: context.buildContext,
82+
context: itemContext.buildContext,
8383
initialDate: DateTime.now(),
8484
firstDate: DateTime(2000),
8585
lastDate: DateTime(2100),
8686
);
8787
if (date != null) {
88-
context.dataContext.update(
88+
itemContext.dataContext.update(
8989
DataPath(path),
9090
date.toIso8601String(),
9191
);
9292
}
9393
}
9494
if (dateTimeInputData.enableTime) {
9595
final time = await showTimePicker(
96-
context: context.buildContext,
96+
context: itemContext.buildContext,
9797
initialTime: TimeOfDay.now(),
9898
);
9999
if (time != null) {
100-
context.dataContext.update(
100+
itemContext.dataContext.update(
101101
DataPath(path),
102-
time.format(context.buildContext),
102+
time.format(itemContext.buildContext),
103103
);
104104
}
105105
}

‎packages/flutter_genui/lib/src/catalog/core_widgets/divider.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ extension type _DividerData.fromMap(JsonMap _json) {
3232
final divider = CatalogItem(
3333
name: 'Divider',
3434
dataSchema: _schema,
35-
widgetBuilder: (context) {
36-
final dividerData = _DividerData.fromMap(context.data as JsonMap);
35+
widgetBuilder: (itemContext) {
36+
final dividerData = _DividerData.fromMap(itemContext.data as JsonMap);
3737
if (dividerData.axis == 'vertical') {
3838
return const VerticalDivider();
3939
}

0 commit comments

Comments
 (0)