c2e460a | only-bible-app

git clone https://git.pyrossh.dev/only-bible-app

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

c2e460a — Peter John 2026-08-08T13:34:21+05:30

fix navigatino

Generated files not shown: pubspec.lock

Files changed (11) hide show

.gitignore +1 -0
ios/Runner.xcodeproj/project.pbxproj +6 -6
ios/Runner/Info.plist +1 -5
lib/app.dart +40 -17
lib/dialog.dart +24 -5
lib/home.dart +1 -1
lib/store/actions_navigation.dart +35 -1
macos/Runner/Info.plist +0 -4
pubspec.yaml +2 -3
test/actions_backup_test.dart +3 -2
test/app_logic_test.dart +8 -7

.gitignore CHANGED Viewed

@@ -17,6 +17,7 @@ node_modules
 *.aab
 *.apk
 *.ipa
+*.dSYM.zip
 # Python
 .venv

ios/Runner.xcodeproj/project.pbxproj CHANGED Viewed

@@ -485,7 +485,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -508,7 +508,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -526,7 +526,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -542,7 +542,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -671,7 +671,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -698,7 +698,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;

ios/Runner/Info.plist CHANGED Viewed

@@ -23,7 +23,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>4</string>
+		<string>5</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>UIApplicationSceneManifest</key>
@@ -72,10 +72,6 @@
 		<false/>
 		<key>NSPhotoLibraryUsageDescription</key>
 		<string>Only Bible App uses the system file picker to let you choose a backup file to restore your highlights and settings. Depending on your device, this picker may show your photo library, though Only Bible App does not access your photos directly.</string>
-		<key>NSCameraUsageDescription</key>
-		<string>Only Bible App does not use the camera. This description is required because a bundled library references camera APIs, even though this app does not use them.</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>Only Bible App does not use your location. This description is required because a bundled library references location APIs, even though this app does not use them.</string>
 		<key>NSAppleMusicUsageDescription</key>
 		<string>Only Bible App does not access your music library. This description is required because a bundled library references media library APIs, even though this app does not use them.</string>
 	</dict>

lib/app.dart CHANGED Viewed

@@ -22,31 +22,53 @@ class App extends StatelessWidget {
           path: "/chapter/:bookIndex/:chapterIndex",
           pageBuilder: (context, state) {
             final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
+            final chapterIndex = int.parse(
-            final chapterIndex = int.parse(state.pathParameters["chapterIndex"]!);
+              state.pathParameters["chapterIndex"]!,
+            );
+            final extra =
+                state.extra
+                    as ({
-            final extra = state.extra as ({TextDirection? slideDir, int? scrollToVerse, int navId})?;
+                      TextDirection? slideDir,
+                      int? scrollToVerse,
+                      int navId,
+                    })?;
             final slideDir = extra?.slideDir;
             final scrollToVerse = extra?.scrollToVerse;
+            final pageKey = ValueKey(
-            final pageKey = ValueKey("$bookIndex-$chapterIndex-${extra?.navId ?? 0}");
+              "$bookIndex-$chapterIndex-${extra?.navId ?? 0}",
+            );
             if (slideDir != null) {
               return CustomTransitionPage(
                 key: pageKey,
+                child: Home(
+                  bookIndex: bookIndex,
+                  chapterIndex: chapterIndex,
-                child: Home(bookIndex: bookIndex, chapterIndex: chapterIndex, scrollToVerse: scrollToVerse),
+                  scrollToVerse: scrollToVerse,
+                ),
+                transitionsBuilder:
-                transitionsBuilder: (context, animation, secondaryAnimation, child) {
+                    (context, animation, secondaryAnimation, child) {
-                  const begin = Offset(1.0, 0.0);
+                      const begin = Offset(1.0, 0.0);
-                  const end = Offset.zero;
+                      const end = Offset.zero;
-                  const curve = Curves.ease;
+                      const curve = Curves.ease;
+                      final tween = Tween(
+                        begin: begin,
+                        end: end,
-                  final tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
+                      ).chain(CurveTween(curve: curve));
-                  return SlideTransition(
+                      return SlideTransition(
-                    textDirection: slideDir,
+                        textDirection: slideDir,
-                    position: animation.drive(tween),
+                        position: animation.drive(tween),
-                    child: child,
+                        child: child,
-                  );
+                      );
-                },
+                    },
               );
             }
             return NoTransitionPage(
               key: pageKey,
+              child: Home(
+                bookIndex: bookIndex,
+                chapterIndex: chapterIndex,
-              child: Home(bookIndex: bookIndex, chapterIndex: chapterIndex, scrollToVerse: scrollToVerse),
+                scrollToVerse: scrollToVerse,
+              ),
             );
           },
         ),
