Show country flag for PhoneField

Author: danvick

lib/src/fields/form_builder_phone_field.dart

@@ -212,20 +212,9 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
           focusNode: _readOnly ? AlwaysDisabledFocusNode() : widget.focusNode,
           decoration: widget.decoration.copyWith(
             enabled: !_readOnly,
-            prefix: GestureDetector(
-              onTap: () {
-                FocusScope.of(context).requestFocus(FocusNode());
-                if (widget.isCupertinoPicker) {
-                  _openCupertinoCountryPicker(field);
-                } else {
-                  _openCountryPickerDialog(field);
-                }
-              },
-              child: Text(
-                "+${_selectedDialogCountry.phoneCode} ",
-                style: widget.style,
-              ),
-            ),
+            // prefixIcon: widget.decoration.prefixIcon == null ? _textFieldPrefix(field) : widget.decoration.prefixIcon,
+            // prefix: widget.decoration.prefixIcon != null ? _textFieldPrefix(field) : null,
+            prefix: _textFieldPrefix(field),
           ),
           // initialValue: "${_initialValue ?? ''}",
           maxLines: widget.maxLines,
@@ -260,6 +249,36 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
     );
   }
 
+  Widget _textFieldPrefix(field){
+    return GestureDetector(
+      onTap: () {
+        FocusScope.of(context).requestFocus(FocusNode());
+        if (widget.isCupertinoPicker) {
+          _openCupertinoCountryPicker(field);
+        } else {
+          _openCountryPickerDialog(field);
+        }
+      },
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          minWidth: 100,
+          maxWidth: 120,
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: <Widget>[
+            Icon(Icons.arrow_drop_down),
+            CountryPickerUtils.getDefaultFlagImage(_selectedDialogCountry),
+            Text(
+              "+${_selectedDialogCountry.phoneCode} ",
+              style: widget.style ?? Theme.of(context).textTheme.subhead,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   void _openCupertinoCountryPicker(FormFieldState field) {
     showCupertinoModalPopup<void>(
       context: context,

pubspec.lock

@@ -21,42 +21,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   convert:
     dependency: transitive
     description:
@@ -84,7 +84,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   csslib:
     dependency: transitive
     description:
@@ -206,7 +206,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
   image_picker:
     dependency: "direct main"
     description:
@@ -367,7 +367,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   rating_bar:
     dependency: "direct main"
     description:
@@ -421,7 +421,7 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "2.0.0"
   source_maps:
     dependency: transitive
     description:
@@ -435,7 +435,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
   stack_trace:
     dependency: transitive
     description:
@@ -470,21 +470,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.4"
+    version: "1.14.4"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.3.4"
   typed_data:
     dependency: transitive
     description:
@@ -527,13 +527,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.3"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
   yaml:
     dependency: transitive
     description: