fix desktop crash

naoxio · Nov 18, 2023 · 19b166c · 19b166c
1 parent 695422d
commit 19b166c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 38 deletions.
diff --git a/lib/screens/exercise/exercise_step1.dart b/lib/screens/exercise/exercise_step1.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:inner_breeze/providers/user_provider.dart';
 import 'package:inner_breeze/shared/breeze_style.dart';
@@ -136,13 +135,12 @@ class _ExerciseStep1State extends State<ExerciseStep1> {
               ),
               SizedBox(height: 200),
               StopSessionButton(),
-              if (!kReleaseMode)
-                TextButton(
-                  child: Text('Skip'),
-                  onPressed: () {
-                    _navigateToNextExercise();
-                  },
-                )
+              TextButton(
+                child: Text('Skip'),
+                onPressed: () {
+                  skipCountdown();
+                },
+              ),
             ],
           ),
         ),
@@ -156,4 +154,17 @@ class _ExerciseStep1State extends State<ExerciseStep1> {
 
     super.dispose();
   }
+
+
+  void skipCountdown() {
+    if (breathsDone < 0) {
+      breathCycleTimer?.cancel();
+      setState(() {
+        breathsDone = 1;
+      });
+      startBreathCounting();
+    } else {
+      _navigateToNextExercise();
+    }
+  }
 }
diff --git a/lib/screens/exercise/exercise_step2.dart b/lib/screens/exercise/exercise_step2.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:inner_breeze/providers/user_provider.dart';
 import 'package:inner_breeze/widgets/stop_session.dart';
@@ -90,7 +89,7 @@ class _ExerciseStep2State extends State<ExerciseStep2> {
                     _navigateToNextExercise();
                   },
                   child: Text(
-                    'Stop Hold',
+                    'Finish Hold',
                     style: TextStyle(
                       fontSize: 18.0,
                     ),
@@ -101,13 +100,6 @@ class _ExerciseStep2State extends State<ExerciseStep2> {
               StopSessionButton(
                 onStopSessionPressed: _onStopSessionPressed,
               ),
-              if (!kReleaseMode)
-                TextButton(
-                  child: Text('Skip'),
-                  onPressed: () {
-                    _navigateToNextExercise();
-                  },
-                )
             ],
           ),
         ),

diff --git a/lib/screens/exercise/exercise_step3.dart b/lib/screens/exercise/exercise_step3.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:inner_breeze/providers/user_provider.dart';
 import 'package:inner_breeze/shared/breeze_style.dart';
@@ -95,13 +94,12 @@ class _ExerciseStep3State extends State<ExerciseStep3> {
               ),
               SizedBox(height: 200),
               StopSessionButton(),
-              if (!kReleaseMode)
-                TextButton(
-                  child: Text('Skip'),
-                  onPressed: () {
-                    _navigateToNextExercise();
-                  },
-                ),
+              TextButton(
+                child: Text('Skip'),
+                onPressed: () {
+                  _navigateToNextExercise();
+                },
+              ),
             ],
           ),
         ),

diff --git a/lib/widgets/animated_circle.dart b/lib/widgets/animated_circle.dart
@@ -27,7 +27,6 @@ class AnimatedCircleState extends State<AnimatedCircle>
   late Animation<double> _radiusAnimation;
   late AudioPlayer _audioPlayer;
   late AudioSession _audioSession;
-
   bool _isInitialized = false;
 
   Future<AudioSession> _configureAudioSession() async {
@@ -50,18 +49,15 @@ class AnimatedCircleState extends State<AnimatedCircle>
   void initState() {
     super.initState();
 
+    _audioPlayer = AudioPlayer();
+     _controller = AnimationController(
+      vsync: this,
+      duration: widget.tempoDuration,
+    );
+    _radiusAnimation = Tween<double>(begin: 40, end: 72).animate(_controller);
+
     _configureAudioSession().then((session) {
       _audioSession = session;
-
-      _controller = AnimationController(
-        vsync: this,
-        duration: widget.tempoDuration,
-      );
-
-      _radiusAnimation = Tween<double>(begin: 40, end: 72).animate(_controller);
-
-      _audioPlayer = AudioPlayer();
-
       _audioSession.interruptionEventStream.listen((event) {
         if (event.begin) {
           if (event.type == AudioInterruptionType.pause || event.type == AudioInterruptionType.unknown) {
@@ -208,10 +204,8 @@ class BreathingCircle extends CustomPainter {
 
     String? displayText = innerText;
 
-    // Try to parse the innerText as an integer
     int? numberValue = int.tryParse(innerText ?? '');
 
-    // If the parsed value is a number and is less than 0, update the displayText to its absolute value
     if (numberValue != null && numberValue < 0) {
       displayText = numberValue.abs().toString();
     }