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.

89a99c6d — pyrossh

Fix various issues

Files changed (15) hide show

lib/l10n/app_en.arb +1 -0
lib/l10n/app_kn.arb +1 -0
lib/models.dart +1 -4
lib/providers/app_model.dart +158 -58
lib/providers/chapter_view_model.dart +2 -122
lib/screens/chapter_select_screen.dart +1 -11
lib/screens/chapter_view_screen.dart +0 -1
lib/theme.dart +2 -2
lib/utils.dart +14 -0
lib/widgets/actions_sheet.dart +28 -57
lib/widgets/highlight_button.dart +1 -1
lib/widgets/highlight_sheet.dart +49 -0
lib/widgets/note_sheet.dart +7 -2
lib/widgets/settings_sheet.dart +32 -40
lib/widgets/verses_view.dart +3 -3

lib/l10n/app_en.arb CHANGED Viewed

@@ -1,4 +1,5 @@
 {
+  "hasAudio": "false",
   "languageTitle": "English",
   "localeLanguageTitle": "English",
   "oldTestamentTitle": "Old Testament",

lib/l10n/app_kn.arb CHANGED Viewed

@@ -1,4 +1,5 @@
 {
+  "hasAudio": "true",
   "languageTitle": "Kannada",
   "localeLanguageTitle": "ಕನ್ನಡ",
   "oldTestamentTitle": "ಹಳೆಯ ಒಡಂಬಡಿಕೆ",

lib/models.dart CHANGED Viewed

@@ -3,17 +3,14 @@ import "package:only_bible_app/providers/app_model.dart";
 class Bible {
   final String name;
-  final bool hasAudio;
   List<Book> books = [];
   Bible({
     required this.name,
-    required this.hasAudio,
   });
   Bible.withBooks({
     required this.name,
-    required this.hasAudio,
     required this.books,
   });
@@ -50,7 +47,7 @@ class Book {
   String shortName(BuildContext context) {
     final name = this.name(context);
     if (name[0] == "1" || name[0] == "2" || name[0] == "3") {
-      return "${name[0]}${name[2].toUpperCase()}${name.substring(3, 5).toLowerCase()}";
+      return "${name[0]}${name[2].toUpperCase()}${name.substring(3, 4).toLowerCase()}";
     }
     return "${name[0].toUpperCase()}${name.substring(1, 3).toLowerCase()}";
   }

lib/providers/app_model.dart CHANGED Viewed

@@ -1,18 +1,24 @@
 // 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:share_plus/share_plus.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
-import "package:flutter/services.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/widgets/actions_sheet.dart";
-import "package:only_bible_app/widgets/highlight_button.dart";
+import "package:only_bible_app/widgets/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/widgets/settings_sheet.dart";
 import "package:package_info_plus/package_info_plus.dart";
 import "package:provider/provider.dart";
-import "package:share_plus/share_plus.dart";
 import "package:shared_preferences/shared_preferences.dart";
 import "package:get_storage/get_storage.dart";
 import "package:only_bible_app/utils.dart";
@@ -34,7 +40,10 @@ class AppModel extends ChangeNotifier {
   bool fontBold = false;
   double textScaleFactor = 0;
   bool actionsShown = false;
-  bool highlightMenuShown = 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");
@@ -87,7 +96,6 @@ class AppModel extends ChangeNotifier {
     // }
     return Bible.withBooks(
       name: name,
-      hasAudio: true,
       books: books,
     );
   }
@@ -164,6 +172,10 @@ class AppModel extends ChangeNotifier {
     ];
   }
+  hasAudio(BuildContext context) {
+    return context.l10n.hasAudio == "true";
+  }
   changeBible(BuildContext context) {
     Navigator.of(context).pushReplacement(
       createNoTransitionPageRoute(
@@ -197,6 +209,36 @@ class AppModel extends ChangeNotifier {
     );
   }
+  clearEvents(
+    BuildContext context,
+  ) {
+    if (isPlaying) {
+      pause();
+    }
+    clearSelections();
+    hideActions(context);
+  }
+  pushBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
+    clearEvents(context);
+    Navigator.of(context).push(
+      createSlideRoute(
+        context: context,
+        slideDir: dir,
+        page: ChapterViewScreen(book: book, chapter: chapter),
+      ),
+    );
+  }
+  replaceBookChapter(BuildContext context, int book, int chapter) {
+    clearEvents(context);
+    Navigator.of(context).pushReplacement(
+      createNoTransitionPageRoute(
+        ChapterViewScreen(book: book, chapter: chapter),
+      ),
+    );
+  }
   toggleDarkMode() {
     darkMode = !darkMode;
     updateStatusBar();
@@ -286,6 +328,24 @@ class AppModel extends ChangeNotifier {
     }
   }
+  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");
   }
@@ -308,11 +368,10 @@ class AppModel extends ChangeNotifier {
     final note = noteTextController.text;
     box.write("${v.book}:${v.chapter}:${v.index}:note", note);
     box.save();
-    // Close the bottom sheet
-    // if (!mounted) return;
-    // Navigator.of(context).pop();
-    notifyListeners();
     hideNoteField(context);
+    clearSelections();
+    hideActions(context);
+    notifyListeners();
   }
   deleteNote(BuildContext context, Verse v) {
@@ -359,55 +418,6 @@ class AppModel extends ChangeNotifier {
     box.save();
   }
-  void showHighlightMenu(BuildContext context, List<Verse> verses, Offset position) {
-    hideHighlightMenu(context);
-    highlightMenuShown = true;
-    final overlay = Overlay.of(context).context.findRenderObject();
-    onTap(c) => setHighlight(context, verses, c);
-    showMenu(
-        context: context,
-        position: RelativeRect.fromRect(
-          Rect.fromLTWH(position.dx, position.dy + 30, 100, 100),
-          Rect.fromLTWH(0, 0, overlay!.paintBounds.size.width, overlay.paintBounds.size.height),
-        ),
-        items: [
-          PopupMenuItem(
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                HighlightButton(
-                  color: const Color(0xFFDAEFFE),
-                  onColorSelected: onTap,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFFFFBB1),
-                  onColorSelected: onTap,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFFFDEF3),
-                  onColorSelected: onTap,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFE6FCC3),
-                  onColorSelected: onTap,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFEADDFF),
-                  onColorSelected: onTap,
-                ),
-              ],
-            ),
-          ),
-        ]);
-  }
-  void hideHighlightMenu(BuildContext context) {
-    if (highlightMenuShown) {
-      Navigator.of(context).pop();
-    }
-  }
   void shareAppLink(BuildContext context) {
     if (isAndroid()) {
       Share.share(
@@ -450,4 +460,94 @@ class AppModel extends ChangeNotifier {
       ),
     );
   }
+  bool hasSelectedVerses() {
+    return selectedVerses.isNotEmpty;
+  }
+  void clearSelections() {
+    selectedVerses.clear();
+    notifyListeners();
+  }
+  void removeSelectedHighlights(BuildContext context) {
+    AppModel.ofEvent(context).removeHighlight(context, selectedVerses);
+    selectedVerses.clear();
+    AppModel.ofEvent(context).hideActions(context);
+    notifyListeners();
+  }
+  void closeActions(BuildContext context) {
+    selectedVerses.clear();
+    AppModel.ofEvent(context).hideActions(context);
+    notifyListeners();
+  }
+  bool isVerseSelected(Verse v) {
+    return selectedVerses.any((el) => el.index == v.index);
+  }
+  bool isVerseHighlighted(BuildContext context) {
+    // box.read("${book}:${chapter}:${verse}", "color");
+    return false;
+  }
+  void onVerseSelected(BuildContext context, Verse v) {
+    if (selectedVerses.isEmpty) {
+      AppModel.ofEvent(context).showActions(context);
+    }
+    if (isVerseSelected(v)) {
+      selectedVerses.removeWhere((it) => it.index == v.index);
+    } else {
+      selectedVerses.add(v);
+    }
+    if (selectedVerses.isEmpty) {
+      AppModel.ofEvent(context).hideActions(context);
+    }
+    notifyListeners();
+  }
+  void shareVerses(BuildContext context) {
+    final name = bible.books[selectedVerses.first.book].name;
+    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 {
+    if (isPlaying) {
+      pause();
+    } else {
+      isPlaying = true;
+      notifyListeners();
+      // add locks todo
+      for (final v in selectedVerses) {
+        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)));
+          showError(context, "Could not play audio");
+          return;
+        } finally {
+          pause();
+        }
+      }
+    }
+  }
 }

