Flutter 2.0 and Null Safety compatibility

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.0]
+    * Flutter 2.0 and Null Safety compatibility
+
 ## [0.0.3]
     * Fix bugs
     * Support loop mode for layout: PageIndicatorLayout.COLOR & PageIndicatorLayout.COLOR.

example/pubspec.yaml

@@ -24,7 +24,7 @@ dependencies:
     path: ../
 
   transformer_page_view:
-    path: /Users/jzoom/SourceCode/transformer_page_view
+    path: /Users/pedro/dev/PESSOAL/tmp/transformer_page_view
 
 dev_dependencies:
   flutter_test:

flutter_page_indicator.iml

@@ -16,7 +16,6 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
   </component>

lib/flutter_page_indicator.dart

@@ -123,12 +123,12 @@ class ScalePainter extends BasePainter {
         : radius + ((index + 1) * (size + space));
 
     double progress = page - index;
-    _paint.color = Color.lerp(widget.activeColor, widget.color, progress);
+    _paint.color = Color.lerp(widget.activeColor, widget.color, progress)!;
     //last
     canvas.drawCircle(new Offset(radius + (index * (size + space)), radius),
         lerp(radius, radius * widget.scale, progress), _paint);
     //first
-    _paint.color = Color.lerp(widget.color, widget.activeColor, progress);
+    _paint.color = Color.lerp(widget.color, widget.activeColor, progress)!;
     canvas.drawCircle(new Offset(secondOffset, radius),
         lerp(radius * widget.scale, radius, progress), _paint);
   }
@@ -154,12 +154,12 @@ class ColorPainter extends BasePainter {
         ? radius
         : radius + ((index + 1) * (size + space));
 
-    _paint.color = Color.lerp(widget.activeColor, widget.color, progress);
+    _paint.color = Color.lerp(widget.activeColor, widget.color, progress)!;
     //left
     canvas.drawCircle(
         new Offset(radius + (index * (size + space)), radius), radius, _paint);
     //right
-    _paint.color = Color.lerp(widget.color, widget.activeColor, progress);
+    _paint.color = Color.lerp(widget.color, widget.activeColor, progress)!;
     canvas.drawCircle(new Offset(secondOffset, radius), radius, _paint);
   }
 }
@@ -330,12 +330,12 @@ class PageIndicator extends StatefulWidget {
   final double activeSize;
 
   PageIndicator(
-      {Key key,
+      {Key? key,
       this.size: 20.0,
       this.space: 5.0,
-      this.count,
+      required this.count,
       this.activeSize: 20.0,
-      this.controller,
+      required this.controller,
       this.color: Colors.white30,
       this.layout: PageIndicatorLayout.SLIDE,
       this.activeColor: Colors.white,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_page_indicator
 description: Page indicator for flutter, with multiple build-in layouts.
-version: 0.0.3
+version: 0.1.0
 author: JZoom <jzoom8112@gmail.com>
 homepage: https://github.com/jzoom/flutter_page_indicator
 
@@ -9,7 +9,7 @@ dependencies:
     sdk: flutter
 
 environment:
-  sdk: ">=2.0.0-dev.48.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
   flutter: ">=0.1.4 <3.0.0"