@@ -57,7 +79,8 @@ class App extends StatelessWidget {
   }
   void _syncCurrentChapter() {
+    final segments =
-    final segments = _router.routerDelegate.currentConfiguration.uri.pathSegments;
+        _router.routerDelegate.currentConfiguration.uri.pathSegments;
     if (segments.length != 3 || segments.first != "chapter") return;
     final book = int.tryParse(segments[1]);

lib/dialog.dart CHANGED Viewed

@@ -4,6 +4,7 @@ import "package:flutter/material.dart";
 import "package:only_bible_app/bible_data.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/actions_navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/app_state.dart";
 export "package:shared/shared.dart" show showAlert, showError, showConfirm;
@@ -14,7 +15,10 @@ void showBibleSelectDialog(BuildContext context, Bible bible) {
     builder: (dialogContext) {
       return AlertDialog(
         title: Text(bible.bibleSelectTitle!),
-        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 16,
+          vertical: 12,
+        ),
         content: SizedBox(
           // Capped so the list doesn't stretch edge-to-edge on wide
           // desktop/tablet windows, where double.maxFinite would otherwise
@@ -23,7 +27,7 @@ void showBibleSelectDialog(BuildContext context, Bible bible) {
           height: 400,
           child: ListView.separated(
             itemCount: bibleItems.length,
-            separatorBuilder: (_, __) => const Divider(height: 1),
+            separatorBuilder: (_, _) => const Divider(height: 1),
             itemBuilder: (itemContext, index) {
               final item = bibleItems.values.elementAt(index);
               final isSelected = context.read().bible.name == item.fileName;
@@ -31,16 +35,31 @@ void showBibleSelectDialog(BuildContext context, Bible bible) {
                 selected: isSelected,
                 tileColor: null,
                 leading: const Icon(Icons.menu_book),
+                title: Text(
+                  item.languageNative,
-                title: Text(item.languageNative, style: const TextStyle(fontWeight: FontWeight.w600)),
+                  style: const TextStyle(fontWeight: FontWeight.w600),
+                ),
                 subtitle: (item.languageNative != item.languageEnglish)
+                    ? Text(
+                        item.languageEnglish,
+                        style: const TextStyle(
+                          fontSize: 15,
-                    ? Text(item.languageEnglish, style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w400))
+                          fontWeight: FontWeight.w400,
+                        ),
+                      )
                     : null,
                 trailing: isSelected ? const Icon(Icons.check) : null,
                 onTap: () {
                   final s = context.read();
+                  final router = context.router;
                   Navigator.of(itemContext).pop();
                   context.dispatch(
-                    UpdateCurrentBibleAction(item.fileName, s.savedBook, s.savedChapter),
+                    UpdateCurrentBibleAction(
+                      router,
+                      item.fileName,
+                      s.savedBook,
+                      s.savedChapter,
+                    ),
                   );
                 },
               );

lib/home.dart CHANGED Viewed

@@ -132,7 +132,7 @@ class _HomeState extends State<Home> {
               onEdgeSwipeRight: () {
                 final router = context.router;
                 if (router.canPop()) {
-                  router.pop();
+                  context.dispatch(PopChapterAction(router));
                 } else {
                   context.dispatch(PreviousChapterAction(router, bible, chapter.book, chapter.index));
                 }

lib/store/actions_navigation.dart CHANGED Viewed

@@ -131,6 +131,12 @@ class ShowChapterSelectAction extends ReduxAction<AppState> {
   }
 }
+// Tracks the (book, chapter) each GoToChapterAction push navigated away
+// from, so PopChapterAction can restore savedBook/savedChapter synchronously
+// instead of waiting on the routerDelegate listener, which does not fire
+// until a pop's page transition animation completes (see PopChapterAction).
+final List<(int, int)> _chapterHistory = [];
 class GoToChapterAction extends ReduxAction<AppState> {
   final GoRouter router;
   final int book;
@@ -153,6 +159,7 @@ class GoToChapterAction extends ReduxAction<AppState> {
     } else {
       slideDir = null;
     }
+    _chapterHistory.add((state.savedBook, state.savedChapter));
     // Update savedBook/savedChapter before pushing: GoRouter notifies the
     // routerDelegate listener (App._syncCurrentChapter) synchronously as
     // part of push(), which dispatches SyncCurrentChapterAction. Setting
@@ -167,6 +174,27 @@ class GoToChapterAction extends ReduxAction<AppState> {
   }
 }
+class PopChapterAction extends ReduxAction<AppState> {
+  final GoRouter router;
+  PopChapterAction(this.router);
+  @override
+  AppState? reduce() {
+    // Unlike push(), GoRouterDelegate.pop() only notifies its listener once
+    // the page's exit transition finishes, so App._syncCurrentChapter can't
+    // be relied on to update savedBook/savedChapter promptly. Restore them
+    // from our own history here, before popping, the same way GoToChapterAction
+    // updates them before pushing.
+    if (_chapterHistory.isNotEmpty) {
+      final (book, chapter) = _chapterHistory.removeLast();
+      dispatch(UpdateChapterAction(book, chapter));
+    }
+    router.pop();
+    return null;
+  }
+}
 class SyncCurrentChapterAction extends ReduxAction<AppState> {
   final int book;
   final int chapter;
@@ -245,16 +273,22 @@ class PreviousChapterAction extends ReduxAction<AppState> {
 }
 class UpdateCurrentBibleAction extends ReduxAction<AppState> {
+  final GoRouter router;
   final String name;
   final int book;
   final int chapter;
-  UpdateCurrentBibleAction(this.name, this.book, this.chapter);
+  UpdateCurrentBibleAction(this.router, this.name, this.book, this.chapter);
   @override
   Future<AppState> reduce() async {
     final bible = await loadBible(name);
     final (newBook, newChapter) = clampBookChapter(bible, book, chapter);
+    // Keep the route in sync with the clamped book/chapter: otherwise the
+    // URL keeps pointing at the pre-switch (possibly now out-of-range)
+    // chapter, and a later App._syncCurrentChapter dispatch would clobber
+    // savedBook/savedChapter back to those stale path segments.
+    router.pushReplacement("/chapter/$newBook/$newChapter");
     return state.copy(
       bible: bible,
       savedBook: newBook,

macos/Runner/Info.plist CHANGED Viewed

@@ -34,10 +34,6 @@
 	<string>NSApplication</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Only Bible App uses the system file picker to let you choose a backup file to restore your highlights and settings. Depending on your device, this picker may show your photo library, though Only Bible App does not access your photos directly.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Only Bible App does not use the camera. This description is required because a bundled library references camera APIs, even though this app does not use them.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Only Bible App does not use your location. This description is required because a bundled library references location APIs, even though this app does not use them.</string>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>Only Bible App does not access your music library. This description is required because a bundled library references media library APIs, even though this app does not use them.</string>
 </dict>

pubspec.yaml CHANGED Viewed

@@ -1,8 +1,7 @@
 name: only_bible_app
 description: The only bible app you will ever need
 publish_to: 'none'
-version: 3.6.0+19
+version: 3.6.1+20
-resolution: workspace
 environment:
   sdk: '^3.12.2'
@@ -25,7 +24,7 @@ dependencies:
   file_picker: ^11.0.2
   flutter_azure_tts: ^1.0.0
   shared:
-    path: ../../packages/shared
+    path: ../r2-backed-apps/packages/shared
 dev_dependencies:
   flutter_test:

test/actions_backup_test.dart CHANGED Viewed

@@ -1,5 +1,6 @@
 import "dart:convert";
+import "package:flutter/material.dart";
 import "package:flutter_test/flutter_test.dart";
 import "package:only_bible_app/store/actions_backup.dart";
 import "package:only_bible_app/store/app_state.dart";
@@ -21,7 +22,7 @@ void main() {
       final bible = buildTestBible();
       final state = AppState(
         bible: bible,
-        darkMode: true,
+        themeMode: ThemeMode.dark,
         fontSize: 22,
         highlights: {"0:0:0": 2},
         highlightHistory: [
@@ -32,7 +33,7 @@ void main() {
       final jsonString = buildBackupJson(state);
       final restored = await parseBackupState(jsonString, loadBibleFn: (_) async => bible);
-      expect(restored.darkMode, true);
+      expect(restored.themeMode, ThemeMode.dark);
       expect(restored.fontSize, 22);
       expect(restored.highlights["0:0:0"], 2);
       expect(restored.highlightHistory.single.colorIndex, 2);

test/app_logic_test.dart CHANGED Viewed

@@ -1,6 +1,7 @@
 import "dart:io";
 import "package:async_redux/async_redux.dart";
+import "package:flutter/material.dart";
 import "package:flutter_test/flutter_test.dart";
 import "package:path_provider_platform_interface/path_provider_platform_interface.dart";
 import "package:only_bible_app/env.dart";
@@ -183,7 +184,7 @@ void main() {
         savedBook: 1,
         savedChapter: 0,
         fontSize: 20,
-        darkMode: true,
+        themeMode: ThemeMode.dark,
         highlightHistory: [
           HighlightHistoryEntry(book: 0, chapter: 0, verseIndex: 0, colorIndex: 1, timestamp: DateTime.utc(2026, 1, 1)),
         ],
@@ -192,7 +193,7 @@ void main() {
       expect(restored.savedBook, 1);
       expect(restored.savedChapter, 0);
       expect(restored.fontSize, 20);
-      expect(restored.darkMode, true);
+      expect(restored.themeMode, ThemeMode.dark);
       expect(restored.highlightHistory.single.book, 0);
     });
@@ -208,7 +209,7 @@ void main() {
       final state = AppState.fromJson({}, bible);
       expect(state.savedBook, 0);
       expect(state.savedChapter, 0);
-      expect(state.darkMode, false);
+      expect(state.themeMode, ThemeMode.system);
       expect(state.engTitles, false);
     });
   });
@@ -329,8 +330,8 @@ void main() {
   });
   group("theme", () {
-    test("dark theme labelMedium uses the dark color scheme (not the light one)", () {
+    test("dark theme labelMedium (verse numbers) uses the dark error accent, matching the light theme's dedicated red", () {
-      expect(AppTheme.dark.textTheme.labelMedium!.color, darkColorScheme.primary);
+      expect(AppTheme.dark.textTheme.labelMedium!.color, darkColorScheme.error);
     });
   });
@@ -356,14 +357,14 @@ void main() {
     test("persistDifference writes atomically, leaving no leftover temp file", () async {
       final bible = buildTestBible();
       final persistor = AppPersistor();
-      final state = AppState(bible: bible, savedBook: 1, savedChapter: 0, darkMode: true);
+      final state = AppState(bible: bible, savedBook: 1, savedChapter: 0, themeMode: ThemeMode.dark);
       await persistor.persistDifference(lastPersistedState: null, newState: state);
       final json = await persistor.readJson();
       expect(json, isNotNull);
       expect(json!["savedBook"], 1);
-      expect(json["darkMode"], true);
+      expect(json["themeMode"], "dark");
       expect(await File("${tempDir.path}/app_state.json.tmp").exists(), isFalse);
     });

only-bible-app v3.7.2+24

git clone https://git.pyrossh.dev/only-bible-app

The only bible app you will ever need. No ads. No in-app purchases. No distractions.