Skip to content

Commit af0110c

Browse files
deandreamatiasdeandreamatias
authored
Merge branch 'main' into dependabot/pub/flutter_lints-5.0.0
2 parents 8a20281 + 5176c06 commit af0110c

File tree

8 files changed

+62
-48
lines changed

8 files changed

+62
-48
lines changed

‎.github/workflows/base.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,10 @@ jobs:
3535
with:
3636
distribution: 'zulu'
3737
java-version: '11'
38-
39-
- name: Get Flutter version by FVM
40-
uses: kuhnroyal/flutter-fvm-config-action@v2
41-
id: fvm-config-action
42-
with:
43-
path: ".fvmrc"
44-
45-
- name: Flutter action
46-
uses: subosito/flutter-action@v2
38+
- name: Setup Flutter
39+
uses: kuhnroyal/flutter-fvm-config-action/setup@v3
4740
with:
48-
flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
49-
channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
50-
architecture: x64
51-
cache: true
52-
41+
path: '.fvmrc'
5342
- name: Install dependencies
5443
run: flutter pub get
5544
- name: Format code

‎example/pubspec.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
40+
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.18.0"
43+
version: "1.19.0"
4444
fake_async:
4545
dependency: transitive
4646
description:
@@ -99,18 +99,18 @@ packages:
9999
dependency: transitive
100100
description:
101101
name: leak_tracker
102-
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
102+
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
103103
url: "https://pub.dev"
104104
source: hosted
105-
version: "10.0.5"
105+
version: "10.0.7"
106106
leak_tracker_flutter_testing:
107107
dependency: transitive
108108
description:
109109
name: leak_tracker_flutter_testing
110-
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
110+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
111111
url: "https://pub.dev"
112112
source: hosted
113-
version: "3.0.5"
113+
version: "3.0.8"
114114
leak_tracker_testing:
115115
dependency: transitive
116116
description:
@@ -163,7 +163,7 @@ packages:
163163
dependency: transitive
164164
description: flutter
165165
source: sdk
166-
version: "0.0.99"
166+
version: "0.0.0"
167167
source_span:
168168
dependency: transitive
169169
description:
@@ -176,10 +176,10 @@ packages:
176176
dependency: transitive
177177
description:
178178
name: stack_trace
179-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
179+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
180180
url: "https://pub.dev"
181181
source: hosted
182-
version: "1.11.1"
182+
version: "1.12.0"
183183
stream_channel:
184184
dependency: transitive
185185
description:
@@ -192,10 +192,10 @@ packages:
192192
dependency: transitive
193193
description:
194194
name: string_scanner
195-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
195+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
196196
url: "https://pub.dev"
197197
source: hosted
198-
version: "1.2.0"
198+
version: "1.3.0"
199199
term_glyph:
200200
dependency: transitive
201201
description:
@@ -208,10 +208,10 @@ packages:
208208
dependency: transitive
209209
description:
210210
name: test_api
211-
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
211+
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
212212
url: "https://pub.dev"
213213
source: hosted
214-
version: "0.7.2"
214+
version: "0.7.3"
215215
vector_math:
216216
dependency: transitive
217217
description:
@@ -224,10 +224,10 @@ packages:
224224
dependency: transitive
225225
description:
226226
name: vm_service
227-
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
227+
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
228228
url: "https://pub.dev"
229229
source: hosted
230-
version: "14.2.5"
230+
version: "14.3.0"
231231
sdks:
232232
dart: ">=3.5.0 <4.0.0"
233233
flutter: ">=3.24.0"

‎lib/src/fields/form_builder_choice_chips.dart‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,28 @@ class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
5151
/// The default is [Colors.black].
5252
final Color? shadowColor;
5353

54+
/// The color and weight of the chip's outline.
55+
///
56+
/// Defaults to the border side in the ambient [ChipThemeData]. If the theme
57+
/// border side resolves to null and [ThemeData.useMaterial3] is true, then
58+
/// [BorderSide] with a [ColorScheme.outline] color is used when the chip is
59+
/// enabled, and [BorderSide] with a [ColorScheme.onSurface] color with an
60+
/// opacity of 0.12 is used when the chip is disabled. Otherwise, it defaults
61+
/// to null.
62+
///
63+
/// This value is combined with [shape] to create a shape decorated with an
64+
/// outline. To omit the outline entirely, pass [BorderSide.none] to [side].
65+
///
66+
/// If it is a [WidgetStateBorderSide], [WidgetStateProperty.resolve] is
67+
/// used for the following [WidgetState]s:
68+
///
69+
/// * [WidgetState.disabled].
70+
/// * [WidgetState.selected].
71+
/// * [WidgetState.hovered].
72+
/// * [WidgetState.focused].
73+
/// * [WidgetState.pressed].
74+
final BorderSide? side;
75+
5476
/// The [OutlinedBorder] to draw around the chip.
5577
///
5678
/// Defaults to the shape in the ambient [ChipThemeData]. If the theme
@@ -293,6 +315,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
293315
this.selectedColor,
294316
this.selectedShadowColor,
295317
this.shadowColor,
318+
this.side,
296319
this.shape,
297320
this.spacing = 0.0,
298321
this.textDirection,
@@ -317,6 +340,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
317340
for (FormBuilderChipOption<T> option in options)
318341
ChoiceChip(
319342
label: option,
343+
side: side,
320344
shape: shape,
321345
selected: field.value == option.value,
322346
onSelected: state.enabled

‎lib/src/fields/form_builder_date_time_picker.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState<
284284
case InputType.date:
285285
return DateFormat.yMd(languageCode);
286286
case InputType.both:
287-
default:
288287
return DateFormat.yMd(languageCode).add_Hms();
289288
}
290289
}
@@ -309,8 +308,6 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState<
309308
newValue = combine(date, time);
310309
}
311310
break;
312-
default:
313-
throw 'Unexpected input type ${widget.inputType}';
314311
}
315312
if (!mounted) return null;
316313
final finalValue = newValue ?? currentValue;

