Handle back button during recording

jthodge · Dec 28, 2021 · 92a76c2 · 92a76c2
1 parent 76c2a82
commit 92a76c2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/lib/views/notes_view.dart b/lib/views/notes_view.dart
@@ -285,6 +285,17 @@ class _NotesViewState extends State<_NotesView> {
     context.read<OutlinesModel>().toggleArchive(outline);
   }
 
+  Future<void> _goToOutlines() async {
+    final playerModel = context.read<PlayerModel>();
+    if (playerModel.playerState == PlayerState.recordingContinuously) {
+      await context.read<NotesModel>().stopRecording(0);
+    }
+    if (playerModel.playerState == PlayerState.playing) {
+      await playerModel.stopPlaying();
+    }
+    Navigator.pushNamedAndRemoveUntil(context, "/", (_) => false);
+  }
+
   @override
   Widget build(BuildContext context) {
     final ready = context.select<NotesModel, bool>((value) => value.isReady);
@@ -341,9 +352,7 @@ class _NotesViewState extends State<_NotesView> {
         ),
         leading: IconButton(
             tooltip: "all outlines",
-            onPressed: () {
-              Navigator.pushNamedAndRemoveUntil(context, "/", (_) => false);
-            },
+            onPressed: _goToOutlines,
             icon: const Icon(Icons.chevron_left)),
         actions: [
           if (currentOutlineArchived)

diff --git a/lib/widgets/record_button.dart b/lib/widgets/record_button.dart
@@ -27,8 +27,9 @@ class _RecordButtonState extends State<RecordButton> {
   }
 
   _stopRecord(_) async {
-    // final playerState = context.read<PlayerModel>().playerState;
-    if (_stopwatch.elapsedMilliseconds > 200) {
+    final playerState = context.read<PlayerModel>().playerState;
+    if (_stopwatch.elapsedMilliseconds > 200 ||
+        playerState == PlayerState.recordingContinuously) {
       _stopwatch.stop();
       _stopwatch.reset();
       int magnitude = max(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.18.1+76
+version: 1.18.2+77
 
 environment:
   sdk: ">=2.12.0 <3.0.0"