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.

469b205a — pyrossh

improve state

Files changed (10) hide show

bible_app/lib/components/book_selector.dart +36 -12
bible_app/lib/components/books_list.dart +11 -16
bible_app/lib/components/chapters_list.dart +8 -14
bible_app/lib/components/header.dart +2 -0
bible_app/lib/components/play_button.dart +1 -0
bible_app/lib/components/side_menu_page.dart +1 -1
bible_app/lib/main.dart +1 -3
bible_app/lib/models/book.dart +7 -0
bible_app/lib/state.dart +0 -15
bible_app/lib/utils/string.dart +0 -9

bible_app/lib/components/book_selector.dart CHANGED Viewed

@@ -1,35 +1,59 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
-import '../models/book.dart';
+import 'package:go_router/go_router.dart';
-import '../state.dart';
 import 'books_list.dart';
 import 'chapters_list.dart';
+import '../state.dart';
-// TODO: use local state for tab instead of global
-class BookSelector extends StatelessWidget {
+class BookSelector extends StatefulWidget {
   const BookSelector({super.key});
+  @override
+  State<StatefulWidget> createState() => BookSelectorState();
+}
+class BookSelectorState extends State<BookSelector> {
+  int tab = 0;
+  int bookIndex = 0;
+  @override
+  void initState() {
+    super.initState();
+    tab = 0;
+  }
+  onBookSelected(int index) {
+    setState(() {
+      bookIndex = index;
+      tab = 1;
+    });
+  }
+  onChapterSelected(int index) {
+    saveBookIndex(bookIndex, index);
+    context.push("/${selectedBible.value[bookIndex].name}/$index");
+    context.pop();
+  }
   @override
   Widget build(BuildContext context) {
-    final tab = tabIndex.reactiveValue(context);
     if (tab == 1) {
+      final book = selectedBible.value[bookIndex];
       return Container(
         margin: const EdgeInsets.only(top: 15, left: 20),
-        child: const ChaptersList(),
+        child: ChaptersList(title: book.name, length: book.chapters.length, onTap: onChapterSelected),
       );
     }
-    final oldTestament = selectedBible.value.where((it) => it.isOldTestament()).map((it) => it.name).toList();
+    final oldTestament = selectedBible.value.where((it) => it.isOldTestament()).toList();
-    final newTestament = selectedBible.value.where((it) => it.isNewTestament()).map((it) => it.name).toList();
+    final newTestament = selectedBible.value.where((it) => it.isNewTestament()).toList();
     return Container(
       margin: const EdgeInsets.only(top: 15, left: 20),
       child: ListView(
         children: [
-          BooksList(title: "Old Testament", offset: 0, books: oldTestament),
+          BooksList(title: "Old Testament", books: oldTestament, onTap: onBookSelected),
           Container(
             margin: const EdgeInsets.only(bottom: 10),
           ),
-          BooksList(title: "New Testament", offset: 39, books: newTestament),
+          BooksList(title: "New Testament", books: newTestament, onTap: onBookSelected),
         ],
       ),
     );

bible_app/lib/components/books_list.dart CHANGED Viewed

@@ -1,14 +1,13 @@
 import "package:flutter/material.dart";
-import "../utils/string.dart";
-import "../state.dart";
 import "tile.dart";
+import "../models/book.dart";
 class BooksList extends StatelessWidget {
   final String title;
-  final int offset;
-  final List<String> books;
+  final List<Book> books;
+  final Function(int) onTap;
-  const BooksList({super.key, required this.title, required this.offset, required this.books});
+  const BooksList({super.key, required this.title, required this.books, required this.onTap});
   @override
   Widget build(BuildContext context) {
@@ -17,24 +16,20 @@ class BooksList extends StatelessWidget {
       children: [
         Container(
           margin: const EdgeInsets.only(bottom: 20),
-          child: Text(title, style: Theme
-              .of(context)
+          child: Text(
-              .textTheme
+            title,
-              .headlineMedium,
+            style: Theme.of(context).textTheme.headlineMedium,
           ),
         ),
         Wrap(
-          children: List.generate(books.length, (index) {
+          children: List.of(books.map((book) {
-            final name = books[index].bookShortName();
+            final name = book.shortName();
             return InkWell(
               borderRadius: const BorderRadius.all(Radius.circular(30)),
-              onTap: () {
-                tabBookIndex.value = offset + index;
+              onTap: () => onTap(book.index),
-                tabIndex.value = 1;
-              },
               child: Tile(name: name),
             );
-          }),
+          })),
         ),
       ],
     );

bible_app/lib/components/chapters_list.dart CHANGED Viewed

@@ -1,32 +1,26 @@
 import "package:flutter/material.dart";
-import 'package:flutter_reactive_value/flutter_reactive_value.dart';
-import 'package:go_router/go_router.dart';
-import '../state.dart';
 import 'tile.dart';
 class ChaptersList extends StatelessWidget {
+  final String title;
+  final int length;
-  const ChaptersList({super.key});
+  final Function(int) onTap;
+  const ChaptersList({super.key, required this.title, required this.length, required this.onTap});
   @override
   Widget build(BuildContext context) {
-    final bookIndex = tabBookIndex.reactiveValue(context);
-    final book = selectedBible.value[bookIndex];
     return ListView(
       children: [
         Container(
           margin: const EdgeInsets.only(bottom: 20),
-          child: Text(book.name, style: Theme.of(context).textTheme.headlineMedium),
+          child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
         ),
         Wrap(
-          children: List.generate(book.chapters.length, (index) {
+          children: List.generate(length, (index) {
             return InkWell(
               borderRadius: const BorderRadius.all(Radius.circular(30)),
-              onTap: () {
-                saveBookIndex(bookIndex, index);
+              onTap: () => onTap(index),
-                context.push("/${book.name}/$index");
-                context.pop();
-                resetTab();
-              },
               child: Tile(name: "${index + 1}"),
             );
           }),

bible_app/lib/components/header.dart CHANGED Viewed

@@ -2,6 +2,7 @@ import "dart:math";
 import "package:flutter/material.dart";
 import "./play_button.dart";
 import "./side_menu_page.dart";
+import "./menu.dart";
 import '../models/book.dart';
 import "../state.dart";
@@ -45,6 +46,7 @@ class Header extends StatelessWidget {
           ),
           const Spacer(flex: 1),
           PlayButton(book: book, chapter: chapter, verses: verses),
+          Menu(),
           // const Spacer(flex: 1),
         ],
       ),

bible_app/lib/components/play_button.dart CHANGED Viewed

@@ -16,6 +16,7 @@ class PlayButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final icon = isPlaying.reactiveValue(context) ? Icons.pause_circle_filled : Icons.play_circle_fill;
     return IconButton(
+      padding: EdgeInsets.symmetric(horizontal: 50),
       icon: Icon(icon, size: 36),
       onPressed: () async {
         final player = AudioPlayer();

bible_app/lib/components/side_menu_page.dart CHANGED Viewed

@@ -35,7 +35,7 @@ class SideMenuPage extends ModalRoute<void> {
       child: Container(
         color: Colors.white,
         margin: EdgeInsets.only(left: 0, right: isDesktop() ? 650 : 0),
-        child: BookSelector(),
+        child: const BookSelector(),
       ),
     );
   }

bible_app/lib/main.dart CHANGED Viewed

@@ -12,11 +12,9 @@ void main() async {
   await initPersistentValueNotifier();
   await loadBible();
   runApp(MaterialApp.router(
-    debugShowCheckedModeBanner: false,
     routerConfig: GoRouter(
-      navigatorKey: GlobalKey<NavigatorState>(),
-      initialLocation: "/${selectedBible.value[bookIndex.value].name}/${chapterIndex.value}",
       debugLogDiagnostics: true,
+      initialLocation: "/${selectedBible.value[bookIndex.value].name}/${chapterIndex.value}",
       routes: [
         Shell(
           routes: [

bible_app/lib/models/book.dart CHANGED Viewed

@@ -9,6 +9,13 @@ class Book {
   bool isOldTestament() => index < 39;
   bool isNewTestament() => index >= 39;
+  String shortName() {
+    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 {

bible_app/lib/state.dart CHANGED Viewed

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:io' show GZipCodec, Platform;
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart';
 import 'package:flutter_reactive_value/flutter_reactive_value.dart';
 import 'models/book.dart';
@@ -95,20 +94,6 @@ onVerseSelected(int i) {
   }
 }
-final tabIndex = ValueNotifier(0);
-final tabBookIndex = ValueNotifier(0);
-onTabBookChange(int i) {
-  tabBookIndex.value = i;
-  tabIndex.value = 1;
-}
-resetTab() {
-  SchedulerBinding.instance.addPostFrameCallback((_) {
-    tabIndex.value = 0;
-  });
-}
 bool isDesktop() {
   return Platform.isMacOS || Platform.isLinux || Platform.isWindows;
 }

bible_app/lib/utils/string.dart DELETED Viewed

@@ -1,9 +0,0 @@
-extension StringExtension on String {
-  String bookShortName() {
-    // final name = replaceAll(" ", "").substring(0, 3);
-    if (this[0] == "1" || this[0] == "2" || this[0] == "3") {
-      return "${this[0]}${this[2].toUpperCase()}${substring(3, 4).toLowerCase()}";
-    }
-    return "${this[0].toUpperCase()}${substring(1, 3).toLowerCase()}";
-  }
-}

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