Skip to content

Commit e607547

Browse files
committed
Added static getter for FormBuilderLocalizations delegate; Fix Localizations dependency
1 parent 23d8698 commit e607547

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MyApp extends StatelessWidget {
1919
),
2020
),
2121
localizationsDelegates: [
22-
FormBuilderLocalizationsDelegate(),
22+
FormBuilderLocalizations.delegate,
2323
GlobalMaterialLocalizations.delegate,
2424
GlobalWidgetsLocalizations.delegate,
2525
],

lib/localization/form_builder_localizations.dart

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ class FormBuilderLocalizations {
1616
});
1717
}
1818

19+
static const LocalizationsDelegate<FormBuilderLocalizations> delegate =
20+
_FormBuilderLocalizationsDelegate();
21+
1922
static FormBuilderLocalizations of(BuildContext context) {
23+
/*return Localizations.of<FormBuilderLocalizations>(
24+
context, FormBuilderLocalizations);*/
2025
return Localizations.of<FormBuilderLocalizations>(
21-
context, FormBuilderLocalizations);
26+
context,
27+
FormBuilderLocalizations,
28+
) ??
29+
FormBuilderLocalizations();
2230
}
2331

2432
String get requiredErrorText {
@@ -100,15 +108,15 @@ class FormBuilderLocalizations {
100108
);
101109

102110
String get dateStringErrorText => Intl.message(
103-
'This field requires a valid date string.',
111+
'This field requires a valid date string.',
104112
name: 'dateStringErrorText',
105113
desc: 'Error Text for date string field',
106114
);
107115
}
108116

109-
class FormBuilderLocalizationsDelegate
117+
class _FormBuilderLocalizationsDelegate
110118
extends LocalizationsDelegate<FormBuilderLocalizations> {
111-
const FormBuilderLocalizationsDelegate();
119+
const _FormBuilderLocalizationsDelegate();
112120

113121
@override
114122
bool isSupported(Locale locale) {
@@ -121,7 +129,7 @@ class FormBuilderLocalizationsDelegate
121129
}
122130

123131
@override
124-
bool shouldReload(FormBuilderLocalizationsDelegate old) {
132+
bool shouldReload(_FormBuilderLocalizationsDelegate old) {
125133
return false;
126134
}
127135
}

test/flutter_form_builder_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
await tester.pumpWidget(
1010
MaterialApp(
1111
localizationsDelegates: [
12-
FormBuilderLocalizationsDelegate(),
12+
FormBuilderLocalizations.delegate,
1313
GlobalMaterialLocalizations.delegate,
1414
GlobalWidgetsLocalizations.delegate,
1515
],
@@ -32,7 +32,7 @@ void main() {
3232
await tester.pumpWidget(
3333
MaterialApp(
3434
localizationsDelegates: [
35-
FormBuilderLocalizationsDelegate(),
35+
FormBuilderLocalizations.delegate,
3636
GlobalMaterialLocalizations.delegate,
3737
GlobalWidgetsLocalizations.delegate,
3838
],
@@ -54,7 +54,7 @@ void main() {
5454
await tester.pumpWidget(
5555
MaterialApp(
5656
localizationsDelegates: [
57-
FormBuilderLocalizationsDelegate(),
57+
FormBuilderLocalizations.delegate,
5858
GlobalMaterialLocalizations.delegate,
5959
GlobalWidgetsLocalizations.delegate,
6060
],
@@ -80,7 +80,7 @@ void main() {
8080
await tester.pumpWidget(
8181
MaterialApp(
8282
localizationsDelegates: [
83-
FormBuilderLocalizationsDelegate(),
83+
FormBuilderLocalizations.delegate,
8484
GlobalMaterialLocalizations.delegate,
8585
GlobalWidgetsLocalizations.delegate,
8686
],
@@ -102,7 +102,7 @@ void main() {
102102
await tester.pumpWidget(
103103
MaterialApp(
104104
localizationsDelegates: [
105-
FormBuilderLocalizationsDelegate(),
105+
FormBuilderLocalizations.delegate,
106106
GlobalMaterialLocalizations.delegate,
107107
GlobalWidgetsLocalizations.delegate,
108108
],
@@ -124,7 +124,7 @@ void main() {
124124
await tester.pumpWidget(
125125
MaterialApp(
126126
localizationsDelegates: [
127-
FormBuilderLocalizationsDelegate(),
127+
FormBuilderLocalizations.delegate,
128128
GlobalMaterialLocalizations.delegate,
129129
GlobalWidgetsLocalizations.delegate,
130130
],
@@ -150,7 +150,7 @@ void main() {
150150
await tester.pumpWidget(
151151
MaterialApp(
152152
localizationsDelegates: [
153-
FormBuilderLocalizationsDelegate(),
153+
FormBuilderLocalizations.delegate,
154154
GlobalMaterialLocalizations.delegate,
155155
GlobalWidgetsLocalizations.delegate,
156156
],

0 commit comments

Comments
 (0)