only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/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.

0ee096c0 — pyrossh

improve sheets

Files changed (9) hide show

.env.example +2 -0
.gitignore +2 -1
ios/Podfile.lock +0 -20
lib/dialog.dart +0 -124
lib/store/actions_navigation.dart +63 -0
lib/widgets/book_select_sheet.dart +73 -0
lib/widgets/chapter_select_sheet.dart +60 -0
lib/widgets/home_app_bar.dart +2 -2
lib/widgets/settings_sheet.dart +1 -1

.env.example ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ AZURE_TTS_SUBSCRIPTION_KEY=abcd
2	+ RESEND_API_KEY=abcd

.gitignore CHANGED Viewed

@@ -8,4 +8,5 @@ upload-keystore.jks
 svc.json
 .dart_tool
 ui
-.flutter-plugins-dependencies
+.flutter-plugins-dependencies
+.env

ios/Podfile.lock CHANGED Viewed

@@ -1,6 +1,4 @@
 PODS:
-  - app_review (1.0.1):
-    - Flutter
   - audio_session (0.0.1):
     - Flutter
   - connectivity_plus (0.0.1):
@@ -17,17 +15,10 @@ PODS:
     - Flutter
   - share_plus (0.0.1):
     - Flutter
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - url_launcher_ios (0.0.1):
     - Flutter
-  - webview_flutter_wkwebview (0.0.1):
-    - Flutter
-    - FlutterMacOS
 DEPENDENCIES:
-  - app_review (from `.symlinks/plugins/app_review/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - Flutter (from `Flutter`)
@@ -36,13 +27,9 @@ DEPENDENCIES:
   - just_audio (from `.symlinks/plugins/just_audio/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
 EXTERNAL SOURCES:
-  app_review:
-    :path: ".symlinks/plugins/app_review/ios"
   audio_session:
     :path: ".symlinks/plugins/audio_session/ios"
   connectivity_plus:
@@ -59,15 +46,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 SPEC CHECKSUMS:
-  app_review: f75e3250ef5694e328a5ecb3f4c445bc7b32d821
   audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
@@ -76,9 +58,7 @@ SPEC CHECKSUMS:
   just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
 PODFILE CHECKSUM: 251cb053df7158f337c0712f2ab29f4e0fa474ce

lib/dialog.dart CHANGED Viewed

@@ -1,9 +1,7 @@
 import "dart:ui";
 import "package:flutter/material.dart";
-import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/actions_navigation.dart";
 import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/widgets/book_tile.dart";
 void showAlert(BuildContext context, String title, String message) {
   showDialog(
@@ -75,128 +73,6 @@ void showBibleSelectDialog(BuildContext context) {
   );
 }
-void showBookSelectDialog(BuildContext context, Bible bible) {
-  void onBookSelected(BuildContext dialogContext, int index) {
-    final book = bible.books![index];
-    Navigator.of(dialogContext).pop();
-    if (book.chapters!.length == 1) {
-      context.dispatch(GoToChapterAction(bible.name!, index, 0));
-    } else {
-      showChapterSelectDialog(context, bible, book);
-    }
-  }
-  showDialog(
-    context: context,
-    barrierColor: Colors.black54,
-    builder: (_) {
-      final currentBook = context.read().savedBook;
-      final oldBooks = bible.getOldBooks();
-      final newBooks = bible.getNewBooks();
-      return AlertDialog(
-        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-        content: SizedBox(
-          width: double.maxFinite,
-          height: 500,
-          child: ListView(
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(bottom: 8, left: 4),
-                child: Text(
-                  context.l.oldTestamentTitle,
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.w500,
-                    color: context.theme.colorScheme.onSurfaceVariant,
-                  ),
-                ),
-              ),
-              GridView.count(
-                shrinkWrap: true,
-                physics: const NeverScrollableScrollPhysics(),
-                crossAxisCount: 5,
-                crossAxisSpacing: 6,
-                mainAxisSpacing: 6,
-                children: oldBooks
-                    .map((book) => BookTile(
-                        label: book.shortName(context.bookNames[book.index]),
-                        isSelected: currentBook == book.index,
-                        onTap: () => onBookSelected(_, book.index)))
-                    .toList(),
-              ),
-              Padding(
-                padding: const EdgeInsets.only(top: 16, bottom: 8, left: 4),
-                child: Text(
-                  context.l.newTestamentTitle,
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.w500,
-                    color: context.theme.colorScheme.onSurfaceVariant,
-                  ),
-                ),
-              ),
-              GridView.count(
-                shrinkWrap: true,
-                physics: const NeverScrollableScrollPhysics(),
-                crossAxisCount: 5,
-                crossAxisSpacing: 6.0,
-                mainAxisSpacing: 6.0,
-                children: newBooks
-                    .map((book) => BookTile(
-                        label: book.shortName(context.bookNames[book.index]),
-                        isSelected: currentBook == book.index,
-                        onTap: () => onBookSelected(_, book.index)))
-                    .toList(),
-              ),
-            ],
-          ),
-        ),
-      );
-    },
-  );
-}
-void showChapterSelectDialog(BuildContext context, Bible bible, Book book) {
-  final currentChapter = context.read().savedChapter;
-  final currentBook = context.read().savedBook;
-  showDialog(
-    context: context,
-    barrierColor: Colors.black54,
-    builder: (_) {
-      return AlertDialog(
-        title: Text(context.bookNames[book.index]),
-        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-        content: SizedBox(
-          width: double.maxFinite,
-          height: 400,
-          child: GridView.builder(
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 5,
-              crossAxisSpacing: 8.0,
-              mainAxisSpacing: 8.0,
-            ),
-            itemCount: book.chapters!.length,
-            itemBuilder: (_, index) {
-              final isSelected = currentBook == book.index && currentChapter == index;
-              return BookTile(
-                label: "${index + 1}",
-                isSelected: isSelected,
-                onTap: () {
-                  Navigator.of(_).pop();
-                  context.dispatch(
-                    GoToChapterAction(bible.name!, book.index, index),
-                  );
-                },
-              );
-            },
-          ),
-        ),
-      );
-    },
-  );
-}
 void showReportError(BuildContext context, String message, StackTrace? st) {
   if (message.contains("LateInitializationError") || message.contains("HardwareKeyboard")) {
     return;

lib/store/actions_navigation.dart CHANGED Viewed

@@ -4,6 +4,8 @@ import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/actions_state.dart" show audioPlayer;
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/widgets/book_select_sheet.dart";
+import "package:only_bible_app/widgets/chapter_select_sheet.dart";
 import "package:only_bible_app/widgets/settings_sheet.dart";
 import "package:share_plus/share_plus.dart";
@@ -27,6 +29,67 @@ class ShowSettingsAction extends ReduxAction<AppState> {
   }
 }
+class ShowBookSelectAction extends ReduxAction<AppState> {
+  final BuildContext buildContext;
+  final Bible bible;
+  ShowBookSelectAction(this.buildContext, this.bible);
+  @override
+  AppState? reduce() {
+    showModalBottomSheet(
+      context: buildContext,
+      isDismissible: true,
+      enableDrag: true,
+      showDragHandle: true,
+      useSafeArea: true,
+      builder: (_) {
+        return BookSelectSheet(
+          bible: bible,
+          parentContext: buildContext,
+          onBookSelected: (BuildContext sheetContext, int index) {
+            final book = bible.books![index];
+            Navigator.of(sheetContext).pop();
+            if (book.chapters!.length == 1) {
+              dispatch(GoToChapterAction(bible.name!, index, 0));
+            } else {
+              dispatch(ShowChapterSelectAction(buildContext, bible, book));
+            }
+          },
+        );
+      },
+    );
+    return null;
+  }
+}
+class ShowChapterSelectAction extends ReduxAction<AppState> {
+  final BuildContext buildContext;
+  final Bible bible;
+  final Book book;
+  ShowChapterSelectAction(this.buildContext, this.bible, this.book);
+  @override
+  AppState? reduce() {
+    showModalBottomSheet(
+      context: buildContext,
+      isDismissible: true,
+      enableDrag: true,
+      showDragHandle: true,
+      useSafeArea: true,
+      builder: (_) {
+        return ChapterSelectSheet(
+          bible: bible,
+          book: book,
+          parentContext: buildContext,
+        );
+      },
+    );
+    return null;
+  }
+}
 class GoToChapterAction extends ReduxAction<AppState> {
   final String bibleName;
   final int book;

lib/widgets/book_select_sheet.dart ADDED Viewed

@@ -0,0 +1,73 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/widgets/book_tile.dart";
+class BookSelectSheet extends StatefulWidget {
+  final Bible bible;
+  final BuildContext parentContext;
+  final void Function(BuildContext, int) onBookSelected;
+  const BookSelectSheet({
+    super.key,
+    required this.bible,
+    required this.parentContext,
+    required this.onBookSelected,
+  });
+  @override
+  State<BookSelectSheet> createState() => _BookSelectSheetState();
+}
+class _BookSelectSheetState extends State<BookSelectSheet> {
+  bool showOldTestament = true;
+  @override
+  Widget build(BuildContext context) {
+    final currentBook = widget.parentContext.read().savedBook;
+    final books = showOldTestament ? widget.bible.getOldBooks() : widget.bible.getNewBooks();
+    final colorScheme = Theme.of(context).colorScheme;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Column(
+        children: [
+          ToggleButtons(
+            onPressed: (int index) {
+              setState(() {
+                showOldTestament = index == 0;
+              });
+            },
+            borderRadius: const BorderRadius.all(Radius.circular(12)),
+            borderColor: colorScheme.outlineVariant,
+            selectedBorderColor: colorScheme.primary,
+            selectedColor: colorScheme.onPrimary,
+            fillColor: colorScheme.primary,
+            color: colorScheme.onSurfaceVariant,
+            constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
+            isSelected: [showOldTestament, !showOldTestament],
+            children: [
+              Text(widget.parentContext.l.oldTestamentTitle),
+              Text(widget.parentContext.l.newTestamentTitle),
+            ],
+          ),
+          const SizedBox(height: 12),
+          Expanded(
+            child: GridView.count(
+              crossAxisCount: 6,
+              crossAxisSpacing: 6,
+              mainAxisSpacing: 6,
+              children: books
+                  .map((book) => BookTile(
+                      label: book.shortName(widget.parentContext.bookNames[book.index]),
+                      isSelected: currentBook == book.index,
+                      onTap: () => widget.onBookSelected(context, book.index)))
+                  .toList(),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/chapter_select_sheet.dart ADDED Viewed

@@ -0,0 +1,60 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/actions_navigation.dart";
+import "package:only_bible_app/utils.dart";
+import "package:only_bible_app/widgets/book_tile.dart";
+class ChapterSelectSheet extends StatelessWidget {
+  final Bible bible;
+  final Book book;
+  final BuildContext parentContext;
+  const ChapterSelectSheet({
+    super.key,
+    required this.bible,
+    required this.book,
+    required this.parentContext,
+  });
+  @override
+  Widget build(BuildContext context) {
+    final currentChapter = parentContext.read().savedChapter;
+    final currentBook = parentContext.read().savedBook;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Column(
+        children: [
+          Text(
+            parentContext.bookNames[book.index],
+            style: Theme.of(context).textTheme.headlineMedium,
+          ),
+          const SizedBox(height: 12),
+          Expanded(
+            child: GridView.builder(
+              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: 6,
+                crossAxisSpacing: 6,
+                mainAxisSpacing: 6,
+              ),
+              itemCount: book.chapters!.length,
+              itemBuilder: (sheetContext, index) {
+                final isSelected = currentBook == book.index && currentChapter == index;
+                return BookTile(
+                  label: "${index + 1}",
+                  isSelected: isSelected,
+                  onTap: () {
+                    Navigator.of(sheetContext).pop();
+                    parentContext.dispatch(
+                      GoToChapterAction(bible.name!, book.index, index),
+                    );
+                  },
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/home_app_bar.dart CHANGED Viewed

@@ -31,7 +31,7 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => showBookSelectDialog(context, bible),
+              onTap: () => context.dispatch(ShowBookSelectAction(context, bible)),
               child: Text(
                 bookName,
                 style: Theme.of(context).textTheme.headlineMedium,
@@ -40,7 +40,7 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
             ),
             InkWell(
               enableFeedback: true,
-              onTap: () => showChapterSelectDialog(context, bible, book),
+              onTap: () => context.dispatch(ShowChapterSelectAction(context, bible, book)),
               child: Padding(
                 padding: const EdgeInsets.only(left: 16),
                 child: Text(

lib/widgets/settings_sheet.dart CHANGED Viewed

@@ -14,7 +14,7 @@ class SettingsSheet extends StatelessWidget {
     final darkMode = context.select((s) => s.darkMode);
     final boldFont = context.select((s) => s.boldFont);
     final engTitles = context.select((s) => s.engTitles);
-    final fontSize = context.select((s) => s.fontSize).clamp(10.0, 30.0);
+    final fontSize = context.select((s) => s.fontSize);
     return SettingsList(
       contentPadding: EdgeInsets.zero,
       platform: DevicePlatform.iOS,

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/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_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs