Merge remote-tracking branch 'repo/main'

Author: moazelsawaf

.github/dependabot.yaml

@@ -0,0 +1,11 @@
+version: 2
+enable-beta-ecosystems: true
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/base.yaml

@@ -35,7 +35,7 @@ jobs:
       - name: Install dependencies
         run: flutter pub get
       - name: Format code
-        run: flutter format --dry-run --set-exit-if-changed .
+        run: flutter format --dry-run --set-exit-if-changed $(find . -name "*.dart" -not -wholename "./lib/localization/intl/*")
       - name: Analyze static code
         run: flutter analyze
       - name: Run tests

.github/workflows/stale.yaml

@@ -0,0 +1,17 @@
+name: "Close stale issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v7
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days."
+          close-issue-message: "This issue was closed because it has been stalled for 7 days with no activity."
+          days-before-stale: 30
+          days-before-pr-close: -1
+          any-of-issue-labels: 'awaiting author response'

CHANGELOG.md

@@ -1,102 +1,114 @@
-## [8.3.0] - 28-Jul-2022
+## 8.4.0
+
+* Refactor l10n generator. Thanks [@ipcjs]()
+* Add property to allow empty on equalLength validator. Thanks [@CircleCurve](https://github.com/CircleCurve)
+* Add support for more languanges
+    - Czech. Thanks [@edlman](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/3)
+    - Bosnian and Croatian. Thanks [@abratanovic](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/9)
+    - Malay. Thanks [@azmilazizi](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/13)
+    - Thai. Thanks [@narospol](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/19)
+    - Tamil. Thanks [@Purus](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/26)
+    - Greek. Thanks [@nrallakis](https://github.com/flutter-form-builder-ecosystem/form_builder_validators/pull/27)
+
+## 8.3.0
 
 * Apply license BSD-3-clause
 * Refactor readme 
 * Remove unused dependency
 * Add web example
 
-## [8.2.1] - 20-Jul-2022
+## 8.2.1
 
 * Added Czech language support
 
-## [8.2.0] - 12-Jul-2022
+## 8.2.0
 
 * Added equalLength validator
 * Added turkish language support
 * Moved repository
 
-## [8.1.1] - 26-Apr-2022
+## 8.1.1
 
 * Fixed issue where email validator trims string before validation 
 
-## [8.1.0] - 13-Apr-2022
+## 8.1.0
 
 * Added Romanian (ro) language support
 
-## [8.0.0] - 10-Apr-2022
+## 8.0.0
 
 * **BREAKING CHANGE**: Avoid passing context to validator functions.
 * Added Swahili (sw) language support
 
-## [7.9.0] - 04-Apr-2022
+## 7.9.0
 
 * Added Bangla (bn) language support
 
-## [7.8.0] - 29-Mar-2022
+## 7.8.0
 
 * Added Estonian (et) language support
 * Improved and corrected Arabic translations
 
-## [7.7.0] - 15-Mar-2022
+## 7.7.0
 
 * Added Catalan (ca) language support
 
-## [7.6.1] - 19-Feb-2022
+## 7.6.1
 
 * Fixed duplicate `en` locale translations. Fixes #969
 
-## [7.6.0] - 18-Feb-2022
+## 7.6.0
 
 * Added Ukrainian (uk) language support
 
-## [7.5.0] - 17-Feb-2022
+## 7.5.0
 
 * Added Lao (lo) language support
 * Added Dutch (nl) language support
 
-## [7.4.0] - 31-Jan-2022
+## 7.4.0
 
 * Added Russian (ru) language support
 
-## [7.3.0] - 10-Jan-2022
+## 7.3.0
 
 * Added support for Slovenian (sl)
 * Added Chinese language support - both traditional (zh_Hant) and simplified (zh_Hans)
 
-## [7.2.0] - 06-Nov-2021
+## 7.2.0
 
 * Added language support for Indonesian (id)
 
-## [7.1.0] - 06-Nov-2021
+## 7.1.0
 
 * Added language support for Korean (ko)
 
-## [7.0.0] - 02-Sep-2021
+## 7.0.0
 
-* New Package 🎉🎊 - Split from and no dependency on [flutter_form_builder](https://pub.dev/packages/flutter_form_builder)
+* New Package 🎉🎊 - Split from and no dependency on flutter_form_builder(https://pub.dev/packages/flutter_form_builder)
 * Added Arabic and Persian/Farsi support
 * Use `intl_utils` package for localization
 * Minor type fixes
 * Documentation and example improvements
 
-## [7.0.0-RC.1] - 02-Sep-2021
+## 7.0.0-RC.1
 
 * `maxLength` and `minLength` validators can now work with `Iterable` field values length
 
-## [7.0.0-RC.0] - 01-Sep-2021
+## 7.0.0-RC.0
 
 * Added Arabic and Persian/Farsi support
 
-## [7.0.0-beta.0] - 19-May-2021
+## 7.0.0-beta.0
 
 * Use `intl_utils` package for localization
 * Documentation and example improvements - added instructions for localization
 * Minor type fixes
 
-## [7.0.0-alpha.2] - 17-May-2021
+## 7.0.0-alpha.2
 
 * Improvements to package documentation and example
 
-## [7.0.0-alpha.1] - 16-May-2021
+## 7.0.0-alpha.1
 
 * Split into own package from `flutter_form_builder`

README.md

@@ -79,6 +79,7 @@ Validators support default errorText messages in this languages:
 - Dutch (nl)
 - Farsi/Persian (fa)
 - French (fr)
+- Greek (el)  
 - German (de)
 - Hungarian (hu)
 - Indonesian (id)
@@ -95,6 +96,8 @@ Validators support default errorText messages in this languages:
 - Spanish (es)
 - Swahili (sw)
 - Ukrainian (uk)
+- Tamil(ta)
+- Thai (th)
 - Turkish (tr)
 - Malay (ms)
 
@@ -104,7 +107,7 @@ And you can still add your custom error messages.
 
 ### Setup
 
-To allow for localization of default error messages within your app, add `FormBuilderLocalizations.delegate` in the list of your app's `localizationsDelegates`
+The default error message is in English. To allow for localization of default error messages within your app, add `FormBuilderLocalizations.delegate` in the list of your app's `localizationsDelegates`
 
 ```dart
   return MaterialApp(
@@ -172,6 +175,10 @@ TextFormField(
 ),
 ```
 
+#### Modify the default error message in a specific language
+
+see [override_form_builder_localizations_en](example/lib/override_form_builder_localizations_en.dart) for more detail.
+
 ## Support
 
 ### Contribute
@@ -194,13 +201,13 @@ Create one ARB file inside the `lib/l10n` folder for each of the locales you nee
 
 2. Translate the error messages
 
-Duplicate the contents of `intl_messages.arb` (or any other ARB file) into your newly created ARB file, then translate the error messages by overwriting the default messages.
+Duplicate the contents of `intl_en.arb` (or any other ARB file) into your newly created ARB file, then translate the error messages by overwriting the default messages.
 
 3. Generate localization code
 
 To generate boilerplate code for localization, run the generate command inside the package directory where `pubspec.yaml` file is located:
 
-`flutter pub run intl_utils:generate`
+`flutter gen-l10n`
 
 Running the command will automatically create/update files inside the `lib/localization` directory, including your newly added locale support.
 

example/lib/home_page.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 class HomePage extends StatefulWidget {
-  const HomePage({Key key}) : super(key: key);
+  const HomePage({Key? key}) : super(key: key);
 
   @override
   HomePageState createState() => HomePageState();
@@ -42,9 +42,11 @@ class HomePageState extends State<HomePage> {
                 /// Include your own custom `FormFieldValidator` function, if you want
                 /// Ensures positive values only. We could also have used `FormBuilderValidators.min( 0)` instead
                 (val) {
-                  final number = int.tryParse(val);
-                  if (number == null) return null;
-                  if (number < 0) return 'We cannot have a negative age';
+                  if (val != null) {
+                    final number = int.tryParse(val);
+                    if (number == null) return null;
+                    if (number < 0) return 'We cannot have a negative age';
+                  }
                   return null;
                 }
               ]),

example/lib/main.dart

@@ -1,3 +1,4 @@
+import 'package:example/override_form_builder_localizations_en.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
@@ -9,17 +10,21 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Form Builder Validators Demo',
       theme: ThemeData(primarySwatch: Colors.blue),
       home: const HomePage(),
-      supportedLocales: [...FormBuilderLocalizations.delegate.supportedLocales],
+      supportedLocales: const [
+        ...FormBuilderLocalizations.supportedLocales,
+      ],
       localizationsDelegates: const [
         ...GlobalMaterialLocalizations.delegates,
+        // Placed in front of `FormBuilderLocalizations.delegate`
+        OverrideFormBuilderLocalizationsEn.delegate,
         FormBuilderLocalizations.delegate,
       ],
     );

example/lib/override_form_builder_localizations_en.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:form_builder_validators/form_builder_validators.dart';
+
+/// Created by ipcjs on 2022/10/31.
+class OverrideFormBuilderLocalizationsEn
+    extends FormBuilderLocalizationsImplEn {
+  OverrideFormBuilderLocalizationsEn();
+
+  static const LocalizationsDelegate<FormBuilderLocalizationsImpl> delegate =
+      _LocalizationsDelegate();
+
+  static const List<Locale> supportedLocales = [Locale('en')];
+
+  // Override a field and return your translation.
+  @override
+  String get requiredErrorText => 'override: This field cannot be empty.';
+}
+
+class _LocalizationsDelegate
+    extends LocalizationsDelegate<FormBuilderLocalizationsImpl> {
+  const _LocalizationsDelegate();
+
+  @override
+  Future<FormBuilderLocalizationsImpl> load(Locale locale) {
+    final instance = OverrideFormBuilderLocalizationsEn();
+    // IMPORTANT!! must to invoke setCurrentInstance()
+    FormBuilderLocalizations.setCurrentInstance(instance);
+    return SynchronousFuture<FormBuilderLocalizationsImpl>(instance);
+  }
+
+  @override
+  bool isSupported(Locale locale) =>
+      OverrideFormBuilderLocalizationsEn.supportedLocales.contains(locale);
+
+  @override
+  bool shouldReload(_LocalizationsDelegate old) => false;
+}

example/pubspec.lock

@@ -71,7 +71,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "8.3.0"
+    version: "8.4.0"
   intl:
     dependency: transitive
     description:

example/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=3.0.0"
 
 dependencies: