only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs

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

924c240f — pyrossh

major refactor

Files changed (39) hide show

assets/bibles/Bengali.bin +0 -0
assets/bibles/English.bin +0 -0
assets/bibles/Gujarati.bin +0 -0
assets/bibles/Hindi.bin +0 -0
assets/bibles/Kannada.bin +0 -0
assets/bibles/Malayalam.bin +0 -0
assets/bibles/Nepali.bin +0 -0
assets/bibles/Oriya.bin +0 -0
assets/bibles/Punjabi.bin +0 -0
assets/bibles/Tamil.bin +0 -0
assets/bibles/Telugu.bin +0 -0
lib/bible_generated.dart +28 -30
lib/main.dart +4 -6
lib/models.dart +0 -121
lib/navigation.dart +15 -19
lib/screens/book_select_screen.dart +5 -5
lib/screens/chapter_select_screen.dart +3 -3
lib/screens/chapter_view_screen.dart +2 -2
lib/screens/webview_screen.dart +1 -1
lib/sheets/actions_sheet.dart +1 -1
lib/sheets/highlight_sheet.dart +67 -0
lib/sheets/settings_sheet.dart +2 -2
lib/store/actions.dart +1 -1
lib/store/app_state.dart +3 -3
lib/utils.dart +24 -8
lib/widgets/chapter_app_bar.dart +1 -1
lib/widgets/verses_view.dart +5 -5
{assets → scripts}/bibles/Bengali.txt +0 -0
{assets → scripts}/bibles/English.txt +0 -0
{assets → scripts}/bibles/Gujarati.txt +0 -0
{assets → scripts}/bibles/Hindi.txt +0 -0
{assets → scripts}/bibles/Kannada.txt +0 -0
{assets → scripts}/bibles/Malayalam.txt +0 -0
{assets → scripts}/bibles/Nepali.txt +0 -0
{assets → scripts}/bibles/Oriya.txt +0 -0
{assets → scripts}/bibles/Punjabi.txt +0 -0
{assets → scripts}/bibles/Tamil.txt +0 -0
{assets → scripts}/bibles/Telugu.txt +0 -0
scripts/generate_flatbuffers.dart +12 -34

assets/bibles/Bengali.bin ADDED Viewed

Binary file

assets/bibles/English.bin ADDED Viewed

Binary file

assets/bibles/Gujarati.bin ADDED Viewed

Binary file

assets/bibles/Hindi.bin ADDED Viewed

Binary file

assets/bibles/Kannada.bin ADDED Viewed

Binary file

assets/bibles/Malayalam.bin ADDED Viewed

Binary file

assets/bibles/Nepali.bin ADDED Viewed

Binary file

assets/bibles/Oriya.bin ADDED Viewed

Binary file

assets/bibles/Punjabi.bin ADDED Viewed

Binary file

assets/bibles/Tamil.bin ADDED Viewed

Binary file

assets/bibles/Telugu.bin ADDED Viewed

Binary file

lib/bible_generated.dart CHANGED Viewed

@@ -6,8 +6,6 @@ library only_bible_app.bible;
 import 'dart:typed_data' show Uint8List;
 import 'package:flat_buffers/flat_buffers.dart' as fb;
 class Verse {
   Verse._(this._bc, this._bcOffset);
   factory Verse(List<int> bytes) {
@@ -36,8 +34,7 @@ class _VerseReader extends fb.TableReader<Verse> {
   const _VerseReader();
   @override
-  Verse createObject(fb.BufferContext bc, int offset) =>
+  Verse createObject(fb.BufferContext bc, int offset) => Verse._(bc, offset);
-    Verse._(bc, offset);
 }
 class VerseBuilder {
@@ -53,18 +50,22 @@ class VerseBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addBook(int? book) {
     fbBuilder.addInt32(1, book);
     return fbBuilder.offset;
   }
   int addChapter(int? chapter) {
     fbBuilder.addInt32(2, chapter);
     return fbBuilder.offset;
   }
   int addHeadingOffset(int? offset) {
     fbBuilder.addOffset(3, offset);
     return fbBuilder.offset;
   }
   int addTextOffset(int? offset) {
     fbBuilder.addOffset(4, offset);
     return fbBuilder.offset;
@@ -88,8 +89,7 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
     int? chapter,
     String? heading,
     String? text,
-  })
-      : _index = index,
+  })  : _index = index,
         _book = book,
         _chapter = chapter,
         _heading = heading,
