only-bible-app

git clone https://pyrossh.dev/repos/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.

71bf8a81 — pyrossh

add bible selector

Files changed (12) hide show

lib/app.dart +1 -1
lib/{models/book.dart → models.dart} +26 -1
lib/routes/home_screen.dart +2 -1
lib/state.dart +29 -16
lib/theme.dart +1 -0
lib/widgets/bible_selector.dart +64 -0
lib/widgets/book_selector.dart +3 -3
lib/widgets/books_list.dart +1 -1
lib/widgets/header.dart +16 -2
lib/widgets/side_menu_page.dart +6 -3
lib/widgets/sidebar.dart +8 -8
macos/Runner/Assets.xcassets/AppIcon.appiconset/logo.png +0 -0

lib/app.dart CHANGED Viewed

@@ -20,7 +20,7 @@ class App extends StatelessWidget {
       darkTheme: darkTheme,
       routerConfig: GoRouter(
         debugLogDiagnostics: true,
-        initialLocation: "/${selectedBible.value[bookIndex.value].name}/${chapterIndex.value}",
+        initialLocation: "/${selectedBible.value!.books[bookIndex.value].name}/${chapterIndex.value}",
         routes: [
           ShellRoute(
             builder: (context, state, child) {

lib/{models/book.dart → models.dart} RENAMED Viewed

@@ -1,3 +1,23 @@
+class Bible {
+  final int id;
+  final String name;
+  final String fileName;
+  List<Book> books = [];
+  Bible({
+    required this.id,
+    required this.name,
+    required this.fileName,
+  });
+  Bible.withBooks({
+    required this.id,
+    required this.name,
+    required this.fileName,
+    required this.books,
+  });
+}
 class Book {
   final int index;
   final String name;
@@ -43,7 +63,7 @@ class TimeRange {
   const TimeRange({required this.start, required this.end});
 }
-final bookNames = [
+const bookNames = [
   "Genesis",
   "Exodus",
   "Leviticus",
@@ -111,3 +131,8 @@ final bookNames = [
   "Jude",
   "Revelation"
 ];
+final bibles = [
+  Bible(id: 1, name: "KJV", fileName: "kj.csv.gz"),
+  Bible(id: 2, name: "Kannada", fileName: "kn.csv.gz"),
+];

lib/routes/home_screen.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import 'package:flutter_reactive_value/flutter_reactive_value.dart';
 import 'package:flutter_swipe_detector/flutter_swipe_detector.dart';
 import 'package:go_router/go_router.dart';
 import 'package:only_bible_app/widgets/header.dart';
@@ -73,7 +74,7 @@ class VerseList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final selectedBook = selectedBible.value[bookIndex.value];
+    final selectedBook = selectedBible.reactiveValue(context)!.books[bookIndex.value];
     final verses = selectedBook.chapters[chapterIndex.value].verses;
     return SelectionArea(
       child: ListView.builder(

lib/state.dart CHANGED Viewed

@@ -7,7 +7,7 @@ import 'package:flutter_reactive_value/flutter_reactive_value.dart';
 import 'package:go_router/go_router.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:only_bible_app/utils/dialog.dart';
-import 'package:only_bible_app/models/book.dart';
+import 'package:only_bible_app/models.dart';
 final shellNavigatorKey = GlobalKey<NavigatorState>();
 final routeNavigatorKey = GlobalKey<NavigatorState>();
@@ -22,9 +22,9 @@ final fontBold = PersistentValueNotifier<bool>(
   initialValue: false,
 );
-final selectedBibleName = PersistentValueNotifier<String>(
+final selectedBibleId = PersistentValueNotifier(
-  sharedPreferencesKey: 'selectedBibleName',
+  sharedPreferencesKey: 'selectedBibleId',
-  initialValue: "kn.csv.gz",
+  initialValue: 1,
 );
 final bookIndex = PersistentValueNotifier<int>(
@@ -38,7 +38,7 @@ final chapterIndex = PersistentValueNotifier<int>(
 );
 final slideTextDir = ValueNotifier<TextDirection?>(null);
-final selectedBible = ValueNotifier<List<Book>>([]);
+final selectedBible = ValueNotifier<Bible?>(null);
 final selectedVerses = ValueNotifier([]);
 final isPlaying = ValueNotifier(false);
 final fontSizeDelta = ValueNotifier(0);
@@ -86,6 +86,13 @@ updateStatusBar() {
   }
 }
+changeBible(BuildContext context, int i) {
+  selectedBibleId.value = i;
+  loadBible();
+  // This page is invoked with the other navigator so can't use context.pop()
+  Navigator.of(context).pop();
+}
 navigateBookChapter(BuildContext context, int book, int chapter, bool noAnim) {
   if (isWide(context) || noAnim) {
     slideTextDir.value = null;
@@ -94,43 +101,49 @@ navigateBookChapter(BuildContext context, int book, int chapter, bool noAnim) {
   }
   bookIndex.value = book;
   chapterIndex.value = chapter;
-  context.push("/${selectedBible.value[book].name}/$chapter");
+  context.push("/${selectedBible.value!.books[book].name}/$chapter");
   // Use this or use navigatorKey once header moves scaffold
   // if (!isWide(context)) {
-  //   context.pop();
+  //   Navigator.of(context).pop();
   // }
 }
 onNext(BuildContext context) {
-  final selectedBook = selectedBible.value[bookIndex.value];
+  final selectedBook = selectedBible.value!.books[bookIndex.value];
   final chapter = chapterIndex.value;
   if (selectedBook.chapters.length > chapter + 1) {
     navigateBookChapter(context, selectedBook.index, chapter + 1, false);
   } else {
-    if (selectedBook.index + 1 < selectedBible.value.length) {
+    if (selectedBook.index + 1 < selectedBible.value!.books.length) {
-      final nextBook = selectedBible.value[selectedBook.index + 1];
+      final nextBook = selectedBible.value!.books[selectedBook.index + 1];
       navigateBookChapter(context, nextBook.index, 0, false);
     }
   }
 }
 onPrevious(BuildContext context) {
-  final selectedBook = selectedBible.value[bookIndex.value];
+  final selectedBook = selectedBible.value!.books[bookIndex.value];
   final chapter = chapterIndex.value;
   if (chapter - 1 >= 0) {
     navigateBookChapter(context, selectedBook.index, chapter - 1, false);
   } else {
     if (selectedBook.index - 1 >= 0) {
-      final prevBook = selectedBible.value[selectedBook.index - 1];
+      final prevBook = selectedBible.value!.books[selectedBook.index - 1];
       navigateBookChapter(context, prevBook.index, prevBook.chapters.length - 1, false);
     }
   }
 }
 loadBible() async {
-  // selectedBibleName.value
+  print(selectedBibleId.value);
+  final bible = bibles.firstWhere((it) => it.id == selectedBibleId.value);
-  final value = await getBibleFromAsset("kn.csv.gz");
+  final books = await getBibleFromAsset(bible.fileName);
-  selectedBible.value = value;
+  selectedBible.value = Bible.withBooks(
+    id: bible.id,
+    name: bible.name,
+    fileName: bible.fileName,
+    books: books,
+  );
 }
 getBibleFromAsset(String file) async {
@@ -177,7 +190,7 @@ List<Book> getBibleFromText(String text) {
 }
 onPlay(BuildContext context) async {
-  final verses = selectedBible.value[bookIndex.value].chapters[chapterIndex.value].verses;
+  final verses = selectedBible.value!.books[bookIndex.value].chapters[chapterIndex.value].verses;
   final filteredVerses = verses.asMap().keys.where((it) => selectedVerses.value.contains(it)).map((it) => verses[it]);
   final player = AudioPlayer();
   player.setUrl(

lib/theme.dart CHANGED Viewed

@@ -54,6 +54,7 @@ final lightTheme = ThemeData(
       fontSize: 38,
       fontWeight: FontWeight.w700,
       color: Color(0xFFFFB341),
+      // letterSpacing: 2,
       shadows: [
         Shadow(color: Colors.black, offset: Offset(0, 1), blurRadius: 3.0),
       ],

lib/widgets/bible_selector.dart ADDED Viewed

@@ -0,0 +1,64 @@
+import "package:flutter/material.dart";
+import 'package:go_router/go_router.dart';
+import 'package:only_bible_app/widgets/books_list.dart';
+import 'package:only_bible_app/widgets/chapters_list.dart';
+import 'package:only_bible_app/state.dart';
+import 'package:only_bible_app/widgets/tile.dart';
+import '../models.dart';
+class BibleSelector extends StatelessWidget {
+  const BibleSelector({super.key});
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
+      child: ListView(
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                margin: const EdgeInsets.only(bottom: 20),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Expanded(
+                      child: Text("Bibles", style: Theme.of(context).textTheme.headlineMedium),
+                    ),
+                    Container(
+                      margin: EdgeInsets.only(right: isWide(context) ? 30 : 10),
+                      child: IconButton(
+                        icon: const Icon(Icons.close, size: 28),
+                        onPressed: () {
+                          Navigator.of(context).pop();
+                        },
+                      ),
+                    )
+                  ],
+                ),
+              ),
+              Wrap(
+                children: List.of(
+                  bibles.map((bible) {
+                    return Container(
+                      margin: const EdgeInsets.only(right: 16, bottom: 16),
+                      child: TextButton(
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.all(20),
+                        ),
+                        child: Text(bible.name),
+                        onPressed: () => changeBible(context, bible.id),
+                      ),
+                    );
+                  }),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/book_selector.dart CHANGED Viewed

@@ -35,7 +35,7 @@ class BookSelectorState extends State<BookSelector> {
   @override
   Widget build(BuildContext context) {
     if (tab == 1) {
-      final book = selectedBible.value[bookIndex];
+      final book = selectedBible.value!.books[bookIndex];
       return Container(
         margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
         child: ChaptersList(
@@ -45,8 +45,8 @@ class BookSelectorState extends State<BookSelector> {
         ),
       );
     }
-    final oldTestament = selectedBible.value.where((it) => it.isOldTestament()).toList();
+    final oldTestament = selectedBible.value!.books.where((it) => it.isOldTestament()).toList();
-    final newTestament = selectedBible.value.where((it) => it.isNewTestament()).toList();
+    final newTestament = selectedBible.value!.books.where((it) => it.isNewTestament()).toList();
     return Container(
       margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
       child: ListView(

lib/widgets/books_list.dart CHANGED Viewed

@@ -2,7 +2,7 @@ import "package:flutter/material.dart";
 import 'package:go_router/go_router.dart';
 import 'package:only_bible_app/state.dart';
 import 'package:only_bible_app/widgets/tile.dart';
-import 'package:only_bible_app/models/book.dart';
+import 'package:only_bible_app/models.dart';
 class BooksList extends StatelessWidget {
   final String title;

lib/widgets/header.dart CHANGED Viewed

@@ -1,9 +1,11 @@
 import "package:flutter/material.dart";
 import 'package:flutter_reactive_value/flutter_reactive_value.dart';
+import 'package:only_bible_app/widgets/book_selector.dart';
 import 'package:only_bible_app/widgets/play_button.dart';
 import 'package:only_bible_app/widgets/side_menu_page.dart';
 import 'package:only_bible_app/widgets/menu.dart';
 import 'package:only_bible_app/state.dart';
+import 'package:only_bible_app/widgets/bible_selector.dart';
 class Header extends StatelessWidget {
   const Header({super.key});
@@ -12,7 +14,7 @@ class Header extends StatelessWidget {
   Widget build(BuildContext context) {
     final book = bookIndex.reactiveValue(context);
     final chapter = chapterIndex.reactiveValue(context);
-    final selectedBook = selectedBible.value[book];
+    final selectedBook = selectedBible.value!.books[book];
     return Container(
         padding: EdgeInsets.only(
           left: 20,
@@ -41,12 +43,24 @@ class Header extends StatelessWidget {
                     style: Theme.of(context).textTheme.headlineMedium,
                   ),
                   onPressed: () {
-                    Navigator.of(context).push(SideMenuPage());
+                    Navigator.of(context).push(SideMenuPage(child: const BookSelector()));
                   },
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
+                    Container(
+                      margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
+                      child: TextButton(
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.all(20),
+                        ),
+                        child: Text(selectedBible.reactiveValue(context)!.name),
+                        onPressed: () {
+                          Navigator.of(context).push(SideMenuPage(child: const BibleSelector()));
+                        },
+                      ),
+                    ),
                     Container(
                       margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
                       child: const PlayButton(),

lib/widgets/side_menu_page.dart CHANGED Viewed

@@ -1,8 +1,11 @@
 import "package:flutter/material.dart";
-import 'package:only_bible_app/widgets/book_selector.dart';
 import 'package:only_bible_app/state.dart';
 class SideMenuPage extends ModalRoute<void> {
+  final Widget child;
+  SideMenuPage({required this.child});
   @override
   Duration get transitionDuration => const Duration(milliseconds: 300);
@@ -36,10 +39,10 @@ class SideMenuPage extends ModalRoute<void> {
         color: Theme.of(context).colorScheme.background,
         margin: EdgeInsets.only(left: 0, right: isWide(context) ? 650 : 0),
         child: isWide(context)
-            ? const BookSelector()
+            ? child
             : SlideTransition(
                 position: Tween(begin: const Offset(-1, 0), end: Offset.zero).animate(animation),
-                child: const BookSelector(),
+                child: child,
               ),
       ),
     );

lib/widgets/sidebar.dart CHANGED Viewed

@@ -37,7 +37,7 @@ class Sidebar extends StatelessWidget {
                   ),
                 ),
                 child: Padding(
-                  padding: const EdgeInsets.only(bottom: 50, right: 50),
+                  padding: const EdgeInsets.only(bottom: 50, right: 50, top: 0),
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     crossAxisAlignment: CrossAxisAlignment.end,
@@ -68,7 +68,10 @@ class TrianglePainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = color
+      ..style = PaintingStyle.fill;
-    Path path = Path();
+    final path = Path();
     path.moveTo(0, 0);
     path.lineTo(15, 0);
     path.lineTo(15, 30);
@@ -77,12 +80,9 @@ class TrianglePainter extends CustomPainter {
     path.lineTo(-15, 0);
     path.lineTo(-15, 30);
     path.close();
+    // canvas.drawRect(const Offset(30, 100) & const Size(40, 300), paint);
+    // canvas.drawRect(const Offset(-20, 160) & const Size(140, 40), paint);
-    canvas.drawPath(
+    canvas.drawPath(path, paint);
-      path,
-      Paint()
-        ..color = color
-        ..style = PaintingStyle.fill,
-    );
     canvas.save();
     canvas.restore();

macos/Runner/Assets.xcassets/AppIcon.appiconset/logo.png ADDED Viewed

Binary file

~repos /only-bible-app

git clone https://pyrossh.dev/repos/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 clone https://pyrossh.dev/repos/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs