Merge pull request #99 from martijn00/ci

Update CI

Author: deandreamatias

.github/workflows/base.yaml

@@ -35,16 +35,21 @@ jobs:
           cache: true
 
       - name: Install dependencies
-        run: flutter pub get
+        run: dart pub get
 
       - name: Run l10n
         run: flutter gen-l10n
 
+      - name: Run l10n on example
+        run: |
+          cd example
+          flutter gen-l10n
+
       - name: Format code
-        run: dart format --set-exit-if-changed $(find . -name "*.dart" -not -wholename "./lib/localization/intl/*")
+        run: dart format --set-exit-if-changed $(find . -name "*.dart" ! \( -wholename "./lib/localization/intl/*" -or -wholename "./example/lib/localization/intl/*" \))
 
       - name: Analyze static code
-        run: flutter analyze
+        run: dart analyze
 
       - name: Run tests
         run: flutter test
@@ -85,6 +90,9 @@ jobs:
           # use the build-in cache from Subosito
           cache: true
 
+      - name: Install dependencies
+        run: dart pub get
+
       - name: Run l10n
         run: flutter gen-l10n
 

.gitignore

@@ -75,3 +75,5 @@ pubspec.lock
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 
+# L10n files
+**/intl

.pubignore

@@ -0,0 +1,77 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+.fvm/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+build/
+pubspec.lock
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 10.0.2
+* Reland generated l10n files
+* Add Bulgarian
+
 ## 10.0.1
 * Fix regression (include l10n files)
 

README.md

@@ -74,6 +74,7 @@ Validators support default `errorText` messages in these languages:
 - Arabic (ar)
 - Bangla (bn)
 - Bosnian (bs)
+- Bulgarian (bg)
 - Catalan (ca)
 - Chinese Simplified (zh_Hans)
 - Chinese Traditional (zh_Hant)
@@ -97,7 +98,7 @@ Validators support default `errorText` messages in these languages:
 - Lao (lo)
 - Malay (ms)
 - Mongolian (mn)
-- Norwegian
+- Norwegian (no)
 - Polish (pl)
 - Portuguese (pt)
 - Romanian (ro)

example/l10n.yaml

@@ -0,0 +1,10 @@
+# https://docs.flutter.dev/development/accessibility-and-localization/internationalization#adding-your-own-localized-messages
+# https://docs.google.com/document/d/10e0saTfAv32OZLRmONy866vnaw0I2jwL8zukykpgWBc
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+synthetic-package: false
+output-dir: lib/localization/intl
+output-localization-file: app_localizations.dart
+output-class: AppLocalizations
+nullable-getter: false
+#untranslated-messages-file: build/untranslated-messages.txt

example/lib/l10n.dart

@@ -0,0 +1,9 @@
+import 'package:flutter/material.dart';
+
+import 'localization/intl/app_localizations.dart';
+
+/// Extension for the app localization.
+extension AppLocalizationsExtensions on BuildContext {
+  /// Get the L10n localization.
+  AppLocalizations get l10n => AppLocalizations.of(this);
+}

example/lib/l10n/app_en.arb

@@ -0,0 +1,3 @@
+{
+  "@@locale": "en"
+}

example/lib/main.dart

@@ -3,6 +3,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
 
 import 'home_page.dart';
+import 'localization/intl/app_localizations.dart';
 import 'override_form_builder_localizations_en.dart';
 
 void main() {
@@ -18,12 +19,11 @@ class MyApp extends StatelessWidget {
       title: 'Form Builder Validators Demo',
       theme: ThemeData(primarySwatch: Colors.blue),
       home: const HomePage(),
-      supportedLocales: const [
-        ...FormBuilderLocalizations.supportedLocales,
-      ],
+      supportedLocales: AppLocalizations.supportedLocales,
       localizationsDelegates: const [
         ...GlobalMaterialLocalizations.delegates,
         // Placed in front of `FormBuilderLocalizations.delegate`
+        ...AppLocalizations.localizationsDelegates,
         OverrideFormBuilderLocalizationsEn.delegate,
         FormBuilderLocalizations.delegate,
       ],

example/pubspec.yaml

@@ -22,3 +22,4 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+  generate: true