@@ -98,10 +98,8 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? headingOffset = _heading == null ? null
+    final int? headingOffset = _heading == null ? null : fbBuilder.writeString(_heading!);
-        : fbBuilder.writeString(_heading!);
-    final int? textOffset = _text == null ? null
+    final int? textOffset = _text == null ? null : fbBuilder.writeString(_text!);
-        : fbBuilder.writeString(_text!);
     fbBuilder.startTable(5);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addInt32(1, _book);
@@ -119,6 +117,7 @@ class VerseObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Chapter {
   Chapter._(this._bc, this._bcOffset);
   factory Chapter(List<int> bytes) {
@@ -145,8 +144,7 @@ class _ChapterReader extends fb.TableReader<Chapter> {
   const _ChapterReader();
   @override
-  Chapter createObject(fb.BufferContext bc, int offset) =>
+  Chapter createObject(fb.BufferContext bc, int offset) => Chapter._(bc, offset);
-    Chapter._(bc, offset);
 }
 class ChapterBuilder {
@@ -162,10 +160,12 @@ class ChapterBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addBook(int? book) {
     fbBuilder.addInt32(1, book);
     return fbBuilder.offset;
   }
   int addVersesOffset(int? offset) {
     fbBuilder.addOffset(2, offset);
     return fbBuilder.offset;
@@ -185,16 +185,15 @@ class ChapterObjectBuilder extends fb.ObjectBuilder {
     int? index,
     int? book,
     List<VerseObjectBuilder>? verses,
-  })
-      : _index = index,
+  })  : _index = index,
         _book = book,
         _verses = verses;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? versesOffset = _verses == null ? null
+    final int? versesOffset =
-        : fbBuilder.writeList(_verses!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        _verses == null ? null : fbBuilder.writeList(_verses!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(3);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addInt32(1, _book);
@@ -210,6 +209,7 @@ class ChapterObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Book {
   Book._(this._bc, this._bcOffset);
   factory Book(List<int> bytes) {
@@ -235,8 +235,7 @@ class _BookReader extends fb.TableReader<Book> {
   const _BookReader();
   @override
-  Book createObject(fb.BufferContext bc, int offset) =>
+  Book createObject(fb.BufferContext bc, int offset) => Book._(bc, offset);
-    Book._(bc, offset);
 }
 class BookBuilder {
@@ -252,6 +251,7 @@ class BookBuilder {
     fbBuilder.addInt32(0, index);
     return fbBuilder.offset;
   }
   int addChaptersOffset(int? offset) {
     fbBuilder.addOffset(1, offset);
     return fbBuilder.offset;
@@ -269,15 +269,14 @@ class BookObjectBuilder extends fb.ObjectBuilder {
   BookObjectBuilder({
     int? index,
     List<ChapterObjectBuilder>? chapters,
-  })
-      : _index = index,
+  })  : _index = index,
         _chapters = chapters;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? chaptersOffset = _chapters == null ? null
+    final int? chaptersOffset =
-        : fbBuilder.writeList(_chapters!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        _chapters == null ? null : fbBuilder.writeList(_chapters!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(2);
     fbBuilder.addInt32(0, _index);
     fbBuilder.addOffset(1, chaptersOffset);
@@ -292,6 +291,7 @@ class BookObjectBuilder extends fb.ObjectBuilder {
     return fbBuilder.buffer;
   }
 }
 class Bible {
   Bible._(this._bc, this._bcOffset);
   factory Bible(List<int> bytes) {
@@ -317,8 +317,7 @@ class _BibleReader extends fb.TableReader<Bible> {
   const _BibleReader();
   @override
-  Bible createObject(fb.BufferContext bc, int offset) =>
+  Bible createObject(fb.BufferContext bc, int offset) => Bible._(bc, offset);
-    Bible._(bc, offset);
 }
 class BibleBuilder {
@@ -334,6 +333,7 @@ class BibleBuilder {
     fbBuilder.addOffset(0, offset);
     return fbBuilder.offset;
   }
   int addBooksOffset(int? offset) {
     fbBuilder.addOffset(1, offset);
     return fbBuilder.offset;
@@ -351,17 +351,15 @@ class BibleObjectBuilder extends fb.ObjectBuilder {
   BibleObjectBuilder({
     String? name,
     List<BookObjectBuilder>? books,
-  })
-      : _name = name,
+  })  : _name = name,
         _books = books;
   /// Finish building, and store into the [fbBuilder].
   @override
   int finish(fb.Builder fbBuilder) {
-    final int? nameOffset = _name == null ? null
+    final int? nameOffset = _name == null ? null : fbBuilder.writeString(_name!);
-        : fbBuilder.writeString(_name!);
-    final int? booksOffset = _books == null ? null
+    final int? booksOffset =
-        : fbBuilder.writeList(_books!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
+        _books == null ? null : fbBuilder.writeList(_books!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     fbBuilder.startTable(2);
     fbBuilder.addOffset(0, nameOffset);
     fbBuilder.addOffset(1, booksOffset);

lib/main.dart CHANGED Viewed

@@ -7,12 +7,10 @@ import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:async_redux/async_redux.dart";
 import "package:only_bible_app/app.dart";
 import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/env.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/store/app_state.dart";
-import "package:only_bible_app/store/actions.dart";
 void main() async {
   final globalNavigatorKey = GlobalKey<NavigatorState>();
@@ -41,9 +39,9 @@ void main() async {
   //   });
   //   return true;
   // };
-  // FlutterNativeSplash.preserve(
+  FlutterNativeSplash.preserve(
-  //   widgetsBinding: WidgetsFlutterBinding.ensureInitialized(),
+    widgetsBinding: WidgetsFlutterBinding.ensureInitialized(),
-  // );
+  );
   usePathUrlStrategy();
   WidgetsFlutterBinding.ensureInitialized();
   FlutterAzureTts.init(
@@ -54,5 +52,5 @@ void main() async {
   updateStatusBar(store.state.darkMode);
   await store.dispatchAndWait(LoadBibleAction());
   runApp(App(globalNavigatorKey: globalNavigatorKey, store: store));
-  // FlutterNativeSplash.remove();
+  FlutterNativeSplash.remove();
 }

lib/models.dart DELETED Viewed

@@ -1,121 +0,0 @@
-class Bible {
-  final String name;
-  final List<Book> books;
-  const Bible({
-    required this.name,
-    required this.books,
-  });
-  String shortName() {
-    return name.substring(0, 3).toUpperCase();
-  }
-  List<Book> getOldBooks() {
-    return books.where((it) => it.isOldTestament()).toList();
-  }
-  List<Book> getNewBooks() {
-    return books.where((it) => it.isNewTestament()).toList();
-  }
-}
-class Book {
-  final int index;
-  final List<Chapter> chapters;
-  const Book({
-    required this.index,
-    required this.chapters,
-  });
-  bool isOldTestament() => index < 39;
-  bool isNewTestament() => index >= 39;
-  String shortName(String name) {
-    if (name[0] == "1" || name[0] == "2" || name[0] == "3") {
-      return "${name[0]}${name[2].toUpperCase()}${name.substring(3, 4).toLowerCase()}";
-    }
-    return "${name[0].toUpperCase()}${name.substring(1, 3).toLowerCase()}";
-  }
-}
-class Chapter {
-  final int index;
-  final int book;
-  final List<Verse> verses;
-  const Chapter(
-      {required this.index, required this.verses, required this.book,});
-}
-class Verse {
-  final int index;
-  final String bibleName;
-  final int book;
-  final int chapter;
-  String heading;
-  final String text;
-  Verse({
-    required this.index,
-    required this.text,
-    required this.bibleName,
-    required this.chapter,
-    required this.book,
-    required this.heading,
-  });
-}
-List<Book> parseBible(String bibleName, String text) {
-  final List<Book> books = [];
-  final lines = text.split("\n");
-  for (var (index, line) in lines.indexed) {
-// ignore last empty line
-    if (lines.length - 1 == index) {
-      continue;
-    }
-    final arr = line.split("|");
-    final book = int.parse(arr[0]);
-    final chapter = int.parse(arr[1]);
-    final verseNo = int.parse(arr[2]);
-    final heading = arr[3];
-    final verseText = arr.sublist(4, arr.length).join("|");
-    if (books.length < book + 1) {
-      books.add(
-        Book(
-          index: book,
-          chapters: [],
-        ),
-      );
-    }
-    if (books[book].chapters.length < chapter + 1) {
-      books[book].chapters.add(
-            Chapter(
-              index: chapter,
-              book: book,
-              verses: [],
-            ),
-          );
-    }
-    books[book].chapters[chapter].verses.add(
-          Verse(
-            index: verseNo,
-            bibleName: bibleName,
-            chapter: chapter,
-            book: book,
-            text: verseText,
-            heading: heading,
-          ),
-        );
-  }
-  return books;
-}
-class HistoryFrame {
-  final int book;
-  final int chapter;
-  const HistoryFrame({required this.book, required this.chapter});
-}

lib/navigation.dart CHANGED Viewed

@@ -2,7 +2,7 @@ import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:app_review/app_review.dart";
 import "package:go_router/go_router.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/sheets/actions_sheet.dart";
 import "package:only_bible_app/sheets/settings_sheet.dart";
 import "package:only_bible_app/store/actions.dart";
@@ -68,21 +68,21 @@ void replaceBookChapter(
 }
 void nextChapter(BuildContext context, Bible bible, int book, int chapter) {
-  final selectedBook = bible.books[book];
+  final selectedBook = bible.books![book];
-  if (selectedBook.chapters.length > chapter + 1) {
+  if (selectedBook.chapters!.length > chapter + 1) {
     pushBookChapter(
       context,
-      bible.name,
+      bible.name!,
       selectedBook.index,
       chapter + 1,
       TextDirection.ltr,
     );
   } else {
-    if (selectedBook.index + 1 < bible.books.length) {
+    if (selectedBook.index + 1 < bible.books!.length) {
-      final nextBook = bible.books[selectedBook.index + 1];
+      final nextBook = bible.books![selectedBook.index + 1];
       pushBookChapter(
         context,
-        bible.name,
+        bible.name!,
         nextBook.index,
         0,
         TextDirection.ltr,
@@ -92,27 +92,23 @@ void nextChapter(BuildContext context, Bible bible, int book, int chapter) {
 }
 void previousChapter(BuildContext context, Bible bible, int book, int chapter) {
-  final selectedBook = bible.books[book];
+  final selectedBook = bible.books![book];
   if (chapter - 1 >= 0) {
-    // if (Navigator.of(context).canPop()) {
-    //   Navigator.of(context).pop();
-    // } else {
     pushBookChapter(
       context,
-      bible.name,
+      bible.name!,
       selectedBook.index,
       chapter - 1,
       TextDirection.rtl,
     );
-    // }
   } else {
     if (selectedBook.index - 1 >= 0) {
-      final prevBook = bible.books[selectedBook.index - 1];
+      final prevBook = bible.books![selectedBook.index - 1];
       pushBookChapter(
         context,
-        bible.name,
+        bible.name!,
         prevBook.index,
-        prevBook.chapters.length - 1,
+        prevBook.chapters!.length - 1,
         TextDirection.rtl,
       );
     }
@@ -140,11 +136,11 @@ void changeBibleFromHeader(BuildContext context) {
 }
 void changeBook(BuildContext context, Bible bible) {
-  context.push("/books/${Uri.encodeComponent(bible.name)}");
+  context.push("/books/${Uri.encodeComponent(bible.name!)}");
 }
 void changeChapter(BuildContext context, Bible bible, Book book, int index) {
-  context.push("/chapters/${Uri.encodeComponent(bible.name)}/${book.index}");
+  context.push("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
 }
 Future<void> updateCurrentBible(
@@ -185,7 +181,7 @@ Future<void> shareVerses(BuildContext context, Bible bible, List<Verse> verses)
   final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
   final version = context.currentLang.languageCode == "en" ? "KJV" : "";
   final title = "$name $chapter:$versesThrough $version";
-  final text = verses.map((e) => e.text).join("\n");
+  final text = verses.map((e) => e.text ?? "").join("\n");
   await SharePlus.instance.share(
     ShareParams(
       title: title,

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -5,7 +5,7 @@ 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";
 import "package:only_bible_app/widgets/sliver_tile_grid.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 class BookSelectScreen extends StatelessWidget {
   final String bibleName;
@@ -13,11 +13,11 @@ class BookSelectScreen extends StatelessWidget {
   const BookSelectScreen({super.key, required this.bibleName});
   dynamic onBookSelected(BuildContext context, Bible bible, int index) {
-    final book = bible.books[index];
+    final book = bible.books![index];
-    if (book.chapters.length == 1) {
+    if (book.chapters!.length == 1) {
-      return replaceBookChapter(context, bible.name, index, 0);
+      return replaceBookChapter(context, bible.name!, index, 0);
     }
-    context.go("/chapters/${Uri.encodeComponent(bible.name)}/${book.index}");
+    context.go("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
   }
   @override

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -20,17 +20,17 @@ class ChapterSelectScreen extends StatelessWidget {
         child: const Center(child: CircularProgressIndicator()),
       );
     }
-    final book = bible.books[bookIndex];
+    final book = bible.books![bookIndex];
     return ScaffoldMenu(
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),
         slivers: [
           SliverHeading(title: context.bookNames[book.index], showClose: true),
           SliverTileGrid(
-            children: List.generate(book.chapters.length, (index) {
+            children: List.generate(book.chapters!.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
-                onPressed: () => replaceBookChapter(context, bible.name, bookIndex, index),
+                onPressed: () => replaceBookChapter(context, bible.name!, bookIndex, index),
               );
             }),
           ),

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -24,8 +24,8 @@ class ChapterViewScreen extends StatelessWidget {
         child: const Center(child: CircularProgressIndicator()),
       );
     }
-    final book = bible.books[bookIndex];
+    final book = bible.books![bookIndex];
-    final chapter = book.chapters[chapterIndex];
+    final chapter = book.chapters![chapterIndex];
     return Scaffold(
       appBar: ChapterAppBar(bible: bible, book: book, chapter: chapter),
       backgroundColor: Theme.of(context).colorScheme.surface,

lib/screens/webview_screen.dart CHANGED Viewed

@@ -15,7 +15,7 @@ class WebViewScreen extends StatelessWidget {
       backgroundColor: Theme.of(context).colorScheme.surface,
       appBar: AppBar(),
       body: SafeArea(
-        child:  WebViewWidget(controller: controller),
+        child: WebViewWidget(controller: controller),
       ),
     );
   }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/theme.dart";

lib/sheets/highlight_sheet.dart ADDED Viewed

@@ -0,0 +1,67 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/app.dart";
+import "package:only_bible_app/bible_generated.dart";
+import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/theme.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 iconColor = store.state.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
+    void onHighlight(int index) {
+      store.dispatch(SetHighlightAction(
+        List<Verse>.from(store.state.selectedVerses),
+        index,
+      ));
+      hideActions(context);
+    }
+    return Container(
+      height: 50,
+      color: context.theme.colorScheme.surface,
+      padding: const EdgeInsets.only(left: 20, right: 20),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          IconButton(
+            padding: EdgeInsets.zero,
+            onPressed: () {
+              store.dispatch(
+                RemoveHighlightAction(
+                  List<Verse>.from(store.state.selectedVerses),
+                ),
+              );
+              hideActions(context);
+            },
+            icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
+          ),
+          HighlightButton(
+            index: 0,
+            color: store.state.darkMode ? darkHighlights[0] : lightHighlights[0],
+            onHighlightSelected: onHighlight,
+          ),
+          HighlightButton(
+            index: 1,
+            color: store.state.darkMode ? darkHighlights[1] : lightHighlights[1],
+            onHighlightSelected: onHighlight,
+          ),
+          HighlightButton(
+            index: 2,
+            color: store.state.darkMode ? darkHighlights[2] : lightHighlights[2],
+            onHighlightSelected: onHighlight,
+          ),
+          HighlightButton(
+            index: 3,
+            color: store.state.darkMode ? darkHighlights[3] : lightHighlights[3],
+            onHighlightSelected: onHighlight,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
@@ -32,7 +32,7 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
-              value: Text(bible.name),
+              value: Text(bible.name!),
               onPressed: changeBible,
             ),
             SettingsTile.navigation(

lib/store/actions.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:async_redux/async_redux.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";

lib/store/app_state.dart CHANGED Viewed

@@ -2,7 +2,7 @@ import "dart:developer";
 import "package:flutter/material.dart";
 import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/buffer_audio_source.dart";
 import "package:only_bible_app/theme.dart";
@@ -143,9 +143,9 @@ class AppState {
     } else {
       context.dispatch(SetPlayingAction(true));
       for (final v in versesToPlay) {
-        final pathname = "${bible.name}_${v.book}_${v.chapter}_${v.index}";
+        final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
         try {
-          final data = await convertText(context.currentLang.audioVoice, v.text);
+          final data = await convertText(context.currentLang.audioVoice, v.text ?? "");
           await player.setAudioSource(BufferAudioSource(data));
           await player.play();
           await player.stop();

lib/utils.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "dart:convert";
+import "dart:io";
 import "package:async_redux/async_redux.dart";
 import "package:http/http.dart" as http;
 import "package:flutter/services.dart";
@@ -10,9 +11,28 @@ import "package:only_bible_app/l10n/app_localizations.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/env.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/store/app_state.dart";
+extension BibleExt on Bible {
+  List<Book> getOldBooks() {
+    return books!.where((it) => it.index < 39).toList();
+  }
+  List<Book> getNewBooks() {
+    return books!.where((it) => it.index >= 39).toList();
+  }
+}
+extension BookExt on Book {
+  String shortName(String name) {
+    if (name[0] == "1" || name[0] == "2" || name[0] == "3") {
+      return "${name[0]}${name[2].toUpperCase()}${name.substring(3, 4).toLowerCase()}";
+    }
+    return "${name[0].toUpperCase()}${name.substring(1, 3).toLowerCase()}";
+  }
+}
 extension IterableUtils<E> on Iterable<E> {
   Iterable<E> sortedBy(Comparable Function(E e) key) => toList()..sort((a, b) => key(a).compareTo(key(b)));
@@ -159,13 +179,9 @@ Future<Uint8List> convertText(String langCode, String text) async {
 }
 Future<Bible> loadBible(String name) async {
-  final bytes = await rootBundle.load("assets/bibles/$name.txt");
+  final data = await rootBundle.load("assets/bibles/$name.bin");
-  final books = parseBible(name, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
+  final decompressed = gzip.decode(data.buffer.asUint8List());
-// await Future.delayed(Duration(seconds: 2));
-  return Bible(
+  return Bible(decompressed);
-    name: name,
-    books: books,
-  );
 }
 Future<void> recordError(String message, StackTrace? stack) async {

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/models.dart";
+import "package:only_bible_app/bible_generated.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/utils.dart";

lib/widgets/verses_view.dart CHANGED Viewed

@@ -1,6 +1,6 @@
 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/bible_generated.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
@@ -35,7 +35,7 @@ class VersesView extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            for (final v in chapter.verses)
+            for (final v in chapter.verses!)
               Padding(
                 padding: const EdgeInsets.only(bottom: 4),
                 child: GestureDetector(
@@ -45,14 +45,14 @@ class VersesView extends StatelessWidget {
                     TextSpan(
                       style: baseStyle,
                       children: [
-                        if (v.heading != "")
+                        if (v.heading != null && v.heading!.isNotEmpty)
                           TextSpan(
-                            text: "${v.heading.replaceAll("<br>", "\n")}\n",
+                            text: "${v.heading!.replaceAll("<br>", "\n")}\n",
                             style: theme.labelLarge,
                           ),
                         TextSpan(text: "${v.index + 1} ", style: theme.labelMedium),
                         TextSpan(
-                          text: v.text,
+                          text: v.text ?? "",
                           style: appState.getHighlightStyle(context, v, false),
                         ),
                       ],

{assets → scripts}/bibles/Bengali.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/English.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Gujarati.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Hindi.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Kannada.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Malayalam.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Nepali.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Oriya.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Punjabi.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Tamil.txt RENAMED Viewed

File without changes

{assets → scripts}/bibles/Telugu.txt RENAMED Viewed

File without changes

scripts/generate_flatbuffers.dart CHANGED Viewed

@@ -3,45 +3,22 @@ import "dart:io";
 import "dart:typed_data";
 import "package:flat_buffers/flat_buffers.dart" as fb;
-// Mirrors parseBible from models.dart but outputs FlatBuffer binary
+// Converts bible .txt to FlatBuffer binary
+// Format: bookName|bookIndex|chapterIndex|verseNo|heading|text...
 Uint8List convertBibleToFlatBuffer(String name, String text) {
-  // First parse into intermediate structure
   final books = <int, Map<int, List<Map<String, dynamic>>>>{};
-  final bookNameToIndex = <String, int>{};
   final lines = text.split("\n");
   for (var i = 0; i < lines.length; i++) {
     final line = lines[i];
     if (line.isEmpty) continue;
     final arr = line.split("|");
-    // Detect format: English has numeric first field, others have book name
-    int book;
-    int chapter;
-    int verseNo;
-    String heading;
-    String verseText;
-    final firstFieldNumeric = int.tryParse(arr[0]) != null;
-    if (firstFieldNumeric) {
-      // English format: book|chapter|verse|heading|text
+    // bookName|bookIndex|chapterIndex|verseNo|heading|text...
-      book = int.parse(arr[0]);
+    final book = int.parse(arr[1]);
-      chapter = int.parse(arr[1]);
+    final chapter = int.parse(arr[2]);
-      verseNo = int.parse(arr[2]);
+    final verseNo = int.parse(arr[3]);
-      heading = arr[3];
+    final heading = arr[4];
-      verseText = arr.sublist(4).join("|");
+    final verseText = arr.sublist(5).join("|");
-    } else {
-      // Non-English format: bookName|chapter|verse|heading|text|...
-      final bookName = arr[0];
-      if (!bookNameToIndex.containsKey(bookName)) {
-        bookNameToIndex[bookName] = bookNameToIndex.length;
-      }
-      book = bookNameToIndex[bookName]!;
-      chapter = int.parse(arr[1]);
-      verseNo = int.parse(arr[2]);
-      heading = arr[3];
-      verseText = arr.sublist(4).join("|");
-    }
     books.putIfAbsent(book, () => {});
     books[book]!.putIfAbsent(chapter, () => []);
@@ -109,17 +86,18 @@ Uint8List convertBibleToFlatBuffer(String name, String text) {
 }
 void main() async {
-  final biblesDir = Directory("assets/bibles");
+  final biblesDir = Directory("scripts/bibles");
   final txtFiles = biblesDir.listSync().whereType<File>().where((f) => f.path.endsWith(".txt"));
   for (final file in txtFiles) {
     final name = file.uri.pathSegments.last.replaceAll(".txt", "");
     final text = await file.readAsString(encoding: utf8);
     final bytes = convertBibleToFlatBuffer(name, text);
+    final compressed = gzip.encode(bytes);
     final outPath = "assets/bibles/$name.bin";
-    await File(outPath).writeAsBytes(bytes);
+    await File(outPath).writeAsBytes(compressed);
     final txtSize = (file.lengthSync() / 1024).toStringAsFixed(1);
-    final binSize = (bytes.length / 1024).toStringAsFixed(1);
+    final binSize = (compressed.length / 1024).toStringAsFixed(1);
     print("$name: ${txtSize}KB txt -> ${binSize}KB bin");
   }
   print("Done! Generated ${txtFiles.length} .bin files.");

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git Discussions: https://groups.google.com/g/rust-embed-devs

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

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs