Merge pull request #30 from bootloopmaster636/dev-chto

Fix timer not working when autostart disabled
bootloopmaster636 · Oct 30, 2023 · 6daf432 · 6daf432
2 parents dce7cd3 + 0fae275
commit 6daf432
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/lib/displayLayers/OverlayLayer.dart b/lib/displayLayers/OverlayLayer.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
@@ -23,8 +24,10 @@ class OverlayLayer extends ConsumerWidget {
             duration: const Duration(milliseconds: 450),
             curve: Curves.easeInOutCubic,
             begin: Offset(
-                -1 + (MediaQuery.of(context).size.width - 400) / MediaQuery.of(context).size.width,
-                0,
+              -1 +
+                  (MediaQuery.of(context).size.width - 400) /
+                      MediaQuery.of(context).size.width,
+              0,
             ),
             end: const Offset(0, 0))
       ],
@@ -690,7 +693,7 @@ class AboutUs extends StatelessWidget {
           height: 24,
         ),
         const Text(
-          "Version 0.9.1",
+          "Version 0.9.2",
           textAlign: TextAlign.center,
           style: TextStyle(fontWeight: FontWeight.bold),
         ),

diff --git a/lib/logic/states/TimerState.dart b/lib/logic/states/TimerState.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:ugd_timer/logic/managers/DisplayManager.dart';
 import 'package:pausable_timer/pausable_timer.dart';
+import 'package:ugd_timer/logic/managers/DisplayManager.dart';
 import 'package:ugd_timer/logic/managers/NotificationManager.dart';
-import 'package:ugd_timer/logic/managers/TimerManager.dart';
 import 'package:ugd_timer/logic/managers/ProfileManager.dart';
-import 'dart:io';
+import 'package:ugd_timer/logic/managers/TimerManager.dart';
 
 class TimerState extends ChangeNotifier {
   // ============= Instances =============
@@ -134,8 +134,11 @@ class TimerState extends ChangeNotifier {
       } else {
         _isAutoStartEnabled = false;
         startCountdown();
+        return;
       }
     }
+    startCountdown();
+    return;
   }
 
   void startCountdown() async {
@@ -151,6 +154,7 @@ class TimerState extends ChangeNotifier {
                 _timerManager.getTimer(TimerType.mainFreeze));
           }
 
+          print("TIMER TICKED");
           _timerManager.decrementTimer(TimerType.main);
           _timerManager.decrementTimer(TimerType.assist);
           _timerManager.decrementTimer(TimerType.bonus);

diff --git a/pubspec.lock b/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: ca12e6c9ac022f33fd89128e7007fb5e97ab6e814d4fa05dd8d4f2db1e3c69cb
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.5"
+    version: "3.4.6"
   args:
     dependency: transitive
     description:
@@ -335,10 +335,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_riverpod
-      sha256: e667e406a74d67715f1fa0bd941d9ded49aff72f3a9f4440a36aece4e8d457a7
+      sha256: bdba94be666ecb1beeb0f5a748d96cdd6a37215f27e6b48c7673b95cecb800c8
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
   flutter_styled_toast:
     dependency: "direct main"
     description:
@@ -361,10 +361,10 @@ packages:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3"
+      sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08"
       url: "https://pub.dev"
     source: hosted
-    version: "10.5.0"
+    version: "10.6.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -489,10 +489,10 @@ packages:
     dependency: "direct main"
     description:
       name: lottie
-      sha256: b8bdd54b488c54068c57d41ae85d02808da09e2bee8b8dd1f59f441e7efa60cd
+      sha256: a93542cc2d60a7057255405f62252533f8e8956e7e06754955669fd32fb4b216
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.7.0"
   markdown:
     dependency: transitive
     description:
@@ -665,10 +665,10 @@ packages:
     dependency: transitive
     description:
       name: riverpod
-      sha256: "494bf2cfb4df30000273d3052bdb1cc1de738574c6b678f0beb146ea56f5e208"
+      sha256: "2af3d127a6e4e34b89b8f1f018086f5ded04b8e538174f0510bba3e4c0d878b1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
   screen_retriever:
     dependency: transitive
     description:
@@ -838,18 +838,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618"
+      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5"
+      sha256: "043a0d5b83bb7a6f4f0040763dd7b23e75c8e1979cc1109a545054b6dcf56d17"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.1.0"
   url_launcher_windows:
     dependency: transitive
     description: