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.

ae3c7ac5 — pyrossh

Update navigation

Files changed (7) hide show

lib/app.dart +93 -9
lib/navigation.dart +72 -123
lib/screens/book_select_screen.dart +55 -42
lib/screens/chapter_select_screen.dart +39 -18
lib/widgets/sliver_heading.dart +4 -2
pubspec.lock +8 -0
pubspec.yaml +1 -0

lib/app.dart CHANGED Viewed

@@ -1,20 +1,111 @@
 import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
 import "package:only_bible_app/l10n/app_localizations.dart";
 import "package:only_bible_app/screens/bible_select_screen.dart";
+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/state.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 final globalNavigatorKey = GlobalKey<NavigatorState>();
+final router = GoRouter(
+  navigatorKey: globalNavigatorKey,
+  initialLocation: firstOpenAtom.value
+      ? "/bible"
+      : "/chapter/${Uri.encodeComponent(bibleNameAtom.value)}/${savedBookAtom.value}/${savedChapterAtom.value}",
+  routes: [
+    GoRoute(
+      path: "/bible",
+      pageBuilder: (context, state) => const NoTransitionPage(
+        child: BibleSelectScreen(),
+      ),
+    ),
+    GoRoute(
+      path: "/chapter/:bibleName/:bookIndex/:chapterIndex",
+      pageBuilder: (context, state) {
+        final bibleName =
+            Uri.decodeComponent(state.pathParameters["bibleName"]!);
+        final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
+        final chapterIndex = int.parse(state.pathParameters["chapterIndex"]!);
+        final slideDir = state.extra as TextDirection?;
+        if (slideDir != null) {
+          return CustomTransitionPage(
+            key: state.pageKey,
+            child: ChapterViewScreen(
+              bibleName: bibleName,
+              bookIndex: bookIndex,
+              chapterIndex: chapterIndex,
+            ),
+            transitionsBuilder:
+                (context, animation, secondaryAnimation, child) {
+              const begin = Offset(1.0, 0.0);
+              const end = Offset.zero;
+              const curve = Curves.ease;
+              final tween =
+                  Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+              return SlideTransition(
+                textDirection: slideDir,
+                position: animation.drive(tween),
+                child: child,
+              );
+            },
+          );
+        }
+        return NoTransitionPage(
+          key: state.pageKey,
+          child: ChapterViewScreen(
+            bibleName: bibleName,
+            bookIndex: bookIndex,
+            chapterIndex: chapterIndex,
+          ),
+        );
+      },
+    ),
+    GoRoute(
+      path: "/books/:bibleName",
+      pageBuilder: (context, state) {
+        final bibleName =
+            Uri.decodeComponent(state.pathParameters["bibleName"]!);
+        return NoTransitionPage(
+          child: BookSelectScreen(bibleName: bibleName),
+        );
+      },
+    ),
+    GoRoute(
+      path: "/chapters/:bibleName/:bookIndex",
+      pageBuilder: (context, state) {
+        final bibleName =
+            Uri.decodeComponent(state.pathParameters["bibleName"]!);
+        final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
+        return NoTransitionPage(
+          child:
+              ChapterSelectScreen(bibleName: bibleName, bookIndex: bookIndex),
+        );
+      },
+    ),
+    GoRoute(
+      path: "/webview",
+      pageBuilder: (context, state) {
+        final url = state.extra as String;
+        return NoTransitionPage(
+          child: WebViewScreen(url: url),
+        );
+      },
+    ),
+  ],
+);
 class App extends StatelessWidget {
   const App({super.key});
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return MaterialApp.router(
-      navigatorKey: globalNavigatorKey,
+      routerConfig: router,
       onGenerateTitle: (context) => context.l.title,
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
@@ -23,13 +114,6 @@ class App extends StatelessWidget {
       theme: lightTheme,
       darkTheme: darkTheme,
       locale: Locale(languageCodeAtom.watch(context)),
-      home: firstOpenAtom.value
-          ? const BibleSelectScreen()
-          : ChapterViewScreen(
-              bibleName: bibleNameAtom.value,
-              bookIndex: savedBookAtom.value,
-              chapterIndex: savedChapterAtom.value,
-            ),
     );
   }
 }

lib/navigation.dart CHANGED Viewed

@@ -2,18 +2,14 @@ import "package:atoms_state/atoms_state.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:app_review/app_review.dart";
+import "package:go_router/go_router.dart";
 import "package:only_bible_app/models.dart";
-import "package:only_bible_app/screens/bible_select_screen.dart";
-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/sheets/actions_sheet.dart";
 import "package:only_bible_app/sheets/highlight_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/state.dart";
 import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/screens/webview_screen.dart";
 import "package:share_plus/share_plus.dart";
 final actionsShownAtom = Atom(
@@ -38,73 +34,42 @@ final highlightsShownAtom = Atom(
   },
 );
-PageRouteBuilder<dynamic> createNoTransitionPageRoute(Widget page) {
-  return PageRouteBuilder(
-    opaque: false,
-    transitionDuration: Duration.zero,
-    reverseTransitionDuration: Duration.zero,
-    pageBuilder: (context, _, __) => page,
-  );
-}
-PageRouteBuilder<dynamic> createSlideRoute({
-  required BuildContext context,
-  TextDirection? slideDir,
-  required Widget page,
-}) {
-  if (slideDir == null) {
-    return PageRouteBuilder(
-      pageBuilder: (context, _, __) {
-        return page;
-      },
-    );
-  }
-  return PageRouteBuilder(
-    pageBuilder: (context, animation, secondaryAnimation) => page,
-    transitionsBuilder: (context, animation, secondaryAnimation, child) {
+String _chapterPath(String bibleName, int book, int chapter) {
-      const begin = Offset(1.0, 0.0);
-      const end = Offset.zero;
-      const curve = Curves.ease;
-      var tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+  return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
-      return SlideTransition(
-        textDirection: slideDir,
-        position: animation.drive(tween),
-        child: child,
-      );
-    },
-  );
 }
 void updateStatusBar(bool v) {
   if (v) {
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(
-      systemNavigationBarColor: Color(0xFF1F1F22),
+        systemNavigationBarColor: Color(0xFF1F1F22),
-      statusBarColor: Color(0xFF1F1F22),
+        statusBarColor: Color(0xFF1F1F22),
-      systemNavigationBarIconBrightness: Brightness.light,
+        systemNavigationBarIconBrightness: Brightness.light,
-      statusBarIconBrightness: Brightness.light,
+        statusBarIconBrightness: Brightness.light,
-    ),);
+      ),
+    );
   } else {
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(
-      systemNavigationBarColor: Colors.white,
+        systemNavigationBarColor: Colors.white,
-      statusBarColor: Colors.white,
+        statusBarColor: Colors.white,
-      systemNavigationBarIconBrightness: Brightness.dark,
+        systemNavigationBarIconBrightness: Brightness.dark,
-      statusBarIconBrightness: Brightness.dark,
+        statusBarIconBrightness: Brightness.dark,
-    ),);
+      ),
+    );
   }
 }
-void pushBookChapter(BuildContext context, String bibleName, int book, int chapter,
+void pushBookChapter(
+  BuildContext context,
+  String bibleName,
+  int book,
+  int chapter,
-    TextDirection? dir,) {
+  TextDirection? dir,
+) {
   dispatch(UpdateChapter(book, chapter));
   clearEvents(context);
-  Navigator.of(context).push(
-    createSlideRoute(
-      context: context,
-      slideDir: dir,
-      page: ChapterViewScreen(
-          bibleName: bibleName, bookIndex: book, chapterIndex: chapter,),
+  context.push(_chapterPath(bibleName, book, chapter), extra: dir);
-    ),
-  );
 }
 void replaceBookChapter(
@@ -115,27 +80,29 @@ void replaceBookChapter(
 ) {
   dispatch(UpdateChapter(book, chapter));
   clearEvents(context);
-  Navigator.of(context).pushReplacement(
-    createNoTransitionPageRoute(
-      ChapterViewScreen(
-        bibleName: bibleName,
-        bookIndex: book,
-        chapterIndex: chapter,
+  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,
-    pushBookChapter(context, bible.name, selectedBook.index, chapter + 1,
+      selectedBook.index,
+      chapter + 1,
-        TextDirection.ltr,);
+      TextDirection.ltr,
+    );
   } else {
     if (selectedBook.index + 1 < bible.books.length) {
       final nextBook = bible.books[selectedBook.index + 1];
       pushBookChapter(
+        context,
+        bible.name,
+        nextBook.index,
+        0,
-          context, bible.name, nextBook.index, 0, TextDirection.ltr,);
+        TextDirection.ltr,
+      );
     }
   }
 }
@@ -146,85 +113,66 @@ void previousChapter(BuildContext context, Bible bible, int book, int chapter) {
     // if (Navigator.of(context).canPop()) {
     //   Navigator.of(context).pop();
     // } else {
+    pushBookChapter(
+      context,
+      bible.name,
-    pushBookChapter(context, bible.name, selectedBook.index, chapter - 1,
+      selectedBook.index,
+      chapter - 1,
-        TextDirection.rtl,);
+      TextDirection.rtl,
+    );
     // }
   } else {
     if (selectedBook.index - 1 >= 0) {
       final prevBook = bible.books[selectedBook.index - 1];
-      pushBookChapter(context, bible.name, prevBook.index,
+      pushBookChapter(
+        context,
+        bible.name,
+        prevBook.index,
-          prevBook.chapters.length - 1, TextDirection.rtl,);
+        prevBook.chapters.length - 1,
+        TextDirection.rtl,
+      );
     }
   }
 }
 void showAboutUs(BuildContext context) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
-      const WebViewScreen(
-        url: "https://onlybible.app/about-us",
+  context.push("/webview", extra: "https://onlybible.app/about-us");
-      ),
-    ),
-  );
 }
 void showPrivacyPolicy(BuildContext context) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
-      const WebViewScreen(
-        url: "https://onlybible.app/privacy-policy",
+  context.push("/webview", extra: "https://onlybible.app/privacy-policy");
-      ),
-    ),
-  );
 }
 void showTermsAndConditions(BuildContext context) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
-      const WebViewScreen(
-        url: "https://onlybible.app/terms-and-conditions",
+  context.push("/webview", extra: "https://onlybible.app/terms-and-conditions");
-      ),
-    ),
-  );
 }
 void changeBible(BuildContext context) {
-  Navigator.of(context).pushReplacement(
-    createNoTransitionPageRoute(
+  context.go("/bible");
-      const BibleSelectScreen(),
-    ),
-  );
 }
 void changeBibleFromHeader(BuildContext context) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
+  context.push("/bible");
-      const BibleSelectScreen(),
-    ),
-  );
 }
 void changeBook(BuildContext context, Bible bible) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
-      BookSelectScreen(bible: bible),
+  context.push("/books/${Uri.encodeComponent(bible.name)}");
-    ),
-  );
 }
 void changeChapter(BuildContext context, Bible bible, Book book, int index) {
-  Navigator.of(context).push(
-    createNoTransitionPageRoute(
-      ChapterSelectScreen(bible: bible, book: book, selectedBookIndex: index),
+  context.push("/chapters/${Uri.encodeComponent(bible.name)}/${book.index}");
-    ),
-  );
 }
-Future<void> updateCurrentBible(BuildContext context, String name, String code, int book,
+Future<void> updateCurrentBible(
+  BuildContext context,
+  String name,
+  String code,
+  int book,
-    int chapter,) async {
+  int chapter,
+) async {
   hideActions(context);
   dispatch(UpdateBible(name, code));
-  pushBookChapter(context, name, book, chapter, null);
+  context.go(_chapterPath(name, book, chapter));
 }
 void shareAppLink(BuildContext context) {
@@ -245,7 +193,8 @@ Future<void> rateApp(BuildContext context) async {
   AppReview.requestReview;
 }
+Future<void> shareVerses(
-Future<void> shareVerses(BuildContext context, Bible bible, List<Verse> verses) async {
+    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);

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -1,66 +1,79 @@
 import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
 import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
-import "package:only_bible_app/screens/chapter_select_screen.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
 import "package:only_bible_app/widgets/sliver_tile_grid.dart";
 import "package:only_bible_app/models.dart";
 class BookSelectScreen extends StatelessWidget {
-  final Bible bible;
+  final String bibleName;
-  const BookSelectScreen({super.key, required this.bible});
+  const BookSelectScreen({super.key, required this.bibleName});
-  dynamic onBookSelected(BuildContext context, int index) {
+  dynamic onBookSelected(BuildContext context, Bible bible, int index) {
     final book = bible.books[index];
     if (book.chapters.length == 1) {
       return replaceBookChapter(context, bible.name, index, 0);
     }
-    Navigator.of(context).pushReplacement(
-      PageRouteBuilder(
-        opaque: false,
-        transitionDuration: Duration.zero,
-        reverseTransitionDuration: Duration.zero,
-        pageBuilder: (context, _, __) => ChapterSelectScreen(
+    context.go("/chapters/${Uri.encodeComponent(bible.name)}/${book.index}");
-          bible: bible,
-          book: book,
-          selectedBookIndex: index,
-        ),
-      ),
-    );
   }
   @override
   Widget build(BuildContext context) {
-    return ScaffoldMenu(
+    return FutureBuilder(
+      future: bibleAtom.getValue(bibleName),
-      child: CustomScrollView(
+      builder: (context, state) {
-        physics: const BouncingScrollPhysics(),
-        slivers: [
-          SliverHeading(title: context.l.oldTestamentTitle, showClose: true),
-          SliverTileGrid(
-            children: List.of(
-              bible.getOldBooks().map((book) {
-                return TextButton(
+        return state.when(
+          loading: () => ColoredBox(
-                  child: Text(book.shortName(context.bookNames[book.index])),
+            color: Theme.of(context).colorScheme.surface,
-                  onPressed: () => onBookSelected(context, book.index),
+            child: const Center(child: CircularProgressIndicator()),
-                );
-              }),
-            ),
           ),
+          success: (Bible? bible) {
+            return ScaffoldMenu(
+              child: CustomScrollView(
+                physics: const BouncingScrollPhysics(),
+                slivers: [
+                  SliverHeading(
-          SliverHeading(title: context.l.newTestamentTitle, top: 30, bottom: 20),
+                      title: context.l.oldTestamentTitle, showClose: true),
-          SliverTileGrid(
+                  SliverTileGrid(
-            children: List.of(
+                    children: List.of(
+                      bible!.getOldBooks().map((book) {
+                        return TextButton(
+                          child: Text(
+                              book.shortName(context.bookNames[book.index])),
+                          onPressed: () =>
+                              onBookSelected(context, bible, book.index),
+                        );
+                      }),
+                    ),
+                  ),
+                  SliverHeading(
+                      title: context.l.newTestamentTitle, top: 30, bottom: 20),
+                  SliverTileGrid(
+                    children: List.of(
-              bible.getNewBooks().map((book) {
+                      bible.getNewBooks().map((book) {
-                return TextButton(
+                        return TextButton(
+                          child: Text(
-                  child: Text(book.shortName(context.bookNames[book.index])),
+                              book.shortName(context.bookNames[book.index])),
+                          onPressed: () =>
-                  onPressed: () => onBookSelected(context, book.index),
+                              onBookSelected(context, bible, book.index),
-                );
+                        );
-              }),
+                      }),
-            ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
+          error: () => ColoredBox(
+            color: Theme.of(context).colorScheme.surface,
+            child: Center(child: Text("Could not load bible ${state.error}")),
           ),
+        );
-        ],
+      },
-      ),
     );
   }
 }

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -1,35 +1,56 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
 import "package:only_bible_app/widgets/sliver_tile_grid.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
 class ChapterSelectScreen extends StatelessWidget {
-  final Bible bible;
+  final String bibleName;
-  final Book book;
-  final int selectedBookIndex;
+  final int bookIndex;
+  const ChapterSelectScreen(
-  const ChapterSelectScreen({super.key, required this.bible, required this.selectedBookIndex, required this.book});
+      {super.key, required this.bibleName, required this.bookIndex});
   @override
   Widget build(BuildContext context) {
-    return ScaffoldMenu(
+    return FutureBuilder(
+      future: bibleAtom.getValue(bibleName),
-      child: CustomScrollView(
+      builder: (context, state) {
-        physics: const BouncingScrollPhysics(),
-        slivers: [
-          SliverHeading(title: context.bookNames[book.index], showClose: true),
-          SliverTileGrid(
-            children: List.generate(book.chapters.length, (index) {
-              return TextButton(
+        return state.when(
+          loading: () => ColoredBox(
-                child: Text("${index + 1}"),
+            color: Theme.of(context).colorScheme.surface,
-                onPressed: () => replaceBookChapter(context, bible.name, selectedBookIndex, index),
+            child: const Center(child: CircularProgressIndicator()),
-              );
-            }),
           ),
+          success: (Bible? bible) {
+            final book = bible!.books[bookIndex];
+            return ScaffoldMenu(
+              child: CustomScrollView(
+                physics: const BouncingScrollPhysics(),
+                slivers: [
+                  SliverHeading(
+                      title: context.bookNames[book.index], showClose: true),
+                  SliverTileGrid(
+                    children: List.generate(book.chapters.length, (index) {
+                      return TextButton(
+                        child: Text("${index + 1}"),
+                        onPressed: () => replaceBookChapter(
+                            context, bible.name, bookIndex, index),
+                      );
+                    }),
+                  ),
-        ],
+                ],
-      ),
+              ),
+            );
+          },
+          error: () => ColoredBox(
+            color: Theme.of(context).colorScheme.surface,
+            child: Center(child: Text("Could not load bible ${state.error}")),
+          ),
+        );
+      },
     );
   }
 }

lib/widgets/sliver_heading.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
 class SliverHeading extends StatelessWidget {
   final String title;
@@ -24,13 +25,14 @@ class SliverHeading extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             Expanded(
+              child: Text(title,
-              child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
+                  style: Theme.of(context).textTheme.headlineMedium),
             ),
             if (showClose)
               IconButton(
                 icon: const Icon(Icons.close, size: 26),
                 onPressed: () {
-                  Navigator.of(context).pop();
+                  context.pop();
                 },
               ),
           ],

pubspec.lock CHANGED Viewed

@@ -423,6 +423,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896"
+      url: "https://pub.dev"
+    source: hosted
+    version: "17.1.0"
   graphs:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -30,6 +30,7 @@ dependencies:
   atoms_state: ^0.0.2
   webview_flutter: ^4.13.1
   app_review: ^3.0.0
+  go_router: ^17.1.0
 dev_dependencies:
   flutter_test:

~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