Merge pull request #27 from BrunoJurkovic/null-safety

Added null safety.

.github/workflows/publish.yml

@@ -6,11 +6,10 @@ jobs:
   publishing:
     runs-on: ubuntu-latest
     steps:
-      - name: "Checkout"
+      - name: 'Checkout'
         uses: actions/checkout@v2 # required!
 
       - name: Dart and Flutter Package Publisher
-        uses: k-paxian/dart-package-publisher@v1.2
+        uses: k-paxian/dart-package-publisher@master
         with:
-          accessToken: ${{ secrets.OAUTH_ACCESS_TOKEN }}
-          refreshToken: ${{ secrets.OAUTH_REFRESH_TOKEN }}
+          credentialJson: ${{ secrets.CREDENTIAL_JSON }}

CHANGELOG.md

@@ -1,7 +1,15 @@
+## [1.3.3] - 2021.02.23
+
+1. Use credentialJson 🏗
+
+## [1.3.2] - 2021.02.23
+
+1. Use master branch publisher 🏗
+
 ## [1.3.1] - 2021.02.23
 
 1. Fix onBack callback info index 🐛
-   
+
 ## [1.3.0] - 2021.02.23
 
 1. Add lockYAxis property ✨

README.md

@@ -21,7 +21,7 @@ Tinder like cards.
 ```yaml
 # pubspec.yaml
 dependencies:
-  tcard: ^1.3.0
+  tcard: ^1.3.3
 ```
 
 ## Uasge
@@ -182,7 +182,7 @@ class _MyAppState extends State<MyApp> {
       print('dislike');
     }
   },
