Migrate example app

Author: Kamil Klyta

example/lib/indicators/check_mark_indicator.dart

@@ -6,8 +6,8 @@ class CheckMarkIndicator extends StatefulWidget {
   final Widget child;
 
   const CheckMarkIndicator({
-    Key key,
-    @required this.child,
+    Key? key,
+    required this.child,
   }) : super(key: key);
 
   @override
@@ -37,7 +37,7 @@ class _CheckMarkIndicatorState extends State<CheckMarkIndicator>
           children: <Widget>[
             AnimatedBuilder(
               animation: controller,
-              builder: (BuildContext context, Widget _) {
+              builder: (BuildContext context, Widget? _) {
                 /// set [_renderCompleteState] to true when controller.state become completed
                 if (controller.didStateChange(to: IndicatorState.complete)) {
                   _renderCompleteState = true;

example/lib/indicators/custom_indicator.dart

@@ -1,10 +1,9 @@
 import 'package:custom_refresh_indicator/custom_refresh_indicator.dart';
-import 'package:flutter/foundation.dart';
 
 class CustomIndicatorConfig {
   final IndicatorBuilder builder;
 
   const CustomIndicatorConfig({
-    @required this.builder,
-  }) : assert(builder != null, 'builder argument cannot be null');
+    required this.builder,
+  });
 }

example/lib/indicators/emoji_indicator.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 class ParalaxConfig {
-  final int level;
-  final AssetImage image;
+  final int? level;
+  final AssetImage? image;
 
   const ParalaxConfig({
     this.level,
@@ -16,8 +16,8 @@ class IceCreamIndicator extends StatefulWidget {
   final Widget child;
 
   const IceCreamIndicator({
-    Key key,
-    @required this.child,
+    Key? key,
+    required this.child,
   }) : super(key: key);
 
   @override
@@ -60,8 +60,8 @@ class _IceCreamIndicatorState extends State<IceCreamIndicator>
   static const _indicatorSize = 150.0;
   static const _imageSize = 140.0;
 
-  IndicatorState _prevState;
-  AnimationController _spoonController;
+  IndicatorState? _prevState;
+  late AnimationController _spoonController;
   static final _spoonTween = CurveTween(curve: Curves.easeInOut);
 
   @override
@@ -75,13 +75,13 @@ class _IceCreamIndicatorState extends State<IceCreamIndicator>
     return Transform.translate(
       offset: Offset(
         0,
-        -(asset.level * (controller.value.clamp(1.0, 1.5) - 1.0) * 20) + 10,
+        -(asset.level! * (controller.value.clamp(1.0, 1.5) - 1.0) * 20) + 10,
       ),
       child: OverflowBox(
         maxHeight: _imageSize,
         minHeight: _imageSize,
         child: Image(
-          image: asset.image,
+          image: asset.image!,
           fit: BoxFit.contain,
           height: _imageSize,
         ),
@@ -104,7 +104,7 @@ class _IceCreamIndicatorState extends State<IceCreamIndicator>
           children: <Widget>[
             AnimatedBuilder(
               animation: controller,
-              builder: (BuildContext context, Widget _) {
+              builder: (BuildContext context, Widget? _) {
                 final currentState = controller.state;
                 if (_prevState == IndicatorState.armed &&
                     currentState == IndicatorState.loading) {
@@ -114,7 +114,7 @@ class _IceCreamIndicatorState extends State<IceCreamIndicator>
                   _spoonController.stop();
                 } else if (currentState == IndicatorState.idle &&
                     _prevState != currentState) {
-                  _spoonController..value = 0.0;
+                  _spoonController.value = 0.0;
                 }
 
                 _prevState = currentState;

example/lib/indicators/ice_cream_indicator.dart

@@ -13,13 +13,13 @@ class _Cloud {
     "assets/plane_indicator/cloud4.png",
   ];
 
-  AnimationController controller;
-  final Color color;
-  final AssetImage image;
-  final double width;
-  final double dy;
-  final double initialValue;
-  final Duration duration;
+  AnimationController? controller;
+  final Color? color;
+  final AssetImage? image;
+  final double? width;
+  final double? dy;
+  final double? initialValue;
+  final Duration? duration;
   _Cloud({
     this.color,
     this.image,
@@ -33,7 +33,7 @@ class _Cloud {
 class PlaneIndicator extends StatefulWidget {
   final Widget child;
   const PlaneIndicator({
-    @required this.child,
+    required this.child,
   });
 
   @override
@@ -43,8 +43,8 @@ class PlaneIndicator extends StatefulWidget {
 class _PlaneIndicatorState extends State<PlaneIndicator>
     with TickerProviderStateMixin {
   static final _planeTween = CurveTween(curve: Curves.easeInOut);
-  AnimationController _planeController;
-  IndicatorState _prevState;
+  late AnimationController _planeController;
+  IndicatorState? _prevState;
 
   @override
   void initState() {
@@ -120,15 +120,15 @@ class _PlaneIndicatorState extends State<PlaneIndicator>
   }
 
   void _stopCloudAnimation() {
-    for (final cloud in _clouds) cloud.controller..stop();
+    for (final cloud in _clouds) cloud.controller!.stop();
   }
 
   void _startCloudAnimation() {
-    for (final cloud in _clouds) cloud.controller.repeat();
+    for (final cloud in _clouds) cloud.controller!.repeat();
   }
 
   void _disposeCloudsControllers() {
-    for (final cloud in _clouds) cloud.controller.dispose();
+    for (final cloud in _clouds) cloud.controller!.dispose();
   }
 
   @override
@@ -151,7 +151,7 @@ class _PlaneIndicatorState extends State<PlaneIndicator>
         height: 50,
         fit: BoxFit.contain,
       ),
-      builder: (BuildContext context, Widget child) {
+      builder: (BuildContext context, Widget? child) {
         return Transform.translate(
           offset: Offset(
               0.0, 10 * (0.5 - _planeTween.transform(_planeController.value))),
@@ -185,26 +185,26 @@ class _PlaneIndicatorState extends State<PlaneIndicator>
             _prevState = currentState;
 
             return Stack(
-              overflow: Overflow.clip,
+              clipBehavior: Clip.hardEdge,
               children: <Widget>[
                 if (_prevState != IndicatorState.idle)
                   Container(
                     height: _offsetToArmed * controller.value,
                     color: Color(0xFFFDFEFF),
                     width: double.infinity,
                     child: AnimatedBuilder(
-                      animation: _clouds.first.controller,
-                      builder: (BuildContext context, Widget child) {
+                      animation: _clouds.first.controller!,
+                      builder: (BuildContext context, Widget? child) {
                         return Stack(
-                          overflow: Overflow.clip,
+                          clipBehavior: Clip.hardEdge,
                           children: <Widget>[
                             for (final cloud in _clouds)
                               Transform.translate(
                                 offset: Offset(
-                                  ((screenWidth + cloud.width) *
-                                          cloud.controller.value) -
-                                      cloud.width,
-                                  cloud.dy * controller.value,
+                                  ((screenWidth + cloud.width!) *
+                                          cloud.controller!.value) -
+                                      cloud.width!,
+                                  cloud.dy! * controller.value,
                                 ),
                                 child: OverflowBox(
                                   minWidth: cloud.width,
@@ -215,7 +215,7 @@ class _PlaneIndicatorState extends State<PlaneIndicator>
                                   child: Container(
                                     child: Image(
                                       color: cloud.color,
-                                      image: cloud.image,
+                                      image: cloud.image!,
                                       fit: BoxFit.contain,
                                     ),
                                   ),

example/lib/indicators/plane_indicator.dart

@@ -6,9 +6,9 @@ import 'custom_indicator.dart';
 
 class SimpleIndicatorContent extends StatelessWidget {
   const SimpleIndicatorContent({
-    @required this.controller,
+    required this.controller,
     this.indicatorSize = _defaultIndicatorSize,
-  }) : assert(indicatorSize != null && indicatorSize > 0);
+  }) : assert(indicatorSize > 0);
 
   final IndicatorController controller;
   static const _defaultIndicatorSize = 40.0;

example/lib/indicators/simple_indicator.dart

@@ -1,7 +1,6 @@
 import 'package:example/screens/presentation_screen.dart';
 import 'package:flutter/material.dart';
 
-import 'indicators/emoji_indicator.dart';
 import 'indicators/simple_indicator.dart';
 import 'screens/example_indicator_screen.dart';
 import 'screens/ice_cream_indicator_screen.dart';
@@ -41,7 +40,7 @@ class MainScreen extends StatelessWidget {
         child: ListView(
           padding: const EdgeInsets.all(15),
           children: <Widget>[
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -53,7 +52,7 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -66,7 +65,7 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -79,7 +78,7 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -91,7 +90,7 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -103,7 +102,7 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
+            ElevatedButton(
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
@@ -115,18 +114,6 @@ class MainScreen extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 15),
-            RaisedButton(
-              child: Container(
-                height: 50,
-                alignment: Alignment.center,
-                child: Text("Emoji"),
-              ),
-              onPressed: () => Navigator.pushNamed(
-                context,
-                '/example',
-                arguments: emojiIndicator,
-              ),
-            ),
           ],
         ),
       ),