Migrate project to nullsafety

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [5.0.0-nullsafety.0]
+* updated flutter_svg to 0.21.0-nullsafety.0
+* Minimum version of dart set to 2.12.0
+* Migrated to nullsafety
+
 ## [4.0.0] - Release Flags
 * Support Flutter 2
 

example/lib/main.dart

@@ -19,7 +19,7 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
+  MyHomePage({Key? key, required this.title}) : super(key: key);
 
   final String title;
 
@@ -28,7 +28,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  bool displayFlagPicker;
+  bool? displayFlagPicker;
 
   @override
   Widget build(BuildContext context) {
@@ -100,7 +100,7 @@ class _MyHomePageState extends State<MyHomePage> {
                 FlagPicker(
                   width: 50,
                   height: 300,
-                  preCache: displayFlagPicker,
+                  preCache: displayFlagPicker!,
                 ),
             ],
           ),
@@ -111,20 +111,20 @@ class _MyHomePageState extends State<MyHomePage> {
 }
 
 class FlagPicker extends StatefulWidget {
-  const FlagPicker({Key key, this.width, this.height, this.preCache = false})
+  const FlagPicker({Key? key, this.width, this.height, this.preCache = false})
       : super(key: key);
 
-  final double width;
-  final double height;
+  final double? width;
+  final double? height;
   final bool preCache;
 
   @override
   _FlagPicker createState() => _FlagPicker();
 }
 
 class _FlagPicker extends State<FlagPicker> {
-  FixedExtentScrollController _controller;
-  int _currentIndex;
+  late FixedExtentScrollController _controller;
+  late int _currentIndex;
 
   @override
   void initState() {

example/lib/restart_widget.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
 class RestartWidget extends StatefulWidget {
-  RestartWidget({this.child});
+  RestartWidget({required this.child});
 
   final Widget child;
 
   static void restartApp(BuildContext context) {
-    context.findAncestorStateOfType<_RestartWidgetState>().restartApp();
+    context.findAncestorStateOfType<_RestartWidgetState>()!.restartApp();
   }
 
   @override

example/pubspec.yaml

@@ -14,7 +14,7 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:

lib/flag.dart

@@ -17,10 +17,10 @@ class Flag extends StatelessWidget {
   final String country;
 
   /// If non-null, requires the child to have exactly this height.
-  final double height;
+  final double? height;
 
   /// If non-null, requires the child to have exactly this width.
-  final double width;
+  final double? width;
 
   /// How to inscribe the flag into the space allocated during layout.
   ///
@@ -257,16 +257,12 @@ class Flag extends StatelessWidget {
   /// The [country] parameter must not be null.
   Flag(
     this.country, {
-    Key key,
+    Key? key,
     this.height,
     this.width,
     this.fit = BoxFit.contain,
     this.replacement = const SizedBox.shrink(),
-  })  : assert(
-          country != null,
-          'The Country must be provided.',
-        ),
-        super(key: key);
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -283,8 +279,10 @@ class Flag extends StatelessWidget {
         : replacement;
   }
 
-  static Future<void> preloadFlag(
-      {BuildContext context, List<String> flagList = flagsCode}) async {
+  static Future<void> preloadFlag({
+    required BuildContext context,
+    List<String> flagList = flagsCode,
+  }) async {
     for (final flag in flagList) {
       await PlatformSvg.preloadFlag(
           context, 'packages/flag/res/flag/$flag.svg');

lib/platform/interface_svg.dart

@@ -7,10 +7,10 @@ class PlatformSvg extends StatelessWidget {
   final String semanticLabel;
 
   /// If non-null, requires the child to have exactly this height.
-  final double height;
+  final double? height;
 
   /// If non-null, requires the child to have exactly this width.
-  final double width;
+  final double? width;
 
   /// How to inscribe the flag into the space allocated during layout.
   ///
@@ -22,11 +22,11 @@ class PlatformSvg extends StatelessWidget {
 
   PlatformSvg(
     this.assetName, {
-    Key key,
-    this.semanticLabel,
+    Key? key,
+    this.semanticLabel = '',
     this.height,
     this.width,
-    this.fit,
+    this.fit = BoxFit.contain,
   }) : super(key: key);
 
   @override

lib/platform/mobile_svg.dart

@@ -10,10 +10,10 @@ class PlatformSvg extends Interface.PlatformSvg {
   final String semanticLabel;
 
   /// If non-null, requires the child to have exactly this height.
-  final double height;
+  final double? height;
 
   /// If non-null, requires the child to have exactly this width.
-  final double width;
+  final double? width;
 
   /// How to inscribe the flag into the space allocated during layout.
   ///
@@ -25,11 +25,11 @@ class PlatformSvg extends Interface.PlatformSvg {
 
   PlatformSvg(
     this.assetName, {
-    Key key,
-    this.semanticLabel,
+    Key? key,
+    this.semanticLabel = '',
     this.height,
     this.width,
-    this.fit,
+    this.fit = BoxFit.contain,
   }) : super(assetName, key: key);
 
   @override

lib/platform/web_svg.dart

@@ -9,10 +9,10 @@ class PlatformSvg extends Interface.PlatformSvg {
   final String semanticLabel;
 
   /// If non-null, requires the child to have exactly this height.
-  final double height;
+  final double? height;
 
   /// If non-null, requires the child to have exactly this width.
-  final double width;
+  final double? width;
 
   /// How to inscribe the flag into the space allocated during layout.
   ///
@@ -24,11 +24,11 @@ class PlatformSvg extends Interface.PlatformSvg {
 
   PlatformSvg(
     this.assetName, {
-    Key key,
-    this.semanticLabel,
+    Key? key,
+    this.semanticLabel = '',
     this.height,
     this.width,
-    this.fit,
+    this.fit = BoxFit.contain,
   }) : super(assetName, key: key);
 
   @override

pubspec.lock

@@ -178,5 +178,5 @@ packages:
     source: hosted
     version: "5.0.2"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.24.0-7.0"

pubspec.yaml

@@ -1,11 +1,10 @@
 name: flag
 description: A flag Flutter package. Use for showing flags. All flags came from https://www.un.org/en/member-states/index.html . 
-version: 4.0.0
+version: 5.0.0-nullsafety.0
 homepage: https://github.com/LunaGao/flag_flutter
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
-  flutter: ">=1.17.0 <2.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter: