fix: use local value for date comparisons

Author: mikaoelitiana

Diff for: lib/models/pomodoro.dart

@@ -30,9 +30,15 @@ class Pomodoro {
       this.loopsBeforeLongBreak = 4}) {
     DateTime now = DateTime.now();
     this.startingAtTime = DateTime.parse(
-        '${DateFormat('yyyy-MM-dd').format(now)}T$startingAtTime');
+            '${DateFormat('yyyy-MM-dd').format(now)}T$startingAtTime')
+        .toLocal();
     this.endingAtTime =
-        DateTime.parse('${DateFormat('yyyy-MM-dd').format(now)}T$endingAtTime');
+        DateTime.parse('${DateFormat('yyyy-MM-dd').format(now)}T$endingAtTime')
+            .toLocal();
+
+    if (this.endingAtTime.isBefore(this.startingAtTime)) {
+      this.endingAtTime = this.endingAtTime.add(const Duration(days: 1));
+    }
 
     initFocuses();
   }
@@ -42,12 +48,15 @@ class Pomodoro {
     breaks = [];
     int loop = 0;
     while (endingAtTime.isAfter(focuses[loop])) {
-      focuses.add(focuses[loop].add(Duration(
-          minutes: focusInMinutes +
-              ((loop + 1) % loopsBeforeLongBreak == 0
-                  ? longBreakInMinutes
-                  : breakInMinutes))));
-      breaks.add(focuses[loop].add(Duration(minutes: focusInMinutes)));
+      focuses.add(focuses[loop]
+          .add(Duration(
+              minutes: focusInMinutes +
+                  ((loop + 1) % loopsBeforeLongBreak == 0
+                      ? longBreakInMinutes
+                      : breakInMinutes)))
+          .toLocal());
+      breaks
+          .add(focuses[loop].add(Duration(minutes: focusInMinutes)).toLocal());
       loop++;
     }
     breaks.add(endingAtTime);
@@ -88,10 +97,10 @@ class Pomodoro {
     DateTime now = DateTime.now();
     DateTime nextFocusStart = getNextFocusStart();
     DateTime nextBreakStart = getNextBreakStart();
-    int currentLoop = getNextFocusLoop() - 1;
+    int currentLoop = getNextFocusLoop();
     int to = 0;
 
-    if (now.isAfter(nextFocusStart) && now.isBefore(nextBreakStart)) {
+    if (now.isAfter(startingAtTime) && now.isBefore(endingAtTime)) {
       to = nextFocusStart.isBefore(nextBreakStart)
           ? nextFocusStart.difference(now).inSeconds
           : nextBreakStart.difference(now).inSeconds;

Diff for: lib/pomodoro.dart

@@ -57,7 +57,8 @@ class _TimerState extends State<Timer> {
 
   @override
   Widget build(BuildContext context) {
-    WidgetsBinding.instance?.addPostFrameCallback((_) => _setCountDown());
+    WidgetsBinding.instance
+        ?.addPostFrameCallback((_) => {if (_duration == 0) _setCountDown()});
 
     return Container(
       decoration: BoxDecoration(color: _backgroundColor),

Diff for: macos/Runner.xcodeproj/project.pbxproj

@@ -425,7 +425,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mikaoelitiana.syncedPomodoro;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -553,7 +553,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mikaoelitiana.syncedPomodoro;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -575,7 +575,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mikaoelitiana.syncedPomodoro;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;