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.

d9bde302 — pyrossh

improve code

Files changed (15) hide show

analysis_options.yaml +1 -1
lib/main.dart +8 -8
lib/models.dart +8 -0
lib/theme.dart +9 -15
lib/utils/dialog.dart +4 -2
lib/{widgets/side_menu_page.dart → utils/side_menu_modal.dart} +3 -3
lib/widgets/bible_selector.dart +42 -46
lib/widgets/book_selector.dart +59 -56
lib/widgets/books_list.dart +0 -61
lib/widgets/chapter_selector.dart +55 -0
lib/widgets/chapters_list.dart +0 -52
lib/widgets/header.dart +9 -9
lib/widgets/menu.dart +3 -3
pubspec.lock +0 -48
pubspec.yaml +5 -5

analysis_options.yaml CHANGED Viewed

@@ -13,4 +13,4 @@ linter:
     - use_named_constants
     - use_string_buffers
     - secure_pubspec_urls
-    - lines_longer_than_80_chars
+    - prefer_double_quotes

lib/main.dart CHANGED Viewed

@@ -1,12 +1,12 @@
-import 'package:flutter/material.dart';
+import "package:flutter/material.dart";
-import 'package:flutter/foundation.dart';
+import "package:flutter/foundation.dart";
-import 'package:firebase_core/firebase_core.dart';
+import "package:firebase_core/firebase_core.dart";
 // import 'package:firebase_crashlytics/firebase_crashlytics.dart';
-import 'package:only_bible_app/options.dart';
+import "package:only_bible_app/options.dart";
-import 'package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart';
+import "package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart";
-import 'package:flutter_native_splash/flutter_native_splash.dart';
+import "package:flutter_native_splash/flutter_native_splash.dart";
-import 'package:only_bible_app/state.dart';
+import "package:only_bible_app/state.dart";
-import 'package:only_bible_app/app.dart';
+import "package:only_bible_app/app.dart";
 // Toggle this to cause an async error to be thrown during initialization
 // and to test that runZonedGuarded() catches the error

lib/models.dart CHANGED Viewed

@@ -13,6 +13,14 @@ class Bible {
     required this.name,
     required this.books,
   });