lib/providers/chapter_view_model.dart CHANGED Viewed

@@ -1,14 +1,7 @@
-import "dart:developer";
-import "package:firebase_crashlytics/firebase_crashlytics.dart";
-import "package:firebase_storage/firebase_storage.dart";
-import "package:flutter/services.dart";
 import "package:flutter/material.dart";
-import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
-import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/models.dart";
 import "package:provider/provider.dart";
-import "package:share_plus/share_plus.dart";
 import "package:shared_preferences/shared_preferences.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/providers/app_model.dart";
@@ -16,9 +9,6 @@ import "package:only_bible_app/providers/app_model.dart";
 class ChapterViewModel extends ChangeNotifier {
   final int book;
   final int chapter;
-  final List<Verse> selectedVerses;
-  final player = AudioPlayer();
-  bool isPlaying = false;
   static ChapterViewModel of(BuildContext context) {
     return Provider.of(context, listen: true);
@@ -38,7 +28,7 @@ class ChapterViewModel extends ChangeNotifier {
     return AppModel.of(context).bible.books[model.book].chapters[model.chapter];
   }
-  ChapterViewModel({required this.book, required this.chapter, required this.selectedVerses}) {
+  ChapterViewModel({required this.book, required this.chapter}) {
     save(book, chapter);
   }
@@ -49,17 +39,7 @@ class ChapterViewModel extends ChangeNotifier {
   }
   navigateBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
-    if (isPlaying) {
-      pause();
-    }
-    AppModel.ofEvent(context).hideActions(context);
-    Navigator.of(context).push(
-      createSlideRoute(
-        context: context,
-        slideDir: dir,
-        page: ChapterViewScreen(book: book, chapter: chapter),
+    context.appEvent.pushBookChapter(context, book, chapter, dir);
-      ),
-    );
   }
   onNext(BuildContext context, int book, int chapter) {
@@ -91,104 +71,4 @@ class ChapterViewModel extends ChangeNotifier {
       }
     }
   }
-  bool hasSelectedVerses() {
-    return selectedVerses.isNotEmpty;
-  }
-  void clearSelections(BuildContext context) {
-    AppModel.ofEvent(context).removeHighlight(context, selectedVerses);
-    selectedVerses.clear();
-    AppModel.ofEvent(context).hideActions(context);
-    notifyListeners();
-  }
-  void closeActions(BuildContext context) {
-    selectedVerses.clear();
-    AppModel.ofEvent(context).hideActions(context);
-    notifyListeners();
-  }
-  bool isVerseSelected(Verse v) {
-    return selectedVerses.any((el) => el.index == v.index);
-  }
-  bool isVerseHighlighted(BuildContext context) {
-    // box.read("${book}:${chapter}:${verse}", "color");
-    return false;
-  }
-  void onVerseSelected(BuildContext context, Verse v) {
-    if (selectedVerses.isEmpty) {
-      AppModel.ofEvent(context).showActions(context);
-    }
-    if (isVerseSelected(v)) {
-      selectedVerses.removeWhere((it) => it.index == v.index);
-    } else {
-      selectedVerses.add(v);
-    }
-    if (selectedVerses.isEmpty) {
-      AppModel.ofEvent(context).hideActions(context);
-    }
-    notifyListeners();
-  }
-  void copyVerses() {
-    final text = selectedVerses.map((e) => e.text).join("\n");
-    Clipboard.setData(ClipboardData(text: text));
-    // maybe close the action menu or show a snackbar on iOS (android already does this)
-    // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Copied to clipboard")));
-  }
-  void shareVerses(BuildContext context) {
-    final bible = AppModel.ofEvent(context).bible;
-    final name = bible.books[selectedVerses.first.book].name;
-    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 bible = AppModel.ofEvent(context).bible;
-    if (!bible.hasAudio) {
-      showError(
-        context,
-        "This Bible doesn't support audio. Currently audio is only available for the Kannada Bible.",
-      );
-      return;
-    }
-    if (isPlaying) {
-      pause();
-    } else {
-      isPlaying = true;
-      notifyListeners();
-      for (final v in selectedVerses) {
-        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)));
-          showError(context, "Could not play audio");
-          return;
-        } finally {
-          pause();
-        }
-      }
-    }
-  }
 }

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -4,7 +4,6 @@ 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";
-import "package:only_bible_app/screens/chapter_view_screen.dart";
 class ChapterSelectScreen extends StatelessWidget {
   final Book book;
@@ -12,15 +11,6 @@ class ChapterSelectScreen extends StatelessWidget {
   const ChapterSelectScreen({super.key, required this.selectedBookIndex, required this.book});
-  // TODO: move this to app and allow to pause
-  onChapterSelected(BuildContext context, int index) {
-    Navigator.of(context).pushReplacement(
-      createNoTransitionPageRoute(
-        ChapterViewScreen(book: selectedBookIndex, chapter: index),
-      ),
-    );
-  }
   @override
   Widget build(BuildContext context) {
     return ScaffoldMenu(
@@ -32,7 +22,7 @@ class ChapterSelectScreen extends StatelessWidget {
             children: List.generate(book.chapters.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
-                onPressed: () => onChapterSelected(context, index),
+                onPressed: () => context.appEvent.replaceBookChapter(context, selectedBookIndex, index),
               );
             }),
           ),

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -36,7 +36,6 @@ class ChapterViewScreen extends StatelessWidget {
       create: (_) => ChapterViewModel(
         book: book,
         chapter: chapter,
-        selectedVerses: [],
       ),
       child: Scaffold(
         appBar: isDesktop ? null : const ChapterAppBar(),

lib/theme.dart CHANGED Viewed

@@ -42,8 +42,8 @@ final lightTheme = ThemeData(
   //   selectionColor: const Color(0xAAF8D0DC),
   // ),
   inputDecorationTheme: const InputDecorationTheme(
-    focusColor: Colors.black,
+    focusColor: Colors.transparent,
-    hoverColor: Colors.black,
+    hoverColor: Colors.transparent,
     activeIndicatorBorder: BorderSide(
       color: Colors.black,
     ),

lib/utils.dart CHANGED Viewed

@@ -1,16 +1,30 @@
 import "dart:convert";
 import "package:only_bible_app/dialog.dart";
+import "package:only_bible_app/providers/app_model.dart";
+import "package:only_bible_app/providers/chapter_view_model.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:only_bible_app/models.dart";
+import "package:flutter_gen/gen_l10n/app_localizations.dart";
+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)));
 }
+extension AppContext on BuildContext {
+  ThemeData get theme => Theme.of(this);
+  AppLocalizations get l10n => app.engTitles ? lookupAppLocalizations(const Locale("en")) : AppLocalizations.of(this)!;
+  AppModel get app => Provider.of(this, listen: true);
+  AppModel get appEvent => Provider.of(this, listen: false);
+  ChapterViewModel get chapter => Provider.of(this, listen: true);
+  ChapterViewModel get chapterEvent => Provider.of(this, listen: false);
+}
 bool isDesktop() {
   return defaultTargetPlatform == TargetPlatform.macOS ||
       defaultTargetPlatform == TargetPlatform.windows ||

lib/widgets/actions_sheet.dart CHANGED Viewed

@@ -1,8 +1,7 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/providers/app_model.dart";
-import "package:only_bible_app/providers/chapter_view_model.dart";
 import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/widgets/highlight_button.dart";
 import "package:only_bible_app/widgets/icon_button_text.dart";
 class ActionsSheet extends StatelessWidget {
@@ -12,101 +11,73 @@ class ActionsSheet extends StatelessWidget {
   Widget build(BuildContext context) {
     final app = AppModel.of(context);
     final isDesktop = isWide(context);
-    final iconSize = isDesktop ? 10.0 : 0.0;
+    final height = isDesktop || isIOS() ? 92.0 : 70.0;
     final iconColor = app.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
     final bodySmall = Theme.of(context).textTheme.bodySmall;
-    final model = ChapterViewModel.of(context);
-    final audioIcon = model.isPlaying ? Icons.pause_circle_outline : Icons.play_circle_outline;
+    final audioIcon = app.isPlaying ? Icons.pause_circle_outline : Icons.play_circle_outline;
-    final audioText = model.isPlaying ? "Pause" : "Play";
+    final audioText = app.isPlaying ? "Pause" : "Play";
-    final highlightRowEnabled = !isDesktop;
+    final audioEnabled = app.hasAudio(context);
-    onHighlight(Color c) {
-      final verses = ChapterViewModel.ofEvent(context).selectedVerses;
-      app.setHighlight(context, verses, c);
-      model.closeActions(context);
-    }
-    ;
     return Container(
-      height: highlightRowEnabled
+      height: height,
-          ? 150
-          : isDesktop
-              ? 95
-              : isIOS()
-                  ? 100
-                  : 70,
       color: Theme.of(context).colorScheme.background,
       padding: EdgeInsets.only(left: 20, right: 20, top: isDesktop ? 10 : 10, bottom: 20),
       child: Column(
-        mainAxisAlignment: highlightRowEnabled ? MainAxisAlignment.spaceAround : MainAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.start,
         children: [
-          if (highlightRowEnabled)
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                HighlightButton(
-                  color: const Color(0xFFDAEFFE),
-                  onColorSelected: onHighlight,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFFFFBB1),
-                  onColorSelected: onHighlight,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFFFDEF3),
-                  onColorSelected: onHighlight,
-                ),
-                HighlightButton(
-                  color: const Color(0xFFE6FCC3),
-                  onColorSelected: onHighlight,
-                ),
-              ],
-            ),
-          // const Padding(padding: EdgeInsets.only(top: 10)),
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               IconButtonText(
                 leading: IconButton(
                   padding: EdgeInsets.zero,
-                  onPressed: () => model.clearSelections(context),
+                  onPressed: () => context.appEvent.removeSelectedHighlights(context),
-                  icon: Icon(Icons.cancel_outlined, size: 24 + iconSize, color: iconColor),
+                  icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
                 ),
                 trailing: Text("Clear", style: bodySmall),
               ),
               IconButtonText(
                 leading: IconButton(
                   padding: EdgeInsets.zero,
-                  onPressed: model.copyVerses,
+                  onPressed: () => context.appEvent.showHighlights(context),
-                  icon: Icon(Icons.copy, size: 24 + iconSize, color: iconColor),
+                  icon: Icon(Icons.border_color_outlined, size: 28, color: iconColor),
                 ),
-                trailing: Text("Copy", style: bodySmall),
+                trailing: Text("Highlight", style: bodySmall),
               ),
               IconButtonText(
                 leading: IconButton(
                   padding: EdgeInsets.zero,
+                  onPressed: () {
+                    if (audioEnabled) {
-                  onPressed: () => model.onPlay(context),
+                      context.appEvent.onPlay(context);
+                    } else {
+                      showError(
+                        context,
+                        "This Bible doesn't support audio. Currently audio is only available for the Kannada Bible.",
+                      );
+                    }
+                  },
-                  icon: Icon(audioIcon, size: 34 + iconSize, color: app.bible.hasAudio ? iconColor : Colors.grey),
+                  icon: Icon(audioIcon, size: 34, color: audioEnabled ? iconColor : Colors.grey),
                 ),
                 trailing: Text(
                   audioText,
                   style: bodySmall!.copyWith(
-                    color: app.bible.hasAudio ? bodySmall!.color : Colors.grey,
+                    color: audioEnabled ? bodySmall.color : Colors.grey,
                   ),
                 ),
               ),
               IconButtonText(
                 leading: IconButton(
                   padding: EdgeInsets.zero,
-                  onPressed: () => app.showNoteField(context, model.selectedVerses.first),
+                  onPressed: () => context.appEvent.showNoteField(context, context.appEvent.selectedVerses.first),
-                  icon: Icon(Icons.post_add_outlined, size: 32 + iconSize, color: iconColor),
+                  icon: Icon(Icons.post_add_outlined, size: 34, color: iconColor),
                 ),
                 trailing: Text("Note", style: bodySmall),
               ),
               IconButtonText(
                 leading: IconButton(
                   padding: EdgeInsets.zero,
-                  onPressed: () => model.shareVerses(context),
+                  onPressed: () => context.appEvent.shareVerses(context),
-                  icon: Icon(Icons.share_outlined, size: 28 + iconSize, color: iconColor),
+                  icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
                 ),
                 trailing: Text("Share", style: bodySmall),
               ),

lib/widgets/highlight_button.dart CHANGED Viewed

@@ -16,7 +16,7 @@ class HighlightButton extends StatelessWidget {
           color: color.withOpacity(1),
           shape: BoxShape.circle,
         ),
-        child: const SizedBox(width: 30, height: 30),
+        child: const SizedBox(width: 45, height: 45),
       ),
     );
   }

lib/widgets/highlight_sheet.dart ADDED Viewed

@@ -0,0 +1,49 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/widgets/highlight_button.dart";
+class HighlightSheet extends StatelessWidget {
+  const HighlightSheet({super.key});
+  @override
+  Widget build(BuildContext context) {
+    final isDesktop = isWide(context);
+    final height = isDesktop || isIOS() ? 100.0 : 70.0;
+    onHighlight(Color c) {
+      final verses = context.appEvent.selectedVerses;
+      context.appEvent.setHighlight(context, verses, c);
+      context.appEvent.closeActions(context);
+    }
+    return Container(
+      height: height,
+      color: Theme.of(context).colorScheme.background,
+      padding: EdgeInsets.only(left: 20, right: 20, top: isDesktop ? 10 : 10, bottom: 30),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          HighlightButton(
+            color: const Color(0xFFDAEFFE),
+            onColorSelected: onHighlight,
+          ),
+          HighlightButton(
+            color: const Color(0xFFFFFBB1),
+            onColorSelected: onHighlight,
+          ),
+          HighlightButton(
+            color: const Color(0xFFFFDEF3),
+            onColorSelected: onHighlight,
+          ),
+          HighlightButton(
+            color: const Color(0xFFE6FCC3),
+            onColorSelected: onHighlight,
+          ),
+          HighlightButton(
+            color: const Color(0xFFAACCAA),
+            onColorSelected: onHighlight,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/note_sheet.dart CHANGED Viewed

@@ -1,6 +1,7 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/providers/app_model.dart";
+import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/modal_button.dart";
 class NoteSheet extends StatelessWidget {
@@ -24,7 +25,7 @@ class NoteSheet extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.only(bottom: 5, left: 15),
             child: Text(
-              "Note on ${app.bible.books[verse.book].name} ${verse.chapter + 1}:${verse.index + 1}",
+              "Note on ${app.bible.books[verse.book].name(context)} ${verse.chapter + 1}:${verse.index + 1}",
               style: Theme.of(context).textTheme.headlineMedium,
             ),
           ),
@@ -57,7 +58,11 @@ class NoteSheet extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [
                       ModalButton(
+                        onPressed: () {
-                        onPressed: () => app.saveNote(context, verse),
+                          context.appEvent.saveNote(context, verse);
+                          // context.chapterEvent.clearSelections();
+                          // context.appEvent.hideActions(context);
+                        },
                         icon: Icons.save_outlined,
                         label: "Save",
                       ),

lib/widgets/settings_sheet.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/app_model.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
@@ -8,9 +7,6 @@ class SettingsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final app = AppModel.of(context);
-    final localizations = AppModel.getLocalizations(context);
-    final iconColor = Theme.of(context).textTheme.bodyMedium!.color;
     return SettingsList(
       contentPadding: EdgeInsets.zero,
       platform: DevicePlatform.iOS,
@@ -22,26 +18,26 @@ class SettingsSheet extends StatelessWidget {
       ),
       sections: [
         SettingsSection(
-          title: Text(localizations.settingsTitle, style: Theme.of(context).textTheme.headlineMedium),
+          title: Text(context.l10n.settingsTitle, style: context.theme.textTheme.headlineMedium),
           margin: const EdgeInsetsDirectional.symmetric(horizontal: 20),
           tiles: [
             SettingsTile.navigation(
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
-              title: Text(localizations.bibleTitle),
+              title: Text(context.l10n.bibleTitle),
-              value: Text(app.bible.name),
+              value: Text(context.app.bible.name),
-              onPressed: app.changeBible,
+              onPressed: context.app.changeBible,
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.color_lens_outlined, color: Colors.pink),
-              title: Text(localizations.themeTitle),
+              title: Text(context.l10n.themeTitle),
               trailing: ToggleButtons(
                 onPressed: (int index) {
-                  app.toggleDarkMode();
+                  context.appEvent.toggleDarkMode();
                 },
                 highlightColor: Colors.transparent,
                 borderColor: Colors.grey,
                 borderRadius: const BorderRadius.all(Radius.circular(25)),
-                selectedColor: app.darkMode ? Colors.lightBlue.shade300 : Colors.yellowAccent.shade700,
+                selectedColor: context.app.darkMode ? Colors.lightBlue.shade300 : Colors.yellowAccent.shade700,
                 selectedBorderColor: Colors.grey,
                 color: Colors.grey,
                 fillColor: Colors.transparent,
@@ -49,7 +45,7 @@ class SettingsSheet extends StatelessWidget {
                   minHeight: 36.0,
                   minWidth: 50.0,
                 ),
-                isSelected: [!app.darkMode, app.darkMode],
+                isSelected: [!context.app.darkMode, context.app.darkMode],
                 children: const [
                   Icon(Icons.light_mode),
                   Icon(Icons.dark_mode),
@@ -57,63 +53,59 @@ class SettingsSheet extends StatelessWidget {
               ),
             ),
             SettingsTile(
-              title: Text(localizations.incrementFontTitle),
+              title: Text(context.l10n.incrementFontTitle),
-              leading: Icon(Icons.font_download, color: iconColor),
+              leading: Icon(Icons.font_download, color: context.theme.colorScheme.onBackground),
               trailing: IconButton(
-                onPressed: app.increaseFont,
+                onPressed: context.appEvent.increaseFont,
                 icon: const Icon(Icons.add_circle_outline, size: 32, color: Colors.redAccent),
               ),
             ),
             SettingsTile(
-              title: Text(localizations.decrementFontTitle),
+              title: Text(context.l10n.decrementFontTitle),
-              leading: Icon(Icons.font_download, color: iconColor),
+              leading: Icon(Icons.font_download, color: context.theme.colorScheme.onBackground),
               trailing: IconButton(
-                onPressed: app.decreaseFont,
+                onPressed: context.appEvent.decreaseFont,
                 icon: const Icon(Icons.remove_circle_outline, size: 32, color: Colors.blueAccent),
               ),
             ),
             SettingsTile.switchTile(
-              onToggle: (value) {
-                app.toggleBold();
-              },
-              initialValue: app.fontBold,
+              initialValue: context.app.fontBold,
-              leading: Icon(Icons.format_bold, color: iconColor),
+              leading: Icon(Icons.format_bold, color: context.theme.colorScheme.onBackground),
-              title: Text(localizations.boldFontTitle),
+              title: Text(context.l10n.boldFontTitle),
+              onToggle: (value) => context.appEvent.toggleBold(),
             ),
             SettingsTile.switchTile(
-              onToggle: (value) {
-                app.toggleEngBookNames();
-              },
-              initialValue: app.engTitles,
+              initialValue: context.app.engTitles,
-              leading: Icon(Icons.abc, color: iconColor),
+              leading: Icon(Icons.abc, color: context.theme.colorScheme.onBackground),
-              title: Text(localizations.engTitles),
+              title: Text(context.l10n.engTitles),
+              onToggle: (value) => context.appEvent.toggleEngBookNames(),
             ),
           ],
         ),
         SettingsSection(
-          // title: Text("About", style: Theme.of(context).textTheme.headlineMedium),
+          title: Text(context.l10n.aboutUsTitle, style: context.theme.textTheme.headlineMedium),
           margin: const EdgeInsetsDirectional.symmetric(horizontal: 20, vertical: 20),
           tiles: [
             SettingsTile.navigation(
               leading: const Icon(Icons.policy_outlined, color: Colors.brown),
-              title: Text(localizations.privacyPolicyTitle),
+              title: Text(context.l10n.privacyPolicyTitle),
-              onPressed: app.showPrivacyPolicy,
+              onPressed: context.appEvent.showPrivacyPolicy,
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.share_outlined, color: Colors.blueAccent),
-              title: Text(localizations.shareAppTitle),
+              title: Text(context.l10n.shareAppTitle),
-              onPressed: app.shareAppLink,
+              onPressed: context.appEvent.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(localizations.rateAppTitle),
+                title: Text(context.l10n.rateAppTitle),
-                onPressed: app.rateApp,
+                onPressed: context.appEvent.rateApp,
               ),
             SettingsTile.navigation(
-              leading: Icon(Icons.info_outline, color: Theme.of(context).colorScheme.onBackground),
+              leading: Icon(Icons.info_outline, color: context.theme.colorScheme.onBackground),
-              title: Text(localizations.aboutUsTitle),
+              title: Text(context.l10n.aboutUsTitle),
-              onPressed: app.showAboutUs,
+              onPressed: context.appEvent.showAboutUs,
             ),
           ],
         ),

lib/widgets/verses_view.dart CHANGED Viewed

@@ -3,7 +3,7 @@ import "package:flutter/material.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
 import "package:only_bible_app/providers/app_model.dart";
 import "package:only_bible_app/providers/chapter_view_model.dart";
-import "package:provider/provider.dart";
+import "package:only_bible_app/utils.dart";
 class VersesView extends StatelessWidget {
   const VersesView({super.key});
@@ -75,7 +75,7 @@ class VersesView extends StatelessWidget {
                           ),
                         TextSpan(
                           text: "${v.text}\n",
-                          style: context.watch<ChapterViewModel>().isVerseSelected(v)
+                          style: context.app.isVerseSelected(v)
                               ? TextStyle(
                             backgroundColor: app.darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
                           )
@@ -84,7 +84,7 @@ class VersesView extends StatelessWidget {
                           ),
                           recognizer: TapGestureRecognizer()
                             ..onTap = () {
-                              model.onVerseSelected(context, v);
+                              context.appEvent.onVerseSelected(context, v);
                               // AppModel.ofEvent(context).showHighlightMenu(context, v, details.globalPosition);
                             },
                         ),

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