fix: wait for time before starting

mikaoelitiana · Jan 25, 2022 · a67371b · a67371b
1 parent 9dcf482
commit a67371b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -122,7 +122,8 @@ class _PreferencesRouteState extends State<PreferencesRoute> {
                 future: _getSharedPreferences(),
                 builder: (context, AsyncSnapshot<SharedPreferences> snapshot) {
                   _pomodoroIdTextController = TextEditingController(
-                      text: snapshot.data?.getInt('pomodoro_id').toString());
+                      text: (snapshot.data?.getInt('pomodoro_id') ?? 1)
+                          .toString());
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [

diff --git a/lib/models/pomodoro.dart b/lib/models/pomodoro.dart
@@ -89,9 +89,14 @@ class Pomodoro {
     DateTime nextFocusStart = getNextFocusStart();
     DateTime nextBreakStart = getNextBreakStart();
     int currentLoop = getNextFocusLoop() - 1;
-    int to = nextFocusStart.isBefore(nextBreakStart)
-        ? nextFocusStart.difference(now).inSeconds
-        : nextBreakStart.difference(now).inSeconds;
+    int to = 0;
+
+    if (now.isAfter(nextFocusStart) && now.isBefore(nextBreakStart)) {
+      to = nextFocusStart.isBefore(nextBreakStart)
+          ? nextFocusStart.difference(now).inSeconds
+          : nextBreakStart.difference(now).inSeconds;
+    }
+
     Phase phase =
         nextFocusStart.isBefore(nextBreakStart) ? Phase.Break : Phase.Focus;