-  onBack: (index) {
+  onBack: (index, info) {
     print(index);
   },
   onEnd: () {
@@ -193,7 +193,6 @@ class _MyAppState extends State<MyApp> {
 
 ![like](./example/like.png)
 
-
 ### Reset width new cards
 
 ```dart
@@ -204,7 +203,6 @@ TCardController _controller = TCardController();
 _controller.reset(cards: newCards);
 ```
 
-
 ## Property
 
 | property      |       type        | default |                                                      description                                                       | required |

example/example.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/material.dart';
 
 import '../lib/tcard.dart';

example/images.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/material.dart';
 import 'package:tcard/tcard.dart';
 

lib/src/animations.dart

@@ -64,7 +64,7 @@ class CardAnimations {
   }
 
   /// 中间卡片尺寸变换动画
-  static Animation<Size> middleCardSizeAnimation(
+  static Animation<Size?> middleCardSizeAnimation(
     AnimationController parent,
     BoxConstraints constraints,
   ) {
@@ -95,7 +95,7 @@ class CardAnimations {
   }
 
   /// 最后面卡片尺寸变换动画
-  static Animation<Size> backCardSizeAnimation(
+  static Animation<Size?> backCardSizeAnimation(
     AnimationController parent,
     BoxConstraints constraints,
   ) {
@@ -151,7 +151,7 @@ class CardReverseAnimations {
   }
 
   /// 中间卡片尺寸变换动画
-  static Animation<Size> middleCardSizeAnimation(
+  static Animation<Size?> middleCardSizeAnimation(
     AnimationController parent,
     BoxConstraints constraints,
   ) {
@@ -182,7 +182,7 @@ class CardReverseAnimations {
   }
 
   /// 最后面卡片尺寸变换动画
-  static Animation<Size> backCardSizeAnimation(
+  static Animation<Size?> backCardSizeAnimation(
     AnimationController parent,
     BoxConstraints constraints,
   ) {

lib/src/cards.dart

@@ -19,16 +19,16 @@ class TCard extends StatefulWidget {
   final List<Widget> cards;
 
   /// 向前回调方法
-  final ForwardCallback onForward;
+  final ForwardCallback? onForward;
 
   /// 向后回调方法
-  final BackCallback onBack;
+  final BackCallback? onBack;
 
   /// 结束回调方法
-  final EndCallback onEnd;
+  final EndCallback? onEnd;
 
   /// 卡片控制器
-  final TCardController controller;
+  final TCardController? controller;
 
   /// 控制Y轴
   final bool lockYAxis;
@@ -40,7 +40,7 @@ class TCard extends StatefulWidget {
   final int delaySlideFor;
 
   const TCard({
-    @required this.cards,
+    required this.cards,
     this.controller,
     this.onForward,
     this.onBack,
@@ -72,13 +72,13 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
   // 最前面卡片的旋转角度
   double _frontCardRotation = 0.0;
   // 卡片位置变换动画控制器
-  AnimationController _cardChangeController;
+  late AnimationController _cardChangeController;
   // 卡片位置恢复动画控制器
-  AnimationController _cardReverseController;
+  late AnimationController _cardReverseController;
   // 卡片回弹动画
-  Animation<Alignment> _reboundAnimation;
+  late Animation<Alignment> _reboundAnimation;
   // 卡片回弹动画控制器
-  AnimationController _reboundController;
+  late AnimationController _reboundController;
   //  前面的卡片
   Widget _frontCard(BoxConstraints constraints) {
     Widget child =
@@ -274,7 +274,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
     _frontCardIndex++;
     _resetFrontCard();
     if (widget.onForward != null && widget.onForward is Function) {
-      widget.onForward(
+      widget.onForward!(
         _frontCardIndex,
         _swipInfoList[_frontCardIndex - 1],
       );
@@ -283,7 +283,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
     if (widget.onEnd != null &&
         widget.onEnd is Function &&
         _frontCardIndex >= _cards.length) {
-      widget.onEnd();
+      widget.onEnd!();
     }
   }
 
@@ -297,7 +297,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
           ? _swipInfoList[index]
           : SwipInfo(-1, SwipDirection.None);
 
-      widget.onBack(_frontCardIndex, info);
+      widget.onBack!(_frontCardIndex, info);
     }
   }
 
@@ -309,7 +309,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
   }
 
   // 重置所有卡片
-  void _reset({List<Widget> cards}) {
+  void reset({List<Widget>? cards}) {
     _cards.clear();
     if (cards != null) {
       _cards.addAll(cards);
@@ -321,8 +321,6 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
     _resetFrontCard();
   }
 
-  get reset => _reset;
-
   // Stop animations
   void _stop() {
     _reboundController.stop();
@@ -374,7 +372,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
 
     // 绑定控制器
     if (widget.controller != null && widget.controller is TCardController) {
-      widget.controller.bindState(this);
+      widget.controller!.bindState(this);
     }
 
     // 初始化向前的动画控制器
@@ -420,7 +418,7 @@ class TCardState extends State<TCard> with TickerProviderStateMixin {
     _cardChangeController.dispose();
     _reboundController.dispose();
     if (widget.controller != null) {
-      widget.controller.dispose();
+      widget.controller!.dispose();
     }
     super.dispose();
   }

lib/src/controller.dart

@@ -5,29 +5,29 @@ import 'swip_info.dart';
 
 /// Card controller
 class TCardController {
-  TCardState state;
+  TCardState? state;
 
   void bindState(TCardState state) {
     this.state = state;
   }
 
   int get index => state?.frontCardIndex ?? 0;
 
-  forward({SwipDirection direction}) {
+  forward({SwipDirection? direction}) {
     if (direction == null) {
       direction =
           Random().nextBool() ? SwipDirection.Left : SwipDirection.Right;
     }
 
-    state.swipInfoList.add(SwipInfo(state.frontCardIndex, direction));
-    state.runChangeOrderAnimation();
+    state!.swipInfoList.add(SwipInfo(state!.frontCardIndex, direction));
+    state!.runChangeOrderAnimation();
   }
 
   back() {
-    state.runReverseOrderAnimation();
+    state!.runReverseOrderAnimation();
   }
 
-  get reset => state.reset;
+  get reset => state!.reset;
 
   void dispose() {
     state = null;