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.

61c943af — pyrossh

move routes

Files changed (9) hide show

bible_app/lib/components/header.dart +7 -6
bible_app/lib/components/{verse.dart → verse_view.dart} +2 -2
bible_app/lib/main.dart +9 -3
bible_app/lib/routes.dart +0 -106
bible_app/lib/routes.g.dart +0 -60
bible_app/lib/screens/book_selector.dart +0 -171
bible_app/lib/state.dart +6 -0
bible_app/lib/utils/dialog.dart +14 -1
bible_app/pubspec.lock +40 -0

bible_app/lib/components/header.dart CHANGED Viewed

@@ -1,16 +1,17 @@
 import "dart:math";
 import "package:flutter/material.dart";
 import "package:just_audio/just_audio.dart";
-import 'package:kannada_bible_app/routes.dart';
+import "package:kannada_bible_app/domain/book.dart";
+import "../routes/select.dart";
 import "../state.dart";
 import "../domain/kannada_gen.dart";
 class Header extends StatelessWidget {
-  final String bookName;
+  final int book;
   final int chapter;
   final player = AudioPlayer();
-  Header({super.key, required this.bookName, required this.chapter}) {
+  Header({super.key, required this.book, required this.chapter}) {
     player.setUrl("https://github.com/pyrossh/bible-app/raw/master/public/audio/output.mp3");
     player.setUrl("asset:output.mp3");
   }
@@ -33,7 +34,7 @@ class Header extends StatelessWidget {
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                Text("$bookName ${chapter + 1}", style: Theme.of(context).textTheme.headlineLarge),
+                Text("${allBooks[book]} ${chapter + 1}", style: Theme.of(context).textTheme.headlineLarge),
                 Container(
                   margin: const EdgeInsets.only(left: 3),
                   child: Transform.rotate(
@@ -48,8 +49,8 @@ class Header extends StatelessWidget {
           IconButton(
             icon: const Icon(Icons.play_circle_fill, size: 36),
             onPressed: () async {
-              final verses = kannadaBible[bookIndex.value]
+              final verses = kannadaBible[book]
-                  .chapters[chapterIndex.value]
+                  .chapters[chapter]
                   .verses
                   .where((v) => selectedVerses.value.contains(v.index - 1));
               // Todo: play/pause button

bible_app/lib/components/{verse.dart → verse_view.dart} RENAMED Viewed

@@ -2,11 +2,11 @@ import "package:flutter/material.dart";
 import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "../state.dart";
-class Verse extends StatelessWidget {
+class VerseText extends StatelessWidget {
   final int index;
   final String text;
-  const Verse({super.key, required this.index, required this.text});
+  const VerseText({super.key, required this.index, required this.text});
   @override
   Widget build(BuildContext context) {

bible_app/lib/main.dart CHANGED Viewed

@@ -1,7 +1,10 @@
 import "package:flutter/material.dart";
 import 'package:go_router/go_router.dart';
 import "package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart";
+import 'package:kannada_bible_app/domain/book.dart';
+import 'package:kannada_bible_app/state.dart';
-import 'routes.dart' as routes2;
+import 'routes/index.dart';
+import 'routes/select.dart';
 import "components/sidebar.dart";
 void main() async {
@@ -14,11 +17,14 @@ final _rootNavigatorKey = GlobalKey<NavigatorState>();
 final _shellNavigatorKey = GlobalKey<NavigatorState>();
 final _router = GoRouter(
   navigatorKey: _rootNavigatorKey,
-  initialLocation: "/Genesis/1",
+  initialLocation: "/${allBooks[bookIndex.value]}/${chapterIndex.value}",
   routes: [
     ShellRoute(
       navigatorKey: _shellNavigatorKey,
+      routes: [
-      routes: routes2.$appRoutes,
+        $homeScreenRoute,
+        $selectScreenRoute,
+      ],
       builder: (context, state, child) {
         return Scaffold(
           backgroundColor: Colors.white,

bible_app/lib/routes.dart DELETED Viewed

@@ -1,106 +0,0 @@
-import "package:flutter/material.dart";
-import 'package:go_router/go_router.dart';
-import 'screens/book_selector.dart';
-import 'components/header.dart';
-import 'domain/kannada_gen.dart';
-import 'components/verse.dart';
-import 'state.dart';
-part 'routes.g.dart';
-@TypedGoRoute<HomeScreenRoute>(
-  path: "/:book/:chapter",
-)
-@immutable
-class HomeScreenRoute extends GoRouteData {
-  final String book;
-  final int chapter;
-  HomeScreenRoute({required this.book, required this.chapter}) {
-    selectedVerses.value.clear();
-  }
-  @override
-  Page buildPage(BuildContext context, GoRouterState state) {
-    final selectedBook = kannadaBible.firstWhere((it) => book == it.name);
-    final verses = selectedBook.chapters[chapter].verses;
-    return NoPageTransition(
-      child: Column(
-        children: [
-          Header(bookName: selectedBook.name, chapter: chapter),
-          Flexible(
-            child: ListView.builder(
-              padding: const EdgeInsets.symmetric(
-                vertical: 20,
-                horizontal: 40,
-              ),
-              itemCount: verses.length,
-              itemBuilder: (BuildContext context, int index) {
-                final v = verses[index];
-                return Container(
-                  margin: const EdgeInsets.symmetric(vertical: 6),
-                  child: Verse(index: v.index - 1, text: v.text),
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-@TypedGoRoute<SelectScreenRoute>(
-  path: "/select",
-)
-@immutable
-class SelectScreenRoute extends GoRouteData {
-  @override
-  Page buildPage(BuildContext context, GoRouterState state) {
-    final width = MediaQuery.of(context).size.width;
-    final right = width/10;
-    return NoPageTransition(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Flexible(
-            child: Container(
-              margin: EdgeInsets.only(left: 40, top: 20, right: right),
-              child: const BookSelectorScreen(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-class NoPageTransition extends CustomTransitionPage {
-  NoPageTransition({required super.child})
-      : super(
-            transitionDuration: const Duration(milliseconds: 0),
-            reverseTransitionDuration: const Duration(milliseconds: 0),
-            transitionsBuilder: (context, animation, secondaryAnimation, child) {
-              return FadeTransition(
-                opacity: animation,
-                child: child,
-              );
-            });
-}
-// key: state.pageKey,
-// barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
-// barrierDismissible: true,
-// barrierColor: Colors.black.withOpacity(0.7),
-// transitionDuration: const Duration(milliseconds: 0),
-// reverseTransitionDuration: const Duration(milliseconds: 0),
-// transitionsBuilder: (context, animation, secondaryAnimation, child) {
-// return FadeTransition(
-// opacity: animation,
-// child: child,
-// );
-// },
-// opaque: false,
-// fullscreenDialog: false,

bible_app/lib/routes.g.dart DELETED Viewed

@@ -1,60 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-part of 'routes.dart';
-// **************************************************************************
-// GoRouterGenerator
-// **************************************************************************
-List<RouteBase> get $appRoutes => [
-      $homeScreenRoute,
-      $selectScreenRoute,
-    ];
-RouteBase get $homeScreenRoute => GoRouteData.$route(
-      path: '/:book/:chapter',
-      factory: $HomeScreenRouteExtension._fromState,
-    );
-extension $HomeScreenRouteExtension on HomeScreenRoute {
-  static HomeScreenRoute _fromState(GoRouterState state) => HomeScreenRoute(
-        book: state.pathParameters['book']!,
-        chapter: int.parse(state.pathParameters['chapter']!),
-      );
-  String get location => GoRouteData.$location(
-        '/${Uri.encodeComponent(book)}/${Uri.encodeComponent(chapter.toString())}',
-      );
-  void go(BuildContext context) => context.go(location);
-  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
-  void pushReplacement(BuildContext context) =>
-      context.pushReplacement(location);
-  void replace(BuildContext context) => context.replace(location);
-}
-RouteBase get $selectScreenRoute => GoRouteData.$route(
-      path: '/select',
-      factory: $SelectScreenRouteExtension._fromState,
-    );
-extension $SelectScreenRouteExtension on SelectScreenRoute {
-  static SelectScreenRoute _fromState(GoRouterState state) =>
-      SelectScreenRoute();
-  String get location => GoRouteData.$location(
-        '/select',
-      );
-  void go(BuildContext context) => context.go(location);
-  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
-  void pushReplacement(BuildContext context) =>
-      context.pushReplacement(location);
-  void replace(BuildContext context) => context.replace(location);
-}

bible_app/lib/screens/book_selector.dart DELETED Viewed

@@ -1,171 +0,0 @@
-import 'dart:io' show Platform;
-import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
-import 'package:kannada_bible_app/routes.dart';
-import '../domain/book.dart';
-import '../domain/kannada_gen.dart';
-final tabBookIndex = ValueNotifier(0);
-onTabBookChange(int i) {
-  tabBookIndex.value = i;
-}
-class BookSelectorScreen extends StatelessWidget {
-  const BookSelectorScreen({super.key});
-  @override
-  Widget build(BuildContext context) {
-    return DefaultTabController(
-      length: 2,
-      // animationDuration: Platform.isMacOS ? Duration.zero: const Duration(milliseconds: 300),
-      child: Column(
-        children: [
-          SizedBox(
-            width: 250,
-            child: TabBar(
-              labelPadding: EdgeInsets.zero,
-              labelColor: Colors.black,
-              labelStyle: const TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.w600,
-              ),
-              indicator: BoxDecoration(
-                border: Border.all(color: Colors.blue.shade700, width: 3),
-                borderRadius: BorderRadius.circular(50),
-              ),
-              tabs: const [
-                Tab(
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Icon(Icons.book_outlined, color: Colors.red, size: 24),
-                      SizedBox(width: 8),
-                      Text('BOOK'),
-                    ],
-                  ),
-                ),
-                Tab(
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Icon(Icons.bookmark_outline, color: Colors.blue, size: 24),
-                      SizedBox(width: 8),
-                      Text('CHAPTER'),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Container(
-            margin: const EdgeInsets.symmetric(vertical: 20),
-            decoration: const BoxDecoration(
-              border: Border(bottom: BorderSide(width: 1.5)),
-            ),
-          ),
-          Expanded(
-            child: TabBarView(
-              children: [
-                ListView(children: [
-                  Container(
-                    margin: const EdgeInsets.only(bottom: 20, left: 10),
-                    child: Text("Old Testament", style: Theme.of(context).textTheme.headlineMedium),
-                  ),
-                  BooksList(offset: 0, books: oldTestament),
-                  Container(
-                    padding: const EdgeInsets.only(bottom: 20, top: 40, left: 10),
-                    child: Text("New Testament", style: Theme.of(context).textTheme.headlineMedium),
-                  ),
-                  BooksList(offset: 39, books: newTestament),
-                ]),
-                const ChaptersList(),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-class BooksList extends StatelessWidget {
-  final int offset;
-  final List<String> books;
-  const BooksList({super.key, required this.offset, required this.books});
-  @override
-  Widget build(BuildContext context) {
-    return Wrap(
-      children: List.generate(books.length, (index) {
-        final name = books[index].replaceAll(" ", "").substring(0, 3).toUpperCase();
-        return InkWell(
-          borderRadius: const BorderRadius.all(Radius.circular(30)),
-          onTap: () {
-            DefaultTabController.of(context).animateTo(1);
-            tabBookIndex.value = offset + index;
-          },
-          child: Container(
-            width: 90,
-            height: 50,
-            margin: const EdgeInsets.all(8),
-            child: Material(
-              elevation: 3,
-              borderRadius: const BorderRadius.all(Radius.circular(30)),
-              child: Center(
-                child: Text(
-                  name,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.labelMedium,
-                ),
-              ),
-            ),
-          ),
-        );
-      }),
-    );
-  }
-}
-class ChaptersList extends StatelessWidget {
-  const ChaptersList({super.key});
-  @override
-  Widget build(BuildContext context) {
-    final bookIndex = tabBookIndex.reactiveValue(context);
-    final book = kannadaBible[bookIndex];
-    return ListView(children: [
-      Container(
-        margin: const EdgeInsets.only(bottom: 10, left: 10),
-        child: Text(book.name, style: Theme.of(context).textTheme.headlineMedium),
-      ),
-      Wrap(
-        children: List.generate(book.chapters.length, (index) {
-          return InkWell(
-            borderRadius: const BorderRadius.all(Radius.circular(30)),
-            onTap: () {
-              HomeScreenRoute(book: book.name, chapter: index).go(context);
-            },
-            child: Container(
-              width: 90,
-              height: 50,
-              margin: const EdgeInsets.all(8),
-              child: Material(
-                elevation: 3,
-                borderRadius: const BorderRadius.all(Radius.circular(30)),
-                child: Center(
-                  child: Text(
-                    "${index + 1}",
-                    textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.labelMedium,
-                  ),
-                ),
-              ),
-            ),
-          );
-        }),
-      )
-    ]);
-  }
-}

bible_app/lib/state.dart CHANGED Viewed

@@ -31,3 +31,9 @@ onVerseSelected(int i) {
     selectedVerses.value = [...selectedVerses.value, i];
   }
 }
+final tabBookIndex = ValueNotifier(0);
+onTabBookChange(int i) {
+  tabBookIndex.value = i;
+}

bible_app/lib/utils/dialog.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:go_router/go_router.dart";
 Future<T?> showCustomDialog<T>(BuildContext context, Widget child) {
   return showGeneralDialog<T>(
@@ -143,4 +144,16 @@ void showSlideCustomDialog(BuildContext context) {
 //       tabIndex.value = 0;
 //     });
 //   }
-// });
+// });
+class NoPageTransition extends CustomTransitionPage {
+  NoPageTransition({required super.child})
+      : super(
+      transitionDuration: const Duration(milliseconds: 0),
+      reverseTransitionDuration: const Duration(milliseconds: 0),
+      transitionsBuilder: (context, animation, secondaryAnimation, child) {
+        return FadeTransition(
+          opacity: animation,
+          child: child,
+        );
+      });
+}

bible_app/pubspec.lock CHANGED Viewed

@@ -201,6 +201,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
+  directed_graph:
+    dependency: transitive
+    description:
+      name: directed_graph
+      sha256: "82061c9ce3ac74d9c4c173fb03daac515d503a0f9f77c0010a872f8c344a4f03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.9"
+  exception_templates:
+    dependency: transitive
+    description:
+      name: exception_templates
+      sha256: e9303fd16ecdb845a14b397cb93476f807dd2b4706f5ee44f708dbc95c256c33
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.4"
   fake_async:
     dependency: transitive
     description:
@@ -384,6 +400,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.8"
+  lazy_memo:
+    dependency: transitive
+    description:
+      name: lazy_memo
+      sha256: ca4be412d65726f79a30ba6e40b7056f1dbefbb35ec42913365b3f3e86d49279
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.9"
   lints:
     dependency: transitive
     description:
@@ -416,6 +440,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  merging_builder:
+    dependency: "direct dev"
+    description:
+      name: merging_builder
+      sha256: dbe9c12c9c0c675f2684d24c0c4ce91c046f7b32a414f02343507951e1a6f6b7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.5"
   meta:
     dependency: transitive
     description:
@@ -544,6 +576,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.3"
+  quote_buffer:
+    dependency: transitive
+    description:
+      name: quote_buffer
+      sha256: a9eefd3ddc63bb310ffbc855b6ebe0363d925235485bc5778e28c492b1224b31
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.5"
   rxdart:
     dependency: transitive
     description:

~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