Skip to content

Commit 761ffac

Browse files
Merge branch 'master' into filter_chip_avatar
2 parents 82eda27 + bf5a591 commit 761ffac

File tree

7 files changed

+115
-5
lines changed

7 files changed

+115
-5
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: "\U0001F41B Bug"
3+
about: Something is crashing or not working as intended
4+
labels: bug
5+
6+
---
7+
8+
## Environment
9+
10+
**Package name:** <!-- flutter_form_builder, form_builder_extra_field, form_builder_phone_field or form_builder_validators -->
11+
**Package version:** <!-- Add branch if necessary -->
12+
**Platform:** <!-- iOS, Android, Web, etc -->
13+
**Device information:** <!-- Manufacturer and model -->
14+
15+
## Description
16+
17+
**Expected behavior:**
18+
19+
**Current behavior:**
20+
21+
## Steps to reproduce
22+
23+
1. This
24+
2. Than that
25+
3. Then
26+
27+
## Images <!-- if available, else delete -->
28+
29+
## Stacktrace/Logcat <!-- if available, else delete -->
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: "\U0001F4C3 Documentation Bug"
3+
about: You want to report something that is wrong or missing from the documentation.
4+
labels: documentation
5+
6+
---
7+
8+
### Describe the change you would like to see
9+
<!-- A clear and concise description of the bug or documentation you feel is missing.
10+
For example: The Technical Reference does not include information about the FormBuilderFilterChip widget. -->
11+
12+
### How would the suggested change make the documentation more useful?
13+
<!-- Provide context for how the requested change would make the docs easier to use and improve your ability to develop successful applications with this packages.
14+
For example: It's hard to know a method exists or understand its use when you have to search through the code base to learn about it. Properly documenting it in the Technical Reference makes it easier for me to know what the flutter_fom_builder is (and is not capable of). -->
15+
16+
### Additional context
17+
<!-- Add any other context about your feedback here.
18+
For example: I am reading the docs directly from GitHub, so it's harder for me to find information on a particular method if it's not included in the documentation. -->
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: "\U0001F680 Feature request"
3+
about: Suggest new feature or request for this project
4+
labels: enhancement
5+
6+
---
7+
8+
## Environment
9+
10+
**Package name:** <!-- flutter_form_builder, form_builder_extra_field, form_builder_phone_field or form_builder_validators -->
11+
**Package version:** <!-- Add branch if necessary -->
12+
**Platform:** <!-- iOS, Android, Web, etc -->
13+
**Device information:** <!-- Manufacturer and model -->
14+
15+
## Description
16+
17+
**What you'd like to happen:**
18+
19+
**Alternatives you've considered:** <!-- if available, else delete -->
20+
21+
**Images:** <!-- if available, else delete -->

.github/ISSUE_TEMPLATE/question.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: "\U0001F914 Questions and Help"
3+
about: You have a quetion or need help using this packages
4+
labels: question
5+
6+
---
7+
8+
## Environment
9+
10+
**Package name:** <!-- flutter_form_builder, form_builder_extra_field, form_builder_phone_field or form_builder_validators -->
11+
12+
## Describe your question
13+
<!-- A clear and concise description of your question or help wanted.
14+
For example: How can I add a datetime field? -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## Connection with issue(s)
2+
3+
Resolve issue #???
4+
5+
<!-- Required: this reference (one or many) will be closed upon merge. Ideally it has the acceptance criteria and designs for features or fixes related to the work in this Pull Request -->
6+
7+
Connected to #???
8+
9+
<!-- Optional: other issues or pull requests related to this, but merging should not close it -->
10+
11+
## Testing and Review Notes
12+
13+
<!-- Required: steps to take to confirm this works as expected or other guidance for code, UX, and any other reviewers -->
14+
15+
## Screenshots or Videos
16+
17+
<!-- Optional: to clearly demonstrate the feature or fix to help with testing and reviews -->
18+
19+
## To Do
20+
21+
<!-- Add “WIP” to the PR title if pushing up but not complete nor ready for review -->
22+
- [ ] double check the original issue to confirm it is fully satisfied
23+
- [ ] add testing notes and screenshots in PR description to help guide reviewers
24+
- [ ] request the "UX" team perform a design review (if/when applicable)

packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
4545
/// If defined, the TextField [decoration]'s [suffixIcon] will be
4646
/// overridden to reset the input using the icon defined here.
4747
/// Set this to `null` to stop that behavior. Defaults to [Icons.close].
48-
final Icon resetIcon;
48+
final Widget? resetIcon;
4949

5050
/// Called when an enclosing form is saved. The value passed will be `null`
5151
/// if [format] fails to parse the text.
@@ -218,7 +218,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
218218
textAlign: textAlign,
219219
maxLength: maxLength,
220220
autofocus: autofocus,
221-
decoration: state.decoration,
221+
decoration: state.decoration.copyWith(suffixIcon: resetIcon),
222222
readOnly: true,
223223
enabled: state.enabled,
224224
autocorrect: autocorrect,

packages/form_builder_extra_fields/lib/src/fields/form_builder_cupertino_date_time_picker.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class FormBuilderCupertinoDateTimePicker extends FormBuilderField<DateTime> {
6161
final DateCancelledCallback? onCancel;
6262
final DateChangedCallback? onConfirm;
6363
final DateFormat? format;
64-
final DatePickerTheme? theme;
64+
final DatePickerTheme? datePickerTheme;
65+
final DatePickerTheme? timePickerTheme;
6566
final DateTime? firstDate;
6667
final DateTime? lastDate;
6768
final Locale? locale;
@@ -89,7 +90,8 @@ class FormBuilderCupertinoDateTimePicker extends FormBuilderField<DateTime> {
8990
this.locale,
9091
this.onCancel,
9192
this.onConfirm,
92-
this.theme,
93+
this.timePickerTheme,
94+
this.datePickerTheme,
9395

9496
//TextField options
9597
this.autocorrect = false,
@@ -259,7 +261,7 @@ class FormBuilderCupertinoDateTimePickerState extends FormBuilderFieldState<
259261
maxTime: widget.lastDate ?? DateTime(2100),
260262
currentTime: currentValue,
261263
locale: _localeType(),
262-
theme: widget.theme,
264+
theme: widget.datePickerTheme,
263265
onCancel: widget.onCancel,
264266
onConfirm: widget.onConfirm,
265267
);
@@ -274,12 +276,14 @@ class FormBuilderCupertinoDateTimePickerState extends FormBuilderFieldState<
274276
currentTime: currentValue,
275277
showSecondsColumn: false,
276278
locale: _localeType(),
279+
theme: widget.timePickerTheme,
277280
)
278281
: DatePicker.showTime12hPicker(
279282
context,
280283
showTitleActions: true,
281284
currentTime: currentValue,
282285
locale: _localeType(),
286+
theme: widget.timePickerTheme,
283287
);
284288
final timePickerResult = await timePicker;
285289
final newDateTime = timePickerResult ?? currentValue;

0 commit comments

Comments
 (0)