only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs

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

e545d60e — pyrossh

update stuff

Files changed (17) hide show

lib/app.dart +19 -17
lib/dialog.dart +4 -3
lib/gen/bible.gen.dart +30 -28
lib/main.dart +13 -34
lib/screens/bible_select_screen.dart +4 -7
lib/screens/book_select_screen.dart +3 -9
lib/screens/chapter_select_screen.dart +3 -7
lib/screens/chapter_view_screen.dart +0 -6
lib/sheets/actions_sheet.dart +12 -6
lib/sheets/settings_sheet.dart +7 -7
lib/store/actions.dart +351 -24
lib/store/app_navigator.dart +9 -248
lib/store/app_persistor.dart +5 -2
lib/store/app_state.dart +5 -50
lib/utils.dart +1 -3
lib/widgets/chapter_app_bar.dart +4 -3
lib/widgets/verses_view.dart +52 -44

lib/app.dart CHANGED Viewed

@@ -1,4 +1,4 @@
-import "package:async_redux/async_redux.dart" show Store;
+import "package:async_redux/async_redux.dart" show Store, StoreProvider;
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
 import "package:only_bible_app/gen/l10n/app_localizations.dart";
@@ -7,6 +7,7 @@ import "package:only_bible_app/screens/book_select_screen.dart";
 import "package:only_bible_app/screens/chapter_select_screen.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/screens/webview_screen.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/theme.dart";
