Fixed timer issues (#31)

* Fixed timer issues

* bump app version

* minor improvement

Author: M97Chahboun

lib/countdown_screen.dart

@@ -21,7 +21,7 @@ const size = Size(500, 900);
 
 class CountdownScreenState extends State<CountdownScreen> with WindowListener {
   RocketTimer? _timer;
-  bool inProgress = false;
+  bool inBreak = false;
   bool isPaused = false;
   late ValueNotifier<bool> forceModeEnabled = ValueNotifier(false);
   WindowOptions windowOptions = const WindowOptions(
@@ -37,6 +37,8 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
 
   late int reminder;
   late int breakTime;
+  Duration get workDuration => Duration(minutes: reminder);
+  Duration get breakDuration => Duration(seconds: breakTime);
 
   @override
   void initState() {
@@ -64,13 +66,13 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
   }
 
   void initTimer() {
-    final duration = Duration(minutes: reminder);
-    _timer = RocketTimer(type: TimerType.countdown, duration: duration);
+    _timer = RocketTimer(type: TimerType.countdown, duration: workDuration);
     _timer!.addListener(() {
       if (_timer!.kDuration == 0) {
         showNotification();
-        _timer!.kDuration = inProgress ? duration.inSeconds : reminder;
-        inProgress = !inProgress;
+        _timer!.kDuration =
+            inBreak ? workDuration.inSeconds : breakDuration.inSeconds;
+        inBreak = !inBreak;
         setState(() {});
       }
     });
@@ -100,7 +102,7 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
   }
 
   Future<void> handleWindowState() async {
-    if (inProgress) {
+    if (inBreak) {
       await windowManager.show();
       await windowManager.focus();
       await windowManager.setFullScreen(true);
@@ -119,8 +121,8 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
 
   Future<void> showNotification() async {
     LocalNotification notification = LocalNotification(
-      title: inProgress ? "Stay Focused 💪" : "Take a Moment 🌟",
-      body: inProgress
+      title: inBreak ? "Stay Focused 💪" : "Take a Moment 🌟",
+      body: inBreak
           ? "Keep your gaze on the screen. Remember, every 20 minutes, take a 20-second break looking at something 20 feet away."
           : "Step back from the screen and focus on something 20 feet away for 20 seconds. Your eyes will thank you!",
     );
@@ -145,19 +147,6 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
     });
   }
 
-  void resetTimer() {
-    final duration = Duration(minutes: reminder);
-    _timer?.stop();
-    _timer?.kDuration = duration.inSeconds;
-    if (isPaused) {
-      setState(() {
-        isPaused = false;
-        inProgress = false;
-      });
-    }
-    _timer?.start();
-  }
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -214,7 +203,7 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
                 if (_timer != null)
                   Column(
                     children: [
-                      RuleTimer(timer: _timer!, inProgress: inProgress),
+                      RuleTimer(timer: _timer!, inBreak: inBreak),
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
@@ -235,7 +224,7 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
                                 );
                               }),
                           IconButton(
-                              onPressed: _timer!.restart,
+                              onPressed: _restartTimer,
                               icon: const Icon(Icons.restart_alt)),
                         ],
                       )
@@ -301,4 +290,11 @@ class CountdownScreenState extends State<CountdownScreen> with WindowListener {
       ),
     );
   }
+
+  void _restartTimer() {
+    _timer!.restart();
+    inBreak = false;
+    _timer!.kDuration = workDuration.inSeconds;
+    setState(() {});
+  }
 }

lib/widgets/custom_slider.dart

@@ -64,7 +64,7 @@ class CustomSlider extends StatelessWidget {
           ),
           child: Slider(
             value: value.toDouble(),
-            min: 10,
+            min: 1,
             max: 60,
             divisions: 50,
             onChanged: onChanged,

lib/widgets/rule_timer.dart

@@ -5,18 +5,17 @@ class RuleTimer extends StatelessWidget {
   const RuleTimer({
     super.key,
     required RocketTimer timer,
-    required this.inProgress,
+    required this.inBreak,
   }) : _timer = timer;
 
   final RocketTimer _timer;
-  final bool inProgress;
+  final bool inBreak;
 
   final circleSize = 200.0;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final stroke = inProgress ? 25.0 : 15.0;
 
     return SizedBox(
       height: circleSize + 40,
@@ -39,7 +38,7 @@ class RuleTimer extends StatelessWidget {
                   shape: BoxShape.circle,
                   boxShadow: [
                     BoxShadow(
-                      color: (inProgress
+                      color: (inBreak
                               ? theme.colorScheme.secondary
                               : theme.colorScheme.primary)
                           .withAlpha((0.2 * 255).round()),
@@ -57,12 +56,12 @@ class RuleTimer extends StatelessWidget {
                     timeString,
                     style: theme.textTheme.displayMedium?.copyWith(
                       fontWeight: FontWeight.bold,
-                      color: inProgress
+                      color: inBreak
                           ? theme.colorScheme.secondary
                           : theme.colorScheme.primary,
                     ),
                   ),
-                  if (inProgress)
+                  if (inBreak)
                     Text(
                       'Break Time',
                       style: theme.textTheme.titleMedium?.copyWith(
@@ -83,11 +82,11 @@ class RuleTimer extends StatelessWidget {
                   height: circleSize,
                   width: circleSize,
                   child: CircularProgressIndicator(
-                    color: inProgress
+                    color: inBreak
                         ? theme.colorScheme.secondary
                         : theme.colorScheme.primary,
                     backgroundColor: theme.colorScheme.surfaceContainerHighest,
-                    strokeWidth: stroke,
+                    strokeWidth: 15.0,
                     value: value,
                     strokeCap: StrokeCap.round,
                   ),

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.0.0
+version: 2.0.1
 
 environment:
   sdk: '>=3.1.2 <4.0.0'