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.

65bf36fe — pyrossh

improve app overall

Files changed (26) hide show

README.md +1 -3
android/app/build.gradle +2 -2
android/build.gradle +1 -1
ios/Podfile.lock +0 -10
lib/app.dart +41 -42
lib/models.dart +41 -0
lib/routes/home_screen.dart +0 -98
lib/screens/bible_select_screen.dart +32 -0
lib/screens/book_select_screen.dart +55 -0
lib/screens/chapter_select_screen.dart +35 -0
lib/screens/chapter_view_screen.dart +64 -0
lib/state.dart +53 -29
lib/theme.dart +44 -1
lib/utils.dart +0 -42
lib/utils/dialog.dart +1 -2
lib/utils/side_menu_modal.dart +0 -53
lib/widgets/bible_selector.dart +0 -57
lib/widgets/book_selector.dart +0 -79
lib/widgets/chapter_selector.dart +0 -52
lib/widgets/header.dart +34 -18
lib/widgets/play_button.dart +3 -4
lib/widgets/scaffold_menu.dart +26 -0
lib/widgets/sliver_heading.dart +40 -0
lib/widgets/sliver_tile_grid.dart +33 -0
lib/widgets/verse_list.dart +32 -0
scripts/generate_audio.dart +10 -7

README.md CHANGED Viewed

@@ -1,7 +1,6 @@
 # Only Bible App
-minSdkVersion 30
+Fix dialog theme
-targetSdkVersion 34
 ## Setup
@@ -44,6 +43,5 @@ firebase deploy
 ## Web
 ```agsl
 https://only-bible-app.web.app
-https://only-bible-app.firebaseapp.app
 https://onlybible.app
 ```

android/app/build.gradle CHANGED Viewed

@@ -51,8 +51,8 @@ android {
         applicationId "sh.pyros.only_bible_app"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 30
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/build.gradle CHANGED Viewed

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.0'
         // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.14'
         // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

ios/Podfile.lock CHANGED Viewed

@@ -13,9 +13,6 @@ PODS:
   - FirebaseCoreInternal (10.13.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - Flutter (1.0.0)
-  - flutter_charset_detector_ios (0.0.1):
-    - Flutter
-    - UniversalDetector2 (= 2.0.1)
   - flutter_native_splash (0.0.1):
     - Flutter
   - GoogleUtilities/Environment (7.11.5):
@@ -34,13 +31,11 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - UniversalDetector2 (2.0.1)
 DEPENDENCIES:
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - Flutter (from `Flutter`)
-  - flutter_charset_detector_ios (from `.symlinks/plugins/flutter_charset_detector_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - just_audio (from `.symlinks/plugins/just_audio/ios`)
@@ -54,7 +49,6 @@ SPEC REPOS:
     - FirebaseCoreInternal
     - GoogleUtilities
     - PromisesObjC
-    - UniversalDetector2
 EXTERNAL SOURCES:
   audio_session:
@@ -63,8 +57,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_core/ios"
   Flutter:
     :path: Flutter
-  flutter_charset_detector_ios:
-    :path: ".symlinks/plugins/flutter_charset_detector_ios/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   integration_test:
@@ -83,7 +75,6 @@ SPEC CHECKSUMS:
   FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
   FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_charset_detector_ios: 5157d0104855b9deb78e1395515a287197bc2d55
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
   integration_test: 13825b8a9334a850581300559b8839134b124670
@@ -91,7 +82,6 @@ SPEC CHECKSUMS:
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  UniversalDetector2: 7c9ffd935cf050eeb19edf7e90f6febe3743a1af
 PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189

lib/app.dart CHANGED Viewed

@@ -1,10 +1,8 @@
 import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:flutter_reactive_value/flutter_reactive_value.dart";
-import "package:go_router/go_router.dart";
-import "package:only_bible_app/routes/home_screen.dart";
+import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/state.dart";
-import "package:only_bible_app/widgets/sidebar.dart";
 import "package:only_bible_app/theme.dart";
 class App extends StatelessWidget {
@@ -12,7 +10,7 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return MaterialApp.router(
+    return MaterialApp(
       title: "Only Bible App",
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
@@ -20,44 +18,45 @@ class App extends StatelessWidget {
       themeMode: darkMode.reactiveValue(context) ? ThemeMode.dark : ThemeMode.light,
       theme: lightTheme,
       darkTheme: darkTheme,
+      home: ChapterViewScreen(book: bookIndex.value, chapter: chapterIndex.value),
-      routerConfig: GoRouter(
+      // routerConfig: GoRouter(
-        debugLogDiagnostics: true,
+      //   debugLogDiagnostics: true,
-        initialLocation: "/${selectedBible.value!.books[bookIndex.value].name}/${chapterIndex.value}",
+      //   initialLocation: "/${selectedBible.value!.books[bookIndex.value].name}/${chapterIndex.value}",
-        routes: [
+      //   screens: [
-          ShellRoute(
+      //     ShellRoute(
-            builder: (context, state, child) {
+      //       builder: (context, state, child) {
-              if (isWide(context)) {
+      //         if (isWide(context)) {
+      //           return Scaffold(
+      //             backgroundColor: Theme.of(context).colorScheme.background,
+      //             body: Row(
+      //               children: [
+      //                 const Sidebar(),
+      //                 Flexible(
+      //                   child: child,
+      //                 ),
+      //               ],
+      //             ),
+      //           );
+      //         }
-                return Scaffold(
+      //         return Scaffold(
-                  backgroundColor: Theme.of(context).colorScheme.background,
+      //           backgroundColor: Theme.of(context).colorScheme.background,
-                  body: Row(
-                    children: [
-                      const Sidebar(),
-                      Flexible(
-                        child: child,
-                      ),
-                    ],
-                  ),
-                );
-              }
-              return Scaffold(
-                backgroundColor: Theme.of(context).colorScheme.background,
-                body: SafeArea(
+      //           body: SafeArea(
-                  child: child,
+      //             child: child,
-                ),
+      //           ),
-              );
+      //         );
-            },
+      //       },
-            routes: [
+      //       screens: [
-              GoRouteData.$route(
+      //         GoRouteData.$route(
-                path: "/:book/:chapter",
+      //           path: "/:book/:chapter",
-                factory: (GoRouterState state) => HomeScreen(
+      //           factory: (GoRouterState state) => HomeScreen(
-                  book: state.pathParameters["book"]!,
+      //             book: state.pathParameters["book"]!,
-                  chapter: int.parse(state.pathParameters["chapter"]!),
+      //             chapter: int.parse(state.pathParameters["chapter"]!),
+      //           ),
+      //         ),
+      //       ],
+      //     ),
+      //   ],
-                ),
+      // ),
-              ),
-            ],
-          ),
-        ],
-      ),
     );
   }
 }

lib/models.dart CHANGED Viewed

@@ -148,3 +148,44 @@ final bibles = [
   Bible(id: 10, name: "Telugu"),
   Bible(id: 11, name: "Bengali"),
 ];
+List<Book> getBibleFromText(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;
+    }
+    var book = int.parse(line.substring(0, 2));
+    var chapter = int.parse(line.substring(3, 6));
+    // var verseNo = line.substring(7, 10);
+    var verseText = line.substring(11);
+    double start = 0;
+    double end = 0;
+    // if (item.length > 4) {
+    //   start = double.parse(item[4]);
+    //   end = double.parse(item[5]);
+    // }
+    if (books.length < book) {
+      books.add(
+        Book(
+          index: book - 1,
+          name: bookNames[book-1],
+          chapters: [],
+        ),
+      );
+    }
+    if (books[book - 1].chapters.length < chapter) {
+      // ignore: prefer_const_constructors
+      books[book - 1].chapters.add(Chapter(verses: []));
+    }
+    books[book - 1].chapters[chapter - 1].verses.add(
+      Verse(
+        text: verseText,
+        audioRange: TimeRange(start: start, end: end),
+      ),
+    );
+  }
+  return books;
+}

lib/routes/home_screen.dart DELETED Viewed

@@ -1,98 +0,0 @@
-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';
-import 'package:only_bible_app/widgets/verse_view.dart';
-import 'package:only_bible_app/state.dart';
-class HomeScreen extends GoRouteData {
-  final String book;
-  final int chapter;
-  HomeScreen({required this.book, required this.chapter}) {
-    selectedVerses.value.clear();
-  }
-  @override
-  Page buildPage(BuildContext context, GoRouterState state) {
-    if (slideTextDir.value == null) {
-      return NoTransitionPage(
-        child: SwipeDetector(
-          onSwipeLeft: (offset) {
-            onNext(context);
-          },
-          onSwipeRight: (offset) {
-            onPrevious(context);
-          },
-          child: const Column(
-            children: [
-              Header(),
-              Flexible(
-                child: VerseList(),
-              ),
-            ],
-          ),
-        ),
-      );
-    }
-    return CustomTransitionPage(
-      barrierDismissible: false,
-      barrierColor: Theme.of(context).colorScheme.background,
-      transitionDuration: const Duration(milliseconds: 360),
-      transitionsBuilder: (context, animation, secondaryAnimation, child) {
-        return SwipeDetector(
-          onSwipeLeft: (offset) {
-            onNext(context);
-          },
-          onSwipeRight: (offset) {
-            onPrevious(context);
-          },
-          child: Column(
-            children: [
-              const Header(),
-              Flexible(
-                child: SlideTransition(
-                  textDirection: slideTextDir.value,
-                  position: Tween(begin: const Offset(1, 0), end: Offset.zero)
-                      .chain(CurveTween(curve: Curves.linear))
-                      .animate(animation),
-                  child: child,
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-      child: const VerseList(),
-    );
-  }
-}
-class VerseList extends StatelessWidget {
-  const VerseList({super.key});
-  @override
-  Widget build(BuildContext context) {
-    final selectedBook = selectedBible.reactiveValue(context)!.books[bookIndex.value];
-    final verses = selectedBook.chapters[chapterIndex.value].verses;
-    return SelectionArea(
-      child: ListView.builder(
-        shrinkWrap: false,
-        padding: const EdgeInsets.only(
-          left: 20,
-          right: 20,
-          bottom: 20,
-        ),
-        itemCount: verses.length,
-        itemBuilder: (BuildContext context, int index) {
-          final v = verses[index];
-          return Container(
-            margin: const EdgeInsets.symmetric(vertical: 6),
-            child: VerseText(index: index, text: v.text),
-          );
-        },
-      ),
-    );
-  }
-}

lib/screens/bible_select_screen.dart ADDED Viewed

@@ -0,0 +1,32 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+import "package:only_bible_app/models.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";
+class BibleSelectScreen extends StatelessWidget {
+  const BibleSelectScreen({super.key});
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldMenu(
+      child: CustomScrollView(
+        slivers: [
+          const SliverHeading(title: "Bibles", showClose: true),
+          SliverTileGrid(
+            listType: ListType.large,
+            children: List.of(
+              bibles.map((bible) {
+                return TextButton(
+                  child: Text(bible.name),
+                  onPressed: () => changeBible(context, bible.id),
+                );
+              }),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/book_select_screen.dart ADDED Viewed

@@ -0,0 +1,55 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+import "package:only_bible_app/widgets/scaffold_menu.dart";
+import "package:only_bible_app/screens/chapter_select_screen.dart";
+import "package:only_bible_app/widgets/sliver_heading.dart";
+import "package:only_bible_app/widgets/sliver_tile_grid.dart";
+class BookSelectScreen extends StatelessWidget {
+  const BookSelectScreen({super.key});
+  onBookSelected(BuildContext context, int index) {
+    Navigator.of(context).pushReplacement(
+      PageRouteBuilder(
+        opaque: false,
+        transitionDuration: Duration.zero,
+        reverseTransitionDuration: Duration.zero,
+        pageBuilder: (context, _, __) => ChapterSelectScreen(
+          selectedBookIndex: index,
+        ),
+      ),
+    );
+  }
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldMenu(
+      child: CustomScrollView(
+        slivers: [
+          const SliverHeading(title: "Old Testament", showClose: true),
+          SliverTileGrid(
+            children: List.of(
+              selectedBible.value!.getOldBooks().map((book) {
+                return TextButton(
+                  child: Text(book.shortName()),
+                  onPressed: () => onBookSelected(context, book.index),
+                );
+              }),
+            ),
+          ),
+          const SliverHeading(title: "New Testament", top: 30, bottom: 20),
+          SliverTileGrid(
+            children: List.of(
+              selectedBible.value!.getNewBooks().map((book) {
+                return TextButton(
+                  child: Text(book.shortName()),
+                  onPressed: () => onBookSelected(context, book.index),
+                );
+              }),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/chapter_select_screen.dart ADDED Viewed

@@ -0,0 +1,35 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+import "package:only_bible_app/widgets/scaffold_menu.dart";
+import "package:only_bible_app/widgets/sliver_tile_grid.dart";
+import "package:only_bible_app/widgets/sliver_heading.dart";
+class ChapterSelectScreen extends StatelessWidget {
+  final int selectedBookIndex;
+  const ChapterSelectScreen({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 ScaffoldMenu(
+      child: CustomScrollView(
+        slivers: [
+          SliverHeading(title: book.name, showClose: true),
+          SliverTileGrid(
+            children: List.generate(book.chapters.length, (index) {
+              return TextButton(
+                child: Text("${index + 1}"),
+                onPressed: () => onChapterSelected(context, index),
+              );
+            }),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/chapter_view_screen.dart ADDED Viewed

@@ -0,0 +1,64 @@
+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:only_bible_app/widgets/header.dart";
+import "package:only_bible_app/state.dart";
+import "package:only_bible_app/widgets/play_button.dart";
+import "package:only_bible_app/widgets/sidebar.dart";
+import "package:only_bible_app/widgets/verse_list.dart";
+class ChapterViewScreen extends StatelessWidget {
+  final int book;
+  final int chapter;
+  const ChapterViewScreen({super.key, required this.book, required this.chapter});
+  @override
+  Widget build(BuildContext context) {
+    final isDesktop = isWide(context);
+    final showPlay = selectedVerses.reactiveValue(context).isNotEmpty;
+    return Scaffold(
+      backgroundColor: Theme.of(context).colorScheme.background,
+      bottomSheet: !isDesktop && showPlay
+          ? BottomSheet(
+              enableDrag: false,
+              onClosing: () {},
+              builder: (BuildContext ctx) => Container(
+                padding: const EdgeInsets.only(bottom: 40),
+                child: const Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    PlayButton(),
+                  ],
+                ),
+              ),
+            )
+          : null,
+      body: SafeArea(
+        child: SwipeDetector(
+          onSwipeLeft: (offset) {
+            onNext(context);
+          },
+          onSwipeRight: (offset) {
+            onPrevious(context);
+          },
+          child: Row(
+            children: [
+              if (isWide(context)) const Sidebar(),
+              const Flexible(
+                child: Column(
+                  children: [
+                    Header(),
+                    Flexible(
+                      child: VerseList(),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/state.dart CHANGED Viewed

@@ -1,40 +1,39 @@
-import 'dart:convert';
+import "dart:convert";
-import 'package:flutter/foundation.dart' show defaultTargetPlatform, TargetPlatform;
+import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
-import 'package:flutter/services.dart';
+import "package:flutter/services.dart";
-import 'package:flutter/material.dart';
+import "package:flutter/material.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_reactive_value/flutter_reactive_value.dart';
+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:just_audio/just_audio.dart";
-import 'package:only_bible_app/utils.dart';
+import "package:only_bible_app/screens/chapter_view_screen.dart";
-import 'package:only_bible_app/utils/dialog.dart';
+import "package:only_bible_app/utils/dialog.dart";
-import 'package:only_bible_app/models.dart';
+import "package:only_bible_app/models.dart";
 final shellNavigatorKey = GlobalKey<NavigatorState>();
 final routeNavigatorKey = GlobalKey<NavigatorState>();
 final darkMode = PersistentValueNotifier<bool>(
-  sharedPreferencesKey: 'darkMode',
+  sharedPreferencesKey: "darkMode",
   initialValue: false,
 );
 final fontBold = PersistentValueNotifier<bool>(
-  sharedPreferencesKey: 'fontBold',
+  sharedPreferencesKey: "fontBold",
   initialValue: false,
 );
 final selectedBibleId = PersistentValueNotifier(
-  sharedPreferencesKey: 'selectedBibleId',
+  sharedPreferencesKey: "selectedBibleId",
   initialValue: 1,
 );
 final bookIndex = PersistentValueNotifier<int>(
-  sharedPreferencesKey: 'bookIndex',
+  sharedPreferencesKey: "bookIndex",
   initialValue: 0,
 );
 final chapterIndex = PersistentValueNotifier<int>(
-  sharedPreferencesKey: 'chapterIndex',
+  sharedPreferencesKey: "chapterIndex",
   initialValue: 0,
 );
@@ -94,19 +93,44 @@ changeBible(BuildContext context, int i) {
   Navigator.of(context).pop();
 }
-navigateBookChapter(BuildContext context, int book, int chapter, bool noAnim) {
+createSlideRoute({required BuildContext context, TextDirection? slideDir, required Widget page}) {
-  if (isWide(context) || noAnim) {
+  if (isWide(context) || slideDir == null) {
+    return PageRouteBuilder(
-    slideTextDir.value = null;
+      pageBuilder: (context, _, __) {
-  } else {
+        return page;
+      },
-    slideTextDir.value = bookIndex.value > book || chapterIndex.value > chapter ? TextDirection.rtl : TextDirection.ltr;
+    );
   }
+  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,
+      );
+    },
+  );
+}
+navigateBookChapter(BuildContext context, int book, int chapter, bool noAnim) {
+  final slideDir = bookIndex.value > book || chapterIndex.value > chapter ? TextDirection.rtl : TextDirection.ltr;
+  // TODO: add bible param here maybe
+  // route: /bible/book/chapter
   bookIndex.value = book;
   chapterIndex.value = chapter;
-  context.push("/${selectedBible.value!.books[book].name}/$chapter");
-  // Use this or use navigatorKey once header moves scaffold
-  // if (!isWide(context)) {
+  selectedVerses.value.clear();
-  //   Navigator.of(context).pop();
+  Navigator.of(context).push(
+    createSlideRoute(
-  // }
+      context: context,
+      slideDir: noAnim ? null : slideDir,
+      page: ChapterViewScreen(book: book, chapter: chapter),
+    ),
+  );
 }
 onNext(BuildContext context) {
@@ -161,9 +185,9 @@ onPlay(BuildContext context) async {
       isPlaying.value = true;
       for (final v in selectedVerses.value) {
         final bibleName = selectedBible.value!.name;
-        final book = (bookIndex.value + 1).toString().padLeft(2, '0');
+        final book = (bookIndex.value + 1).toString().padLeft(2, "0");
-        final chapter = (chapterIndex.value + 1).toString().padLeft(3, '0');
+        final chapter = (chapterIndex.value + 1).toString().padLeft(3, "0");
-        final verse = (v + 1).toString().padLeft(3, '0');
+        final verse = (v + 1).toString().padLeft(3, "0");
         await player.setUrl(
           "http://localhost:3000/$bibleName/$book-$chapter-$verse.mp3",
         );

lib/theme.dart CHANGED Viewed

@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import "package:flutter/material.dart";
 final lightTheme = ThemeData(
   brightness: Brightness.light,
@@ -12,6 +12,31 @@ final lightTheme = ThemeData(
   hoverColor: const Color(0xAAF8D0DC),
   dividerColor: Colors.black,
   shadowColor: Colors.black,
+  bottomSheetTheme: const BottomSheetThemeData(
+    elevation: 10,
+    shadowColor: Colors.black,
+    backgroundColor: Colors.white,
+    surfaceTintColor: Colors.white,
+    shape: Border(
+      top: BorderSide(
+        width: 1.5,
+        color: Colors.black,
+      ),
+    ),
+  ),
+  dialogTheme: const DialogTheme(
+    elevation: 10,
+    // TODO: get this to inherit from top like darkTheme does
+    shadowColor: Colors.black,
+    backgroundColor: Colors.white,
+    surfaceTintColor: Colors.white,
+    shape: Border(
+      top: BorderSide(
+        width: 1.5,
+        color: Colors.black,
+      ),
+    ),
+  ),
   popupMenuTheme: const PopupMenuThemeData(
     enableFeedback: true,
     elevation: 4,
@@ -86,6 +111,24 @@ final darkTheme = ThemeData(
   hoverColor: const Color(0xAA5D4979),
   dividerColor: Colors.white,
   shadowColor: Colors.white,
+  bottomSheetTheme: const BottomSheetThemeData(
+    elevation: 1,
+    shape: Border(
+      top: BorderSide(
+        width: 1.5,
+        color: Color(0xAA5D4979),
+      ),
+    ),
+  ),
+  dialogTheme: const DialogTheme(
+    elevation: 1,
+    shape: Border(
+      top: BorderSide(
+        width: 1.5,
+        color: Color(0xAA5D4979),
+      ),
+    ),
+  ),
   popupMenuTheme: lightTheme.popupMenuTheme,
   colorScheme: const ColorScheme.dark(
     background: Color(0xFF1F1F22),

lib/utils.dart DELETED Viewed

@@ -1,42 +0,0 @@
-import 'package:only_bible_app/models.dart';
-List<Book> getBibleFromText(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;
-    }
-    var book = int.parse(line.substring(0, 2));
-    var chapter = int.parse(line.substring(3, 6));
-    // var verseNo = line.substring(7, 10);
-    var verseText = line.substring(11);
-    double start = 0;
-    double end = 0;
-    // if (item.length > 4) {
-    //   start = double.parse(item[4]);
-    //   end = double.parse(item[5]);
-    // }
-    if (books.length < book) {
-      books.add(
-        Book(
-          index: book - 1,
-          name: bookNames[book-1],
-          chapters: [],
-        ),
-      );
-    }
-    if (books[book - 1].chapters.length < chapter) {
-      // ignore: prefer_const_constructors
-      books[book - 1].chapters.add(Chapter(verses: []));
-    }
-    books[book - 1].chapters[chapter - 1].verses.add(
-          Verse(
-            text: verseText,
-            audioRange: TimeRange(start: start, end: end),
-          ),
-        );
-  }
-  return books;
-}

lib/utils/dialog.dart CHANGED Viewed

@@ -41,8 +41,7 @@ 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/utils/side_menu_modal.dart DELETED Viewed

@@ -1,53 +0,0 @@
-import "package:flutter/material.dart";
-import "package:only_bible_app/state.dart";
-class SideMenuModal extends ModalRoute<void> {
-  final Widget child;
-  SideMenuModal({required this.child});
-  @override
-  Duration get transitionDuration => Duration.zero;
-  @override
-  Duration get reverseTransitionDuration => Duration.zero;
-  @override
-  bool get opaque => false;
-  @override
-  bool get barrierDismissible => true;
-  @override
-  Color get barrierColor => Colors.black.withOpacity(0.7);
-  @override
-  String? get barrierLabel => "Route";
-  @override
-  bool get maintainState => false;
-  @override
-  Widget buildPage(
-    BuildContext context,
-    Animation<double> animation,
-    Animation<double> secondaryAnimation,
-  ) {
-    return Material(
-      type: MaterialType.transparency,
-      child: Container(
-        color: Theme.of(context).colorScheme.background,
-        margin: EdgeInsets.only(left: 0, right: isWide(context) ? 650 : 0),
-        child: Container(
-          margin: EdgeInsets.only(top: isWide(context) ? 5 : 0, left: 20, right: 20),
-          child: isWide(context)
-              ? child
-              : SlideTransition(
-                  position: Tween(begin: const Offset(-1, 0), end: Offset.zero).animate(animation),
-                  child: child,
-                ),
-        ),
-      ),
-    );
-  }
-}

lib/widgets/bible_selector.dart DELETED Viewed

@@ -1,57 +0,0 @@
-import "package:flutter/material.dart";
-import "package:only_bible_app/state.dart";
-import "package:only_bible_app/models.dart";
-class BibleSelector extends StatelessWidget {
-  const BibleSelector({super.key});
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Container(
-          margin: const EdgeInsets.only(bottom: 10),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Expanded(
-                child: Text("Bibles", style: Theme.of(context).textTheme.headlineMedium),
-              ),
-              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 DELETED Viewed

@@ -1,79 +0,0 @@
-import "package:flutter/material.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 StatelessWidget {
-  const BookSelector({super.key});
-  onBookSelected(BuildContext context, int index) {
-    Navigator.of(context).pushReplacement(
-      SideMenuModal(
-        child: ChapterSelector(
-          selectedBookIndex: index,
-        ),
-      ),
-    );
-  }
-  @override
-  Widget build(BuildContext context) {
-    return CustomScrollView(
-      slivers: [
-        SliverToBoxAdapter(
-          child: Container(
-            margin: const EdgeInsets.only(bottom: 10),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Expanded(
-                  child: Text("Old Testament", 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.of(
-            selectedBible.value!.getOldBooks().map((book) {
-              return TextButton(
-                child: Text(book.shortName()),
-                onPressed: () => onBookSelected(context, book.index),
-              );
-            }),
-          ),
-        ),
-        SliverToBoxAdapter(
-          child: Container(
-            margin: const EdgeInsets.only(top: 30, bottom: 20),
-            child: Text("New Testament", style: Theme.of(context).textTheme.headlineMedium),
-          ),
-        ),
-        SliverGrid.count(
-          crossAxisCount: 6,
-          crossAxisSpacing: 16,
-          mainAxisSpacing: 16,
-          childAspectRatio: 1.6,
-          children: List.of(
-            selectedBible.value!.getNewBooks().map((book) {
-              return TextButton(
-                child: Text(book.shortName()),
-                onPressed: () => onBookSelected(context, book.index),
-              );
-            }),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/widgets/chapter_selector.dart DELETED Viewed

@@ -1,52 +0,0 @@
-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 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/header.dart CHANGED Viewed

@@ -1,11 +1,10 @@
 import "package:flutter/material.dart";
 import "package:flutter_reactive_value/flutter_reactive_value.dart";
+import "package:only_bible_app/screens/bible_select_screen.dart";
-import "package:only_bible_app/widgets/book_selector.dart";
+import "package:only_bible_app/screens/book_select_screen.dart";
 import "package:only_bible_app/widgets/play_button.dart";
-import "package:only_bible_app/utils/side_menu_modal.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});
@@ -15,6 +14,7 @@ class Header extends StatelessWidget {
     final book = bookIndex.reactiveValue(context);
     final chapter = chapterIndex.reactiveValue(context);
     final selectedBook = selectedBible.value!.books[book];
+    final isDesktop = isWide(context);
     return Container(
         padding: EdgeInsets.only(
           left: 20,
@@ -43,28 +43,44 @@ class Header extends StatelessWidget {
                     style: Theme.of(context).textTheme.headlineMedium,
                   ),
                   onPressed: () {
+                    Navigator.of(context).push(
+                      PageRouteBuilder(
+                        opaque: false,
+                        transitionDuration: Duration.zero,
+                        reverseTransitionDuration: Duration.zero,
-                    Navigator.of(context).push(SideMenuModal(child: const BookSelector()));
+                        pageBuilder: (context, _, __) => const BookSelectScreen(),
+                      ),
+                    );
                   },
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
+                    if (isDesktop)
-                    Container(
+                      Container(
-                      margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
+                        margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
-                      child: TextButton(
+                        child: TextButton(
-                        style: TextButton.styleFrom(
+                          style: TextButton.styleFrom(
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
+                            padding: const EdgeInsets.symmetric(horizontal: 20),
+                          ),
+                          child: Text(selectedBible.reactiveValue(context)!.name),
+                          onPressed: () {
+                            Navigator.of(context).push(
+                              PageRouteBuilder(
+                                opaque: false,
+                                transitionDuration: Duration.zero,
+                                reverseTransitionDuration: Duration.zero,
+                                pageBuilder: (context, _, __) => const BibleSelectScreen(),
+                              ),
+                            );
+                          },
                         ),
-                        child: Text(selectedBible.reactiveValue(context)!.name),
-                        onPressed: () {
-                          Navigator.of(context).push(SideMenuModal(child: const BibleSelector()));
-                        },
                       ),
+                    if (isDesktop)
+                      Container(
+                        margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
+                        child: const PlayButton(),
-                    ),
+                      ),
-                    Container(
-                      margin: EdgeInsets.only(right: isWide(context) ? 10 : 8),
-                      child: const PlayButton(),
-                    ),
                     const Menu(),
                   ],
                 ),

lib/widgets/play_button.dart CHANGED Viewed

@@ -7,11 +7,10 @@ class PlayButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final icon = isPlaying.reactiveValue(context) ? Icons.pause_circle_filled : Icons.play_circle_fill;
-    final icon = isPlaying.reactiveValue(context)
+    final size = isWide(context) ? 28.0 : 42.0;
-        ? Icons.pause_circle_filled
-        : Icons.play_circle_fill;
     return IconButton(
-      icon: Icon(icon, size: 28),
+      icon: Icon(icon, size: size),
       onPressed: () {
         onPlay(context);
       },

lib/widgets/scaffold_menu.dart ADDED Viewed

@@ -0,0 +1,26 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+class ScaffoldMenu extends StatelessWidget {
+  final Widget child;
+  const ScaffoldMenu({super.key, required this.child});
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      body: SafeArea(
+        child: Container(
+          color: Colors.black.withOpacity(0.7),
+          margin: EdgeInsets.only(left: isWide(context) ? 250 : 0),
+          child: Container(
+            color: Theme.of(context).colorScheme.background,
+            margin: EdgeInsets.only(right: isWide(context) ? 650 : 0),
+            child: child,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sliver_heading.dart ADDED Viewed

@@ -0,0 +1,40 @@
+import "package:flutter/material.dart";
+class SliverHeading extends StatelessWidget {
+  final String title;
+  final bool showClose;
+  final double top;
+  final double bottom;
+  const SliverHeading({
+    super.key,
+    required this.title,
+    this.showClose = false,
+    this.top = 0,
+    this.bottom = 10,
+  });
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: Container(
+        margin: EdgeInsets.only(top: top, bottom: bottom, left: 20, right: 10),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Expanded(
+              child: Text(title, style: Theme.of(context).textTheme.headlineMedium),
+            ),
+            if (showClose)
+              IconButton(
+                icon: const Icon(Icons.close, size: 28),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              )
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/sliver_tile_grid.dart ADDED Viewed

@@ -0,0 +1,33 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/state.dart";
+enum ListType { small, large }
+class SliverTileGrid extends StatelessWidget {
+  final ListType listType;
+  final List<Widget> children;
+  const SliverTileGrid({super.key, this.listType = ListType.small, required this.children});
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      sliver: SliverGrid.count(
+        crossAxisCount: listType == ListType.large
+            ? 2
+            : isWide(context)
+                ? 6
+                : 5,
+        crossAxisSpacing: 16,
+        mainAxisSpacing: 16,
+        childAspectRatio: listType == ListType.large
+            ? 4
+            : isWide(context)
+                ? 1.6
+                : 1.5,
+        children: children,
+      ),
+    );
+  }
+}

lib/widgets/verse_list.dart ADDED Viewed

@@ -0,0 +1,32 @@
+import "package:flutter/material.dart";
+import "package:flutter_reactive_value/flutter_reactive_value.dart";
+import "package:only_bible_app/widgets/verse_view.dart";
+import "package:only_bible_app/state.dart";
+class VerseList extends StatelessWidget {
+  const VerseList({super.key});
+  @override
+  Widget build(BuildContext context) {
+    final selectedBook = selectedBible.reactiveValue(context)!.books[bookIndex.value];
+    final verses = selectedBook.chapters[chapterIndex.value].verses;
+    return SelectionArea(
+      child: ListView.builder(
+        shrinkWrap: false,
+        padding: const EdgeInsets.only(
+          left: 20,
+          right: 20,
+          bottom: 20,
+        ),
+        itemCount: verses.length,
+        itemBuilder: (BuildContext context, int index) {
+          final v = verses[index];
+          return Container(
+            margin: const EdgeInsets.symmetric(vertical: 6),
+            child: VerseText(index: index, text: v.text),
+          );
+        },
+      ),
+    );
+  }
+}

scripts/generate_audio.dart CHANGED Viewed

@@ -4,8 +4,8 @@ import 'package:flutter_azure_tts/flutter_azure_tts.dart';
 Future<void> convertText(Voice v, String fileName, String text) async {
   final ttsResponse = await AzureTts.getTts(TtsParams(
     voice: v,
-    audioFormat: AudioOutputFormat.audio48khz96kBitrateMonoMp3,
+    audioFormat: AudioOutputFormat.audio24khz48kBitrateMonoMp3,
-    rate: 0.80,
+    rate: 0.90,
     text: text,
   ));
   await File(fileName).writeAsBytes(ttsResponse.audio.buffer.asUint8List(), flush: true);
@@ -18,14 +18,14 @@ void main() async {
     name: "",
     displayName: "",
     localName: "",
-    shortName: "kn-IN-GaganNeural",
+    shortName: "ne-NP-SagarNeural",
     gender: "Male",
-    locale: "kn-IN",
+    locale: "ne-NP",
     sampleRateHertz: AudioOutputFormat.audio24khz48kBitrateMonoMp3,
     voiceType: "",
     status: "",
   );
-  final bibleTxt = await File("./assets/bibles/Kannada.txt").readAsString();
+  final bibleTxt = await File("./assets/bibles/Nepali.txt").readAsString();
   final lines = bibleTxt.split("\n");
   for (final line in lines) {
     if (line.isEmpty) {
@@ -35,13 +35,16 @@ void main() async {
     final chapter = line.substring(3, 6);
     final verseNo = line.substring(7, 10);
     final verseText = line.substring(11);
-    print("${book}-${chapter}-${verseNo}.mp3");
+    print("$book-$chapter-$verseNo.mp3");
-    final outputFilename = "./scripts/audio/${book}-${chapter}-${verseNo}.mp3";
+    final outputFilename = "./scripts/audio/Nepali/$book-$chapter-$verseNo.mp3";
     final outFile = File(outputFilename);
     if (outFile.existsSync() && outFile.lengthSync() > 100) {
       continue;
     }
     await convertText(voice, outputFilename, verseText);
+    if (chapter == "002") {
+      break;
+    }
   }
   print("finished");
 }

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