nullalbe with support 70 languages

lib/country_code_picker.dart

@@ -1,5 +1,6 @@
 library country_code_picker;
 
+import 'package:collection/collection.dart' show IterableExtension;
 import 'package:country_code_picker/country_code.dart';
 import 'package:country_code_picker/country_codes.dart';
 import 'package:country_code_picker/selection_dialog.dart';
@@ -9,39 +10,39 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 export 'country_code.dart';
 
 class CountryCodePicker extends StatefulWidget {
-  final ValueChanged<CountryCode> onChanged;
-  final ValueChanged<CountryCode> onInit;
-  final String initialSelection;
+  final ValueChanged<CountryCode>? onChanged;
+  final ValueChanged<CountryCode?>? onInit;
+  final String? initialSelection;
   final List<String> favorite;
-  final TextStyle textStyle;
+  final TextStyle? textStyle;
   final EdgeInsetsGeometry padding;
   final bool showCountryOnly;
   final InputDecoration searchDecoration;
-  final TextStyle searchStyle;
-  final TextStyle dialogTextStyle;
-  final WidgetBuilder emptySearchBuilder;
-  final Function(CountryCode) builder;
+  final TextStyle? searchStyle;
+  final TextStyle? dialogTextStyle;
+  final WidgetBuilder? emptySearchBuilder;
+  final Function(CountryCode?)? builder;
   final bool enabled;
   final TextOverflow textOverflow;
   final Icon closeIcon;
 
   /// Barrier color of ModalBottomSheet
-  final Color barrierColor;
+  final Color? barrierColor;
 
   /// Background color of ModalBottomSheet
-  final Color backgroundColor;
+  final Color? backgroundColor;
 
   /// BoxDecoration for dialog
-  final BoxDecoration boxDecoration;
+  final BoxDecoration? boxDecoration;
 
   /// the size of the selection dialog
-  final Size dialogSize;
+  final Size? dialogSize;
 
   /// Background color of selection dialog
-  final Color dialogBackgroundColor;
+  final Color? dialogBackgroundColor;
 
   /// used to customize the country list
-  final List<String> countryFilter;
+  final List<String>? countryFilter;
 
   /// shows the name of the country instead of the dialcode
   final bool showOnlyCountryWhenClosed;
@@ -58,15 +59,15 @@ class CountryCodePicker extends StatefulWidget {
 
   final bool hideMainText;
 
-  final bool showFlagMain;
+  final bool? showFlagMain;
 
-  final bool showFlagDialog;
+  final bool? showFlagDialog;
 
   /// Width of the flag images
   final double flagWidth;
 
   /// Use this property to change the order of the options
-  final Comparator<CountryCode> comparator;
+  final Comparator<CountryCode>? comparator;
 
   /// Set to true if you want to hide the search part
   final bool hideSearch;
@@ -106,7 +107,7 @@ class CountryCodePicker extends StatefulWidget {
     this.dialogSize,
     this.dialogBackgroundColor,
     this.closeIcon = const Icon(Icons.close),
-    Key key,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -114,15 +115,15 @@ class CountryCodePicker extends StatefulWidget {
     List<Map> jsonList = codes;
 
     List<CountryCode> elements =
-        jsonList.map((json) => CountryCode.fromJson(json)).toList();
+        jsonList.map((json) => CountryCode.fromJson(json as Map<String, dynamic>)).toList();
 
     if (comparator != null) {
       elements.sort(comparator);
     }
 
-    if (countryFilter != null && countryFilter.isNotEmpty) {
+    if (countryFilter != null && countryFilter!.isNotEmpty) {
       final uppercaseCustomList =
-          countryFilter.map((c) => c.toUpperCase()).toList();
+          countryFilter!.map((c) => c.toUpperCase()).toList();
       elements = elements
           .where((c) =>
               uppercaseCustomList.contains(c.code) ||
@@ -136,7 +137,7 @@ class CountryCodePicker extends StatefulWidget {
 }
 
 class CountryCodePickerState extends State<CountryCodePicker> {
-  CountryCode selectedItem;
+  CountryCode? selectedItem;
   List<CountryCode> elements = [];
   List<CountryCode> favoriteElements = [];
 
@@ -148,7 +149,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
     if (widget.builder != null)
       _widget = InkWell(
         onTap: showCountryCodePickerDialog,
-        child: widget.builder(selectedItem),
+        child: widget.builder!(selectedItem),
       );
     else {
       _widget = FlatButton(
@@ -159,7 +160,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
           mainAxisSize: MainAxisSize.min,
           children: <Widget>[
             if (widget.showFlagMain != null
-                ? widget.showFlagMain
+                ? widget.showFlagMain!
                 : widget.showFlag)
               Flexible(
                 flex: widget.alignLeft ? 0 : 1,
@@ -169,7 +170,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
                       ? const EdgeInsets.only(right: 16.0, left: 8.0)
                       : const EdgeInsets.only(right: 16.0),
                   child: Image.asset(
-                    selectedItem.flagUri,
+                    selectedItem!.flagUri!,
                     package: 'country_code_picker',
                     width: widget.flagWidth,
                   ),
@@ -180,7 +181,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
                 fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
                 child: Text(
                   widget.showOnlyCountryWhenClosed
-                      ? selectedItem.toCountryStringOnly()
+                      ? selectedItem!.toCountryStringOnly()
                       : selectedItem.toString(),
                   style: widget.textStyle ?? Theme.of(context).textTheme.button,
                   overflow: widget.textOverflow,
@@ -223,10 +224,10 @@ class CountryCodePickerState extends State<CountryCodePicker> {
       if (widget.initialSelection != null) {
         selectedItem = elements.firstWhere(
             (e) =>
-                (e.code.toUpperCase() ==
-                    widget.initialSelection.toUpperCase()) ||
+                (e.code!.toUpperCase() ==
+                    widget.initialSelection!.toUpperCase()) ||
                 (e.dialCode == widget.initialSelection) ||
-                (e.name.toUpperCase() == widget.initialSelection.toUpperCase()),
+                (e.name!.toUpperCase() == widget.initialSelection!.toUpperCase()),
             orElse: () => elements[0]);
       } else {
         selectedItem = elements[0];
@@ -242,9 +243,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
     if (widget.initialSelection != null) {
       selectedItem = elements.firstWhere(
           (e) =>
-              (e.code.toUpperCase() == widget.initialSelection.toUpperCase()) ||
+              (e.code!.toUpperCase() == widget.initialSelection!.toUpperCase()) ||
               (e.dialCode == widget.initialSelection) ||
-              (e.name.toUpperCase() == widget.initialSelection.toUpperCase()),
+              (e.name!.toUpperCase() == widget.initialSelection!.toUpperCase()),
           orElse: () => elements[0]);
     } else {
       selectedItem = elements[0];
@@ -252,12 +253,11 @@ class CountryCodePickerState extends State<CountryCodePicker> {
 
     favoriteElements = elements
         .where((e) =>
-            widget.favorite.firstWhere(
+            widget.favorite.firstWhereOrNull(
                 (f) =>
-                    e.code.toUpperCase() == f.toUpperCase() ||
+                    e.code!.toUpperCase() == f.toUpperCase() ||
                     e.dialCode == f ||
-                    e.name.toUpperCase() == f.toUpperCase(),
-                orElse: () => null) !=
+                    e.name!.toUpperCase() == f.toUpperCase()) !=
             null)
         .toList();
   }
@@ -301,13 +301,13 @@ class CountryCodePickerState extends State<CountryCodePicker> {
 
   void _publishSelection(CountryCode e) {
     if (widget.onChanged != null) {
-      widget.onChanged(e);
+      widget.onChanged!(e);
     }
   }
 
-  void _onInit(CountryCode e) {
+  void _onInit(CountryCode? e) {
     if (widget.onInit != null) {
-      widget.onInit(e);
+      widget.onInit!(e);
     }
   }
 }