form_builder_phone_field update (#1040)

deandreamatias · danvick · web-flow · commit ececc0141bda · 2022-06-15T01:02:14.000+03:00
* feat: Update example

- Web support
- Update dependencies
- Fix localizations from form_builder_validators

* chore: Add fvm config

* build: Update dependencies

* docs: Add warning message to readme

* Update .gitignore

* Delete fvm_config.json

* fix(phone_field): resolve example ios

* chore(phone_field): improvements to docs

* chore(phone_field): resolved static analysis

Co-authored-by: Danvick Miller &lt;danvickmiller@live.com&gt;
diff --git a/README.md b/README.md
@@ -49,6 +49,17 @@ Unlike flutter_form_builder package which depends purely on Flutter provided inp
 
 [[View Documentation][extra_fields_docs]] [[View Source][extra_fields_code]]
 
+### form_builder_phone_field
+> [![Pub Version](https://img.shields.io/pub/v/form_builder_phone_field?logo=flutter&style=for-the-badge)](https://pub.dev/packages/form_builder_phone_field)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/danvick/flutter_form_builder/Form%20Builder%20Phone%20Field?logo=github&style=for-the-badge)](https://github.com/danvick/flutter_form_builder/actions/workflows/form_builder_validators.yaml)
+[![Codecov](https://img.shields.io/codecov/c/github/danvick/flutter_form_builder?logo=codecov&style=for-the-badge)](https://codecov.io/gh/danvick/flutter_form_builder/)
+[![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/danvick/flutter_form_builder?logo=codefactor&style=for-the-badge)](https://www.codefactor.io/repository/github/danvick/flutter_form_builder)
+[![GitHub](https://img.shields.io/github/license/danvick/flutter_form_builder?logo=open+source+initiative&style=for-the-badge)](https://github.com/danvick/flutter_form_builder/blob/master/LICENSE)
+
+Phone input field for flutter_form_builder package
+
+[[View Documentation][phone_field_docs]] [[View Source][phone_field_code]]
+
 ### form_builder_validators
 > [![Pub Version](https://img.shields.io/pub/v/form_builder_validators?logo=flutter&style=for-the-badge)](https://pub.dev/packages/form_builder_validators)
 [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/danvick/flutter_form_builder/Form%20Builder%20Validators?logo=github&style=for-the-badge)](https://github.com/danvick/flutter_form_builder/actions/workflows/form_builder_validators.yaml)
@@ -93,6 +104,10 @@ Made with [contributors-img](https://contributors-img.firebaseapp.com).
 
 [extra_fields_docs]: https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_extra_fields/README.md
 
+[phone_field_code]: https://github.com/danvick/flutter_form_builder/tree/master/packages/form_builder_phone_field
+
+[phone_field_docs]: https://github.com/danvick/flutter_form_builder/tree/master/packages/form_builder_phone_field/README.md
+
 [validators_code]: https://github.com/danvick/flutter_form_builder/tree/master/packages/form_builder_validators
 
 [validators_docs]: https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_validators/README.md
diff --git a/packages/form_builder_phone_field/.gitignore b/packages/form_builder_phone_field/.gitignore
@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+.fvm/
 
 # IntelliJ related
 *.iml
diff --git a/packages/form_builder_phone_field/README.md b/packages/form_builder_phone_field/README.md
@@ -1,4 +1,4 @@
-# packages.form_builder_phone_field
+# Form Builder Phone Field
 
 Phone input field for [flutter_form_builder](https://pub.dev/packages/flutter_form_builder) package
 
diff --git a/packages/form_builder_phone_field/example/analysis_options.yaml b/packages/form_builder_phone_field/example/analysis_options.yaml
@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/packages/form_builder_phone_field/example/ios/Flutter/AppFrameworkInfo.plist b/packages/form_builder_phone_field/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/packages/form_builder_phone_field/example/ios/Runner.xcodeproj/project.pbxproj b/packages/form_builder_phone_field/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/packages/form_builder_phone_field/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/form_builder_phone_field/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/packages/form_builder_phone_field/example/ios/Runner/Info.plist b/packages/form_builder_phone_field/example/ios/Runner/Info.plist
@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>
diff --git a/packages/form_builder_phone_field/example/lib/main.dart b/packages/form_builder_phone_field/example/lib/main.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_phone_field/form_builder_phone_field.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 
 void main() {
   runApp(const MyApp());
@@ -14,6 +15,15 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter Demo',
+      // Locale config required by form_builder_validators
+      // https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_validators/example/lib/main.dart
+      supportedLocales: [...FormBuilderLocalizations.delegate.supportedLocales],
+      localizationsDelegates: const [
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+        FormBuilderLocalizations.delegate,
+      ],
       theme: ThemeData(
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
@@ -48,8 +58,8 @@ class MyHomePage extends StatelessWidget {
                 // onChanged: _onChanged,
                 priorityListByIsoCode: const ['KE'],
                 validator: FormBuilderValidators.compose([
-                  FormBuilderValidators.numeric(context),
-                  FormBuilderValidators.required(context),
+                  FormBuilderValidators.numeric(),
+                  FormBuilderValidators.required(),
                 ]),
               ),
               const SizedBox(height: 15),
@@ -63,8 +73,8 @@ class MyHomePage extends StatelessWidget {
                 // onChanged: _onChanged,
                 priorityListByIsoCode: const ['US'],
                 validator: FormBuilderValidators.compose([
-                  FormBuilderValidators.numeric(context),
-                  FormBuilderValidators.required(context),
+                  FormBuilderValidators.numeric(),
+                  FormBuilderValidators.required(),
                 ]),
               ),
               const SizedBox(height: 15),
diff --git a/packages/form_builder_phone_field/example/pubspec.yaml b/packages/form_builder_phone_field/example/pubspec.yaml
@@ -9,14 +9,15 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-
-  flutter_form_builder: ^7.1.0
+  flutter_form_builder: 7.1.1
+  flutter_localizations:
+    sdk: flutter
   form_builder_phone_field:
     path: ../
-  form_builder_validators: ^7.4.0
+  form_builder_validators: ^8.1.1
   
 dev_dependencies:
-  flutter_lints: ^1.0.4
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
 
diff --git a/packages/form_builder_phone_field/example/web/favicon.png b/packages/form_builder_phone_field/example/web/favicon.png
diff --git a/packages/form_builder_phone_field/example/web/icons/Icon-192.png b/packages/form_builder_phone_field/example/web/icons/Icon-192.png
diff --git a/packages/form_builder_phone_field/example/web/icons/Icon-512.png b/packages/form_builder_phone_field/example/web/icons/Icon-512.png
diff --git a/packages/form_builder_phone_field/example/web/icons/Icon-maskable-192.png b/packages/form_builder_phone_field/example/web/icons/Icon-maskable-192.png
diff --git a/packages/form_builder_phone_field/example/web/icons/Icon-maskable-512.png b/packages/form_builder_phone_field/example/web/icons/Icon-maskable-512.png
diff --git a/packages/form_builder_phone_field/example/web/index.html b/packages/form_builder_phone_field/example/web/index.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="example">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>example</title>
+  <link rel="manifest" href="manifest.json">
+</head>
+<body>
+  <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+  <script>
+    var serviceWorkerVersion = null;
+    var scriptLoaded = false;
+    function loadMainDartJs() {
+      if (scriptLoaded) {
+        return;
+      }
+      scriptLoaded = true;
+      var scriptTag = document.createElement('script');
+      scriptTag.src = 'main.dart.js';
+      scriptTag.type = 'application/javascript';
+      document.body.append(scriptTag);
+    }
+
+    if ('serviceWorker' in navigator) {
+      // Service workers are supported. Use them.
+      window.addEventListener('load', function () {
+        // Wait for registration to finish before dropping the <script> tag.
+        // Otherwise, the browser will load the script multiple times,
+        // potentially different versions.
+        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
+        navigator.serviceWorker.register(serviceWorkerUrl)
+          .then((reg) => {
+            function waitForActivation(serviceWorker) {
+              serviceWorker.addEventListener('statechange', () => {
+                if (serviceWorker.state == 'activated') {
+                  console.log('Installed new service worker.');
+                  loadMainDartJs();
+                }
+              });
+            }
+            if (!reg.active && (reg.installing || reg.waiting)) {
+              // No active web worker and we have installed or are installing
+              // one for the first time. Simply wait for it to activate.
+              waitForActivation(reg.installing || reg.waiting);
+            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
+              // When the app updates the serviceWorkerVersion changes, so we
+              // need to ask the service worker to update.
+              console.log('New service worker available.');
+              reg.update();
+              waitForActivation(reg.installing);
+            } else {
+              // Existing service worker is still good.
+              console.log('Loading app from service worker.');
+              loadMainDartJs();
+            }
+          });
+
+        // If service worker doesn't succeed in a reasonable amount of time,
+        // fallback to plaint <script> tag.
+        setTimeout(() => {
+          if (!scriptLoaded) {
+            console.warn(
+              'Failed to load app from service worker. Falling back to plain <script> tag.',
+            );
+            loadMainDartJs();
+          }
+        }, 4000);
+      });
+    } else {
+      // Service workers not supported. Just drop the <script> tag.
+      loadMainDartJs();
+    }
+  </script>
+</body>
+</html>
diff --git a/packages/form_builder_phone_field/example/web/manifest.json b/packages/form_builder_phone_field/example/web/manifest.json
@@ -0,0 +1,35 @@
+{
+    "name": "example",
+    "short_name": "example",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}
diff --git a/packages/form_builder_phone_field/lib/src/form_builder_phone_field.dart b/packages/form_builder_phone_field/lib/src/form_builder_phone_field.dart
@@ -278,7 +278,8 @@ class FormBuilderPhoneField extends FormBuilderField<String> {
         );
 
   @override
-  _FormBuilderPhoneFieldState createState() => _FormBuilderPhoneFieldState();
+  FormBuilderFieldState<FormBuilderPhoneField, String> createState() =>
+      _FormBuilderPhoneFieldState();
 }
 
 class _FormBuilderPhoneFieldState
diff --git a/packages/form_builder_phone_field/pubspec.yaml b/packages/form_builder_phone_field/pubspec.yaml
@@ -5,16 +5,16 @@ homepage: https://github.com/danvick/form_builder_phone_field
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: "^2.2.0"
+  flutter: ">=2.8.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_form_builder: ^7.0.0-beta.0
-  phone_number: ^0.12.0
+  flutter_form_builder: 7.1.1
+  phone_number: ^0.12.0+2
   country_pickers: ^2.0.0
 
 dev_dependencies:
-  flutter_lints: ^1.0.4
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# packages.form_builder_phone_field`
	`1`	`+# Form Builder Phone Field`
`2`	`2`
`3`	`3`	`Phone input field for [flutter_form_builder](https://pub.dev/packages/flutter_form_builder) package`
`4`	`4`