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.

c322445f — pyrossh

add loader

Files changed (12) hide show

lib/atom.dart +8 -0
lib/main.dart +1 -1
lib/models.dart +1 -1
lib/navigation.dart +35 -2
lib/screens/chapter_view_screen.dart +35 -37
lib/sheets/actions_sheet.dart +1 -1
lib/state.dart +34 -15
lib/utils.dart +12 -58
lib/widgets/bible_loader.dart +27 -0
lib/widgets/scaffold_markdown.dart +1 -1
pubspec.lock +0 -16
pubspec.yaml +0 -1

lib/atom.dart CHANGED Viewed

@@ -9,6 +9,14 @@ ensureAtomsInitialized(GetStorage box) async {
   await localBox.initStorage;
 }
+class Cubit<T> extends ValueNotifier<T> {
+  Cubit(T initialState) : super(initialState);
+  void emit(T state) {
+    super.value = state;
+  }
+}
 class Atom<T> extends ValueNotifier<T> {
   final String key;
   final bool persist;

lib/main.dart CHANGED Viewed

@@ -26,7 +26,7 @@ void main() async {
   usePathUrlStrategy();
   await initState();
   updateStatusBar(darkMode.value);
-  await loadBible();
+  bibleCache.value = loadBible(bibleName.value);
   runApp(const App());
   FlutterNativeSplash.remove();
 }

lib/models.dart CHANGED Viewed

@@ -116,4 +116,4 @@ class HistoryFrame {
   final int chapter;
   const HistoryFrame({required this.book, required this.chapter});
-}
+}

lib/navigation.dart CHANGED Viewed

@@ -31,6 +31,39 @@ final Atom<bool> highlightsShown = Atom<bool>(
   },
 );
+createNoTransitionPageRoute(Widget page) {
+  return PageRouteBuilder(
+    opaque: false,
+    transitionDuration: Duration.zero,
+    reverseTransitionDuration: Duration.zero,
+    pageBuilder: (context, _, __) => page,
+  );
+}
+createSlideRoute({required BuildContext context, TextDirection? slideDir, required Widget page}) {
+  if (context.isWide || slideDir == null) {
+    return PageRouteBuilder(
+      pageBuilder: (context, _, __) {
+        return page;
+      },
+    );
+  }
+  return PageRouteBuilder(
+    pageBuilder: (context, animation, secondaryAnimation) => page,
+    transitionsBuilder: (context, animation, secondaryAnimation, child) {
+      const begin = Offset(1.0, 0.0);
+      const end = Offset.zero;
+      const curve = Curves.ease;
+      var tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+      return SlideTransition(
+        textDirection: slideDir,
+        position: animation.drive(tween),
+        child: child,
+      );
+    },
+  );
+}
 updateStatusBar(bool v) {
   if (v) {
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
@@ -162,9 +195,9 @@ shareAppLink(BuildContext context) {
 rateApp(BuildContext context) {
   if (isAndroid()) {
-    openUrl(context, "https://play.google.com/store/apps/details?id=packageName");
+    context.openUrl("https://play.google.com/store/apps/details?id=packageName");
   } else if (isIOS()) {
-    openUrl(context, "https://apps.apple.com/us/app/only-bible-app/packageName");
+    context.openUrl("https://apps.apple.com/us/app/only-bible-app/packageName");
   }
 }

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,10 +1,9 @@
 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/bible_loader.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;
@@ -14,35 +13,19 @@ class ChapterViewScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    // FutureBuilder(
-    //   future: loadData(), // This reloads everytime theme changes
-    //   builder: (context, snapshot) {
+    if (context.isWide) {
-    //     if (snapshot.hasData && snapshot.data != null && snapshot.connectionState == ConnectionState.done) {
-    //       return ChangeNotifierProvider(
-    //         create: (_) => BibleViewModel(bible: snapshot.data!.$1),
-    //         child: ChapterViewScreen(book: snapshot.data!.$2, chapter: snapshot.data!.$3),
-    //       );
-    //     }
+      return Scaffold(
-    //     return ColoredBox(
-    //       color: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.background,
-    //       child: const Center(
-    //         child: CircularProgressIndicator(),
-    //       ),
-    //     );
-    //   },
+        body: SafeArea(
+          child: Row(
+            children: [
-    // ),
+              const Sidebar(),
+              Flexible(
+                child: BibleLoader(
+                  builder: (bible) {
-    final book = bible.watch(context).books[bookIndex];
+                    final book = bible.books[bookIndex];
-    final chapter = book.chapters[chapterIndex];
+                    final chapter = book.chapters[chapterIndex];
-    return Scaffold(
-      appBar: context.isWide ? null : ChapterAppBar(book: book, chapter: chapter),
-      backgroundColor: Theme.of(context).colorScheme.background,
-      body: SafeArea(
-        child: context.isWide
-            ? Row(
-                children: [
-                  const Sidebar(),
-                  Flexible(
-                    child: Column(
+                    return Column(
                       children: [
                         ChapterAppBar(book: book, chapter: chapter),
                         const Padding(
@@ -53,12 +36,27 @@ class ChapterViewScreen extends StatelessWidget {
                           child: VersesView(chapter: chapter),
                         ),
                       ],
+                    );
+                  },
-                    ),
+                ),
-                  ),
+              ),
-                ],
+            ],
-              )
-            : VersesView(chapter: chapter),
-      ),
+          ),
+        ),
+      );
+    }
+    return BibleLoader(
+      builder: (bible) {
+        final book = bible.books[bookIndex];
+        final chapter = book.chapters[chapterIndex];
+        return Scaffold(
+          appBar: ChapterAppBar(book: book, chapter: chapter),
+          backgroundColor: Theme.of(context).colorScheme.background,
+          body: SafeArea(
+            child: VersesView(chapter: chapter),
+          ),
+        );
+      },
     );
   }
 }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -36,7 +36,7 @@ class ActionsSheet extends StatelessWidget {
               if (audioEnabled) {
                 onPlay(context);
               } else {
-                showError(context, context.lEvent.audioNotAvailable);
+                showError(context, context.l.audioNotAvailable);
               }
             },
             icon: Icon(audioIcon, size: 34, color: audioEnabled ? iconColor : Colors.grey),

lib/state.dart CHANGED Viewed

@@ -1,7 +1,9 @@
+import "dart:convert";
 import "dart:developer";
 import "package:firebase_crashlytics/firebase_crashlytics.dart";
 import "package:firebase_storage/firebase_storage.dart";
 import "package:flutter/material.dart";
+import "package:flutter/services.dart";
 import "package:get_storage/get_storage.dart";
 import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/atom.dart";
@@ -53,27 +55,44 @@ final Atom<Bible> bible = Atom<Bible>(
   },
 );
+final bibleCache = Atom<Future<Bible?>?>(
+  key: "bible",
+  persist: false,
+  initialValue: null,
+);
 updateCurrentBible(BuildContext context, Locale l, String name) async {
   languageCode.value = l.languageCode;
-  bibleName.value = name;
+  bibleName.update!(name);
-  await loadBible();
+  bibleCache.value = loadBible(name);
 }
-loadBible() async {
-  // Trace customTrace;
-  // if (!isDesktop()) {
-  //   customTrace = FirebasePerformance.instance.newTrace("loadBible");
-  //   await customTrace.start();
-  // }
-  final books = await getBibleFromAsset(bibleName.value);
+Future<Bible> getBibleFromAsset(String file) async {
-  // if (!isDesktop()) {
+  final bytes = await rootBundle.load("assets/bibles/$file.txt");
+  final books = getBibleFromText(utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
-  //   await customTrace.stop();
+  // await Future.delayed(Duration(seconds: 1));
-  // }
-  bible.update!(Bible.withBooks(
+  return Bible.withBooks(
     name: bibleName.value,
     books: books,
+  );
+}
+Future<Bible?> loadBible(String name) async {
+  print("loadBible ${name}");
+  return getBibleFromAsset(name).then((value) {
+    bible.update!(value);
+    return value;
-  ));
+  });
 }
+// Trace customTrace;
+// if (!isDesktop()) {
+//   customTrace = FirebasePerformance.instance.newTrace("loadBible");
+//   await customTrace.start();
+// }
+// bibleLoading = Future.delayed(const Duration(seconds: 2)).then((value) => getBibleFromAsset(bibleName.value));
+// if (!isDesktop()) {
+//   await customTrace.stop();
+// }
 final Atom<bool> engTitles = Atom<bool>(
   key: "engTitles",
@@ -251,7 +270,7 @@ onPlay(BuildContext context) async {
         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);
+          showError(context, context.l.audioError);
         }
         return;
       } finally {

lib/utils.dart CHANGED Viewed

@@ -1,13 +1,9 @@
-import "dart:convert";
 import "package:only_bible_app/dialog.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";
-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)));
@@ -20,11 +16,7 @@ extension MyIterable<E> on Iterable<E> {
 extension AppContext on BuildContext {
   ThemeData get theme => Theme.of(this);
-  AppLocalizations get l => engTitles.value && languageCode.value != "en"
+  AppLocalizations get l => engTitles.watch(this) && languageCode.watch(this) != "en"
-      ? lookupAppLocalizations(const Locale("en"))
-      : AppLocalizations.of(this)!;
-  AppLocalizations get lEvent => engTitles.value && languageCode.value != "en"
       ? lookupAppLocalizations(const Locale("en"))
       : AppLocalizations.of(this)!;
@@ -125,6 +117,17 @@ extension AppContext on BuildContext {
       l.revelation,
     ];
   }
+  openUrl(String url) async {
+    final uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      if (await launchUrl(uri)) {
+        return;
+      }
+    }
+    if (!mounted) return;
+    showError(this, l.urlError);
+  }
 }
 bool isDesktop() {
@@ -140,52 +143,3 @@ bool isIOS() {
 bool isAndroid() {
   return defaultTargetPlatform == TargetPlatform.android;
 }
-createNoTransitionPageRoute(Widget page) {
-  return PageRouteBuilder(
-    opaque: false,
-    transitionDuration: Duration.zero,
-    reverseTransitionDuration: Duration.zero,
-    pageBuilder: (context, _, __) => page,
-  );
-}
-createSlideRoute({required BuildContext context, TextDirection? slideDir, required Widget page}) {
-  if (context.isWide || slideDir == null) {
-    return PageRouteBuilder(
-      pageBuilder: (context, _, __) {
-        return page;
-      },
-    );
-  }
-  return PageRouteBuilder(
-    pageBuilder: (context, animation, secondaryAnimation) => page,
-    transitionsBuilder: (context, animation, secondaryAnimation, child) {
-      const begin = Offset(1.0, 0.0);
-      const end = Offset.zero;
-      const curve = Curves.ease;
-      var tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
-      return SlideTransition(
-        textDirection: slideDir,
-        position: animation.drive(tween),
-        child: child,
-      );
-    },
-  );
-}
-getBibleFromAsset(String file) async {
-  final bytes = await rootBundle.load("assets/bibles/$file.txt");
-  return getBibleFromText(utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
-}
-openUrl(BuildContext context, String url) async {
-  final uri = Uri.parse(url);
-  if (await canLaunchUrl(uri)) {
-    if (await launchUrl(uri)) {
-      return;
-    }
-  }
-  if (!context.mounted) return;
-  showError(context, context.l.urlError);
-}

lib/widgets/bible_loader.dart ADDED Viewed

@@ -0,0 +1,27 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/models.dart";
+import "package:only_bible_app/state.dart";
+class BibleLoader extends StatelessWidget {
+  final Function(Bible) builder;
+  const BibleLoader({super.key, required this.builder});
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: bibleCache.watch(context),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          return builder(snapshot.data!);
+        }
+        return ColoredBox(
+          color: Theme.of(context).colorScheme.background,
+          child: const Center(
+            child: CircularProgressIndicator(),
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/scaffold_markdown.dart CHANGED Viewed

@@ -29,7 +29,7 @@ class ScaffoldMarkdown extends StatelessWidget {
                 ),
                 data: snapshot.data!,
                 onTapLink: (text, href, title) {
-                  openUrl(context, href!);
+                  context.openUrl(href!);
                 },
               );
             }

pubspec.lock CHANGED Viewed

@@ -628,14 +628,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   package_config:
     dependency: transitive
     description:
@@ -764,14 +756,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.4"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -21,7 +21,6 @@ dependencies:
   flutter_swipe_detector: ^2.0.0
   cupertino_icons: ^1.0.5
   firebase_core: ^2.15.0
-  provider: ^6.0.5
   firebase_crashlytics: ^3.3.4
   firebase_performance: ^0.9.2+4
   firebase_storage: ^11.2.5

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