+  List<Book> getOldBooks() {
+    return books.where((it) => it.isOldTestament()).toList();
+  }
+  List<Book> getNewBooks() {
+    return books.where((it) => it.isNewTestament()).toList();
+  }
 }
 class Book {

lib/theme.dart CHANGED Viewed

@@ -37,7 +37,6 @@ final lightTheme = ThemeData(
       textStyle: const TextStyle(
         fontSize: 18,
         fontWeight: FontWeight.w500,
-        color: Color(0xFF9A1111),
         letterSpacing: 0,
       ),
     ),
@@ -93,20 +92,15 @@ final darkTheme = ThemeData(
   ),
   iconButtonTheme: lightTheme.iconButtonTheme,
   textButtonTheme: TextButtonThemeData(
-    style: TextButton.styleFrom( // TODO: copy this
-      enableFeedback: true,
+    style: ButtonStyle(
+      enableFeedback: lightTheme.textButtonTheme.style!.enableFeedback,
-      padding: EdgeInsets.zero,
+      padding: lightTheme.textButtonTheme.style!.padding,
-      shape: const RoundedRectangleBorder(),
+      shape: lightTheme.textButtonTheme.style!.shape,
+      textStyle: lightTheme.textButtonTheme.style!.textStyle,
-      elevation: 1,
+      elevation: lightTheme.textButtonTheme.style!.elevation,
-      shadowColor: Colors.white,
+      shadowColor: MaterialStateProperty.all(Colors.white),
-      backgroundColor: const Color(0xFF323232),
+      backgroundColor: MaterialStateProperty.all(const Color(0xFF323232)),
-      foregroundColor: const Color(0xFFBC86FC),
+      foregroundColor: MaterialStateProperty.all(const Color(0xFFBC86FC)),
-      textStyle: const TextStyle(
-        fontSize: 18,
-        fontWeight: FontWeight.w500,
-        color: Color(0xFF9A1111),
-        letterSpacing: 0,
-      ),
     ),
   ),
   textTheme: TextTheme(

lib/utils/dialog.dart CHANGED Viewed

@@ -1,5 +1,6 @@
 import "dart:ui";
 import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
 Future<T?> showCustomDialog<T>(BuildContext context, Widget child) {
   return showGeneralDialog<T>(
@@ -7,7 +8,7 @@ Future<T?> showCustomDialog<T>(BuildContext context, Widget child) {
     barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
     barrierDismissible: true,
     barrierColor: Colors.black.withOpacity(0.5),
-    transitionDuration: const Duration(milliseconds: 0),
+    transitionDuration: Duration.zero,
     transitionBuilder: (_, anim, __, child) {
       return FadeTransition(
         opacity: anim,
@@ -40,7 +41,8 @@ showAlert(BuildContext context, String title, String message) {
           actions: [
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                // Navigator.of(context).pop();
+                context.pop();
               },
               child: const Text("OK"),
             ),

lib/{widgets/side_menu_page.dart → utils/side_menu_modal.dart} RENAMED Viewed

@@ -1,13 +1,13 @@
 import "package:flutter/material.dart";
 import 'package:only_bible_app/state.dart';
-class SideMenuPage extends ModalRoute<void> {
+class SideMenuModal extends ModalRoute<void> {
   final Widget child;
-  SideMenuPage({required this.child});
+  SideMenuModal({required this.child});
   @override
-  Duration get transitionDuration => const Duration(milliseconds: 300);
+  Duration get transitionDuration => Duration.zero;
   @override
   Duration get reverseTransitionDuration => Duration.zero;

lib/widgets/bible_selector.dart CHANGED Viewed

@@ -1,11 +1,6 @@
 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/state.dart";
-import 'package:only_bible_app/widgets/tile.dart';
+import "package:only_bible_app/models.dart";
-import '../models.dart';
 class BibleSelector extends StatelessWidget {
   const BibleSelector({super.key});
@@ -14,48 +9,49 @@ class BibleSelector extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
-      child: ListView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Column(
+          Container(
+            margin: const EdgeInsets.only(bottom: 20),
+            child: Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
-            children: [
+              children: [
-              Container(
-                margin: const EdgeInsets.only(bottom: 20),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Expanded(
+                Expanded(
-                      child: Text("Bibles", style: Theme.of(context).textTheme.headlineMedium),
+                  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),
-                      ),
-                    );
-                  }),
                 ),
+                Container(
+                  margin: const EdgeInsets.only(right: 10),
+                  child: IconButton(
+                    icon: const Icon(Icons.close, size: 28),
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                )
+              ],
+            ),
+          ),
+          Expanded(
+            child: GridView.count(
+              crossAxisCount: 2,
+              padding: EdgeInsets.zero,
+              shrinkWrap: true,
+              crossAxisSpacing: 0,
+              mainAxisSpacing: 0,
+              childAspectRatio: 4,
+              children: List.of(
+                bibles.map((bible) {
+                  return Container(
+                    margin: const EdgeInsets.only(right: 16, bottom: 16),
+                    child: TextButton(
+                      child: Text(bible.name),
+                      onPressed: () => changeBible(context, bible.id),
+                    ),
+                  );
+                }),
               ),
-            ],
+            ),
           ),
         ],
       ),

lib/widgets/book_selector.dart CHANGED Viewed

@@ -1,70 +1,73 @@
 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/state.dart";
+import "package:only_bible_app/widgets/chapter_selector.dart";
+import "package:only_bible_app/utils/side_menu_modal.dart";
-class BookSelector extends StatefulWidget {
+class BookSelector extends StatelessWidget {
   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) {
+  onBookSelected(BuildContext context, int index) {
-    setState(() {
-      bookIndex = index;
-      tab = 1;
-    });
-  }
-  onChapterSelected(int index) {
-    navigateBookChapter(context, bookIndex, index, true);
+    Navigator.of(context).pushReplacement(SideMenuModal(child: ChapterSelector(selectedBookIndex: index)));
   }
   @override
   Widget build(BuildContext context) {
-    if (tab == 1) {
-      final book = selectedBible.value!.books[bookIndex];
-      return Container(
-        margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
-        child: ChaptersList(
-          title: book.name,
-          length: book.chapters.length,
-          onTap: onChapterSelected,
-        ),
-      );
-    }
-    final oldTestament = selectedBible.value!.books.where((it) => it.isOldTestament()).toList();
-    final newTestament = selectedBible.value!.books.where((it) => it.isNewTestament()).toList();
     return Container(
-      margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20),
+      margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20, right: 20),
+      child: CustomScrollView(
+        slivers: [
+          SliverToBoxAdapter(
-      child: ListView(
+            child: Container(
+              margin: const EdgeInsets.only(bottom: 10),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
-        children: [
+                children: [
+                  Expanded(
+                    child: Text("Old Testament", style: Theme.of(context).textTheme.headlineMedium),
+                  ),
-          BooksList(
+                  IconButton(
-            title: "Old Testament",
+                    icon: const Icon(Icons.close, size: 28),
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
-            books: oldTestament,
+          SliverGrid.count(
-            showClose: true,
+            crossAxisCount: 6,
+            crossAxisSpacing: 16,
+            mainAxisSpacing: 16,
+            childAspectRatio: 1.6,
+            children: List.of(
+              selectedBible.value!.getOldBooks().map((book) {
+                return TextButton(
-            onTap: onBookSelected,
+                  child: Text(book.shortName()),
+                  onPressed: () => onBookSelected(context, book.index),
+                );
+              }),
+            ),
           ),
+          SliverToBoxAdapter(
-          Container(
+            child: Container(
-            margin: const EdgeInsets.only(bottom: 10),
+              margin: const EdgeInsets.only(top: 30, bottom: 20),
+              child: Text("New Testament", style: Theme.of(context).textTheme.headlineMedium),
+            ),
           ),
+          SliverGrid.count(
-          BooksList(
+            crossAxisCount: 6,
+            crossAxisSpacing: 16,
+            mainAxisSpacing: 16,
+            childAspectRatio: 1.6,
+            children: List.of(
-            title: "New Testament",
+              selectedBible.value!.getNewBooks().map((book) {
+                return TextButton(
-            books: newTestament,
+                  child: Text(book.shortName()),
-            showClose: false,
-            onTap: onBookSelected,
+                  onPressed: () => onBookSelected(context, book.index),
+                );
+              }),
+            ),
           ),
         ],
       ),

lib/widgets/books_list.dart DELETED Viewed

@@ -1,61 +0,0 @@
-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.dart';
-class BooksList extends StatelessWidget {
-  final String title;
-  final List<Book> books;
-  final Function(int) onTap;
-  final bool showClose;
-  const BooksList({
-    super.key,
-    required this.title,
-    required this.books,
-    required this.onTap,
-    required this.showClose,
-  });
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Container(
-          margin: const EdgeInsets.only(bottom: 20),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Expanded(
-                child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
-              ),
-              if (showClose)
-                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(
-            books.map((book) {
-              final name = book.shortName();
-              return Tile(
-                name: name,
-                onPressed: () => onTap(book.index),
-              );
-            }),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/widgets/chapter_selector.dart ADDED Viewed

@@ -0,0 +1,55 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+class ChapterSelector extends StatelessWidget {
+  final int selectedBookIndex;
+  const ChapterSelector({super.key, required this.selectedBookIndex});
+  onChapterSelected(BuildContext context, int index) {
+    navigateBookChapter(context, selectedBookIndex, index, true);
+  }
+  @override
+  Widget build(BuildContext context) {
+    final book = selectedBible.value!.books[selectedBookIndex];
+    return Container(
+      margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20, right: 20),
+      child: CustomScrollView(
+        slivers: [
+          SliverToBoxAdapter(
+            child: Container(
+              margin: const EdgeInsets.only(bottom: 10),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Expanded(
+                    child: Text(book.name, style: Theme.of(context).textTheme.headlineMedium),
+                  ),
+                  IconButton(
+                    icon: const Icon(Icons.close, size: 28),
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+          SliverGrid.count(
+            crossAxisCount: 6,
+            crossAxisSpacing: 16,
+            mainAxisSpacing: 16,
+            childAspectRatio: 1.6,
+            children: List.generate(book.chapters.length, (index) {
+              return TextButton(
+                child: Text("${index + 1}"),
+                onPressed: () => onChapterSelected(context, index),
+              );
+            }),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/chapters_list.dart DELETED Viewed

@@ -1,52 +0,0 @@
-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';
-class ChaptersList extends StatelessWidget {
-  final String title;
-  final int length;
-  final Function(int) onTap;
-  const ChaptersList({
-    super.key,
-    required this.title,
-    required this.length,
-    required this.onTap,
-  });
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      children: [
-        Container(
-          margin: const EdgeInsets.only(bottom: 20),
-          child: Row(
-            children: [
-              Expanded(
-                child: Text(title, 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.generate(length, (index) {
-            return Tile(
-              name: "${index + 1}",
-              onPressed: () => onTap(index),
-            );
-          }),
-        )
-      ],
-    );
-  }
-}

lib/widgets/header.dart CHANGED Viewed

@@ -1,11 +1,11 @@
 import "package:flutter/material.dart";
-import 'package:flutter_reactive_value/flutter_reactive_value.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/book_selector.dart";
-import 'package:only_bible_app/widgets/play_button.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/utils/side_menu_modal.dart";
-import 'package:only_bible_app/widgets/menu.dart';
+import "package:only_bible_app/widgets/menu.dart";
-import 'package:only_bible_app/state.dart';
+import "package:only_bible_app/state.dart";
-import 'package:only_bible_app/widgets/bible_selector.dart';
+import "package:only_bible_app/widgets/bible_selector.dart";
 class Header extends StatelessWidget {
   const Header({super.key});
@@ -43,7 +43,7 @@ class Header extends StatelessWidget {
                     style: Theme.of(context).textTheme.headlineMedium,
                   ),
                   onPressed: () {
-                    Navigator.of(context).push(SideMenuPage(child: const BookSelector()));
+                    Navigator.of(context).push(SideMenuModal(child: const BookSelector()));
                   },
                 ),
                 Row(
@@ -57,7 +57,7 @@ class Header extends StatelessWidget {
                         ),
                         child: Text(selectedBible.reactiveValue(context)!.name),
                         onPressed: () {
-                          Navigator.of(context).push(SideMenuPage(child: const BibleSelector()));
+                          Navigator.of(context).push(SideMenuModal(child: const BibleSelector()));
                         },
                       ),
                     ),

lib/widgets/menu.dart CHANGED Viewed

@@ -1,6 +1,6 @@
-import 'package:flutter/material.dart';
+import "package:flutter/material.dart";
-import 'package:flutter_reactive_value/flutter_reactive_value.dart';
+import "package:flutter_reactive_value/flutter_reactive_value.dart";
-import 'package:only_bible_app/state.dart';
+import "package:only_bible_app/state.dart";
 class Menu extends StatelessWidget {
   const Menu({super.key});

pubspec.lock CHANGED Viewed

@@ -49,14 +49,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.16"
-  back_button_interceptor:
-    dependency: transitive
-    description:
-      name: back_button_interceptor
-      sha256: e47660f2178a4392eb72001f9594d3fdcb5efde93e59d2819d61fda499e781c8
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -294,38 +286,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.6"
-  flutter_charset_detector:
-    dependency: "direct main"
-    description:
-      name: flutter_charset_detector
-      sha256: edc87079f3c8917f2fa5620e594d10deef81bbf3d7a89cf99441dec955a06d9f
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  flutter_charset_detector_android:
-    dependency: transitive
-    description:
-      name: flutter_charset_detector_android
-      sha256: "2439a3bf418fe0fb962fc3dc9d0401c3561a497017bc587b9c48a47490f9c428"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  flutter_charset_detector_ios:
-    dependency: transitive
-    description:
-      name: flutter_charset_detector_ios
-      sha256: e0e2c7b819cd1f7c9a50da94bf7f0e6d7a095eb64e81196ec758e77793903d43
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  flutter_charset_detector_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_charset_detector_platform_interface
-      sha256: fcb61de27285031164c945aca4b42e4d36f9a9e359212f21ab652275c9c723ec
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   flutter_driver:
     dependency: transitive
     description: flutter
@@ -580,14 +540,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
-  one_context:
-    dependency: "direct main"
-    description:
-      name: one_context
-      sha256: db39c05e68a0f8dabb68072eab31e21912a5f4933db24eabc2b1af8a02d221e2
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   package_config:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -9,6 +9,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_localizations:
+    sdk: flutter
+  intl: any
   path_provider: ^2.0.15
   flutter_persistent_value_notifier: ^1.0.2
   flutter_reactive_value: ^1.0.4
@@ -16,14 +19,11 @@ dependencies:
   go_router: ^10.0.0
   shared_preferences: ^2.2.0
   flutter_native_splash: ^2.3.1
-  flutter_charset_detector: ^1.0.2
-  one_context: ^2.1.0
   flutter_swipe_detector: ^2.0.0
   cupertino_icons: ^1.0.5
   firebase_core: ^2.15.0
-  flutter_localizations:
+#  firebase_crashlytics: ^3.3.4
-    sdk: flutter
+#  firebase_performance: ^0.9.2+4
-  intl: any
 dev_dependencies:
   flutter_test:

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