@@ -15,17 +16,16 @@ import "package:only_bible_app/utils.dart";
 class App extends StatelessWidget {
   final GlobalKey<NavigatorState> globalNavigatorKey;
   final Store<AppState> store;
-  final AppNavigator navigator;
   late final GoRouter _router;
-  App({super.key, required this.globalNavigatorKey, required this.store, required this.navigator}) {
+  App({super.key, required this.globalNavigatorKey, required this.store}) {
     final s = store.state;
     _router = GoRouter(
       navigatorKey: globalNavigatorKey,
       initialLocation:
           s.firstOpen ? "/bible" : "/chapter/${Uri.encodeComponent(s.bibleName)}/${s.savedBook}/${s.savedChapter}",
       redirect: (context, state) {
-        navigator.hideActions();
+        store.dispatch(HideActionsAction());
         return null;
       },
       routes: [
@@ -107,20 +107,22 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return AppNavigatorProvider(
+    return StoreProvider<AppState>(
       store: store,
+      child: AppRouterScope(
-      navigator: navigator,
+        router: _router,
-      child: Builder(
+        child: Builder(
-        builder: (context) => MaterialApp.router(
+          builder: (context) => MaterialApp.router(
-          routerConfig: _router,
+            routerConfig: _router,
-          onGenerateTitle: (context) => context.l.title,
+            onGenerateTitle: (context) => context.l.title,
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
+            supportedLocales: AppLocalizations.supportedLocales,
-          debugShowCheckedModeBanner: false,
+            debugShowCheckedModeBanner: false,
-          themeMode: context.select((s) => s.darkMode) ? ThemeMode.dark : ThemeMode.light,
+            themeMode: context.select((s) => s.darkMode) ? ThemeMode.dark : ThemeMode.light,
-          theme: lightTheme,
+            theme: lightTheme,
-          darkTheme: darkTheme,
+            darkTheme: darkTheme,
-          locale: Locale(context.select((s) => s.languageCode)),
+            locale: Locale(context.select((s) => s.languageCode)),
+          ),
         ),
       ),
     );

lib/dialog.dart CHANGED Viewed

@@ -1,7 +1,8 @@
 import "dart:ui";
 import "package:flutter/material.dart";
-import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_navigator.dart";
+import "package:only_bible_app/utils.dart";
 void showAlert(BuildContext context, String title, String message) {
   showDialog(
@@ -50,13 +51,13 @@ void showReportError(BuildContext context, String message, StackTrace? st) {
             TextButton(
               onPressed: () {
                 recordError(message, st);
-                context.nav.changeBible(context);
+                context.dispatch(ChangeBibleAction(context.router));
               },
               child: const Text("Yes"),
             ),
             TextButton(
               onPressed: () {
-                context.nav.changeBible(context);
+                context.dispatch(ChangeBibleAction(context.router));
               },
               child: const Text("No"),
             ),

lib/gen/bible.gen.dart CHANGED Viewed

@@ -6,6 +6,8 @@ library only_bible_app.bible;
 import 'dart:typed_data' show Uint8List;
 import 'package:flat_buffers/flat_buffers.dart' as fb;
 class Verse {
   Verse._(this._bc, this._bcOffset);
   factory Verse(List<int> bytes) {
@@ -34,7 +36,8 @@ class _VerseReader extends fb.TableReader<Verse> {
   const _VerseReader();
   @override
-  Verse createObject(fb.BufferContext bc, int offset) => Verse._(bc, offset);
+  Verse createObject(fb.BufferContext bc, int offset) =>
+    Verse._(bc, offset);
 }
 class VerseBuilder {
@@ -50,22 +53,18 @@ class VerseBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addBook(int? book) {
     fbBuilder.addInt32(1, book);
     return fbBuilder.offset;
   }
   int addChapter(int? chapter) {
     fbBuilder.addInt32(2, chapter);
     return fbBuilder.offset;
   }
   int addHeadingOffset(int? offset) {
     fbBuilder.addOffset(3, offset);
     return fbBuilder.offset;
   }
   int addTextOffset(int? offset) {
     fbBuilder.addOffset(4, offset);
     return fbBuilder.offset;
@@ -89,7 +88,8 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
     int? chapter,
     String? heading,
     String? text,
+  })
-  })  : _index = index,
+      : _index = index,
         _book = book,
         _chapter = chapter,
         _heading = heading,
@@ -98,8 +98,10 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? headingOffset = _heading == null ? null : fbBuilder.writeString(_heading!);
+    final int? headingOffset = _heading == null ? null
+        : fbBuilder.writeString(_heading!);
-    final int? textOffset = _text == null ? null : fbBuilder.writeString(_text!);
+    final int? textOffset = _text == null ? null
+        : fbBuilder.writeString(_text!);
     fbBuilder.startTable(5);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addInt32(1, _book);
@@ -117,7 +119,6 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Chapter {
   Chapter._(this._bc, this._bcOffset);
   factory Chapter(List<int> bytes) {
@@ -144,7 +145,8 @@ class _ChapterReader extends fb.TableReader<Chapter> {
   const _ChapterReader();
   @override
-  Chapter createObject(fb.BufferContext bc, int offset) => Chapter._(bc, offset);
+  Chapter createObject(fb.BufferContext bc, int offset) =>
+    Chapter._(bc, offset);
 }
 class ChapterBuilder {
@@ -160,12 +162,10 @@ class ChapterBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addBook(int? book) {
     fbBuilder.addInt32(1, book);
     return fbBuilder.offset;
   }
   int addVersesOffset(int? offset) {
     fbBuilder.addOffset(2, offset);
     return fbBuilder.offset;
@@ -185,15 +185,16 @@ class ChapterObjectBuilder extends fb.ObjectBuilder {
     int? index,
     int? book,
     List<VerseObjectBuilder>? verses,
+  })
-  })  : _index = index,
+      : _index = index,
         _book = book,
         _verses = verses;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? versesOffset =
+    final int? versesOffset = _verses == null ? null
-        _verses == null ? null : fbBuilder.writeList(_verses!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        : fbBuilder.writeList(_verses!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(3);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addInt32(1, _book);
@@ -209,7 +210,6 @@ class ChapterObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Book {
   Book._(this._bc, this._bcOffset);
   factory Book(List<int> bytes) {
@@ -235,7 +235,8 @@ class _BookReader extends fb.TableReader<Book> {
   const _BookReader();
   @override
-  Book createObject(fb.BufferContext bc, int offset) => Book._(bc, offset);
+  Book createObject(fb.BufferContext bc, int offset) =>
+    Book._(bc, offset);
 }
 class BookBuilder {
@@ -251,7 +252,6 @@ class BookBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addChaptersOffset(int? offset) {
     fbBuilder.addOffset(1, offset);
     return fbBuilder.offset;
@@ -269,14 +269,15 @@ class BookObjectBuilder extends fb.ObjectBuilder {
   BookObjectBuilder({
     int? index,
     List<ChapterObjectBuilder>? chapters,
+  })
-  })  : _index = index,
+      : _index = index,
         _chapters = chapters;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? chaptersOffset =
+    final int? chaptersOffset = _chapters == null ? null
-        _chapters == null ? null : fbBuilder.writeList(_chapters!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        : fbBuilder.writeList(_chapters!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(2);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addOffset(1, chaptersOffset);
@@ -291,7 +292,6 @@ class BookObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Bible {
   Bible._(this._bc, this._bcOffset);
   factory Bible(List<int> bytes) {
@@ -317,7 +317,8 @@ class _BibleReader extends fb.TableReader<Bible> {
   const _BibleReader();
   @override
-  Bible createObject(fb.BufferContext bc, int offset) => Bible._(bc, offset);
+  Bible createObject(fb.BufferContext bc, int offset) =>
+    Bible._(bc, offset);
 }
 class BibleBuilder {
@@ -333,7 +334,6 @@ class BibleBuilder {
     fbBuilder.addOffset(0, offset);
     return fbBuilder.offset;
   }
   int addBooksOffset(int? offset) {
     fbBuilder.addOffset(1, offset);
     return fbBuilder.offset;
@@ -351,15 +351,17 @@ class BibleObjectBuilder extends fb.ObjectBuilder {
   BibleObjectBuilder({
     String? name,
     List<BookObjectBuilder>? books,
+  })
-  })  : _name = name,
+      : _name = name,
         _books = books;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? nameOffset = _name == null ? null : fbBuilder.writeString(_name!);
+    final int? nameOffset = _name == null ? null
+        : fbBuilder.writeString(_name!);
-    final int? booksOffset =
+    final int? booksOffset = _books == null ? null
-        _books == null ? null : fbBuilder.writeList(_books!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        : fbBuilder.writeList(_books!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(2);
     fbBuilder.addOffset(0, nameOffset);
     fbBuilder.addOffset(1, booksOffset);

lib/main.dart CHANGED Viewed

@@ -1,17 +1,15 @@
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:flutter/foundation.dart";
-import "package:flutter/scheduler.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
 import "package:flutter_web_plugins/url_strategy.dart";
 import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:async_redux/async_redux.dart";
 import "package:only_bible_app/app.dart";
-import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/store/app_navigator.dart";
-import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/utils.dart";
 void updateStatusBar(bool v) {
   if (v) {
@@ -36,45 +34,26 @@ void updateStatusBar(bool v) {
 }
 void main() async {
-  final globalNavigatorKey = GlobalKey<NavigatorState>();
-  final persistor = AppPersistor();
-  final initialState = await persistor.readState();
-  final store = Store<AppState>(
-    initialState: initialState ?? const AppState(),
-    persistor: persistor,
-  );
-  // FlutterError.onError = (errorDetails) {
-  //   SchedulerBinding.instance.addPostFrameCallback((d) {
-  //     showReportError(
-  //       globalNavigatorKey.currentState!.context,
-  //       errorDetails.exception.toString(),
-  //       errorDetails.stack,
-  //     );
-  //   });
-  // };
-  // PlatformDispatcher.instance.onError = (error, stack) {
-  //   Future.delayed(const Duration(seconds: 1), () {
-  //     showReportError(
-  //       globalNavigatorKey.currentState!.context,
-  //       error.toString(),
-  //       stack,
-  //     );
-  //   });
-  //   return true;
-  // };
   FlutterNativeSplash.preserve(
     widgetsBinding: WidgetsFlutterBinding.ensureInitialized(),
   );
   usePathUrlStrategy();
-  WidgetsFlutterBinding.ensureInitialized();
   FlutterAzureTts.init(
     subscriptionKey: "a9d2d78796924a2a9df2b6d5c1c4a576",
     region: "centralindia",
     withLogs: true,
   );
+  final globalNavigatorKey = GlobalKey<NavigatorState>();
+  final persistor = AppPersistor();
+  final json = await persistor.readJson();
+  final bibleName = json?["bibleName"] as String? ?? "English";
+  final bible = await loadBible(bibleName);
+  final initialState = json != null ? AppState.fromJson(json, bible) : AppState(bible: bible);
+  final store = Store<AppState>(
+    initialState: initialState,
+    persistor: persistor,
+  );
   updateStatusBar(store.state.darkMode);
-  await store.dispatchAndWait(LoadBibleAction());
-  final navigator = AppNavigator(store);
-  runApp(App(globalNavigatorKey: globalNavigatorKey, store: store, navigator: navigator));
+  runApp(App(globalNavigatorKey: globalNavigatorKey, store: store));
   FlutterNativeSplash.remove();
 }

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
@@ -38,12 +38,9 @@ class BibleSelectScreen extends StatelessWidget {
                     if (s.firstOpen) {
                       context.dispatch(FirstOpenDoneAction());
                     }
+                    context.dispatch(
-                    context.nav.updateCurrentBible(
+                      UpdateCurrentBibleAction(
-                      context,
-                      l.languageTitle,
+                          context.router, l.languageTitle, l.localeName, s.savedBook, s.savedChapter),
-                      l.localeName,
-                      s.savedBook,
-                      s.savedChapter,
                     );
                   },
                 );

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:go_router/go_router.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -15,20 +15,14 @@ class BookSelectScreen extends StatelessWidget {
   dynamic onBookSelected(BuildContext context, Bible bible, int index) {
     final book = bible.books![index];
     if (book.chapters!.length == 1) {
-      return context.nav.replaceBookChapter(context, bible.name!, index, 0);
+      return context.dispatch(ReplaceBookChapterAction(context.router, bible.name!, index, 0));
     }
-    context.go("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
+    context.dispatch(ChangeChapterAction(context.router, bible, book));
   }
   @override
   Widget build(BuildContext context) {
     final bible = context.select((s) => s.bible);
-    if (bible == null) {
-      return ColoredBox(
-        color: Theme.of(context).colorScheme.surface,
-        child: const Center(child: CircularProgressIndicator()),
-      );
-    }
     return ScaffoldMenu(
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -14,12 +15,6 @@ class ChapterSelectScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final bible = context.select((s) => s.bible);
-    if (bible == null) {
-      return ColoredBox(
-        color: Theme.of(context).colorScheme.surface,
-        child: const Center(child: CircularProgressIndicator()),
-      );
-    }
     final book = bible.books![bookIndex];
     return ScaffoldMenu(
       child: CustomScrollView(
@@ -30,7 +25,8 @@ class ChapterSelectScreen extends StatelessWidget {
             children: List.generate(book.chapters!.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
+                onPressed: () =>
-                onPressed: () => context.nav.replaceBookChapter(context, bible.name!, bookIndex, index),
+                    context.dispatch(ReplaceBookChapterAction(context.router, bible.name!, bookIndex, index)),
               );
             }),
           ),

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -18,12 +18,6 @@ class ChapterViewScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final bible = context.select((s) => s.bible);
-    if (bible == null) {
-      return ColoredBox(
-        color: Theme.of(context).colorScheme.surface,
-        child: const Center(child: CircularProgressIndicator()),
-      );
-    }
     final book = bible.books![bookIndex];
     final chapter = book.chapters![chapterIndex];
     return Scaffold(

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,6 +1,5 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
-import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
@@ -14,7 +13,7 @@ class ActionsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final darkMode = context.select((s) => s.darkMode);
-    final isPlaying = context.select((s) => s.isPlaying);
+    final isPlaying = context.isWaiting(TogglePlayAction);
     final iconColor = darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
     final audioIcon = isPlaying ? Icons.pause_circle_outline : Icons.play_circle_outline;
@@ -25,7 +24,7 @@ class ActionsSheet extends StatelessWidget {
           index,
         ),
       );
-      context.nav.hideActions();
+      context.dispatch(HideActionsAction());
     }
     return Material(
@@ -46,7 +45,7 @@ class ActionsSheet extends StatelessWidget {
                     List<Verse>.from(context.read().selectedVerses),
                   ),
                 );
-                context.nav.hideActions();
+                context.dispatch(HideActionsAction());
               },
               icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
             ),
@@ -73,13 +72,20 @@ class ActionsSheet extends StatelessWidget {
             IconButton(
               padding: EdgeInsets.zero,
               onPressed: () {
-                context.read().onPlay(context, bible);
+                context.dispatch(TogglePlayAction(context, bible));
               },
               icon: Icon(audioIcon, size: 34, color: iconColor),
             ),
             IconButton(
               padding: EdgeInsets.zero,
+              onPressed: () {
-              onPressed: () => context.nav.shareVerses(context, bible, context.read().selectedVerses),
+                final verses = context.read().selectedVerses;
+                context.dispatch(ShareVersesAction(
+                  verses,
+                  context.bookNames[verses.first.book],
+                  context.read().languageCode,
+                ));
+              },
               icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
             ),
           ],

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
-import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
@@ -36,7 +36,7 @@ class SettingsSheet extends StatelessWidget {
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
               value: Text(bible.name!),
-              onPressed: context.nav.changeBible,
+              onPressed: (_) => context.dispatch(ChangeBibleAction(context.router)),
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.color_lens_outlined, color: Colors.green),
@@ -123,7 +123,7 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.policy_outlined, color: Colors.brown),
               title: Text(context.l.privacyPolicyTitle),
-              onPressed: context.nav.showPrivacyPolicy,
+              onPressed: (_) => context.dispatch(ShowPrivacyPolicyAction(context.router)),
             ),
             SettingsTile.navigation(
               leading: const Icon(
@@ -131,17 +131,17 @@ class SettingsSheet extends StatelessWidget {
                 color: Colors.blueGrey,
               ),
               title: Text(context.l.termsAndConditionsTitle),
-              onPressed: context.nav.showTermsAndConditions,
+              onPressed: (_) => context.dispatch(ShowTermsAndConditionsAction(context.router)),
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.share_outlined, color: Colors.blueAccent),
               title: Text(context.l.shareAppTitle),
-              onPressed: context.nav.shareAppLink,
+              onPressed: (_) => context.dispatch(ShareAppLinkAction()),
             ),
             SettingsTile.navigation(
               leading: Icon(Icons.star, color: Colors.yellowAccent.shade700),
               title: Text(context.l.rateAppTitle),
-              onPressed: context.nav.rateApp,
+              onPressed: (_) => context.dispatch(RateAppAction()),
             ),
             SettingsTile.navigation(
               leading: Icon(
@@ -149,7 +149,7 @@ class SettingsSheet extends StatelessWidget {
                 color: context.theme.colorScheme.onSurface,
               ),
               title: Text(context.l.aboutUsTitle),
-              onPressed: context.nav.showAboutUs,
+              onPressed: (_) => context.dispatch(ShowAboutUsAction(context.router)),
             ),
           ],
         ),

lib/store/actions.dart CHANGED Viewed

@@ -1,18 +1,17 @@
+import "dart:developer";
+import "package:app_review/app_review.dart";
 import "package:async_redux/async_redux.dart";
+import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
+import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/sheets/settings_sheet.dart";
 import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/store/buffer_audio_source.dart";
 import "package:only_bible_app/utils.dart";
-class LoadBibleAction extends ReduxAction<AppState> {
-  @override
-  Future<AppState> reduce() async {
-    if (state.bible != null && state.bible!.name == state.bibleName) {
+import "package:only_bible_app/widgets/verses_view.dart";
-      return state;
-    }
-    final bible = await loadBible(state.bibleName);
+import "package:share_plus/share_plus.dart";
-    return state.copy(bible: bible);
-  }
-}
 class FirstOpenDoneAction extends ReduxAction<AppState> {
   @override
@@ -63,13 +62,45 @@ class UpdateChapterAction extends ReduxAction<AppState> {
   AppState reduce() => state.copy(savedBook: book, savedChapter: chapter);
 }
-class SetPlayingAction extends ReduxAction<AppState> {
+class TogglePlayAction extends ReduxAction<AppState> {
+  final BuildContext buildContext;
-  final bool value;
+  final Bible bible;
-  SetPlayingAction(this.value);
+  TogglePlayAction(this.buildContext, this.bible);
   @override
+  Future<AppState?> reduce() async {
+    if (audioPlayer.playing) {
+      await audioPlayer.pause();
+      return null;
+    }
+    final versesToPlay = List<Verse>.from(state.selectedVerses);
+    final audioVoice = buildContext.currentLang.audioVoice;
+    final audioError = buildContext.l.audioError;
+    for (final v in versesToPlay) {
+      final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
+      try {
+        final data = await convertText(audioVoice, v.text ?? "");
+        await audioPlayer.setAudioSource(BufferAudioSource(data));
+        await audioPlayer.play();
+        await audioPlayer.stop();
+      } catch (err) {
+        log(
+          "Could not play audio",
+          name: "play",
+          error: (err.toString(), pathname),
+        );
-  AppState reduce() => state.copy(isPlaying: value);
+        recordError((err.toString(), pathname).toString(), null);
+        if (buildContext.mounted) {
+          showError(buildContext, audioError);
+        }
+        return null;
+      } finally {
+        await audioPlayer.pause();
+      }
+    }
+    return null;
+  }
 }
 class SelectVerseAction extends ReduxAction<AppState> {
@@ -82,15 +113,12 @@ class SelectVerseAction extends ReduxAction<AppState> {
     final isSelected = state.selectedVerses.any(
       (el) => el.book == verse.book && el.chapter == verse.chapter && el.index == verse.index,
     );
-    if (isSelected) {
+    final newVerses = isSelected
+        ? state.selectedVerses.where((it) => it.index != verse.index).toList()
+        : [...state.selectedVerses, verse];
-      return state.copy(
+    return state.copy(
-        selectedVerses: state.selectedVerses.where((it) => it.index != verse.index).toList(),
+      selectedVerses: newVerses,
-      );
+    );
-    } else {
-      return state.copy(
-        selectedVerses: [...state.selectedVerses, verse],
-      );
-    }
   }
 }
@@ -129,3 +157,302 @@ class RemoveHighlightAction extends ReduxAction<AppState> {
     return state.copy(highlights: updated);
   }
 }
+// ─── Navigation actions ──────────────────────────────────────────────────────
+class HideActionsAction extends ReduxAction<AppState> {
+  @override
+  AppState? reduce() {
+    return state.selectedVerses.isEmpty ? null : state.copy(selectedVerses: []);
+  }
+}
+class ShowSettingsAction extends ReduxAction<AppState> {
+  final BuildContext buildContext;
+  final Bible bible;
+  ShowSettingsAction(this.buildContext, this.bible);
+  @override
+  AppState? reduce() {
+    showModalBottomSheet(
+      context: buildContext,
+      isDismissible: true,
+      enableDrag: true,
+      showDragHandle: true,
+      useSafeArea: true,
+      builder: (context) => SettingsSheet(bible: bible),
+    );
+    return null;
+  }
+}
+class PushBookChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final String bibleName;
+  final int book;
+  final int chapter;
+  final TextDirection? dir;
+  PushBookChapterAction(this.router, this.bibleName, this.book, this.chapter, [this.dir]);
+  @override
+  AppState reduce() {
+    audioPlayer.pause();
+    router.push(
+      "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter",
+      extra: dir,
+    );
+    return state.copy(
+      savedBook: book,
+      savedChapter: chapter,
+      selectedVerses: [],
+    );
+  }
+}
+class ReplaceBookChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final String bibleName;
+  final int book;
+  final int chapter;
+  ReplaceBookChapterAction(this.router, this.bibleName, this.book, this.chapter);
+  @override
+  AppState reduce() {
+    audioPlayer.pause();
+    router.go("/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter");
+    return state.copy(
+      savedBook: book,
+      savedChapter: chapter,
+      selectedVerses: [],
+    );
+  }
+}
+class NextChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final Bible bible;
+  final int book;
+  final int chapter;
+  NextChapterAction(this.router, this.bible, this.book, this.chapter);
+  @override
+  AppState? reduce() {
+    final selectedBook = bible.books![book];
+    int? newBook;
+    int? newChapter;
+    if (selectedBook.chapters!.length > chapter + 1) {
+      newBook = selectedBook.index;
+      newChapter = chapter + 1;
+    } else if (selectedBook.index + 1 < bible.books!.length) {
+      final nextBook = bible.books![selectedBook.index + 1];
+      newBook = nextBook.index;
+      newChapter = 0;
+    }
+    if (newBook == null) return null;
+    audioPlayer.pause();
+    router.push(
+      "/chapter/${Uri.encodeComponent(bible.name!)}/$newBook/$newChapter",
+      extra: TextDirection.ltr,
+    );
+    return state.copy(
+      savedBook: newBook,
+      savedChapter: newChapter,
+      selectedVerses: [],
+    );
+  }
+}
+class PreviousChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final Bible bible;
+  final int book;
+  final int chapter;
+  PreviousChapterAction(this.router, this.bible, this.book, this.chapter);
+  @override
+  AppState? reduce() {
+    final selectedBook = bible.books![book];
+    int? newBook;
+    int? newChapter;
+    if (chapter - 1 >= 0) {
+      newBook = selectedBook.index;
+      newChapter = chapter - 1;
+    } else if (selectedBook.index - 1 >= 0) {
+      final prevBook = bible.books![selectedBook.index - 1];
+      newBook = prevBook.index;
+      newChapter = prevBook.chapters!.length - 1;
+    }
+    if (newBook == null) return null;
+    audioPlayer.pause();
+    router.push(
+      "/chapter/${Uri.encodeComponent(bible.name!)}/$newBook/$newChapter",
+      extra: TextDirection.rtl,
+    );
+    return state.copy(
+      savedBook: newBook,
+      savedChapter: newChapter,
+      selectedVerses: [],
+    );
+  }
+}
+class ChangeBibleAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  ChangeBibleAction(this.router);
+  @override
+  AppState? reduce() {
+    router.go("/bible");
+    return null;
+  }
+}
+class PushChangeBibleAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  PushChangeBibleAction(this.router);
+  @override
+  AppState? reduce() {
+    router.push("/bible");
+    return null;
+  }
+}
+class ChangeBookAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final Bible bible;
+  ChangeBookAction(this.router, this.bible);
+  @override
+  AppState? reduce() {
+    router.push("/books/${Uri.encodeComponent(bible.name!)}");
+    return null;
+  }
+}
+class ChangeChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final Bible bible;
+  final Book book;
+  ChangeChapterAction(this.router, this.bible, this.book);
+  @override
+  AppState? reduce() {
+    router.push("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
+    return null;
+  }
+}
+class UpdateCurrentBibleAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  final String name;
+  final String code;
+  final int book;
+  final int chapter;
+  UpdateCurrentBibleAction(this.router, this.name, this.code, this.book, this.chapter);
+  @override
+  Future<AppState> reduce() async {
+    final bible = await loadBible(name);
+    router.go("/chapter/${Uri.encodeComponent(name)}/$book/$chapter");
+    return state.copy(
+      bibleName: name,
+      languageCode: code,
+      bible: bible,
+      savedBook: book,
+      savedChapter: chapter,
+      selectedVerses: [],
+    );
+  }
+}
+class ShowAboutUsAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  ShowAboutUsAction(this.router);
+  @override
+  AppState? reduce() {
+    router.push("/webview", extra: "https://onlybible.app/about-us");
+    return null;
+  }
+}
+class ShowPrivacyPolicyAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  ShowPrivacyPolicyAction(this.router);
+  @override
+  AppState? reduce() {
+    router.push("/webview", extra: "https://onlybible.app/privacy-policy");
+    return null;
+  }
+}
+class ShowTermsAndConditionsAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  ShowTermsAndConditionsAction(this.router);
+  @override
+  AppState? reduce() {
+    router.push("/webview", extra: "https://onlybible.app/terms-and-conditions");
+    return null;
+  }
+}
+class ShareAppLinkAction extends ReduxAction<AppState> {
+  @override
+  AppState? reduce() {
+    final url = isAndroid()
+        ? "https://play.google.com/store/apps/details?id=sh.pyros.only_bible_app"
+        : "https://apps.apple.com/us/app/only-bible-app/id6467606465";
+    SharePlus.instance.share(ShareParams(subject: "Only Bible App", text: url));
+    return null;
+  }
+}
+class RateAppAction extends ReduxAction<AppState> {
+  @override
+  AppState? reduce() {
+    AppReview.requestReview;
+    return null;
+  }
+}
+class ShareVersesAction extends ReduxAction<AppState> {
+  final List<Verse> verses;
+  final String bookName;
+  final String languageCode;
+  ShareVersesAction(this.verses, this.bookName, this.languageCode);
+  @override
+  Future<AppState?> reduce() async {
+    final chapter = verses.first.chapter + 1;
+    final items = verses.sortedBy((e) => e.index).map((e) => e.index + 1);
+    final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
+    final version = languageCode == "en" ? "KJV" : "";
+    final title = "$bookName $chapter:$versesThrough $version";
+    final text = verses.map((e) => e.text ?? "").join("\n");
+    await SharePlus.instance.share(
+      ShareParams(title: title, subject: title, text: "$title\n$text"),
+    );
+    return state.copy(selectedVerses: []);
+  }
+}

lib/store/app_navigator.dart CHANGED Viewed

@@ -1,260 +1,21 @@
-import "package:async_redux/async_redux.dart" show Store, StoreProvider;
 import "package:flutter/material.dart";
-import "package:app_review/app_review.dart";
 import "package:go_router/go_router.dart";
-import "package:only_bible_app/gen/bible.gen.dart";
-import "package:only_bible_app/sheets/actions_sheet.dart";
-import "package:only_bible_app/sheets/settings_sheet.dart";
-import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/app_state.dart";
-import "package:only_bible_app/utils.dart";
-import "package:share_plus/share_plus.dart";
-class AppNavigatorProvider extends StatelessWidget {
+class AppRouterScope extends InheritedWidget {
-  final Store<AppState> store;
-  final AppNavigator navigator;
-  final Widget child;
+  final GoRouter router;
-  const AppNavigatorProvider({
+  const AppRouterScope({
     super.key,
-    required this.store,
+    required this.router,
-    required this.navigator,
-    required this.child,
-  });
-  static AppNavigator of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<_InheritedAppNavigator>()!.navigator;
-  }
-  @override
-  Widget build(BuildContext context) {
-    return StoreProvider<AppState>(
-      store: store,
-      child: _InheritedAppNavigator(
-        navigator: navigator,
-        child: child,
-      ),
-    );
-  }
-}
-class _InheritedAppNavigator extends InheritedWidget {
-  final AppNavigator navigator;
-  const _InheritedAppNavigator({
-    required this.navigator,
     required super.child,
   });
-  @override
-  bool updateShouldNotify(_InheritedAppNavigator oldWidget) => false;
+  static AppRouterScope of(BuildContext context) => context.dependOnInheritedWidgetOfExactType<AppRouterScope>()!;
-}
-extension AppNavigatorContext on BuildContext {
+  @override
-  AppNavigator get nav => AppNavigatorProvider.of(this);
+  bool updateShouldNotify(AppRouterScope old) => false;
 }
-class AppNavigator {
-  final Store<AppState> store;
-  OverlayEntry? _actionsOverlay;
-  AppNavigator(this.store);
-  String _chapterPath(String bibleName, int book, int chapter) {
-    return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
-  }
-  void pushBookChapter(
-    BuildContext context,
-    String bibleName,
-    int book,
-    int chapter,
-    TextDirection? dir,
-  ) {
-    store.dispatch(UpdateChapterAction(book, chapter));
-    if (store.state.isPlaying) {
-      AppState.player.pause();
-      store.dispatch(SetPlayingAction(false));
-    }
-    hideActions();
-    context.push(_chapterPath(bibleName, book, chapter), extra: dir);
-  }
-  void replaceBookChapter(
-    BuildContext context,
-    String bibleName,
-    int book,
-    int chapter,
-  ) {
-    store.dispatch(UpdateChapterAction(book, chapter));
-    if (store.state.isPlaying) {
-      AppState.player.pause();
-      store.dispatch(SetPlayingAction(false));
-    }
-    hideActions();
-    context.go(_chapterPath(bibleName, book, chapter));
-  }
-  void nextChapter(BuildContext context, Bible bible, int book, int chapter) {
-    final selectedBook = bible.books![book];
-    if (selectedBook.chapters!.length > chapter + 1) {
-      pushBookChapter(
-        context,
-        bible.name!,
-        selectedBook.index,
-        chapter + 1,
-        TextDirection.ltr,
-      );
-    } else {
-      if (selectedBook.index + 1 < bible.books!.length) {
-        final nextBook = bible.books![selectedBook.index + 1];
-        pushBookChapter(
-          context,
-          bible.name!,
-          nextBook.index,
-          0,
-          TextDirection.ltr,
-        );
-      }
-    }
-  }
-  void previousChapter(BuildContext context, Bible bible, int book, int chapter) {
-    final selectedBook = bible.books![book];
-    if (chapter - 1 >= 0) {
-      pushBookChapter(
-        context,
-        bible.name!,
-        selectedBook.index,
-        chapter - 1,
-        TextDirection.rtl,
-      );
-    } else {
-      if (selectedBook.index - 1 >= 0) {
-        final prevBook = bible.books![selectedBook.index - 1];
-        pushBookChapter(
-          context,
-          bible.name!,
-          prevBook.index,
-          prevBook.chapters!.length - 1,
-          TextDirection.rtl,
-        );
-      }
-    }
-  }
-  void showAboutUs(BuildContext context) {
-    context.push("/webview", extra: "https://onlybible.app/about-us");
-  }
-  void showPrivacyPolicy(BuildContext context) {
-    context.push("/webview", extra: "https://onlybible.app/privacy-policy");
-  }
-  void showTermsAndConditions(BuildContext context) {
-    context.push("/webview", extra: "https://onlybible.app/terms-and-conditions");
-  }
-  void changeBible(BuildContext context) {
-    context.go("/bible");
-  }
-  void changeBibleFromHeader(BuildContext context) {
-    context.push("/bible");
-  }
-  void changeBook(BuildContext context, Bible bible) {
-    context.push("/books/${Uri.encodeComponent(bible.name!)}");
-  }
-  void changeChapter(BuildContext context, Bible bible, Book book, int index) {
-    context.push("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
-  }
-  Future<void> updateCurrentBible(
-    BuildContext context,
-    String name,
-    String code,
-    int book,
-    int chapter,
-  ) async {
-    hideActions();
-    await store.dispatchAndWait(UpdateBibleAction(name, code));
-    await store.dispatchAndWait(LoadBibleAction());
-    context.go(_chapterPath(name, book, chapter));
-  }
-  void shareAppLink(BuildContext context) {
+extension AppRouterContext on BuildContext {
-    if (isAndroid()) {
-      Share.share(
-        subject: "Only Bible App",
-        "https://play.google.com/store/apps/details?id=sh.pyros.only_bible_app",
-      );
-    } else {
-      Share.share(
-        subject: "Only Bible App",
-        "https://apps.apple.com/us/app/only-bible-app/id6467606465",
-      );
-    }
-  }
-  Future<void> rateApp(BuildContext context) async {
-    AppReview.requestReview;
-  }
-  Future<void> shareVerses(BuildContext context, Bible bible, List<Verse> verses) async {
-    final name = context.bookNames[verses.first.book];
-    final chapter = verses.first.chapter + 1;
-    final items = verses.sortedBy((e) => e.index).map((e) => e.index + 1);
-    final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
-    final version = context.currentLang.languageCode == "en" ? "KJV" : "";
-    final title = "$name $chapter:$versesThrough $version";
-    final text = verses.map((e) => e.text ?? "").join("\n");
-    await SharePlus.instance.share(
-      ShareParams(
-        title: title,
-        subject: title,
-        text: "$title\n$text",
-      ),
-    );
-    hideActions();
-  }
-  void showSettings(BuildContext context, Bible bible) {
-    showModalBottomSheet(
-      context: context,
-      isDismissible: true,
-      enableDrag: true,
-      showDragHandle: true,
-      useSafeArea: true,
-      builder: (context) => SettingsSheet(bible: bible),
+  GoRouter get router => AppRouterScope.of(this).router;
-    );
-  }
-  void showActions(BuildContext context, Bible bible) {
-    _actionsOverlay?.remove();
-    _actionsOverlay = null;
-    final overlay = Overlay.of(context);
-    _actionsOverlay = OverlayEntry(
-      builder: (context) {
-        final bottomPadding = MediaQuery.of(context).padding.bottom;
-        return Align(
-          alignment: Alignment.bottomCenter,
-          child: Padding(
-            padding: EdgeInsets.only(bottom: bottomPadding + 40, left: 20, right: 20),
-            child: ActionsSheet(bible: bible),
-          ),
-        );
-      },
-    );
-    overlay.insert(_actionsOverlay!);
-  }
-  void hideActions() {
-    if (_actionsOverlay != null) {
-      _actionsOverlay?.remove();
-      _actionsOverlay = null;
-      store.dispatch(ClearSelectedVersesAction());
-    }
-  }
 }

lib/store/app_persistor.dart CHANGED Viewed

@@ -15,12 +15,15 @@ class AppPersistor extends Persistor<AppState> {
   @override
   Future<AppState?> readState() async {
+    return null;
+  }
+  Future<Map<String, dynamic>?> readJson() async {
     try {
       final file = await _file;
       if (await file.exists()) {
         final contents = await file.readAsString();
-        final json = jsonDecode(contents) as Map<String, dynamic>;
+        return jsonDecode(contents) as Map<String, dynamic>;
-        return AppState.fromJson(json);
       }
     } catch (_) {}
     return null;

lib/store/app_state.dart CHANGED Viewed

@@ -1,17 +1,8 @@
-import "dart:developer";
 import "package:flutter/material.dart";
-import "package:just_audio/just_audio.dart";
-import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
-import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/buffer_audio_source.dart";
 import "package:only_bible_app/theme.dart";
-import "package:only_bible_app/utils.dart";
 class AppState {
-  static final player = AudioPlayer();
-  static final noteTextController = TextEditingController();
   final bool firstOpen;
   final String languageCode;
   final String bibleName;
@@ -21,12 +12,11 @@ class AppState {
   final double textScale;
   final int savedBook;
   final int savedChapter;
-  final bool isPlaying;
   final List<Verse> selectedVerses;
   final Map<String, int> highlights;
-  final Bible? bible;
+  final Bible bible;
-  const AppState({
+  AppState({
     this.firstOpen = true,
     this.languageCode = "en",
     this.bibleName = "English",
@@ -36,10 +26,9 @@ class AppState {
     this.textScale = 0.0,
     this.savedBook = 0,
     this.savedChapter = 0,
-    this.isPlaying = false,
     this.selectedVerses = const [],
     this.highlights = const {},
-    this.bible,
+    required this.bible,
   });
   AppState copy({
@@ -52,7 +41,6 @@ class AppState {
     double? textScale,
     int? savedBook,
     int? savedChapter,
-    bool? isPlaying,
     List<Verse>? selectedVerses,
     Map<String, int>? highlights,
     Bible? bible,
@@ -67,7 +55,6 @@ class AppState {
       textScale: textScale ?? this.textScale,
       savedBook: savedBook ?? this.savedBook,
       savedChapter: savedChapter ?? this.savedChapter,
-      isPlaying: isPlaying ?? this.isPlaying,
       selectedVerses: selectedVerses ?? this.selectedVerses,
       highlights: highlights ?? this.highlights,
       bible: bible ?? this.bible,
@@ -87,7 +74,7 @@ class AppState {
         "highlights": highlights,
       };
-  factory AppState.fromJson(Map<String, dynamic> json) => AppState(
+  factory AppState.fromJson(Map<String, dynamic> json, Bible bible) => AppState(
         firstOpen: json["firstOpen"] as bool? ?? true,
         languageCode: json["languageCode"] as String? ?? "en",
         bibleName: json["bibleName"] as String? ?? "English",
@@ -98,6 +85,7 @@ class AppState {
         savedBook: json["savedBook"] as int? ?? 0,
         savedChapter: json["savedChapter"] as int? ?? 0,
         highlights: (json["highlights"] as Map<String, dynamic>?)?.map((k, v) => MapEntry(k, v as int)) ?? const {},
+        bible: bible,
       );
   Color? getHighlight(Verse v) {
@@ -134,37 +122,4 @@ class AppState {
       backgroundColor: highlight ?? Theme.of(context).colorScheme.surface,
     );
   }
-  Future<void> onPlay(BuildContext context, Bible bible) async {
-    final versesToPlay = List<Verse>.from(context.read().selectedVerses);
-    if (context.read().isPlaying) {
-      await player.pause();
-      context.dispatch(SetPlayingAction(false));
-    } else {
-      context.dispatch(SetPlayingAction(true));
-      for (final v in versesToPlay) {
-        final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
-        try {
-          final data = await convertText(context.currentLang.audioVoice, v.text ?? "");
-          await player.setAudioSource(BufferAudioSource(data));
-          await player.play();
-          await player.stop();
-        } catch (err) {
-          log(
-            "Could not play audio",
-            name: "play",
-            error: (err.toString(), pathname),
-          );
-          recordError((err.toString(), pathname).toString(), null);
-          if (context.mounted) {
-            showError(context, context.l.audioError);
-          }
-          return;
-        } finally {
-          await player.pause();
-          context.dispatch(SetPlayingAction(false));
-        }
-      }
-    }
-  }
 }

lib/utils.dart CHANGED Viewed

@@ -1,6 +1,7 @@
 import "dart:convert";
 import "dart:io";
 import "package:async_redux/async_redux.dart";
+export "package:async_redux/async_redux.dart" show BuildContextExtensionForProviderAndConnector;
 import "package:http/http.dart" as http;
 import "package:flutter/services.dart";
 import "package:package_info_plus/package_info_plus.dart";
@@ -45,9 +46,6 @@ extension AppStateExtension on BuildContext {
   AppState get state => getState<AppState>();
   AppState read() => getRead<AppState>();
   R select<R>(R Function(AppState state) selector) => getSelect<AppState, R>(selector);
-  R? event<R>(Evt<R> Function(AppState state) selector) => getEvent<AppState, R>(selector);
-  void dispatch(ReduxAction<AppState> action) => StoreProvider.dispatch<AppState>(this, action);
-  Future<void> dispatchAndWait(ReduxAction<AppState> action) => StoreProvider.dispatchAndWait<AppState>(this, action);
 }
 extension AppContext on BuildContext {

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
@@ -30,7 +31,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => context.nav.changeBook(context, bible),
+              onTap: () => context.dispatch(ChangeBookAction(context.router, bible)),
               child: Text(
                 bookName,
                 style: Theme.of(context).textTheme.headlineMedium,
@@ -39,7 +40,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
             ),
             InkWell(
               enableFeedback: true,
-              onTap: () => context.nav.changeChapter(context, bible, book, book.index),
+              onTap: () => context.dispatch(ChangeChapterAction(context.router, bible, book)),
               child: Padding(
                 padding: const EdgeInsets.only(left: 16),
                 child: Text(
@@ -58,7 +59,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                     child: IconButton(
                       padding: EdgeInsets.zero,
                       icon: const Icon(Icons.more_vert, size: 28),
-                      onPressed: () => context.nav.showSettings(context, bible),
+                      onPressed: () => context.dispatch(ShowSettingsAction(context, bible)),
                     ),
                   ),
                 ],

lib/widgets/verses_view.dart CHANGED Viewed

@@ -1,25 +1,20 @@
 import "package:flutter/material.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
+import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
-import "package:only_bible_app/store/app_navigator.dart";
+import "package:only_bible_app/sheets/actions_sheet.dart";
 import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
+final audioPlayer = AudioPlayer();
 class VersesView extends StatelessWidget {
   final Bible bible;
   final Chapter chapter;
   const VersesView({super.key, required this.bible, required this.chapter});
-  void _onVerseTap(BuildContext context, Verse v) {
-    context.dispatch(SelectVerseAction(v));
-    if (context.read().selectedVerses.isNotEmpty) {
-      context.nav.showActions(context, bible);
-    } else {
-      context.nav.hideActions();
-    }
-  }
   @override
   Widget build(BuildContext context) {
     final (boldFont, textScale, selectedVerses, _, _) =
@@ -28,45 +23,58 @@ class VersesView extends StatelessWidget {
     final textStyle = DefaultTextStyle.of(context).style;
     final theme = Theme.of(context).textTheme;
     final baseStyle = boldFont ? textStyle.copyWith(fontWeight: FontWeight.w500) : textStyle;
+    return Stack(
+      children: [
-    return SwipeDetector(
+        SwipeDetector(
+          onSwipeLeft: (offset) =>
-      onSwipeLeft: (offset) => context.nav.nextChapter(context, bible, chapter.book, chapter.index),
+              context.dispatch(NextChapterAction(context.router, bible, chapter.book, chapter.index)),
+          onSwipeRight: (offset) =>
-      onSwipeRight: (offset) => context.nav.previousChapter(context, bible, chapter.book, chapter.index),
+              context.dispatch(PreviousChapterAction(context.router, bible, chapter.book, chapter.index)),
-      child: SingleChildScrollView(
+          child: SingleChildScrollView(
-        physics: const BouncingScrollPhysics(),
+            physics: const BouncingScrollPhysics(),
-        padding: const EdgeInsets.symmetric(horizontal: 20),
+            padding: const EdgeInsets.symmetric(horizontal: 20),
-        child: Column(
+            child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
+              children: [
-            for (final v in chapter.verses!)
+                for (final v in chapter.verses!)
-              Padding(
+                  Padding(
-                padding: const EdgeInsets.only(bottom: 4),
+                    padding: const EdgeInsets.only(bottom: 4),
-                child: GestureDetector(
+                    child: GestureDetector(
-                  onTap: () => _onVerseTap(context, v),
+                      onTap: () => context.dispatch(SelectVerseAction(v)),
-                  behavior: HitTestBehavior.opaque,
+                      behavior: HitTestBehavior.opaque,
-                  child: Text.rich(
+                      child: Text.rich(
-                    TextSpan(
-                      style: baseStyle,
-                      children: [
-                        if (v.heading != null && v.heading!.isNotEmpty)
-                          TextSpan(
-                            text: "${v.heading!.replaceAll("<br>", "\n")}\n",
-                            style: theme.labelLarge,
-                          ),
-                        TextSpan(text: "${v.index + 1} ", style: theme.labelMedium),
                         TextSpan(
+                          style: baseStyle,
+                          children: [
+                            if (v.heading != null && v.heading!.isNotEmpty)
+                              TextSpan(
+                                text: "${v.heading!.replaceAll("<br>", "\n")}\n",
+                                style: theme.labelLarge,
+                              ),
+                            TextSpan(text: "${v.index + 1} ", style: theme.labelMedium),
+                            TextSpan(
-                          text: v.text ?? "",
+                              text: v.text ?? "",
-                          style: appState.getHighlightStyle(context, v, false),
+                              style: appState.getHighlightStyle(context, v, false),
+                            ),
+                          ],
                         ),
+                        textScaler: TextScaler.linear(1.1 + textScale / 2),
-                      ],
+                      ),
                     ),
-                    textScaler: TextScaler.linear(1.1 + textScale / 2),
                   ),
+                if (selectedVerses.isNotEmpty) const SizedBox(height: 120),
+              ],
-                ),
+            ),
-              ),
+          ),
-            if (selectedVerses.isNotEmpty) const SizedBox(height: 120),
-          ],
         ),
+        if (selectedVerses.isNotEmpty)
+          Positioned(
+            left: 20,
+            right: 20,
+            bottom: MediaQuery.of(context).padding.bottom + 40,
+            child: Center(child: ActionsSheet(bible: bible)),
-      ),
+          ),
+      ],
     );
   }
 }

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git Discussions: https://groups.google.com/g/rust-embed-devs

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

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs