only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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

1d1e1408 — pyrossh

improve providers

Files changed (10) hide show

lib/app.dart +4 -3
lib/main.dart +3 -2
lib/models.dart +3 -2
lib/providers/app_provider.dart +53 -12
lib/providers/chapter_provider.dart +0 -73
lib/screens/bible_select_screen.dart +1 -1
lib/screens/chapter_view_screen.dart +29 -35
lib/utils.dart +0 -5
lib/widgets/chapter_app_bar.dart +13 -16
lib/widgets/verses_view.dart +6 -6

lib/app.dart CHANGED Viewed

@@ -7,11 +7,10 @@ import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_markdown.dart";
 class App extends StatelessWidget {
-  final bool firstOpen;
   final int initialBook;
   final int initialChapter;
-  const App({super.key, required this.firstOpen, required this.initialBook, required this.initialChapter});
+  const App({super.key, required this.initialBook, required this.initialChapter});
   @override
   Widget build(BuildContext context) {
@@ -31,7 +30,9 @@ class App extends StatelessWidget {
         "/privacy-policy": (context) => const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
         "/about-us": (context) => const ScaffoldMarkdown(title: "About Us", file: "about-us.md"),
       },
+      home: context.app.firstOpen
+          ? const BibleSelectScreen()
-      home: firstOpen ? const BibleSelectScreen() : ChapterViewScreen(book: initialBook, chapter: initialChapter),
+          : ChapterViewScreen(bookIndex: initialBook, chapterIndex: initialChapter),
     );
   }
 }

lib/main.dart CHANGED Viewed

@@ -25,11 +25,12 @@ void main() async {
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
   usePathUrlStrategy();
   final model = AppProvider();
+  await model.loadData();
-  final (firstOpen, book, chapter) = await model.loadData();
+  final (book, chapter) = model.loadBookChapter();
   runApp(
     ChangeNotifierProvider.value(
       value: model,
-      child: App(firstOpen: firstOpen, initialBook: book, initialChapter: chapter),
+      child: App(initialBook: book, initialChapter: chapter),
     ),
   );
   FlutterNativeSplash.remove();

lib/models.dart CHANGED Viewed

@@ -54,9 +54,10 @@ class Book {
 }
 class Chapter {
+  final int index;
   final List<Verse> verses;
-  const Chapter({required this.verses});
+  const Chapter({required this.index, required this.verses});
 }
 class Verse {
@@ -90,7 +91,7 @@ List<Book> getBibleFromText(String text) {
     }
     if (books[book - 1].chapters.length < chapter) {
 // ignore: prefer_const_constructors
-      books[book - 1].chapters.add(Chapter(verses: []));
+      books[book - 1].chapters.add(Chapter(index: chapter - 1, verses: []));
     }
     books[book - 1].chapters[chapter - 1].verses.add(
           Verse(

lib/providers/app_provider.dart CHANGED Viewed

@@ -35,7 +35,6 @@ class AppProvider extends ChangeNotifier {
   late PackageInfo packageInfo;
   late Bible bible;
   late Locale locale;
-  bool firstOpen = true;
   bool engTitles = false;
   bool darkMode = false;
   bool fontBold = false;
@@ -49,6 +48,13 @@ class AppProvider extends ChangeNotifier {
   List<HistoryFrame> history = [];
   final box = GetStorage("only-bible-app-backup");
+  get firstOpen => box.read("firstOpen") ?? true;
+  set firstOpen(v) {
+    box.write("firstOpen", v);
+    box.save();
+  }
   static AppProvider of(BuildContext context) {
     return Provider.of(context, listen: true);
   }
@@ -59,7 +65,6 @@ class AppProvider extends ChangeNotifier {
   save() async {
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setBool("firstOpen", firstOpen);
     await prefs.setString("bibleName", bible.name);
     await prefs.setBool("engTitles", engTitles);
     await prefs.setBool("darkMode", darkMode);
@@ -68,21 +73,17 @@ class AppProvider extends ChangeNotifier {
     await prefs.setString("languageCode", locale.languageCode);
   }
-  Future<(bool, int, int)> loadData() async {
+  loadData() async {
     packageInfo = await PackageInfo.fromPlatform();
     final prefs = await SharedPreferences.getInstance();
     engTitles = prefs.getBool("engTitles") ?? false;
-    firstOpen = prefs.getBool("firstOpen") ?? true;
     darkMode = prefs.getBool("darkMode") ?? false;
     fontBold = prefs.getBool("fontBold") ?? false;
     textScaleFactor = prefs.getDouble("textScaleFactor") ?? 1;
     locale = Locale(prefs.getString("languageCode") ?? "en");
     bible = await loadBible(prefs.getString("bibleName") ?? "English");
     // await Future.delayed(Duration(seconds: 3));
-    final book = prefs.getInt("book") ?? 0;
-    final chapter = prefs.getInt("chapter") ?? 0;
     updateStatusBar();
-    return (firstOpen, book, chapter);
   }
   Future<Bible> loadBible(String name) async {
@@ -146,29 +147,69 @@ class AppProvider extends ChangeNotifier {
     hideActions(context);
   }
+  onNext(BuildContext context, int book, int chapter) {
+    final selectedBook = bible.books[book];
+    if (selectedBook.chapters.length > chapter + 1) {
+      pushBookChapter(context, selectedBook.index, chapter + 1, TextDirection.ltr);
+    } else {
+      if (selectedBook.index + 1 < bible.books.length) {
+        final nextBook = bible.books[selectedBook.index + 1];
+        pushBookChapter(context, nextBook.index, 0, TextDirection.ltr);
+      }
+    }
+  }
+  onPrevious(BuildContext context, int book, int chapter) {
+    final selectedBook = bible.books[book];
+    if (chapter - 1 >= 0) {
+      // if (Navigator.of(context).canPop()) {
+      //   Navigator.of(context).pop();
+      // } else {
+      pushBookChapter(context, selectedBook.index, chapter - 1, TextDirection.rtl);
+      // }
+    } else {
+      if (selectedBook.index - 1 >= 0) {
+        final prevBook = bible.books[selectedBook.index - 1];
+        pushBookChapter(context, prevBook.index, prevBook.chapters.length - 1, TextDirection.rtl);
+      }
+    }
+  }
+  (int, int) loadBookChapter() {
+    return (box.read("book") ?? 0, box.read("chapter") ?? 0);
+  }
+  saveBookChapter(int book, int chapter) {
+    box.write("book", book);
+    box.write("chapter", chapter);
+    box.save();
+  }
   pushBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
+    saveBookChapter(book, chapter);
     clearEvents(context);
     Navigator.of(context).push(
       createSlideRoute(
         context: context,
         slideDir: dir,
-        page: ChapterViewScreen(book: book, chapter: chapter),
+        page: ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
       ),
     );
   }
   replaceBookChapter(BuildContext context, int book, int chapter) {
+    saveBookChapter(book, chapter);
     clearEvents(context);
     Navigator.of(context).pushReplacement(
       createNoTransitionPageRoute(
-        ChapterViewScreen(book: book, chapter: chapter),
+        ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
       ),
     );
   }
   updateFirstOpen() {
-    firstOpen = false;
+    box.write("firstOpen", true);
-    save();
+    box.save();
   }
   toggleDarkMode() {
@@ -450,7 +491,7 @@ class AppProvider extends ChangeNotifier {
   }
   void shareVerses(BuildContext context) {
-    final name = bible.books[selectedVerses.first.book].name;
+    final name = bible.books[selectedVerses.first.book].name(context);
     final chapter = selectedVerses.first.chapter + 1;
     final title = "$name $chapter: ${selectedVerses.map((e) => e.index + 1).join(", ")}";
     final text = selectedVerses.map((e) => e.text).join("\n");

lib/providers/chapter_provider.dart DELETED Viewed

@@ -1,73 +0,0 @@
-import "package:flutter/material.dart";
-import "package:only_bible_app/models.dart";
-import "package:provider/provider.dart";
-import "package:shared_preferences/shared_preferences.dart";
-import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/providers/app_provider.dart";
-class ChapterProvider extends ChangeNotifier {
-  final int book;
-  final int chapter;
-  static ChapterProvider of(BuildContext context) {
-    return Provider.of(context, listen: true);
-  }
-  static ChapterProvider ofEvent(BuildContext context) {
-    return Provider.of(context, listen: false);
-  }
-  static Book selectedBook(BuildContext context) {
-    final model = of(context);
-    return AppProvider.of(context).bible.books[model.book];
-  }
-  static Chapter selectedChapter(BuildContext context) {
-    final model = of(context);
-    return AppProvider.of(context).bible.books[model.book].chapters[model.chapter];
-  }
-  ChapterProvider({required this.book, required this.chapter}) {
-    save(book, chapter);
-  }
-  save(int book, int chapter) async {
-    final prefs = await SharedPreferences.getInstance();
-    prefs.setInt("book", book);
-    prefs.setInt("chapter", chapter);
-  }
-  navigateBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
-    context.appEvent.pushBookChapter(context, book, chapter, dir);
-  }
-  onNext(BuildContext context, int book, int chapter) {
-    final selectedBible = AppProvider.ofEvent(context).bible;
-    final selectedBook = selectedBible.books[book];
-    if (selectedBook.chapters.length > chapter + 1) {
-      navigateBookChapter(context, selectedBook.index, chapter + 1, TextDirection.ltr);
-    } else {
-      if (selectedBook.index + 1 < selectedBible.books.length) {
-        final nextBook = selectedBible.books[selectedBook.index + 1];
-        navigateBookChapter(context, nextBook.index, 0, TextDirection.ltr);
-      }
-    }
-  }
-  onPrevious(BuildContext context, int book, int chapter) {
-    final selectedBible = AppProvider.ofEvent(context).bible;
-    final selectedBook = selectedBible.books[book];
-    if (chapter - 1 >= 0) {
-      // if (Navigator.of(context).canPop()) {
-      //   Navigator.of(context).pop();
-      // } else {
-      navigateBookChapter(context, selectedBook.index, chapter - 1, TextDirection.rtl);
-      // }
-    } else {
-      if (selectedBook.index - 1 >= 0) {
-        final prevBook = selectedBible.books[selectedBook.index - 1];
-        navigateBookChapter(context, prevBook.index, prevBook.chapters.length - 1, TextDirection.rtl);
-      }
-    }
-  }
-}

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -30,7 +30,7 @@ class BibleSelectScreen extends StatelessWidget {
                   onPressed: () {
                     AppProvider.ofEvent(context).updateCurrentBible(context, Locale(l.localeName), l.languageTitle);
                     if (context.appEvent.firstOpen) {
-                      context.appEvent.updateFirstOpen();
+                      context.appEvent.firstOpen = false;
                       context.appEvent.pushBookChapter(context, 0, 0, null);
                     } else {
                       Navigator.of(context).pop();

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,16 +1,14 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/chapter_provider.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/chapter_app_bar.dart";
 import "package:only_bible_app/widgets/sidebar.dart";
 import "package:only_bible_app/widgets/verses_view.dart";
-import "package:provider/provider.dart";
 class ChapterViewScreen extends StatelessWidget {
-  final int book;
+  final int bookIndex;
-  final int chapter;
+  final int chapterIndex;
-  const ChapterViewScreen({super.key, required this.book, required this.chapter});
+  const ChapterViewScreen({super.key, required this.bookIndex, required this.chapterIndex});
   @override
   Widget build(BuildContext context) {
@@ -31,37 +29,33 @@ class ChapterViewScreen extends StatelessWidget {
     //     );
     //   },
     // ),
+    final book = context.app.bible.books[bookIndex];
+    final chapter = book.chapters[chapterIndex];
-    return ChangeNotifierProvider(
+    return Scaffold(
-      create: (_) => ChapterProvider(
+      appBar: context.isWide ? null : ChapterAppBar(book: book, chapter: chapter),
+      backgroundColor: Theme.of(context).colorScheme.background,
-        book: book,
+      body: SafeArea(
+        child: context.isWide
+            ? Row(
+                children: [
-        chapter: chapter,
+                  const Sidebar(),
+                  Flexible(
+                    child: Column(
+                      children: [
+                        ChapterAppBar(book: book, chapter: chapter),
+                        const Padding(
+                          padding: EdgeInsets.only(bottom: 10),
+                          child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
-      ),
+                        ),
-      child: Scaffold(
-        appBar: context.isWide ? null : const ChapterAppBar(),
-        backgroundColor: Theme.of(context).colorScheme.background,
-        body: SafeArea(
-          child: context.isWide
-              ? const Row(
-                  children: [
-                    Sidebar(),
-                    Flexible(
+                        Flexible(
-                      child: Column(
-                        children: [
-                          ChapterAppBar(),
-                          Padding(
-                            padding: EdgeInsets.only(bottom: 10),
-                            child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
+                          child: VersesView(book: book, chapter: chapter),
-                          ),
+                        ),
-                          Flexible(
-                            child: VersesView(),
-                          ),
-                        ],
+                      ],
-                      ),
                     ),
+                  ),
-                  ],
+                ],
-                )
+              )
-              : const VersesView(),
+            : VersesView(book: book, chapter: chapter),
-        ),
       ),
     );
   }

lib/utils.dart CHANGED Viewed

@@ -1,7 +1,6 @@
 import "dart:convert";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/providers/app_provider.dart";
-import "package:only_bible_app/providers/chapter_provider.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
 import "package:flutter/material.dart";
@@ -29,10 +28,6 @@ extension AppContext on BuildContext {
   AppProvider get appEvent => Provider.of(this, listen: false);
-  ChapterProvider get chapter => Provider.of(this, listen: true);
-  ChapterProvider get chapterEvent => Provider.of(this, listen: false);
   double get actionsHeight {
     if (isIOS()) {
       return 80.0;

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -1,22 +1,19 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/models.dart";
-import "package:only_bible_app/providers/chapter_provider.dart";
 import "package:only_bible_app/utils.dart";
 class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Book book;
-  const ChapterAppBar({super.key});
+  final Chapter chapter;
+  const ChapterAppBar({super.key, required this.book, required this.chapter});
   @override
   Size get preferredSize => const Size.fromHeight(40);
-  // TODO: add next/prev buttons for desktop mode
   @override
   Widget build(BuildContext context) {
-    final app = AppProvider.of(context);
-    final model = ChapterProvider.of(context);
-    final selectedBook = app.bible.books[model.book];
-    final bookName = selectedBook.name(context);
+    final bookName = book.name(context);
     final isDesktop = context.isWide;
     return SafeArea(
       child: Container(
@@ -27,11 +24,11 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => app.changeBook(context),
+              onTap: () => context.appEvent.changeBook(context),
               child: Row(
                 children: [
                   Text(
-                    "$bookName ${model.chapter + 1}",
+                    "$bookName ${chapter.index + 1}",
                     style: Theme.of(context).textTheme.headlineMedium,
                   ),
                   Icon(
@@ -48,7 +45,6 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                 children: [
                   if (isDesktop)
                     TextButton.icon(
-                      onPressed: () => model.onPrevious(context, model.book, model.chapter),
                       style: TextButton.styleFrom(
                         elevation: 0,
                         padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -58,11 +54,11 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                       ),
                       icon: const Icon(Icons.chevron_left),
                       label: const Text("Prev"),
+                      onPressed: () => context.appEvent.onPrevious(context, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 10),
                   if (isDesktop)
                     TextButton.icon(
-                      onPressed: () => model.onNext(context, model.book, model.chapter),
                       style: TextButton.styleFrom(
                         elevation: 0,
                         padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -72,11 +68,11 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                       ),
                       icon: const Icon(Icons.chevron_right),
                       label: const Text("Next"),
+                      onPressed: () => context.appEvent.onNext(context, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 20),
                   if (isDesktop)
                     TextButton.icon(
-                      onPressed: () => app.changeBibleFromHeader(context),
                       style: TextButton.styleFrom(
                         padding: const EdgeInsets.symmetric(horizontal: 10),
                         shadowColor: Theme.of(context).shadowColor,
@@ -90,14 +86,15 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                         ),
                       ),
                       icon: const Icon(Icons.book_outlined),
-                      label: Text(app.bible.name),
+                      label: Text(context.app.bible.name),
+                      onPressed: () => context.appEvent.changeBibleFromHeader(context),
                     ),
                   Padding(
                     padding: const EdgeInsets.only(left: 10),
                     child: IconButton(
                       padding: EdgeInsets.zero,
-                      onPressed: () => AppProvider.ofEvent(context).showSettings(context),
                       icon: Icon(Icons.more_vert, size: isDesktop ? 28 : 24),
+                      onPressed: () => context.appEvent.showSettings(context),
                     ),
                   ),
                 ],

lib/widgets/verses_view.dart CHANGED Viewed

@@ -1,25 +1,25 @@
 import "package:flutter/gestures.dart";
 import "package:flutter/material.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
+import "package:only_bible_app/models.dart";
 import "package:only_bible_app/providers/app_provider.dart";
-import "package:only_bible_app/providers/chapter_provider.dart";
 import "package:only_bible_app/utils.dart";
 class VersesView extends StatelessWidget {
+  final Book book;
+  final Chapter chapter;
-  const VersesView({super.key});
+  const VersesView({super.key, required this.book, required this.chapter});
   @override
   Widget build(BuildContext context) {
     final app = AppProvider.of(context);
-    final model = ChapterProvider.of(context);
-    final chapter = ChapterProvider.selectedChapter(context);
     final textStyle = DefaultTextStyle.of(context).style;
     return SwipeDetector(
       onSwipeLeft: (offset) {
-        model.onNext(context, model.book, model.chapter);
+        context.appEvent.onNext(context, book.index, chapter.index);
       },
       onSwipeRight: (offset) {
-        model.onPrevious(context, model.book, model.chapter);
+        context.appEvent.onPrevious(context, book.index, chapter.index);
       },
       child: Padding(
         padding: const EdgeInsets.only(left: 20, right: 20),

~repos /only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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