Merge pull request #9 from StanleyCocos/feature/update

zhangruiyu · web-flow · commit 0577a76c58f0 · 2024-10-15T09:58:58.000+08:00
update to flutter 3.0
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -7,36 +7,33 @@ void main() => runApp(new MyApp());
 class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
+    return MaterialApp(
       title: 'Flutter Demo',
-      theme: new ThemeData(
+      theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: new MyHomePage(title: 'Flutter Demo Home Page'),
+      home: MyHomePage(title: 'Flutter Demo Home Page'),
     );
   }
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
+  MyHomePage({Key? key,  required this.title}) : super(key: key);
 
   final String title;
 
   @override
-  _MyHomePageState createState() => new _MyHomePageState();
+  _MyHomePageState createState() => _MyHomePageState();
 }
 
 class _MyHomePageState extends State<MyHomePage> {
   GlobalKey<MiniGesturePasswordState> miniGesturePassword =
       new GlobalKey<MiniGesturePasswordState>();
 
-  GlobalKey<ScaffoldState> scaffoldState = new GlobalKey<ScaffoldState>();
-
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
       home: new Scaffold(
-        key: scaffoldState,
         appBar: new AppBar(
           title: new Text('Plugin example app'),
         ),
@@ -53,13 +50,13 @@ class _MyHomePageState extends State<MyHomePage> {
                     width: 200.0,
                     successCallback: (s) {
                       print("successCallback$s");
-                      scaffoldState.currentState?.showSnackBar(new SnackBar(
+                      ScaffoldMessenger.of(context).showSnackBar(new SnackBar(
                           content: new Text('successCallback:$s')));
                       miniGesturePassword.currentState?.setSelected('');
                     },
                     failCallback: () {
                       print('failCallback');
-                      scaffoldState.currentState?.showSnackBar(
+                      ScaffoldMessenger.of(context).showSnackBar(
                           new SnackBar(content: new Text('failCallback')));
                       miniGesturePassword.currentState?.setSelected('');
                     },
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,13 +1,17 @@
 name: example
 description: A new Flutter project.
 
+environment:
+  sdk: ">=2.15.0 <4.0.0"
+  flutter: ">=3.0.0"
+
 dependencies:
   flutter:
     sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
+  cupertino_icons: ^1.0.5
   gesture_password:
          path: ../
 
diff --git a/lib/circle_item_painter.dart b/lib/circle_item_painter.dart
@@ -4,7 +4,11 @@ import 'package:gesture_password/gesture_password.dart';
 
 class CircleItemPainter extends CustomPainter {
   CircleItemPainter(
-      this.itemAttribute, this.touchPoint, this.circleList, this.lineList);
+    this.itemAttribute,
+    this.touchPoint,
+    this.circleList,
+    this.lineList,
+  );
 
   final Offset touchPoint;
   final List<Circle> circleList;
@@ -14,23 +18,23 @@ class CircleItemPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     //没选中小圆
-    final normalCirclePaint = new Paint()
+    final normalCirclePaint = Paint()
       ..color = itemAttribute.normalColor
       ..style = PaintingStyle.fill;
 
     //选中小圆
-    final selectedCirclePaint = new Paint()
+    final selectedCirclePaint = Paint()
       ..color = itemAttribute.selectedColor
       ..style = PaintingStyle.fill;
 
     //选中大圆
-    final selectedBigCirclePaint = new Paint()
+    final selectedBigCirclePaint = Paint()
       ..color = itemAttribute.selectedColor
       ..style = PaintingStyle.stroke
       ..strokeWidth = itemAttribute.circleStrokeWidth;
 
     //线
-    final linePaint = new Paint()
+    final linePaint = Paint()
       ..color = itemAttribute.selectedColor
       ..style = PaintingStyle.fill
       ..strokeWidth = itemAttribute.lineStrokeWidth;
diff --git a/lib/gesture_password.dart b/lib/gesture_password.dart
@@ -1,73 +1,75 @@
 import 'dart:ui' as ui;
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:gesture_password/circle_item_painter.dart';
 
 class GesturePassword extends StatefulWidget {
-  final ValueChanged<String> successCallback;
-  final ValueChanged<String> selectedCallback;
-  final VoidCallback failCallback;
+  final ValueChanged<String>? successCallback;
+  final ValueChanged<String>? selectedCallback;
+  final VoidCallback? failCallback;
   final ItemAttribute attribute;
   final double height;
-  final double width;
-
-  GesturePassword(
-      {@required this.successCallback,
-        this.failCallback,
-        this.selectedCallback,
-        this.attribute: ItemAttribute.normalAttribute,
-        this.height: 300.0,
-        this.width,
-      });
+  final double? width;
+
+  GesturePassword({
+    required this.successCallback,
+    this.failCallback,
+    this.selectedCallback,
+    this.attribute = ItemAttribute.normalAttribute,
+    this.height = 300.0,
+    this.width,
+  });
 
   @override
-  _GesturePasswordState createState() => new _GesturePasswordState();
+  _GesturePasswordState createState() => _GesturePasswordState();
 }
 
 class _GesturePasswordState extends State<GesturePassword> {
   Offset touchPoint = Offset.zero;
-  List<Circle> circleList = new List<Circle>();
-  List<Circle> lineList = new List<Circle>();
+  List<Circle> circleList = <Circle>[];
+  List<Circle> lineList = <Circle>[];
 
   @override
   void initState() {
-    num hor = (widget.width??MediaQueryData.fromWindow(ui.window).size.width) / 6;
+    num hor =
+        (widget.width ?? MediaQueryData.fromWindow(ui.window).size.width) / 6;
     num ver = widget.height / 6;
     //每个圆的中心点
     for (int i = 0; i < 9; i++) {
       num tempX = (i % 3 + 1) * 2 * hor - hor;
       num tempY = (i ~/ 3 + 1) * 2 * ver - ver;
-      circleList.add(new Circle(new Offset(tempX, tempY), i.toString()));
+      circleList.add(Circle(Offset(tempX.toDouble(), tempY.toDouble()), i.toString()));
     }
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    var size = new Size(
-        widget.width??MediaQueryData.fromWindow(ui.window).size.width, widget.height);
-    return new GestureDetector(
+    var size = Size(
+        widget.width ?? MediaQueryData.fromWindow(ui.window).size.width,
+        widget.height);
+    return GestureDetector(
       onPanUpdate: (DragUpdateDetails details) {
         setState(() {
-          RenderBox box = context.findRenderObject();
-          touchPoint = box.globalToLocal(details.globalPosition);
+          RenderBox? box = context.findRenderObject() as RenderBox?;
+          Offset? offset = box?.globalToLocal(details.globalPosition);
+          touchPoint = offset ?? Offset.zero;
           //防止绘画越界
           if (touchPoint.dy < 0) {
-            touchPoint = new Offset(touchPoint.dx, 0.0);
+            touchPoint = Offset(touchPoint.dx, 0.0);
           }
           if (touchPoint.dy > widget.height) {
-            touchPoint = new Offset(touchPoint.dx, widget.height);
+            touchPoint = Offset(touchPoint.dx, widget.height);
           }
-          Circle circle = getOuterCircle(touchPoint);
+          Circle? circle = getOuterCircle(touchPoint);
           if (circle != null) {
 //            print('circle.isUnSelected()${circle.isUnSelected()}');
             if (circle.isUnSelected()) {
               lineList.add(circle);
               circle.setState(Circle.CIRCLE_SELECTED);
               if (widget.selectedCallback != null) {
-                widget.selectedCallback(getPassword());
+                widget.selectedCallback?.call(getPassword());
               }
 
 //              print('circle.isUnSelected()2222${circle.isUnSelected()}');
@@ -80,13 +82,13 @@ class _GesturePasswordState extends State<GesturePassword> {
       onPanEnd: (DragEndDetails details) {
         setState(() {
           if (circleList
-              .where((Circle itemCircle) => itemCircle.isSelected())
-              .length >=
+                  .where((Circle itemCircle) => itemCircle.isSelected())
+                  .length >=
               4) {
-            widget.successCallback(getPassword());
+            widget.successCallback?.call(getPassword());
           } else {
             if (widget.failCallback != null) {
-              widget.failCallback();
+              widget.failCallback?.call();
             }
           }
           touchPoint = Offset.zero;
@@ -97,9 +99,9 @@ class _GesturePasswordState extends State<GesturePassword> {
           }
         });
       },
-      child: new CustomPaint(
+      child: CustomPaint(
           size: size,
-          painter: new CircleItemPainter(
+          painter: CircleItemPainter(
             widget.attribute,
             touchPoint,
             circleList,
@@ -109,7 +111,7 @@ class _GesturePasswordState extends State<GesturePassword> {
   }
 
   ///判断是否在圈里
-  Circle getOuterCircle(Offset offset) {
+  Circle? getOuterCircle(Offset offset) {
     for (int i = 0; i < 9; i++) {
       var cross = offset - circleList[i].offset;
       if (cross.dx.abs() < widget.attribute.focusDistance &&
@@ -169,12 +171,12 @@ class ItemAttribute {
       selectedColor: const Color(0xFF1565C0));
 
   const ItemAttribute({
-    this.normalColor,
-    this.selectedColor,
-    this.lineStrokeWidth: 2.0,
-    this.circleStrokeWidth: 2.0,
-    this.smallCircleR: 10.0,
-    this.bigCircleR: 30.0,
-    this.focusDistance: 25.0,
+    required this.normalColor,
+    required this.selectedColor,
+    this.lineStrokeWidth = 2.0,
+    this.circleStrokeWidth = 2.0,
+    this.smallCircleR = 10.0,
+    this.bigCircleR = 30.0,
+    this.focusDistance = 25.0,
   });
 }
diff --git a/lib/mini_circle_view.dart b/lib/mini_circle_view.dart
@@ -3,7 +3,11 @@ import 'package:flutter/widgets.dart';
 import 'package:gesture_password/mini_gesture_password.dart';
 
 class MiniCircleView extends CustomPainter {
-  MiniCircleView(this.itemAttribute, this.circleList, this.selectedStr);
+  MiniCircleView(
+    this.itemAttribute,
+    this.circleList,
+    this.selectedStr,
+  );
 
   final List<Circle> circleList;
   final MiniItemAttribute itemAttribute;
@@ -12,12 +16,12 @@ class MiniCircleView extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     //没选中小圆
-    final normalCirclePaint = new Paint()
+    final normalCirclePaint = Paint()
       ..color = itemAttribute.normalColor
       ..style = PaintingStyle.fill;
 
     //选中小圆
-    final selectedCirclePaint = new Paint()
+    final selectedCirclePaint = Paint()
       ..color = itemAttribute.selectedColor
       ..style = PaintingStyle.fill;
 
diff --git a/lib/mini_gesture_password.dart b/lib/mini_gesture_password.dart
@@ -6,19 +6,19 @@ class MiniGesturePassword extends StatefulWidget {
   final MiniItemAttribute attribute;
   final double height;
 
-  MiniGesturePassword(
-      {Key key,
-        this.attribute: MiniItemAttribute.normalAttribute,
-        this.height: 60.0})
-      : super(key: key);
+  MiniGesturePassword({
+    Key? key,
+    this.attribute = MiniItemAttribute.normalAttribute,
+    this.height = 60.0,
+  }) : super(key: key);
 
   @override
-  MiniGesturePasswordState createState() => new MiniGesturePasswordState();
+  MiniGesturePasswordState createState() => MiniGesturePasswordState();
 }
 
 class MiniGesturePasswordState extends State<MiniGesturePassword> {
   Offset touchPoint = Offset.zero;
-  List<Circle> circleList = new List<Circle>();
+  List<Circle> circleList = <Circle>[];
   String selectedStr = '';
 
   @override
@@ -29,7 +29,7 @@ class MiniGesturePasswordState extends State<MiniGesturePassword> {
     for (int i = 0; i < 9; i++) {
       num tempX = (i % 3 + 1) * 2 * hor - hor;
       num tempY = (i ~/ 3 + 1) * 2 * ver - ver;
-      circleList.add(new Circle(new Offset(tempX, tempY), i));
+      circleList.add(Circle(Offset(tempX.toDouble(), tempY.toDouble()), i));
     }
     super.initState();
   }
@@ -42,12 +42,11 @@ class MiniGesturePasswordState extends State<MiniGesturePassword> {
 
   @override
   Widget build(BuildContext context) {
-    var size = new Size(widget.height, widget.height);
-    return new Container(
-      child: new CustomPaint(
+    var size = Size(widget.height, widget.height);
+    return Container(
+      child: CustomPaint(
           size: size,
-          painter:
-          new MiniCircleView(widget.attribute, circleList, selectedStr)),
+          painter: MiniCircleView(widget.attribute, circleList, selectedStr)),
     );
   }
 }
@@ -87,8 +86,8 @@ class MiniItemAttribute {
       selectedColor: const Color(0xFF1565C0));
 
   const MiniItemAttribute({
-    this.normalColor,
-    this.selectedColor,
-    this.smallCircleR: 6.0,
+    required this.normalColor,
+    required this.selectedColor,
+    this.smallCircleR = 6.0,
   });
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -5,7 +5,7 @@ author: zhangruiyu <157418979@qq.com>
 homepage: https://github.com/zhangruiyu/flutter_gesture_password
 
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: ">=2.15.0 <4.0.0"
 
 
 dependencies:
