Restructure itinerary and add the concept of "choosing" specific details #274
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| // Copyright 2025 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| /// @docImport 'input_group.dart'; | ||
| library; | ||
|
|
||
| import 'package:dart_schema_builder/dart_schema_builder.dart'; | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_genui/flutter_genui.dart'; | ||
|
|
||
| import 'common.dart'; | ||
|
|
||
| final _schema = S.object( | ||
| description: | ||
| 'A chip used to choose from a set of options where *more than one* ' | ||
| 'option can be chosen. This *must* be placed inside an InputGroup.', | ||
| properties: { | ||
| 'chipLabel': S.string( | ||
| description: | ||
| 'The title of the filter chip e.g. "amenities" or "dietary ' | ||
| 'restrictions" etc', | ||
| ), | ||
| 'options': S.list( | ||
| description: '''The list of options that the user can choose from.''', | ||
| items: S.string(), | ||
| ), | ||
| 'iconName': S.string( | ||
| description: 'An icon to display on the left of the chip.', | ||
| enumValues: TravelIcon.values.map((e) => e.name).toList(), | ||
| ), | ||
| 'initialOptions': S.list( | ||
| description: | ||
| 'The names of the options that should be selected ' | ||
| 'initially. These options must exist in the "options" list.', | ||
| items: S.string(description: 'An option from the "options" list.'), | ||
| ), | ||
| }, | ||
| required: ['chipLabel', 'options'], | ||
| ); | ||
|
|
||
| extension type _CheckboxFilterChipsInputData.fromMap( | ||
| Map<String, Object?> _json | ||
| ) { | ||
| factory _CheckboxFilterChipsInputData({ | ||
| required String chipLabel, | ||
| required List<String> options, | ||
| String? iconName, | ||
| List<String>? initialOptions, | ||
| }) => _CheckboxFilterChipsInputData.fromMap({ | ||
| 'chipLabel': chipLabel, | ||
| 'options': options, | ||
| if (iconName != null) 'iconName': iconName, | ||
| if (initialOptions != null) 'initialOptions': initialOptions, | ||
| }); | ||
|
|
||
| String get chipLabel => _json['chipLabel'] as String; | ||
| List<String> get options => (_json['options'] as List).cast<String>(); | ||
| String? get iconName => _json['iconName'] as String?; | ||
| List<String> get initialOptions => | ||
| (_json['initialOptions'] as List?)?.cast<String>() ?? []; | ||
| } | ||
|
|
||
| /// An interactive chip that allows the user to select multiple options from a | ||
| /// predefined list. | ||
| /// | ||
| /// This widget is a key component for gathering user preferences. It displays a | ||
| /// category (e.g., "Amenities," "Dietary Restrictions") and, when tapped, | ||
| /// presents a | ||
| /// modal bottom sheet containing a list of checkboxes for the available | ||
| /// options. | ||
| /// | ||
| /// It is typically used within a [inputGroup] to manage multiple facets of | ||
| /// a user's query. | ||
| final checkboxFilterChipsInput = CatalogItem( | ||
| name: 'CheckboxFilterChipsInput', | ||
| dataSchema: _schema, | ||
| widgetBuilder: | ||
| ({ | ||
| required data, | ||
| required id, | ||
| required buildChild, | ||
| required dispatchEvent, | ||
| required context, | ||
| required values, | ||
| }) { | ||
| final checkboxFilterChipsData = _CheckboxFilterChipsInputData.fromMap( | ||
| data as Map<String, Object?>, | ||
| ); | ||
| IconData? icon; | ||
| if (checkboxFilterChipsData.iconName != null) { | ||
| try { | ||
| icon = iconFor( | ||
| TravelIcon.values.byName(checkboxFilterChipsData.iconName!), | ||
| ); | ||
| } catch (e) { | ||
| // Invalid icon name, default to no icon. | ||
| // Consider logging this error. | ||
| icon = null; | ||
| } | ||
|
Comment on lines
+96
to
+100
There was a problem hiding this comment. The } catch (e, s) {
// Invalid icon name, default to no icon.
// Consider logging this error.
debugPrint('Invalid icon name: ${checkboxFilterChipsData.iconName}\n$e\n$s');
icon = null;
} |
||
| } | ||
| return _CheckboxFilterChip( | ||
| initialChipLabel: checkboxFilterChipsData.chipLabel, | ||
| options: checkboxFilterChipsData.options, | ||
| widgetId: id, | ||
| dispatchEvent: dispatchEvent, | ||
| icon: icon, | ||
| initialOptions: checkboxFilterChipsData.initialOptions, | ||
| values: values, | ||
| ); | ||
| }, | ||
| ); | ||
|
|
||
| class _CheckboxFilterChip extends StatefulWidget { | ||
| const _CheckboxFilterChip({ | ||
| required this.initialChipLabel, | ||
| required this.options, | ||
| required this.widgetId, | ||
| required this.dispatchEvent, | ||
| required this.values, | ||
| this.icon, | ||
| this.initialOptions, | ||
| }); | ||
|
|
||
| final String initialChipLabel; | ||
| final List<String> options; | ||
| final String widgetId; | ||
| final IconData? icon; | ||
| final DispatchEventCallback dispatchEvent; | ||
| final List<String>? initialOptions; | ||
| final Map<String, Object?> values; | ||
|
|
||
| @override | ||
| State<_CheckboxFilterChip> createState() => _CheckboxFilterChipState(); | ||
| } | ||
|
|
||
| class _CheckboxFilterChipState extends State<_CheckboxFilterChip> { | ||
| late List<String> _selectedOptions; | ||
|
|
||
| @override | ||
| void initState() { | ||
| super.initState(); | ||
| _selectedOptions = widget.initialOptions ?? []; | ||
| } | ||
|
|
||
| String get _chipLabel { | ||
| if (_selectedOptions.isEmpty) { | ||
| return widget.initialChipLabel; | ||
| } | ||
| return _selectedOptions.join(', '); | ||
| } | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return FilterChip( | ||
| avatar: widget.icon != null ? Icon(widget.icon) : null, | ||
| label: Text(_chipLabel), | ||
| selected: false, | ||
|
There was a problem hiding this comment. The selected: _selectedOptions.isNotEmpty, |
||
| shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)), | ||
| onSelected: (bool selected) { | ||
| showModalBottomSheet<void>( | ||
| context: context, | ||
| builder: (BuildContext context) { | ||
| var tempSelectedOptions = List<String>.from(_selectedOptions); | ||
| return StatefulBuilder( | ||
| builder: (BuildContext context, StateSetter setModalState) { | ||
| return Column( | ||
| mainAxisSize: MainAxisSize.min, | ||
| children: widget.options.map((option) { | ||
| return CheckboxListTile( | ||
| title: Text(option), | ||
| value: tempSelectedOptions.contains(option), | ||
| onChanged: (bool? newValue) { | ||
| setModalState(() { | ||
| if (newValue == true) { | ||
| tempSelectedOptions.add(option); | ||
| } else { | ||
| tempSelectedOptions.remove(option); | ||
| } | ||
| }); | ||
| setState(() { | ||
| _selectedOptions = List.from(tempSelectedOptions); | ||
| }); | ||
| widget.values[widget.widgetId] = tempSelectedOptions; | ||
| }, | ||
| ); | ||
| }).toList(), | ||
| ); | ||
| }, | ||
| ); | ||
| }, | ||
| ); | ||
| }, | ||
| ); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment on line 99 suggests logging this error, which is a great idea for debugging. It would be beneficial to actually implement this. You could use a logging package like
package:loggingto record the exception when an invalid icon name is provided.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't worry about this right now - I am adding a logging library in a separate PR