only-bible-app

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

532977a3 — pyrossh

Fix various issues

Files changed (4) hide show

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -41,7 +41,7 @@ class ChapterViewScreen extends StatelessWidget {
       value: model,
       child: Scaffold(
         backgroundColor: Theme.of(context).colorScheme.background,
-        bottomSheet: const ActionsBar(),
+        // bottomSheet: const ActionsBar(),
         body: SafeArea(
           child: SwipeDetector(
             onSwipeLeft: (offset) {

lib/state.dart CHANGED Viewed

@@ -8,6 +8,7 @@ import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/utils/dialog.dart";
 import "package:only_bible_app/models.dart";
+import "package:only_bible_app/widgets/actions_bar.dart";
 import "package:provider/provider.dart";
 import "package:shared_preferences/shared_preferences.dart";
@@ -178,12 +179,22 @@ class ChapterViewModel extends ChangeNotifier {
     return selectedVerses.contains(i);
   }
-  void onVerseSelected(int i) {
+  void onVerseSelected(BuildContext context, int i) {
+    if (!isWide(context)) {
+      if (selectedVerses.isEmpty) {
+        Scaffold.of(context).showBottomSheet((context) => const ActionsBar());
+      }
+    }
     if (selectedVerses.contains(i)) {
       selectedVerses.remove(i);
     } else {
       selectedVerses.add(i);
     }
+    if (!isWide(context)) {
+      if (selectedVerses.isEmpty) {
+        Navigator.of(context).pop();
+      }
+    }
     notifyListeners();
   }
@@ -211,6 +222,7 @@ class ChapterViewModel extends ChangeNotifier {
           log("Could not play audio", name: "play", error: (err.toString(), url));
           FirebaseCrashlytics.instance.recordFlutterError(FlutterErrorDetails(exception: (err.toString(), url)));
           showError(context, "Could not play audio");
+          return;
         } finally {
           await player.pause();
           isPlaying = false;

lib/widgets/actions_bar.dart CHANGED Viewed

@@ -7,12 +7,6 @@ class ActionsBar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final isDesktop = isWide(context);
-    final showPlay = ChapterViewModel.of(context).hasSelectedVerses();
-    if (isDesktop || !showPlay) {
-      // TODO: hack fix this
-      return const ColoredBox(color: Colors.transparent);
-    }
     return BottomSheet(
       enableDrag: false,
       onClosing: () {},

lib/widgets/verse_view.dart CHANGED Viewed

@@ -16,7 +16,7 @@ class VerseText extends StatelessWidget {
     return GestureDetector(
       onTap: () {
-        ChapterViewModel.ofEvent(context).onVerseSelected(index);
+        ChapterViewModel.ofEvent(context).onVerseSelected(context, index);
       },
       child: DecoratedBox(
         decoration: BoxDecoration(