Merge branch 'master' into patch-1

Author: MuhammadUsamaSiddiqui

analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

lib/circular_countdown_timer.dart

@@ -1,13 +1,12 @@
+// ignore_for_file: constant_identifier_names
+
 library circular_countdown_timer;
 
 import 'package:flutter/material.dart';
 import 'custom_timer_painter.dart';
 
 /// Create a Circular Countdown Timer.
 class CircularCountDownTimer extends StatefulWidget {
-  /// Key for Countdown Timer.
-  final Key? key;
-
   /// Filling Color for Countdown Widget.
   final Color fillColor;
 
@@ -74,7 +73,7 @@ class CircularCountDownTimer extends StatefulWidget {
   /// Handles the timer start.
   final bool autoStart;
 
-  CircularCountDownTimer({
+  const CircularCountDownTimer({
     required this.width,
     required this.height,
     required this.duration,
@@ -93,18 +92,15 @@ class CircularCountDownTimer extends StatefulWidget {
     this.strokeWidth = 5.0,
     this.strokeCap = StrokeCap.butt,
     this.textStyle,
-    this.key,
+    super.key,
     this.isTimerTextShown = true,
     this.autoStart = true,
     this.textFormat,
     this.controller,
-  })  : assert(initialDuration <= duration),
-        super(key: key);
+  }) : assert(initialDuration <= duration);
 
   @override
-  CircularCountDownTimerState createState() => CircularCountDownTimerState(
-        countDownController: controller ?? CountDownController(),
-      );
+  CircularCountDownTimerState createState() => CircularCountDownTimerState();
 }
 
 class CircularCountDownTimerState extends State<CircularCountDownTimer>
@@ -113,8 +109,6 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
   Animation<double>? _countDownAnimation;
   CountDownController? countDownController;
 
-  CircularCountDownTimerState({this.countDownController});
-
   String get time {
     String timeStamp = "";
     if (widget.isReverse &&
@@ -185,7 +179,7 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
     }
     // For ss format
     else if (widget.textFormat == CountdownTextFormat.SS) {
-      return '${(duration.inSeconds).toString().padLeft(2, '0')}';
+      return (duration.inSeconds).toString().padLeft(2, '0');
     }
     // For s format
     else if (widget.textFormat == CountdownTextFormat.S) {
@@ -216,6 +210,7 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
 
   @override
   void initState() {
+    countDownController = widget.controller ?? CountDownController();
     super.initState();
     _controller = AnimationController(
       vsync: this,
@@ -253,7 +248,7 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return SizedBox(
       width: widget.width,
       height: widget.height,
       child: AnimatedBuilder(
@@ -286,7 +281,7 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
                             child: Text(
                               time,
                               style: widget.textStyle ??
-                                  TextStyle(
+                                  const TextStyle(
                                     fontSize: 16.0,
                                     color: Colors.black,
                                   ),
@@ -311,73 +306,86 @@ class CircularCountDownTimerState extends State<CircularCountDownTimer>
 
 /// Controls (i.e Start, Pause, Resume, Restart) the Countdown Timer.
 class CountDownController {
-  late CircularCountDownTimerState _state;
-  late bool _isReverse;
+  CircularCountDownTimerState? _state;
+  bool? _isReverse;
   bool isStarted = false, isPaused = false, isResumed = false;
   int? _initialDuration, _duration;
 
   /// This Method Starts the Countdown Timer
   void start() {
-    if (_isReverse) {
-      _state._controller?.reverse(
-          from:
-              _initialDuration == 0 ? 1 : 1 - (_initialDuration! / _duration!));
-    } else {
-      _state._controller?.forward(
-          from: _initialDuration == 0 ? 0 : (_initialDuration! / _duration!));
+    if (_isReverse != null && _state != null && _state?._controller != null) {
+      if (_isReverse!) {
+        _state?._controller?.reverse(
+            from: _initialDuration == 0
+                ? 1
+                : 1 - (_initialDuration! / _duration!));
+      } else {
+        _state?._controller?.forward(
+            from: _initialDuration == 0 ? 0 : (_initialDuration! / _duration!));
+      }
+      isStarted = true;
     }
-
-    isStarted = true;
   }
 
   /// This Method Pauses the Countdown Timer
   void pause() {
-    _state._controller?.stop(canceled: false);
-    isPaused = true;
-    isResumed = false;
+    if (_state != null && _state?._controller != null) {
+      _state?._controller?.stop(canceled: false);
+      isPaused = true;
+      isResumed = false;
+    }
   }
 
   /// This Method Resumes the Countdown Timer
   void resume() {
-    if (_isReverse) {
-      _state._controller?.reverse(from: _state._controller!.value);
-    } else {
-      _state._controller?.forward(from: _state._controller!.value);
+    if (_isReverse != null && _state != null && _state?._controller != null) {
+      if (_isReverse!) {
+        _state?._controller?.reverse(from: _state!._controller!.value);
+      } else {
+        _state?._controller?.forward(from: _state!._controller!.value);
+      }
+      isResumed = true;
+      isPaused = false;
     }
-    isResumed = true;
-    isPaused = false;
   }
 
   /// This Method Restarts the Countdown Timer,
   /// Here optional int parameter **duration** is the updated duration for countdown timer
 
   void restart({int? duration}) {
-    _state._controller!.duration =
-        Duration(seconds: duration ?? _state._controller!.duration!.inSeconds);
-    if (_isReverse) {
-      _state._controller?.reverse(from: 1);
-    } else {
-      _state._controller?.forward(from: 0);
+    if (_isReverse != null && _state != null && _state?._controller != null) {
+      _state?._controller!.duration = Duration(
+          seconds: duration ?? _state!._controller!.duration!.inSeconds);
+      if (_isReverse!) {
+        _state?._controller?.reverse(from: 1);
+      } else {
+        _state?._controller?.forward(from: 0);
+      }
+      isStarted = true;
+      isPaused = false;
+      isResumed = false;
     }
-    isStarted = true;
-    isPaused = false;
-    isResumed = false;
   }
 
   /// This Method resets the Countdown Timer
   void reset() {
-    _state._controller?.reset();
-    isStarted = _state.widget.autoStart;
-    isPaused = false;
-    isResumed = false;
+    if (_state != null && _state?._controller != null) {
+      _state?._controller?.reset();
+      isStarted = _state?.widget.autoStart ?? false;
+      isPaused = false;
+      isResumed = false;
+    }
   }
 
   /// This Method returns the **Current Time** of Countdown Timer i.e
   /// Time Used in terms of **Forward Countdown** and Time Left in terms of **Reverse Countdown**
 
-  String getTime() {
-    return _state
-        ._getTime(_state._controller!.duration! * _state._controller!.value);
+  String? getTime() {
+    if (_state != null && _state?._controller != null) {
+      return _state?._getTime(
+          _state!._controller!.duration! * _state!._controller!.value);
+    }
+    return "";
   }
 }
 

lib/custom_timer_painter.dart

@@ -34,9 +34,9 @@ class CustomTimerPainter extends CustomPainter {
     if (ringGradient != null) {
       final rect = Rect.fromCircle(
           center: size.center(Offset.zero), radius: size.width / 2);
-      paint..shader = ringGradient!.createShader(rect);
+      paint.shader = ringGradient!.createShader(rect);
     } else {
-      paint..shader = null;
+      paint.shader = null;
     }
 
     canvas.drawCircle(size.center(Offset.zero), size.width / 2, paint);
@@ -52,9 +52,9 @@ class CustomTimerPainter extends CustomPainter {
     if (fillGradient != null) {
       final rect = Rect.fromCircle(
           center: size.center(Offset.zero), radius: size.width / 2);
-      paint..shader = fillGradient!.createShader(rect);
+      paint.shader = fillGradient!.createShader(rect);
     } else {
-      paint..shader = null;
+      paint.shader = null;
       paint.color = fillColor!;
     }
 
@@ -66,7 +66,7 @@ class CustomTimerPainter extends CustomPainter {
       if (backgroundGradient != null) {
         final rect = Rect.fromCircle(
             center: size.center(Offset.zero), radius: size.width / 2.2);
-        backgroundPaint..shader = backgroundGradient!.createShader(rect);
+        backgroundPaint.shader = backgroundGradient!.createShader(rect);
       } else {
         backgroundPaint.color = backgroundColor!;
       }
@@ -76,9 +76,9 @@ class CustomTimerPainter extends CustomPainter {
   }
 
   @override
-  bool shouldRepaint(CustomTimerPainter old) {
-    return animation!.value != old.animation!.value ||
-        ringColor != old.ringColor ||
-        fillColor != old.fillColor;
+  bool shouldRepaint(CustomTimerPainter oldDelegate) {
+    return animation!.value != oldDelegate.animation!.value ||
+        ringColor != oldDelegate.ringColor ||
+        fillColor != oldDelegate.fillColor;
   }
 }

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,21 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
@@ -49,7 +42,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -80,28 +73,28 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -113,7 +106,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -134,21 +127,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   vector_math:
     dependency: transitive
     description:
@@ -157,5 +150,5 @@ packages:
     source: hosted
     version: "2.1.2"
 sdks:
-  dart: ">=2.17.3 <3.0.0"
+  dart: ">=2.18.2 <3.0.0"
   flutter: ">=1.17.0"

pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.2.2
 homepage: https://github.com/MuhammadUsamaSiddiqui/circular_countdown_timer
 
 environment:
-  sdk: ">=2.17.3 <3.0.0"
+  sdk: '>=2.18.2 <3.0.0'
   flutter: ">=1.17.0"
 
 dependencies: