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.

f5abd3f1 — pyrossh

refactor state management

Files changed (18) hide show

lib/app.dart +9 -8
lib/atom.dart +73 -0
lib/main.dart +6 -11
lib/models.dart +16 -3
lib/navigation.dart +223 -0
lib/providers/app_provider.dart +0 -538
lib/screens/bible_select_screen.dart +7 -6
lib/screens/chapter_select_screen.dart +2 -1
lib/screens/chapter_view_screen.dart +5 -3
lib/sheets/actions_sheet.dart +10 -10
lib/sheets/highlight_sheet.dart +8 -9
lib/sheets/settings_sheet.dart +18 -16
lib/state.dart +300 -0
lib/utils.dart +8 -6
lib/widgets/chapter_app_bar.dart +8 -6
lib/widgets/note_sheet.dart +6 -10
lib/widgets/scaffold_menu.dart +2 -1
lib/widgets/verses_view.dart +13 -20

lib/app.dart CHANGED Viewed

@@ -2,15 +2,13 @@ import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:only_bible_app/screens/bible_select_screen.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_markdown.dart";
 class App extends StatelessWidget {
-  final int initialBook;
+  const App({super.key});
-  final int initialChapter;
-  const App({super.key, required this.initialBook, required this.initialChapter});
   @override
   Widget build(BuildContext context) {
@@ -19,10 +17,10 @@ class App extends StatelessWidget {
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
       debugShowCheckedModeBanner: false,
-      themeMode: context.app.darkMode ? ThemeMode.dark : ThemeMode.light,
+      themeMode: darkMode.watch(context) ? ThemeMode.dark : ThemeMode.light,
       theme: lightTheme,
       darkTheme: darkTheme,
-      locale: context.app.locale,
+      locale: Locale(languageCode.watch(context)),
       // initialRoute: "",
       routes: {
         // TODO: maybe have a landing page
@@ -30,9 +28,12 @@ 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
+      home: firstOpen.value
           ? const BibleSelectScreen()
+          : ChapterViewScreen(
+              bookIndex: savedBook.value,
-          : ChapterViewScreen(bookIndex: initialBook, chapterIndex: initialChapter),
+              chapterIndex: savedChapter.value,
+            ),
     );
   }
 }

lib/atom.dart ADDED Viewed

@@ -0,0 +1,73 @@
+import "package:flutter/material.dart";
+import "package:flutter/scheduler.dart";
+import "package:get_storage/get_storage.dart";
+late GetStorage localBox;
+ensureAtomsInitialized(GetStorage box) async {
+  localBox = box;
+  await localBox.initStorage;
+}
+class Atom<T> extends ValueNotifier<T> {
+  final String key;
+  final bool persist;
+  Function()? set;
+  Function(T)? update;
+  Atom({required this.key, required T initialValue, this.persist = true, this.set, this.update})
+      : super(persist ? localBox.read<T>(key) ?? initialValue : initialValue);
+  @override
+  set value(T newValue) {
+    super.value = newValue;
+    if (persist) {
+      if (newValue == null) {
+        localBox.remove(key);
+      } else {
+        localBox.write(key, newValue);
+      }
+      localBox.save();
+    }
+  }
+  T watch(BuildContext context) {
+    final elementRef = WeakReference(context as Element);
+    final listenerWrapper = _ListenerWrapper();
+    listenerWrapper.listener = () {
+      assert(
+        SchedulerBinding.instance.schedulerPhase != SchedulerPhase.persistentCallbacks,
+        """
+            Do not mutate state (by setting the value of the ValueNotifier
+            that you are subscribed to) during a `build` method. If you need
+            to schedule a value update after `build` has completed, use
+            `SchedulerBinding.instance.scheduleTask(updateTask, Priority.idle)`,
+            `SchedulerBinding.addPostFrameCallback(updateTask)`, '
+          or similar.
+          """,
+      );
+      // If the element has not been garbage collected (causing
+      // `elementRef.target` to be null), or unmounted
+      if (elementRef.target?.mounted ?? false) {
+        // Mark the element as needing to be rebuilt
+        elementRef.target!.markNeedsBuild();
+      }
+      // Remove the listener -- only listen to one change per `build`
+      removeListener(listenerWrapper.listener!);
+    };
+    addListener(listenerWrapper.listener!);
+    return value;
+  }
+  /// Use this method to notify listeners of deeper changes, e.g. when a value
+  /// is added to or removed from a set which is stored in the value of a
+  /// `ValueNotifier<Set<T>>`.
+  void notifyChanged() {
+    // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
+    notifyListeners();
+  }
+}
+class _ListenerWrapper {
+  void Function()? listener;
+}

lib/main.dart CHANGED Viewed

@@ -6,8 +6,8 @@ import "package:firebase_crashlytics/firebase_crashlytics.dart";
 import "package:only_bible_app/firebase_options.dart";
 import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:only_bible_app/app.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/navigation.dart";
-import "package:provider/provider.dart";
+import "package:only_bible_app/state.dart";
 void main() async {
   WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
@@ -24,14 +24,9 @@ void main() async {
   };
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
   usePathUrlStrategy();
+  await initState();
-  final model = AppProvider();
+  updateStatusBar(darkMode.value);
-  await model.loadData();
+  await loadBible();
-  final (book, chapter) = model.loadBookChapter();
-  runApp(
+  runApp(const App());
-    ChangeNotifierProvider.value(
-      value: model,
-      child: App(initialBook: book, initialChapter: chapter),
-    ),
-  );
   FlutterNativeSplash.remove();
 }

lib/models.dart CHANGED Viewed

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

lib/navigation.dart ADDED Viewed

@@ -0,0 +1,223 @@
+import "package:flutter/material.dart";
+import "package:flutter/services.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_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/state.dart";
+import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/widgets/scaffold_markdown.dart";
+import "package:share_plus/share_plus.dart";
+import "package:only_bible_app/atom.dart";
+final Atom<bool> actionsShown = Atom<bool>(
+  key: "actionsShown",
+  initialValue: false,
+  persist: false,
+  update: (bool v) {
+    actionsShown.value = v;
+  },
+);
+final Atom<bool> highlightsShown = Atom<bool>(
+  key: "highlightsShown",
+  initialValue: false,
+  persist: false,
+  update: (bool v) {
+    highlightsShown.value = v;
+  },
+);
+updateStatusBar(bool v) {
+  if (v) {
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Color(0xFF1F1F22),
+      statusBarColor: Color(0xFF1F1F22),
+      systemNavigationBarIconBrightness: Brightness.light,
+      statusBarIconBrightness: Brightness.light,
+    ));
+  } else {
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.white,
+      statusBarColor: Colors.white,
+      systemNavigationBarIconBrightness: Brightness.dark,
+      statusBarIconBrightness: Brightness.dark,
+    ));
+  }
+}
+pushBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
+  savedBook.update!(book);
+  savedChapter.update!(chapter);
+  clearEvents(context);
+  Navigator.of(context).push(
+    createSlideRoute(
+      context: context,
+      slideDir: dir,
+      page: ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
+    ),
+  );
+}
+replaceBookChapter(BuildContext context, int book, int chapter) {
+  savedBook.update!(book);
+  savedChapter.update!(chapter);
+  clearEvents(context);
+  Navigator.of(context).pushReplacement(
+    createNoTransitionPageRoute(
+      ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
+    ),
+  );
+}
+nextChapter(BuildContext context, Bible bible, 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);
+    }
+  }
+}
+previousChapter(BuildContext context, Bible bible, 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);
+    }
+  }
+}
+showAboutUs(BuildContext context) {
+  Navigator.of(context).push(
+    createNoTransitionPageRoute(
+      const ScaffoldMarkdown(title: "About Us", file: "about-us.md"),
+    ),
+  );
+}
+showPrivacyPolicy(BuildContext context) {
+  Navigator.of(context).push(
+    createNoTransitionPageRoute(
+      const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
+    ),
+  );
+}
+changeBible(BuildContext context) {
+  Navigator.of(context).pushReplacement(
+    createNoTransitionPageRoute(
+      const BibleSelectScreen(),
+    ),
+  );
+}
+changeBibleFromHeader(BuildContext context) {
+  Navigator.of(context).push(
+    createNoTransitionPageRoute(
+      const BibleSelectScreen(),
+    ),
+  );
+}
+changeBook(BuildContext context, Bible bible) {
+  Navigator.of(context).push(
+    createNoTransitionPageRoute(
+      BookSelectScreen(bible: bible),
+    ),
+  );
+}
+shareAppLink(BuildContext context) {
+  if (isAndroid()) {
+    Share.share(
+      subject: "Only Bible App",
+      "https://play.google.com/store/apps/details?id=packageName",
+    );
+  } else if (isIOS()) {
+    Share.share(
+      subject: "Only Bible App",
+      "https://apps.apple.com/us/app/hare-pro/id123",
+    );
+  } else {
+    Share.share(
+      subject: "Only Bible App",
+      "https://onlybible.app",
+    );
+  }
+}
+rateApp(BuildContext context) {
+  if (isAndroid()) {
+    openUrl(context, "https://play.google.com/store/apps/details?id=packageName");
+  } else if (isIOS()) {
+    openUrl(context, "https://apps.apple.com/us/app/only-bible-app/packageName");
+  }
+}
+shareVerses(BuildContext context, Bible bible, List<Verse> verses) {
+  final name = bible.books[verses.first.book].name(context);
+  final chapter = verses.first.chapter + 1;
+  final title = "$name $chapter: ${verses.map((e) => e.index + 1).join(", ")}";
+  final text = verses.map((e) => e.text).join("\n");
+  Share.share("$title\n$text", subject: title);
+}
+showSettings(BuildContext context) {
+  showModalBottomSheet(
+    context: context,
+    isDismissible: true,
+    enableDrag: true,
+    showDragHandle: true,
+    useSafeArea: true,
+    builder: (context) => const SettingsSheet(),
+  );
+}
+showActions(BuildContext context) {
+  if (!actionsShown.value) {
+    actionsShown.value = true;
+    Scaffold.of(context).showBottomSheet(
+      enableDrag: false,
+      clipBehavior: Clip.antiAliasWithSaveLayer,
+      (context) => const ActionsSheet(),
+    );
+  }
+}
+hideActions(BuildContext context) {
+  if (actionsShown.value) {
+    actionsShown.value = false;
+    clearSelections();
+    Navigator.of(context).pop();
+  }
+}
+showHighlights(BuildContext context) {
+  highlightsShown.value = true;
+  Scaffold.of(context).showBottomSheet(
+    enableDrag: false,
+    clipBehavior: Clip.antiAliasWithSaveLayer,
+    (context) => const HighlightSheet(),
+  );
+}
+hideHighlights(BuildContext context) {
+  if (highlightsShown.value) {
+    highlightsShown.value = false;
+    Navigator.of(context).pop();
+  }
+}

lib/providers/app_provider.dart DELETED Viewed

@@ -1,538 +0,0 @@
-// import "package:firebase_performance/firebase_performance.dart";
-import "dart:developer";
-import "package:firebase_crashlytics/firebase_crashlytics.dart";
-import "package:firebase_storage/firebase_storage.dart";
-import "package:just_audio/just_audio.dart";
-import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/screens/chapter_view_screen.dart";
-import "package:only_bible_app/theme.dart";
-import "package:share_plus/share_plus.dart";
-import "package:flutter/material.dart";
-import "package:flutter/services.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/models.dart";
-import "package:only_bible_app/sheets/actions_sheet.dart";
-import "package:only_bible_app/sheets/highlight_sheet.dart";
-import "package:only_bible_app/widgets/scaffold_markdown.dart";
-import "package:only_bible_app/widgets/note_sheet.dart";
-import "package:only_bible_app/sheets/settings_sheet.dart";
-import "package:package_info_plus/package_info_plus.dart";
-import "package:provider/provider.dart";
-import "package:shared_preferences/shared_preferences.dart";
-import "package:get_storage/get_storage.dart";
-import "package:only_bible_app/utils.dart";
-class HistoryFrame {
-  final int book;
-  final int chapter;
-  final int? verse;
-  const HistoryFrame({required this.book, required this.chapter, this.verse});
-}
-class AppProvider extends ChangeNotifier {
-  late PackageInfo packageInfo;
-  late Bible bible;
-  late Locale locale;
-  bool engTitles = false;
-  bool darkMode = false;
-  bool fontBold = false;
-  double textScaleFactor = 0;
-  bool actionsShown = false;
-  bool highlightsShown = false;
-  final player = AudioPlayer();
-  bool isPlaying = false;
-  final List<Verse> selectedVerses = [];
-  final TextEditingController noteTextController = TextEditingController();
-  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);
-  }
-  static AppProvider ofEvent(BuildContext context) {
-    return Provider.of(context, listen: false);
-  }
-  save() async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setString("bibleName", bible.name);
-    await prefs.setBool("engTitles", engTitles);
-    await prefs.setBool("darkMode", darkMode);
-    await prefs.setBool("fontBold", fontBold);
-    await prefs.setDouble("textScaleFactor", textScaleFactor);
-    await prefs.setString("languageCode", locale.languageCode);
-  }
-  loadData() async {
-    packageInfo = await PackageInfo.fromPlatform();
-    final prefs = await SharedPreferences.getInstance();
-    engTitles = prefs.getBool("engTitles") ?? false;
-    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));
-    updateStatusBar();
-  }
-  Future<Bible> loadBible(String name) async {
-    // Trace customTrace;
-    // if (!isDesktop()) {
-    //   customTrace = FirebasePerformance.instance.newTrace("loadBible");
-    //   await customTrace.start();
-    // }
-    final books = await getBibleFromAsset(name);
-    // if (!isDesktop()) {
-    //   await customTrace.stop();
-    // }
-    return Bible.withBooks(
-      name: name,
-      books: books,
-    );
-  }
-  hasAudio(BuildContext context) {
-    return context.l.hasAudio == "true";
-  }
-  changeBible(BuildContext context) {
-    Navigator.of(context).pushReplacement(
-      createNoTransitionPageRoute(
-        const BibleSelectScreen(),
-      ),
-    );
-  }
-  changeBibleFromHeader(BuildContext context) {
-    Navigator.of(context).push(
-      createNoTransitionPageRoute(
-        const BibleSelectScreen(),
-      ),
-    );
-  }
-  // TODO: maybe don't pass name here
-  updateCurrentBible(BuildContext context, Locale l, String name) async {
-    // TODO: maybe use a future as the bible needs to load
-    locale = l;
-    bible = await loadBible(name);
-    notifyListeners();
-    save();
-  }
-  changeBook(BuildContext context) {
-    Navigator.of(context).push(
-      createNoTransitionPageRoute(
-        BookSelectScreen(bible: bible),
-      ),
-    );
-  }
-  clearEvents(BuildContext context) {
-    // if (isPlaying) {
-    //   pause();
-    // }
-    clearSelections();
-    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(bookIndex: book, chapterIndex: chapter),
-      ),
-    );
-  }
-  replaceBookChapter(BuildContext context, int book, int chapter) {
-    saveBookChapter(book, chapter);
-    clearEvents(context);
-    Navigator.of(context).pushReplacement(
-      createNoTransitionPageRoute(
-        ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
-      ),
-    );
-  }
-  updateFirstOpen() {
-    box.write("firstOpen", true);
-    box.save();
-  }
-  toggleDarkMode() {
-    darkMode = !darkMode;
-    updateStatusBar();
-    notifyListeners();
-    save();
-  }
-  toggleEngBookNames() {
-    engTitles = !engTitles;
-    notifyListeners();
-    save();
-  }
-  updateStatusBar() {
-    if (darkMode) {
-      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-        systemNavigationBarColor: Color(0xFF1F1F22),
-        statusBarColor: Color(0xFF1F1F22),
-        systemNavigationBarIconBrightness: Brightness.light,
-        statusBarIconBrightness: Brightness.light,
-      ));
-    } else {
-      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-        systemNavigationBarColor: Colors.white,
-        statusBarColor: Colors.white,
-        systemNavigationBarIconBrightness: Brightness.dark,
-        statusBarIconBrightness: Brightness.dark,
-      ));
-    }
-  }
-  toggleBold() async {
-    fontBold = !fontBold;
-    notifyListeners();
-    save();
-  }
-  increaseFont() async {
-    textScaleFactor += 0.1;
-    notifyListeners();
-    save();
-  }
-  decreaseFont() async {
-    textScaleFactor -= 0.1;
-    notifyListeners();
-    save();
-  }
-  showSettings(BuildContext context) {
-    // if (isWide(context)) {
-    //   Navigator.of(context).push(
-    //     createNoTransitionPageRoute(
-    //       const ScaffoldMenu(
-    //         backgroundColor: Color(0xFFF2F2F7),
-    //         child: SettingsSheet(),
-    //       ),
-    //     ),
-    //   );
-    // } else {
-    showModalBottomSheet(
-      context: context,
-      isDismissible: true,
-      enableDrag: true,
-      showDragHandle: true,
-      useSafeArea: true,
-      builder: (context) => const SettingsSheet(),
-    );
-    // }
-  }
-  showActions(BuildContext context) {
-    actionsShown = true;
-    Scaffold.of(context).showBottomSheet(
-      enableDrag: false,
-      clipBehavior: Clip.antiAliasWithSaveLayer,
-      (context) => const ActionsSheet(),
-    );
-    notifyListeners();
-  }
-  hideActions(BuildContext context) {
-    if (actionsShown) {
-      actionsShown = false;
-      Navigator.of(context).pop();
-      notifyListeners();
-    }
-  }
-  showHighlights(BuildContext context) {
-    highlightsShown = true;
-    Scaffold.of(context).showBottomSheet(
-      enableDrag: false,
-      clipBehavior: Clip.antiAliasWithSaveLayer,
-      (context) => const HighlightSheet(),
-    );
-    notifyListeners();
-  }
-  hideHighlights(BuildContext context) {
-    if (highlightsShown) {
-      highlightsShown = false;
-      Navigator.of(context).pop();
-      notifyListeners();
-    }
-  }
-  bool hasNote(Verse v) {
-    return box.hasData("${v.book}:${v.chapter}:${v.index}:note");
-  }
-  showNoteField(BuildContext context, Verse v) {
-    final noteText = box.read("${v.book}:${v.chapter}:${v.index}:note") ?? "";
-    noteTextController.text = noteText;
-    showModalBottomSheet(
-      context: context,
-      isDismissible: true,
-      enableDrag: true,
-      showDragHandle: true,
-      useSafeArea: true,
-      isScrollControlled: true,
-      builder: (context) => NoteSheet(verse: v),
-    );
-  }
-  saveNote(BuildContext context, Verse v) {
-    final note = noteTextController.text;
-    box.write("${v.book}:${v.chapter}:${v.index}:note", note);
-    box.save();
-    hideNoteField(context);
-    clearSelections();
-    hideActions(context);
-    notifyListeners();
-  }
-  deleteNote(BuildContext context, Verse v) {
-    box.remove("${v.book}:${v.chapter}:${v.index}:note");
-    box.save();
-    notifyListeners();
-    hideNoteField(context);
-  }
-  hideNoteField(BuildContext context) {
-    Navigator.of(context).pop();
-  }
-  Color? getHighlight(Verse v) {
-    final key = "${v.book}:${v.chapter}:${v.index}:highlight";
-    if (box.hasData(key)) {
-      // box.remove(key);
-      // print(box.read(key));
-      final index = box.read<int>(key);
-      if (index == null) {
-        return null;
-      }
-      return darkMode ? darkHighlights[index] : lightHighlights[index];
-    }
-    return null;
-  }
-  TextStyle getHighlightStyle(BuildContext context, Verse v) {
-    if (isVerseSelected(v)) {
-      return TextStyle(
-        backgroundColor: darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
-      );
-    }
-    if (darkMode) {
-      // return TextStyle(
-      //   color: getHighlight(v) ?? context.theme.colorScheme.onBackground,
-      // );
-      return TextStyle(
-        backgroundColor: getHighlight(v)?.withOpacity(0.7),
-        color: getHighlight(v) != null ? Colors.white : context.theme.colorScheme.onBackground,
-      );
-    }
-    return TextStyle(
-      backgroundColor: getHighlight(v) ?? context.theme.colorScheme.background,
-    );
-  }
-  void setHighlight(BuildContext context, List<Verse> verses, int index) {
-    for (final v in verses) {
-      box.write("${v.book}:${v.chapter}:${v.index}:highlight", index);
-    }
-    box.save();
-  }
-  void removeHighlight(BuildContext context, List<Verse> verses) {
-    for (final v in verses) {
-      box.remove("${v.book}:${v.chapter}:${v.index}:highlight");
-    }
-    box.save();
-  }
-  void shareAppLink(BuildContext context) {
-    if (isAndroid()) {
-      Share.share(
-        subject: "Only Bible App",
-        "https://play.google.com/store/apps/details?id=${packageInfo.packageName}",
-      );
-    } else if (isIOS()) {
-      Share.share(
-        subject: "Only Bible App",
-        "https://apps.apple.com/us/app/hare-pro/id123",
-      );
-    } else {
-      Share.share(
-        subject: "Only Bible App",
-        "https://onlybible.app",
-      );
-    }
-  }
-  void rateApp(BuildContext context) {
-    if (isAndroid()) {
-      openUrl(context, "https://play.google.com/store/apps/details?id=${packageInfo.packageName}");
-    } else if (isIOS()) {
-      openUrl(context, "https://apps.apple.com/us/app/only-bible-app/${packageInfo.packageName}");
-    }
-  }
-  showPrivacyPolicy(BuildContext context) {
-    Navigator.of(context).push(
-      createNoTransitionPageRoute(
-        const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
-      ),
-    );
-  }
-  showAboutUs(BuildContext context) {
-    Navigator.of(context).push(
-      createNoTransitionPageRoute(
-        const ScaffoldMarkdown(title: "About Us", file: "about-us.md"),
-      ),
-    );
-  }
-  bool hasSelectedVerses() {
-    return selectedVerses.isNotEmpty;
-  }
-  void clearSelections() {
-    selectedVerses.clear();
-    notifyListeners();
-  }
-  void removeSelectedHighlights(BuildContext context) {
-    AppProvider.ofEvent(context).removeHighlight(context, selectedVerses);
-    selectedVerses.clear();
-    AppProvider.ofEvent(context).hideActions(context);
-    notifyListeners();
-  }
-  void closeActions(BuildContext context) {
-    selectedVerses.clear();
-    AppProvider.ofEvent(context).hideActions(context);
-    notifyListeners();
-  }
-  bool isVerseSelected(Verse v) {
-    return selectedVerses.any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
-  }
-  void onVerseSelected(BuildContext context, Verse v) {
-    if (selectedVerses.isEmpty) {
-      AppProvider.ofEvent(context).showActions(context);
-    }
-    if (isVerseSelected(v)) {
-      selectedVerses.removeWhere((it) => it.index == v.index);
-    } else {
-      selectedVerses.add(v);
-    }
-    if (selectedVerses.isEmpty) {
-      AppProvider.ofEvent(context).hideActions(context);
-    }
-    notifyListeners();
-  }
-  void shareVerses(BuildContext context) {
-    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");
-    Share.share("$title\n$text", subject: title);
-  }
-  pause() async {
-    await player.pause();
-    isPlaying = false;
-    notifyListeners();
-  }
-  onPlay(BuildContext context) async {
-    final versesToPlay = List.from(selectedVerses);
-    if (isPlaying) {
-      pause();
-    } else {
-      isPlaying = true;
-      notifyListeners();
-      for (final v in versesToPlay) {
-        final bibleName = bible.name;
-        final book = (v.book + 1).toString().padLeft(2, "0");
-        final chapter = (v.chapter + 1).toString().padLeft(3, "0");
-        final verseNo = (v.index + 1).toString().padLeft(3, "0");
-        final pathname = "$bibleName/$book-$chapter-$verseNo.mp3";
-        try {
-          final url = await FirebaseStorage.instance.ref(pathname).getDownloadURL();
-          await player.setUrl(url);
-          await player.play();
-          await player.stop();
-        } catch (err) {
-          log("Could not play audio", name: "play", error: (err.toString(), pathname));
-          FirebaseCrashlytics.instance.recordFlutterError(FlutterErrorDetails(exception: (err.toString(), pathname)));
-          if (context.mounted) {
-            showError(context, context.lEvent.audioError);
-          }
-          return;
-        } finally {
-          pause();
-        }
-      }
-    }
-  }
-}

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/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_heading.dart";
@@ -14,7 +15,7 @@ class BibleSelectScreen extends StatelessWidget {
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),
         slivers: [
-          SliverHeading(title: context.l.bibleSelectTitle, showClose: !context.app.firstOpen),
+          SliverHeading(title: context.l.bibleSelectTitle, showClose: !firstOpen.value),
           SliverTileGrid(
             listType: ListType.large,
             children: List.of(
@@ -28,10 +29,10 @@ class BibleSelectScreen extends StatelessWidget {
                   //   ],
                   // ),
                   onPressed: () {
-                    AppProvider.ofEvent(context).updateCurrentBible(context, Locale(l.localeName), l.languageTitle);
+                    updateCurrentBible(context, Locale(l.localeName), l.languageTitle);
-                    if (context.appEvent.firstOpen) {
+                    if (firstOpen.value) {
-                      context.appEvent.firstOpen = false;
+                      firstOpen.set!();
-                      context.appEvent.pushBookChapter(context, 0, 0, null);
+                      pushBookChapter(context, 0, 0, null);
                     } else {
                       Navigator.of(context).pop();
                     }

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
+import "package:only_bible_app/navigation.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";
@@ -22,7 +23,7 @@ class ChapterSelectScreen extends StatelessWidget {
             children: List.generate(book.chapters.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
-                onPressed: () => context.appEvent.replaceBookChapter(context, selectedBookIndex, index),
+                onPressed: () => replaceBookChapter(context, selectedBookIndex, index),
               );
             }),
           ),

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,8 +1,10 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/state.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 bookIndex;
@@ -29,7 +31,7 @@ class ChapterViewScreen extends StatelessWidget {
     //     );
     //   },
     // ),
-    final book = context.app.bible.books[bookIndex];
+    final book = bible.watch(context).books[bookIndex];
     final chapter = book.chapters[chapterIndex];
     return Scaffold(
       appBar: context.isWide ? null : ChapterAppBar(book: book, chapter: chapter),
@@ -48,14 +50,14 @@ class ChapterViewScreen extends StatelessWidget {
                           child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
                         ),
                         Flexible(
-                          child: VersesView(book: book, chapter: chapter),
+                          child: VersesView(chapter: chapter),
                         ),
                       ],
                     ),
                   ),
                 ],
               )
-            : VersesView(book: book, chapter: chapter),
+            : VersesView(chapter: chapter),
       ),
     );
   }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,6 +1,7 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 class ActionsSheet extends StatelessWidget {
@@ -8,11 +9,10 @@ class ActionsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final app = AppProvider.of(context);
     final bottom = isIOS() ? 20.0 : 0.0;
-    final iconColor = app.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
+    final iconColor = darkMode.value ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
-    final audioIcon = app.isPlaying ? Icons.pause_circle_outline : Icons.play_circle_outline;
+    final audioIcon = isPlaying.watch(context) ? Icons.pause_circle_outline : Icons.play_circle_outline;
-    final audioEnabled = app.hasAudio(context);
+    final audioEnabled = context.hasAudio;
     return Container(
       height: context.actionsHeight,
       color: Theme.of(context).colorScheme.background,
@@ -22,19 +22,19 @@ class ActionsSheet extends StatelessWidget {
         children: [
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => context.appEvent.removeSelectedHighlights(context),
+            onPressed: () => removeHighlight(context),
             icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => context.appEvent.showHighlights(context),
+            onPressed: () => showHighlights(context),
             icon: Icon(Icons.border_color_outlined, size: 28, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
             onPressed: () {
               if (audioEnabled) {
-                context.appEvent.onPlay(context);
+                onPlay(context);
               } else {
                 showError(context, context.lEvent.audioNotAvailable);
               }
@@ -43,12 +43,12 @@ class ActionsSheet extends StatelessWidget {
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => context.appEvent.showNoteField(context, context.appEvent.selectedVerses.first),
+            onPressed: () => showNoteField(context, selectedVerses.value.first),
             icon: Icon(Icons.post_add_outlined, size: 34, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => context.appEvent.shareVerses(context),
+            onPressed: () => shareVerses(context, bible.value, selectedVerses.value),
             icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
           ),
         ],

lib/sheets/highlight_sheet.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/highlight_button.dart";
@@ -9,11 +10,9 @@ class HighlightSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final bottom = isIOS() ? 20.0 : 0.0;
-    final iconColor = context.app.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
+    final iconColor = darkMode.value ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
     void onHighlight(int index) {
-      final verses = context.appEvent.selectedVerses;
-      context.appEvent.setHighlight(context, verses, index);
+      setHighlight(context, index);
-      context.appEvent.closeActions(context);
     }
     return Container(
@@ -25,27 +24,27 @@ class HighlightSheet extends StatelessWidget {
         children: [
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => context.appEvent.removeSelectedHighlights(context),
+            onPressed: () => removeHighlight(context),
             icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
           ),
           HighlightButton(
             index: 0,
-            color: context.app.darkMode ? darkHighlights[0] : lightHighlights[0],
+            color: darkMode.value ? darkHighlights[0] : lightHighlights[0],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 1,
-            color: context.app.darkMode ? darkHighlights[1] : lightHighlights[1],
+            color: darkMode.value ? darkHighlights[1] : lightHighlights[1],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 2,
-            color: context.app.darkMode ? darkHighlights[2] : lightHighlights[2],
+            color: darkMode.value ? darkHighlights[2] : lightHighlights[2],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 3,
-            color: context.app.darkMode ? darkHighlights[3] : lightHighlights[3],
+            color: darkMode.value ? darkHighlights[3] : lightHighlights[3],
             onHighlightSelected: onHighlight,
           ),
         ],

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,4 +1,6 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
@@ -24,20 +26,20 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
-              value: Text(context.app.bible.name),
+              value: Text(bible.watch(context).name),
-              onPressed: context.app.changeBible,
+              onPressed: changeBible,
             ),
             SettingsTile.navigation(
-              leading: const Icon(Icons.color_lens_outlined, color: Colors.pink),
+              leading: const Icon(Icons.color_lens_outlined, color: Colors.green),
               title: Text(context.l.themeTitle),
               trailing: ToggleButtons(
                 onPressed: (int index) {
-                  context.appEvent.toggleDarkMode();
+                  darkMode.set!();
                 },
                 highlightColor: Colors.transparent,
                 borderColor: Colors.grey,
                 borderRadius: const BorderRadius.all(Radius.circular(25)),
-                selectedColor: context.app.darkMode ? Colors.lightBlue.shade300 : Colors.yellowAccent.shade700,
+                selectedColor: darkMode.value ? Colors.lightBlue.shade300 : Colors.yellowAccent.shade700,
                 selectedBorderColor: Colors.grey,
                 color: Colors.grey,
                 fillColor: Colors.transparent,
@@ -45,7 +47,7 @@ class SettingsSheet extends StatelessWidget {
                   minHeight: 36.0,
                   minWidth: 50.0,
                 ),
-                isSelected: [!context.app.darkMode, context.app.darkMode],
+                isSelected: [!darkMode.value, darkMode.value],
                 children: const [
                   Icon(Icons.light_mode),
                   Icon(Icons.dark_mode),
@@ -56,7 +58,7 @@ class SettingsSheet extends StatelessWidget {
               title: Text(context.l.incrementFontTitle),
               leading: Icon(Icons.font_download, color: context.theme.colorScheme.onBackground),
               trailing: IconButton(
-                onPressed: context.appEvent.increaseFont,
+                onPressed: () => textScale.update!(0.1),
                 icon: const Icon(Icons.add_circle_outline, size: 32, color: Colors.redAccent),
               ),
             ),
@@ -64,21 +66,21 @@ class SettingsSheet extends StatelessWidget {
               title: Text(context.l.decrementFontTitle),
               leading: Icon(Icons.font_download, color: context.theme.colorScheme.onBackground),
               trailing: IconButton(
-                onPressed: context.appEvent.decreaseFont,
+                onPressed: () => textScale.update!(-0.1),
                 icon: const Icon(Icons.remove_circle_outline, size: 32, color: Colors.blueAccent),
               ),
             ),
             SettingsTile.switchTile(
-              initialValue: context.app.fontBold,
+              initialValue: fontBold.watch(context),
               leading: Icon(Icons.format_bold, color: context.theme.colorScheme.onBackground),
               title: Text(context.l.boldFontTitle),
-              onToggle: (value) => context.appEvent.toggleBold(),
+              onToggle: (value) => fontBold.set!(),
             ),
             SettingsTile.switchTile(
-              initialValue: context.app.engTitles,
+              initialValue: engTitles.watch(context),
               leading: Icon(Icons.abc, color: context.theme.colorScheme.onBackground),
               title: Text(context.l.engTitles),
-              onToggle: (value) => context.appEvent.toggleEngBookNames(),
+              onToggle: (value) => engTitles.set!(),
             ),
           ],
         ),
@@ -89,23 +91,23 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.policy_outlined, color: Colors.brown),
               title: Text(context.l.privacyPolicyTitle),
-              onPressed: context.appEvent.showPrivacyPolicy,
+              onPressed: showPrivacyPolicy,
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.share_outlined, color: Colors.blueAccent),
               title: Text(context.l.shareAppTitle),
-              onPressed: context.appEvent.shareAppLink,
+              onPressed: shareAppLink,
             ),
             if (!isDesktop()) // TODO: mabe support OSx if we release in that store
               SettingsTile.navigation(
                 leading: Icon(Icons.star, color: Colors.yellowAccent.shade700),
                 title: Text(context.l.rateAppTitle),
-                onPressed: context.appEvent.rateApp,
+                onPressed: rateApp,
               ),
             SettingsTile.navigation(
               leading: Icon(Icons.info_outline, color: context.theme.colorScheme.onBackground),
               title: Text(context.l.aboutUsTitle),
-              onPressed: context.appEvent.showAboutUs,
+              onPressed: showAboutUs,
             ),
           ],
         ),

lib/state.dart ADDED Viewed

@@ -0,0 +1,300 @@
+import "dart:developer";
+import "package:firebase_crashlytics/firebase_crashlytics.dart";
+import "package:firebase_storage/firebase_storage.dart";
+import "package:flutter/material.dart";
+import "package:get_storage/get_storage.dart";
+import "package:just_audio/just_audio.dart";
+import "package:only_bible_app/atom.dart";
+import "package:only_bible_app/dialog.dart";
+import "package:only_bible_app/models.dart";
+import "package:only_bible_app/theme.dart";
+import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/widgets/note_sheet.dart";
+final box = GetStorage("only-bible-app-prefs");
+final player = AudioPlayer();
+final noteTextController = TextEditingController();
+initState() async {
+  await ensureAtomsInitialized(box);
+}
+final Atom<bool> firstOpen = Atom<bool>(
+  key: "firstOpen",
+  initialValue: true,
+  set: () {
+    firstOpen.value = false;
+  },
+);
+final Atom<String> languageCode = Atom<String>(
+  key: "languageCode",
+  initialValue: "en",
+  update: (String v) {
+    languageCode.value = v;
+  },
+);
+final Atom<String> bibleName = Atom<String>(
+  key: "bibleName",
+  initialValue: "English",
+  update: (String v) {
+    bibleName.value = v;
+  },
+);
+final Atom<Bible> bible = Atom<Bible>(
+  key: "bible",
+  persist: false,
+  initialValue: Bible(name: "English"),
+  update: (Bible v) {
+    bible.value = v;
+  },
+);
+updateCurrentBible(BuildContext context, Locale l, String name) async {
+  languageCode.value = l.languageCode;
+  bibleName.value = name;
+  await loadBible();
+}
+loadBible() async {
+  // Trace customTrace;
+  // if (!isDesktop()) {
+  //   customTrace = FirebasePerformance.instance.newTrace("loadBible");
+  //   await customTrace.start();
+  // }
+  final books = await getBibleFromAsset(bibleName.value);
+  // if (!isDesktop()) {
+  //   await customTrace.stop();
+  // }
+  bible.update!(Bible.withBooks(
+    name: bibleName.value,
+    books: books,
+  ));
+}
+final Atom<bool> engTitles = Atom<bool>(
+  key: "engTitles",
+  initialValue: false,
+  set: () {
+    engTitles.value = !engTitles.value;
+  },
+);
+final Atom<bool> darkMode = Atom<bool>(
+  key: "darkMode",
+  initialValue: false,
+  set: () {
+    darkMode.value = !darkMode.value;
+    updateStatusBar(darkMode.value);
+  },
+);
+final Atom<bool> fontBold = Atom<bool>(
+  key: "fontBold",
+  initialValue: false,
+  set: () {
+    fontBold.value = !fontBold.value;
+  },
+);
+final Atom<double> textScale = Atom<double>(
+  key: "textScale",
+  initialValue: 0,
+  update: (double v) {
+    textScale.value += v;
+  },
+);
+final Atom<int> savedBook = Atom<int>(
+  key: "savedBook",
+  initialValue: 0,
+  update: (int v) {
+    savedBook.value = v;
+  },
+);
+final Atom<int> savedChapter = Atom<int>(
+  key: "savedChapter",
+  initialValue: 0,
+  update: (int v) {
+    savedChapter.value = v;
+  },
+);
+final Atom<bool> isPlaying = Atom<bool>(
+  key: "isPlaying",
+  initialValue: false,
+  persist: false,
+  update: (bool v) {
+    isPlaying.value = v;
+  },
+);
+final Atom<List<Verse>> selectedVerses = Atom<List<Verse>>(
+  key: "selectedVerses",
+  initialValue: [],
+  persist: false,
+  update: (List<Verse> verses) {
+    selectedVerses.value = verses;
+    // selectedVerses.notifyChanged();
+  },
+);
+void clearSelections() {
+  selectedVerses.value.clear();
+}
+Color? getHighlight(Verse v) {
+  final key = "${v.book}:${v.chapter}:${v.index}:highlight";
+  if (box.hasData(key)) {
+    // box.remove(key);
+    // print(box.read(key));
+    final index = box.read<int>(key);
+    if (index == null) {
+      return null;
+    }
+    return darkMode.value ? darkHighlights[index] : lightHighlights[index];
+  }
+  return null;
+}
+void setHighlight(BuildContext context, int index) {
+  for (final v in selectedVerses.value) {
+    box.write("${v.book}:${v.chapter}:${v.index}:highlight", index);
+  }
+  box.save();
+  hideActions(context);
+}
+void removeHighlight(BuildContext context) {
+  for (final v in selectedVerses.value) {
+    box.remove("${v.book}:${v.chapter}:${v.index}:highlight");
+  }
+  box.save();
+  hideActions(context);
+}
+bool isVerseSelected(Verse v) {
+  return selectedVerses.value.any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
+}
+bool watchVerseSelected(BuildContext context, Verse v) {
+  return selectedVerses.watch(context).any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
+}
+void onVerseSelected(BuildContext context, Verse v) {
+  if (isVerseSelected(v)) {
+    selectedVerses.update!(selectedVerses.value.removeBy((it) => it.index == v.index).toList());
+  } else {
+    selectedVerses.update!(selectedVerses.value.addBy(v).toList());
+  }
+  if (selectedVerses.value.isNotEmpty) {
+    showActions(context);
+  }
+  if (selectedVerses.value.isEmpty) {
+    hideActions(context);
+  }
+}
+TextStyle getHighlightStyle(BuildContext context, Verse v) {
+  if (watchVerseSelected(context, v)) {
+    return TextStyle(
+      backgroundColor: darkMode.value ? Colors.grey.shade800 : Colors.grey.shade200,
+    );
+  }
+  if (darkMode.watch(context)) {
+    // return TextStyle(
+    //   color: getHighlight(v) ?? context.theme.colorScheme.onBackground,
+    // );
+    return TextStyle(
+      backgroundColor: getHighlight(v)?.withOpacity(0.7),
+      color: getHighlight(v) != null ? Colors.white : context.theme.colorScheme.onBackground,
+    );
+  }
+  return TextStyle(
+    backgroundColor: getHighlight(v) ?? context.theme.colorScheme.background,
+  );
+}
+clearEvents(BuildContext context) {
+  if (isPlaying.value) {
+    pause();
+  }
+  hideActions(context);
+}
+pause() async {
+  await player.pause();
+  isPlaying.value = false;
+}
+onPlay(BuildContext context) async {
+  final versesToPlay = List.from(selectedVerses.value);
+  if (isPlaying.value) {
+    pause();
+  } else {
+    isPlaying.value = true;
+    for (final v in versesToPlay) {
+      final book = (v.book + 1).toString().padLeft(2, "0");
+      final chapter = (v.chapter + 1).toString().padLeft(3, "0");
+      final verseNo = (v.index + 1).toString().padLeft(3, "0");
+      final pathname = "${bibleName.value}/$book-$chapter-$verseNo.mp3";
+      try {
+        final url = await FirebaseStorage.instance.ref(pathname).getDownloadURL();
+        await player.setUrl(url);
+        await player.play();
+        await player.stop();
+      } catch (err) {
+        log("Could not play audio", name: "play", error: (err.toString(), pathname));
+        FirebaseCrashlytics.instance.recordFlutterError(FlutterErrorDetails(exception: (err.toString(), pathname)));
+        if (context.mounted) {
+          showError(context, context.lEvent.audioError);
+        }
+        return;
+      } finally {
+        pause();
+      }
+    }
+  }
+}
+bool hasNote(Verse v) {
+  return box.hasData("${v.book}:${v.chapter}:${v.index}:note");
+}
+showNoteField(BuildContext context, Verse v) {
+  final noteText = box.read("${v.book}:${v.chapter}:${v.index}:note") ?? "";
+  noteTextController.text = noteText;
+  showModalBottomSheet(
+    context: context,
+    isDismissible: true,
+    enableDrag: true,
+    showDragHandle: true,
+    useSafeArea: true,
+    isScrollControlled: true,
+    builder: (context) => NoteSheet(verse: v),
+  );
+}
+saveNote(BuildContext context, Verse v) {
+  final note = noteTextController.text;
+  box.write("${v.book}:${v.chapter}:${v.index}:note", note);
+  box.save();
+  hideNoteField(context);
+  hideActions(context);
+}
+deleteNote(BuildContext context, Verse v) {
+  box.remove("${v.book}:${v.chapter}:${v.index}:note");
+  box.save();
+  hideNoteField(context);
+  // TODO: hack to re-render this page
+  selectedVerses.notifyChanged();
+}
+hideNoteField(BuildContext context) {
+  Navigator.of(context).pop();
+}

lib/utils.dart CHANGED Viewed

@@ -1,6 +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/state.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
 import "package:flutter/material.dart";
@@ -11,22 +11,24 @@ import "package:provider/provider.dart";
 extension MyIterable<E> on Iterable<E> {
   Iterable<E> sortedBy(Comparable Function(E e) key) => toList()..sort((a, b) => key(a).compareTo(key(b)));
+  Iterable<E> removeBy(bool Function(E e) key) => toList()..removeWhere(key);
+  Iterable<E> addBy(E e) => toList()..add(e);
 }
 extension AppContext on BuildContext {
   ThemeData get theme => Theme.of(this);
-  AppLocalizations get l => app.engTitles && app.locale.languageCode != "en"
+  AppLocalizations get l => engTitles.value && languageCode.value != "en"
       ? lookupAppLocalizations(const Locale("en"))
       : AppLocalizations.of(this)!;
-  AppLocalizations get lEvent => appEvent.engTitles && appEvent.locale.languageCode != "en"
+  AppLocalizations get lEvent => engTitles.value && languageCode.value != "en"
       ? lookupAppLocalizations(const Locale("en"))
       : AppLocalizations.of(this)!;
-  AppProvider get app => Provider.of(this, listen: true);
+  get hasAudio => l.hasAudio == "true";
-  AppProvider get appEvent => Provider.of(this, listen: false);
   double get actionsHeight {
     if (isIOS()) {

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -1,5 +1,7 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -24,7 +26,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => context.appEvent.changeBook(context),
+              onTap: () => changeBook(context, bible.value),
               child: Row(
                 children: [
                   Text(
@@ -54,7 +56,7 @@ 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),
+                      onPressed: () => previousChapter(context, bible.value, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 10),
                   if (isDesktop)
@@ -68,7 +70,7 @@ 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),
+                      onPressed: () => nextChapter(context, bible.value, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 20),
                   if (isDesktop)
@@ -86,15 +88,15 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                         ),
                       ),
                       icon: const Icon(Icons.book_outlined),
-                      label: Text(context.app.bible.name),
+                      label: Text(bible.watch(context).name),
-                      onPressed: () => context.appEvent.changeBibleFromHeader(context),
+                      onPressed: () => changeBibleFromHeader(context),
                     ),
                   Padding(
                     padding: const EdgeInsets.only(left: 10),
                     child: IconButton(
                       padding: EdgeInsets.zero,
                       icon: Icon(Icons.more_vert, size: isDesktop ? 28 : 24),
-                      onPressed: () => context.appEvent.showSettings(context),
+                      onPressed: () => showSettings(context),
                     ),
                   ),
                 ],

lib/widgets/note_sheet.dart CHANGED Viewed

@@ -1,7 +1,6 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
-import "package:only_bible_app/providers/app_provider.dart";
-import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/widgets/modal_button.dart";
 class NoteSheet extends StatelessWidget {
@@ -11,7 +10,6 @@ class NoteSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final app = AppProvider.of(context);
     return Container(
       padding: EdgeInsets.only(
         left: 10,
@@ -25,7 +23,7 @@ class NoteSheet extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.only(bottom: 5, left: 15),
             child: Text(
-              "Note on ${app.bible.books[verse.book].name(context)} ${verse.chapter + 1}:${verse.index + 1}",
+              "Note on ${bible.watch(context).books[verse.book].name(context)} ${verse.chapter + 1}:${verse.index + 1}",
               style: Theme.of(context).textTheme.headlineMedium,
             ),
           ),
@@ -33,7 +31,7 @@ class NoteSheet extends StatelessWidget {
             margin: const EdgeInsets.all(12),
             height: 8 * 24.0,
             child: TextField(
-              controller: app.noteTextController,
+              controller: noteTextController,
               maxLines: 100,
               keyboardType: TextInputType.multiline,
               decoration: const InputDecoration(filled: true, hintText: "Add a note"),
@@ -47,9 +45,9 @@ class NoteSheet extends StatelessWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,
               children: [
-                if (app.noteTextController.value.text != "")
+                if (noteTextController.value.text != "")
                   ModalButton(
-                    onPressed: () => app.deleteNote(context, verse),
+                    onPressed: () => deleteNote(context, verse),
                     icon: Icons.delete_outline,
                     label: "Delete",
                   ),
@@ -59,9 +57,7 @@ class NoteSheet extends StatelessWidget {
                     children: [
                       ModalButton(
                         onPressed: () {
-                          context.appEvent.saveNote(context, verse);
+                          saveNote(context, verse);
-                          // context.chapterEvent.clearSelections();
-                          // context.appEvent.hideActions(context);
                         },
                         icon: Icons.save_outlined,
                         label: "Save",

lib/widgets/scaffold_menu.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 class ScaffoldMenu extends StatelessWidget {
@@ -10,7 +11,7 @@ class ScaffoldMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final pageWidth = MediaQuery.of(context).size.width;
-    final isWide = context.isWide && !context.app.firstOpen;
+    final isWide = context.isWide && !firstOpen.value;
     return Scaffold(
       backgroundColor: isWide ? Colors.transparent : context.theme.colorScheme.background,
       body: SafeArea(

lib/widgets/verses_view.dart CHANGED Viewed

@@ -2,24 +2,23 @@ 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/navigation.dart";
-import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/state.dart";
 class VersesView extends StatelessWidget {
-  final Book book;
   final Chapter chapter;
-  const VersesView({super.key, required this.book, required this.chapter});
+  const VersesView({super.key, required this.chapter});
   @override
   Widget build(BuildContext context) {
-    final app = AppProvider.of(context);
     final textStyle = DefaultTextStyle.of(context).style;
     return SwipeDetector(
       onSwipeLeft: (offset) {
-        context.appEvent.onNext(context, book.index, chapter.index);
+        nextChapter(context, bible.value, chapter.book, chapter.index);
       },
       onSwipeRight: (offset) {
-        context.appEvent.onPrevious(context, book.index, chapter.index);
+        previousChapter(context, bible.value, chapter.book, chapter.index);
       },
       child: Padding(
         padding: const EdgeInsets.only(left: 20, right: 20),
@@ -35,19 +34,14 @@ class VersesView extends StatelessWidget {
               Align(
                 alignment: Alignment.centerLeft,
                 child: Text.rich(
-                  // scrollPhysics: const BouncingScrollPhysics(),
-                  // contextMenuBuilder: null,
-                  textScaleFactor: app.textScaleFactor,
+                  textScaleFactor: 1.1 + textScale.watch(context),
                   textAlign: TextAlign.left,
-                  // onSelectionChanged: (selection, _) {
-                  // },
                   TextSpan(
-                    style: app.fontBold
+                    style: fontBold.watch(context)
                         ? textStyle.copyWith(
                             fontWeight: FontWeight.w500,
                           )
                         : textStyle,
-                    // recognizer: TapAndPanGestureRecognizer()..onDragEnd = (e) => print("Hello"),
                     children: chapter.verses
                         .map(
                           (v) => [
@@ -57,13 +51,13 @@ class VersesView extends StatelessWidget {
                                 child: Text("${v.index + 1} ", style: Theme.of(context).textTheme.labelMedium),
                               ),
                             ),
-                            if (app.hasNote(v))
+                            if (hasNote(v))
                               WidgetSpan(
                                 child: Padding(
                                   padding: const EdgeInsets.only(left: 3, right: 3),
                                   child: GestureDetector(
                                     onTap: () {
-                                      app.showNoteField(context, v);
+                                      showNoteField(context, v);
                                     },
                                     child: const Icon(
                                       Icons.sticky_note_2_outlined,
@@ -75,11 +69,10 @@ class VersesView extends StatelessWidget {
                               ),
                             TextSpan(
                               text: "${v.text}\n",
-                              style: context.app.getHighlightStyle(context, v),
+                              style: getHighlightStyle(context, v),
                               recognizer: TapGestureRecognizer()
                                 ..onTap = () {
-                                  context.appEvent.onVerseSelected(context, v);
+                                  onVerseSelected(context, v);
-                                  // AppModel.ofEvent(context).showHighlightMenu(context, v, details.globalPosition);
                                 },
                             ),
                             const WidgetSpan(
@@ -95,7 +88,7 @@ class VersesView extends StatelessWidget {
                 ),
               ),
               Padding(
-                padding: EdgeInsets.only(bottom: app.actionsShown ? 120 : 0),
+                padding: EdgeInsets.only(bottom: actionsShown.watch(context) ? 120 : 0),
               ),
             ],
           ),

~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.