‎lib/src/fields/form_builder_filter_chips.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
1313
final double? elevation, pressElevation;
1414
final List<FormBuilderChipOption<T>> options;
1515
final MaterialTapTargetSize? materialTapTargetSize;
16+
final BorderSide? side;
1617
final OutlinedBorder? shape;
1718

1819
// Wrap Settings
@@ -66,6 +67,7 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
6667
this.selectedColor,
6768
this.selectedShadowColor,
6869
this.shadowColor,
70+
this.side,
6971
this.shape,
7072
this.showCheckmark = true,
7173
this.spacing = 0.0,
@@ -119,6 +121,7 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
119121
pressElevation: pressElevation,
120122
materialTapTargetSize: materialTapTargetSize,
121123
padding: padding,
124+
side: side,
122125
shape: shape,
123126
checkmarkColor: checkmarkColor,
124127
clipBehavior: clipBehavior,

‎lib/src/widgets/grouped_radio.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ class _GroupedRadioState<T> extends State<GroupedRadio<T?>> {
237237
child: Row(children: widgetList),
238238
);
239239
case OptionsOrientation.wrap:
240-
default:
241240
return SingleChildScrollView(
242241
child: Wrap(
243242
spacing: widget.wrapSpacing,

‎pubspec.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
40+
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.18.0"
43+
version: "1.19.0"
4444
fake_async:
4545
dependency: transitive
4646
description:
@@ -79,18 +79,18 @@ packages:
7979
dependency: transitive
8080
description:
8181
name: leak_tracker
82-
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
82+
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
8383
url: "https://pub.dev"
8484
source: hosted
85-
version: "10.0.5"
85+
version: "10.0.7"
8686
leak_tracker_flutter_testing:
8787
dependency: transitive
8888
description:
8989
name: leak_tracker_flutter_testing
90-
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
90+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
9191
url: "https://pub.dev"
9292
source: hosted
93-
version: "3.0.5"
93+
version: "3.0.8"
9494
leak_tracker_testing:
9595
dependency: transitive
9696
description:
@@ -143,7 +143,7 @@ packages:
143143
dependency: transitive
144144
description: flutter
145145
source: sdk
146-
version: "0.0.99"
146+
version: "0.0.0"
147147
source_span:
148148
dependency: transitive
149149
description:
@@ -156,10 +156,10 @@ packages:
156156
dependency: transitive
157157
description:
158158
name: stack_trace
159-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
159+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
160160
url: "https://pub.dev"
161161
source: hosted
162-
version: "1.11.1"
162+
version: "1.12.0"
163163
stream_channel:
164164
dependency: transitive
165165
description:
@@ -172,10 +172,10 @@ packages:
172172
dependency: transitive
173173
description:
174174
name: string_scanner
175-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
175+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
176176
url: "https://pub.dev"
177177
source: hosted
178-
version: "1.2.0"
178+
version: "1.3.0"
179179
term_glyph:
180180
dependency: transitive
181181
description:
@@ -188,10 +188,10 @@ packages:
188188
dependency: transitive
189189
description:
190190
name: test_api
191-
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
191+
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
192192
url: "https://pub.dev"
193193
source: hosted
194-
version: "0.7.2"
194+
version: "0.7.3"
195195
vector_math:
196196
dependency: transitive
197197
description:
@@ -204,10 +204,10 @@ packages:
204204
dependency: transitive
205205
description:
206206
name: vm_service
207-
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
207+
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
208208
url: "https://pub.dev"
209209
source: hosted
210-
version: "14.2.5"
210+
version: "14.3.0"
211211
sdks:
212212
dart: ">=3.5.0 <4.0.0"
213213
flutter: ">=3.24.0"

‎pubspec.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ environment:
1717
dependencies:
1818
flutter:
1919
sdk: flutter
20+
# This version would be max, the same version used on flutter_localizations
21+
# https://github.com/flutter/flutter/blob/17025dd88227cd9532c33fa78f5250d548d87e9a/packages/flutter_localizations/pubspec.yaml#L14
2022
intl: ">=0.19.0 <0.20.0"
2123

2224
dev_dependencies:

0 commit comments

Comments
 (0)