0228ae8 | 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.

0228ae8 — Peter John 2026-08-08T15:28:12+05:30

major improvements please

Files changed (36) hide show

Makefile +19 -1
android/fastlane/Fastfile +10 -4
ios/Flutter/Debug.xcconfig +0 -1
ios/Flutter/Release.xcconfig +0 -1
ios/Podfile +0 -43
ios/Podfile.lock +0 -22
ios/Runner.xcodeproj/project.pbxproj +17 -110
ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +0 -59
ios/Runner.xcworkspace/contents.xcworkspacedata +0 -3
ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +0 -59
ios/Runner/Info.plist +1 -5
ios/fastlane/Fastfile +7 -3
lib/app.dart +1 -1
lib/dialog.dart +1 -1
lib/dialogs.dart +66 -0
lib/error_reporting.dart +147 -0
lib/main.dart +1 -1
lib/store/actions_backup.dart +49 -29
lib/store/actions_state.dart +26 -29
lib/theme.dart +343 -0
lib/utils.dart +44 -21
macos/Flutter/Flutter-Debug.xcconfig +0 -1
macos/Flutter/Flutter-Release.xcconfig +0 -1
macos/Flutter/GeneratedPluginRegistrant.swift +4 -6
macos/Podfile +0 -42
macos/Podfile.lock +0 -22
macos/Runner.xcodeproj/project.pbxproj +3 -107
macos/Runner.xcworkspace/contents.xcworkspacedata +0 -3
macos/Runner/Info.plist +0 -4
macos/fastlane/Fastfile +4 -3
macos/fastlane/report.xml +41 -6
pubspec.lock +108 -155
pubspec.yaml +3 -5
readme.md +7 -49
test/app_logic_test.dart +288 -89
test/screenshot_test.dart +1 -1

Makefile CHANGED Viewed

@@ -1,4 +1,4 @@
-.PHONY: run test analyze macos ios android android-device list-devices setup
+.PHONY: run test analyze macos ios android android-device list-devices setup release release-android release-ios release-macos
 setup:
 	brew install fastlane
@@ -36,3 +36,21 @@ list-devices:
 	@echo ""
 	@echo "--- Android Emulators ---"
 	emulator -list-avds 2>/dev/null || echo "No AVDs found (set ANDROID_HOME)"
+# Builds, uploads and publishes to the Play Store, App Store and Mac App Store
+# in one go. Screenshots are regenerated once here instead of once per
+# platform (skip_screenshots:true tells each lane to reuse them).
+release:
+	flutter test test/screenshot_test.dart --update-goldens
+	$(MAKE) release-android
+	$(MAKE) release-ios
+	$(MAKE) release-macos
+release-android:
+	cd android && fastlane deploy skip_screenshots:true
+release-ios:
+	cd ios && fastlane release skip_screenshots:true
+release-macos:
+	cd macos && fastlane release skip_screenshots:true

android/fastlane/Fastfile CHANGED Viewed

@@ -36,10 +36,16 @@ platform :android do
   end
   desc "Deploy a new version to the Google Play"
-  lane :deploy do
+  lane :deploy do |options|
-    screenshots
+    screenshots unless options[:skip_screenshots]
-    gradle(task: "clean assembleRelease")
+    # Invoking gradle directly (as the old `gradle(task: "clean assembleRelease")`
+    # did) skips `flutter pub get`'s plugin-registrant regeneration, which is
+    # what excludes dev-only plugins like integration_test from the release
+    # classpath. Building through `flutter build` runs that step first, so
+    # GeneratedPluginRegistrant.java is correct for a release build. It also
+    # produces an .aab (assembleRelease only produces an .apk).
+    sh("cd ../.. && flutter build appbundle --release")
-    upload_to_play_store
+    upload
   end
   desc "Upload a pre-built AAB to the Google Play"

ios/Flutter/Debug.xcconfig CHANGED Viewed

	@@ -1,2 +1 @@
1	- #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
2 1	#include "Generated.xcconfig"

ios/Flutter/Release.xcconfig CHANGED Viewed

	@@ -1,2 +1 @@
1	- #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
2 1	#include "Generated.xcconfig"

ios/Podfile DELETED Viewed

@@ -1,43 +0,0 @@
-# Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-flutter_ios_podfile_setup
-target 'Runner' do
-  use_frameworks!
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
-end
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-  end
-end

ios/Podfile.lock DELETED Viewed

@@ -1,22 +0,0 @@
-PODS:
-  - Flutter (1.0.0)
-  - flutter_soloud (0.0.1):
-    - Flutter
-DEPENDENCIES:
-  - Flutter (from `Flutter`)
-  - flutter_soloud (from `.symlinks/plugins/flutter_soloud/ios`)
-EXTERNAL SOURCES:
-  Flutter:
-    :path: Flutter
-  flutter_soloud:
-    :path: ".symlinks/plugins/flutter_soloud/ios"
-SPEC CHECKSUMS:
-  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_soloud: 272cc604453b6ca135f274045fb259e7c6426122
-PODFILE CHECKSUM: 251cb053df7158f337c0712f2ab29f4e0fa474ce
-COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj CHANGED Viewed

@@ -9,15 +9,13 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
-		391BE44176019420B8A3CC71 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47321D7A556A4A9BF16431AF /* Pods_RunnerTests.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		B492E2663736AD73EF7204F6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 547E0FBE28272A54761BA898 /* Pods_Runner.framework */; };
-		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -49,16 +47,11 @@
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		43630B2A8F1EB61852D12394 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		4420C6B24FA27C901C38F165 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		47321D7A556A4A9BF16431AF /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		547E0FBE28272A54761BA898 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6044DC6CC5B6EC34A4CDDEAB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		8445FAB3A6845463961F425E /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -66,9 +59,6 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B617937D6DA9BB0132F54E43 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		D7CDE34E68CE03AC0364CCBE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
-		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,7 +66,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				391BE44176019420B8A3CC71 /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,7 +74,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
-				B492E2663736AD73EF7204F6 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -103,12 +91,6 @@
 		818932C489EE28D703604D07 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				6044DC6CC5B6EC34A4CDDEAB /* Pods-Runner.debug.xcconfig */,
-				B617937D6DA9BB0132F54E43 /* Pods-Runner.release.xcconfig */,
-				43630B2A8F1EB61852D12394 /* Pods-Runner.profile.xcconfig */,
-				4420C6B24FA27C901C38F165 /* Pods-RunnerTests.debug.xcconfig */,
-				D7CDE34E68CE03AC0364CCBE /* Pods-RunnerTests.release.xcconfig */,
-				8445FAB3A6845463961F425E /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -133,7 +115,6 @@
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				818932C489EE28D703604D07 /* Pods */,
-				AB430DFF6A3D37D341DBDBAC /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -162,15 +143,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		AB430DFF6A3D37D341DBDBAC /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				547E0FBE28272A54761BA898 /* Pods_Runner.framework */,
-				47321D7A556A4A9BF16431AF /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -178,7 +150,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				1B99EC6CBC943BDF479A1466 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
 				13AD50860C8A698628F45191 /* Frameworks */,
@@ -194,26 +165,24 @@
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				5DA2454F7F236B7C3EACFB0C /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				C1FC2023EB277B23DF78E0EB /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -222,9 +191,6 @@
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
-			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
-			);
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
@@ -250,6 +216,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -282,28 +251,6 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		1B99EC6CBC943BDF479A1466 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -320,28 +267,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		5DA2454F7F236B7C3EACFB0C /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -357,23 +282,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		C1FC2023EB277B23DF78E0EB /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -485,7 +393,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -504,11 +412,10 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4420C6B24FA27C901C38F165 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -522,11 +429,10 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D7CDE34E68CE03AC0364CCBE /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -538,11 +444,10 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8445FAB3A6845463961F425E /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
@@ -671,7 +576,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -698,7 +603,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FXH8NUGFYY;
 				ENABLE_BITCODE = NO;
@@ -751,12 +656,14 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCLocalSwiftPackageReference section */
 /* Begin XCSwiftPackageProductDependency section */
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved DELETED Viewed

@@ -1,59 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "dkcamera",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKCamera",
-      "state" : {
-        "branch" : "master",
-        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
-      }
-    },
-    {
-      "identity" : "dkimagepickercontroller",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKImagePickerController",
-      "state" : {
-        "branch" : "4.3.9",
-        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
-      }
-    },
-    {
-      "identity" : "dkphotogallery",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
-      "state" : {
-        "branch" : "master",
-        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
-      }
-    },
-    {
-      "identity" : "sdwebimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SDWebImage/SDWebImage",
-      "state" : {
-        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
-        "version" : "5.21.7"
-      }
-    },
-    {
-      "identity" : "swiftygif",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kirualex/SwiftyGif.git",
-      "state" : {
-        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
-        "version" : "5.4.5"
-      }
-    },
-    {
-      "identity" : "tocropviewcontroller",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/TimOliver/TOCropViewController",
-      "state" : {
-        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
-        "version" : "2.8.0"
-      }
-    }
-  ],
-  "version" : 2
-}

ios/Runner.xcworkspace/contents.xcworkspacedata CHANGED Viewed

@@ -4,7 +4,4 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved DELETED Viewed

@@ -1,59 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "dkcamera",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKCamera",
-      "state" : {
-        "branch" : "master",
-        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
-      }
-    },
-    {
-      "identity" : "dkimagepickercontroller",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKImagePickerController",
-      "state" : {
-        "branch" : "4.3.9",
-        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
-      }
-    },
-    {
-      "identity" : "dkphotogallery",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
-      "state" : {
-        "branch" : "master",
-        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
-      }
-    },
-    {
-      "identity" : "sdwebimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SDWebImage/SDWebImage",
-      "state" : {
-        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
-        "version" : "5.21.7"
-      }
-    },
-    {
-      "identity" : "swiftygif",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kirualex/SwiftyGif.git",
-      "state" : {
-        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
-        "version" : "5.4.5"
-      }
-    },
-    {
-      "identity" : "tocropviewcontroller",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/TimOliver/TOCropViewController",
-      "state" : {
-        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
-        "version" : "2.8.0"
-      }
-    }
-  ],
-  "version" : 2
-}

ios/Runner/Info.plist CHANGED Viewed

@@ -23,7 +23,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>5</string>
+		<string>8</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>UIApplicationSceneManifest</key>
@@ -70,9 +70,5 @@
 		<false/>
 		<key>ITSAppUsesNonExemptEncryption</key>
 		<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>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>
 </plist>

ios/fastlane/Fastfile CHANGED Viewed

@@ -40,8 +40,8 @@ platform :ios do
   end
   desc "Push a new release build to the App Store"
-  lane :release do
+  lane :release do |options|
-    screenshots
+    screenshots unless options[:skip_screenshots]
     certs
     increment_build_number(xcodeproj: "Runner.xcodeproj")
     build_app(
@@ -54,7 +54,11 @@ platform :ios do
       }
     )
     api_key = api_key()
+    upload_to_app_store(
+      api_key: api_key,
-    upload_to_app_store(api_key: api_key, overwrite_screenshots: true)
+      overwrite_screenshots: true,
+      precheck_include_in_app_purchases: false
+    )
   end
   desc "Upload a pre-built IPA to the App Store"

lib/app.dart CHANGED Viewed

@@ -5,7 +5,7 @@ import "package:only_bible_app/home.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/store/actions_navigation.dart";
-import "package:shared/shared.dart";
+import "package:only_bible_app/theme.dart";
 class App extends StatelessWidget {
   final GlobalKey<NavigatorState> globalNavigatorKey;

lib/dialog.dart CHANGED Viewed

@@ -6,7 +6,7 @@ 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;
+export "package:only_bible_app/dialogs.dart" show showAlert, showError, showConfirm;
 void showBibleSelectDialog(BuildContext context, Bible bible) {
   showDialog(

lib/dialogs.dart ADDED Viewed

@@ -0,0 +1,66 @@
+import "package:flutter/material.dart";
+void showAlert(BuildContext context, String title, String message) {
+  showDialog(
+    context: context,
+    barrierColor: Colors.black54,
+    builder: (_) {
+      return AlertDialog(
+        title: Text(title),
+        content: Text(message),
+        actionsAlignment: MainAxisAlignment.center,
+        actionsOverflowButtonSpacing: 8.0,
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: const Text("OK"),
+          ),
+        ],
+      );
+    },
+  );
+}
+void showError(BuildContext context, String message) {
+  showAlert(context, "Error", message);
+}
+Future<bool> showConfirm(
+  BuildContext context,
+  String title,
+  String message,
+) async {
+  const buttonStyle = ButtonStyle(
+    padding: WidgetStatePropertyAll(
+      EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+    ),
+    textStyle: WidgetStatePropertyAll(TextStyle(fontSize: 13)),
+  );
+  final result = await showDialog<bool>(
+    context: context,
+    barrierColor: Colors.black54,
+    builder: (dialogContext) {
+      return AlertDialog(
+        title: Text(title),
+        content: Text(message),
+        actionsAlignment: MainAxisAlignment.center,
+        actionsOverflowButtonSpacing: 8.0,
+        actions: [
+          TextButton(
+            style: buttonStyle,
+            onPressed: () => Navigator.of(dialogContext).pop(false),
+            child: const Text("Cancel"),
+          ),
+          FilledButton(
+            style: buttonStyle,
+            onPressed: () => Navigator.of(dialogContext).pop(true),
+            child: const Text("Continue"),
+          ),
+        ],
+      );
+    },
+  );
+  return result ?? false;
+}

lib/error_reporting.dart ADDED Viewed

@@ -0,0 +1,147 @@
+import "dart:async";
+import "dart:convert";
+import "package:flutter/foundation.dart";
+import "package:flutter/material.dart";
+import "package:flutter/scheduler.dart";
+import "package:http/http.dart" as http;
+/// Sends (or otherwise records) a single error report. Implementations
+/// should be best-effort — a failed report must never throw back into the
+/// error handler that triggered it.
+typedef ErrorReportSender =
+    Future<void> Function(String message, StackTrace? stack);
+/// Global crash/error reporting: wires [FlutterError.onError] (framework
+/// errors) and [PlatformDispatcher.onError] (uncaught async/platform
+/// errors), shows a user-consent dialog before reporting in release builds,
+/// and just logs to the console in debug builds.
+class ErrorReporting {
+  ErrorReporting._();
+  static GlobalKey<NavigatorState>? _navigatorKey;
+  static ErrorReportSender? _onReport;
+  static Set<String> _ignoredSubstrings = const {};
+  /// Call once at app startup, after `runApp`'s `navigatorKey` exists.
+  static void install({
+    required GlobalKey<NavigatorState> navigatorKey,
+    required ErrorReportSender onReport,
+    Set<String> ignoredSubstrings = const {},
+  }) {
+    _navigatorKey = navigatorKey;
+    _onReport = onReport;
+    _ignoredSubstrings = ignoredSubstrings;
+    FlutterError.onError = (errorDetails) {
+      FlutterError.presentError(errorDetails);
+      _handle(errorDetails.exception.toString(), errorDetails.stack);
+    };
+    PlatformDispatcher.instance.onError = (error, stack) {
+      _handle(error.toString(), stack);
+      return true;
+    };
+  }
+  /// Manually reports [message] through the same sender configured via
+  /// [install], bypassing the consent dialog — for call sites that already
+  /// caught and handled a specific error and just want it recorded (e.g.
+  /// only-bible-app's audio-playback failure handler).
+  static Future<void> report(String message, StackTrace? stack) async {
+    if (kDebugMode) {
+      debugPrint("Error: $message");
+      debugPrint("$stack");
+      return;
+    }
+    await _onReport?.call(message, stack);
+  }
+  static void _handle(String message, StackTrace? stack) {
+    if (kDebugMode) {
+      debugPrint("Error: $message");
+      debugPrint("$stack");
+      return;
+    }
+    if (_ignoredSubstrings.any(message.contains)) {
+      // Known framework noise: still recorded for visibility, just not
+      // worth interrupting the user with a dialog they can't act on.
+      unawaited(_onReport?.call(message, stack));
+      return;
+    }
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      final context = _navigatorKey?.currentContext;
+      if (context == null || !context.mounted) return;
+      _showReportDialog(context, message, stack);
+    });
+  }
+  static void _showReportDialog(
+    BuildContext context,
+    String message,
+    StackTrace? stack,
+  ) {
+    showDialog<void>(
+      context: context,
+      barrierColor: Colors.black54,
+      builder: (dialogContext) => AlertDialog(
+        title: const Text("Alert"),
+        content: const Text(
+          "An error has occurred. Do you want to report this error to us?",
+        ),
+        actionsAlignment: MainAxisAlignment.end,
+        actionsOverflowButtonSpacing: 8.0,
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.of(dialogContext).pop();
+              unawaited(_onReport?.call(message, stack));
+            },
+            child: const Text("Yes"),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(dialogContext).pop(),
+            child: const Text("No"),
+          ),
+        ],
+      ),
+    );
+  }
+}
+/// Builds an [ErrorReportSender] that POSTs to the shared `error-reporter`
+/// Cloudflare Worker (see workers/error-reporter/), which emails the report
+/// via Cloudflare Email Sending. [sharedSecret], if provided, is sent as
+/// `X-Report-Secret` — this is NOT a real security boundary (it's embedded
+/// client-side, same as any app secret), it only filters out generic bots
+/// blindly probing the endpoint. Real abuse resistance is the Worker's own
+/// rate limiter.
+ErrorReportSender httpErrorReportSender({
+  required Uri endpoint,
+  required String appName,
+  String? sharedSecret,
+  String? appVersion,
+  String? buildNumber,
+}) {
+  return (message, stack) async {
+    try {
+      await http.post(
+        endpoint,
+        headers: {
+          "Content-Type": "application/json",
+          if (sharedSecret != null) "X-Report-Secret": sharedSecret,
+        },
+        body: jsonEncode({
+          "app": appName,
+          "message": message,
+          "stack": stack?.toString(),
+          "platform": defaultTargetPlatform.name,
+          "appVersion": appVersion,
+          "buildNumber": buildNumber,
+        }),
+      );
+    } catch (_) {
+      // Best-effort — a failed report must not cascade into another error.
+    }
+  };
+}

lib/main.dart CHANGED Viewed

@@ -9,8 +9,8 @@ import "package:only_bible_app/app.dart";
 import "package:only_bible_app/env.dart";
 import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/error_reporting.dart";
 import "package:only_bible_app/utils.dart";
-import "package:shared/shared.dart" show ErrorReporting, httpErrorReportSender;
 // TODO: replace with the deployed error-reporter Worker's actual URL (see
 // workers/error-reporter/) — either its workers.dev subdomain or a custom

lib/store/actions_backup.dart CHANGED Viewed

@@ -2,13 +2,15 @@ import "dart:convert";
 import "dart:io";
 import "package:async_redux/async_redux.dart";
-import "package:file_picker/file_picker.dart";
+import "package:file_selector/file_selector.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";
+import "package:path_provider/path_provider.dart";
+import "package:share_plus/share_plus.dart";
 String buildBackupFileName([DateTime? now]) {
   final n = now ?? DateTime.now();
@@ -70,21 +72,33 @@ class ExportAppStateAction extends ReduxAction<AppState> {
   Future<AppState?> reduce() async {
     final jsonString = buildBackupJson(state);
     final fileName = buildBackupFileName();
-    // Desktop (macOS/Windows/Linux): saveFile opens a save dialog and returns
+    // file_selector's save-location dialog isn't supported on Android/iOS
-    // the chosen path; we then write the file manually.
-    // Mobile (iOS/Android) and web: pass bytes so the plugin/browser handles
+    // (only desktop and web), so mobile exports go through the share sheet
-    // writing before presenting the share/download UI.
+    // (Save to Files, AirDrop, etc.) instead.
-    final isDesktop = !kIsWeb && (Platform.isMacOS || Platform.isWindows || Platform.isLinux);
-    final encodedBytes = isDesktop ? null : utf8.encode(jsonString);
+    final canPickSaveLocation = kIsWeb || isDesktop;
-    String? path;
     try {
+      if (canPickSaveLocation) {
-      path = await FilePicker.saveFile(
+        final location = await getSaveLocation(
-        fileName: fileName,
+          suggestedName: fileName,
-        bytes: encodedBytes,
+          acceptedTypeGroups: const [
+            XTypeGroup(label: "JSON", extensions: ["json"]),
+          ],
-      );
+        );
-      if (path == null) return null; // user cancelled the dialog
+        if (location == null) return null; // user cancelled
+        final file = XFile.fromData(
+          utf8.encode(jsonString),
+          mimeType: "application/json",
+          name: fileName,
+        );
+        await file.saveTo(location.path);
-      if (isDesktop) {
+      } else {
+        final dir = await getTemporaryDirectory();
+        final path = "${dir.path}/$fileName";
         await File(path).writeAsString(jsonString);
+        final result = await SharePlus.instance.share(
+          ShareParams(files: [XFile(path)]),
+        );
+        if (result.status == ShareResultStatus.dismissed) return null;
       }
     } catch (_) {
       if (buildContext.mounted) {
@@ -93,7 +107,11 @@ class ExportAppStateAction extends ReduxAction<AppState> {
       return null;
     }
     if (buildContext.mounted) {
+      showAlert(
+        buildContext,
+        "Backup Exported",
-      showAlert(buildContext, "Backup Exported", "Your backup was saved successfully.");
+        "Your backup was saved successfully.",
+      );
     }
     return null;
   }
@@ -114,25 +132,22 @@ class ImportAppStateAction extends ReduxAction<AppState> {
     if (!confirmed) return null;
     if (!buildContext.mounted) return null;
-    final result = await FilePicker.pickFiles(
+    final file = await openFile(
-      type: FileType.custom,
+      acceptedTypeGroups: const [
-      allowedExtensions: ["json"],
+        XTypeGroup(label: "JSON", extensions: ["json"]),
-      withData: true,
+      ],
     );
-    if (result == null || result.files.isEmpty) return null; // user cancelled
+    if (file == null) return null; // user cancelled
-    final bytes = result.files.single.bytes;
-    if (bytes == null) {
-      if (buildContext.mounted) {
-        showError(buildContext, "That file isn't a valid backup");
-      }
-      return null;
-    }
     try {
+      final bytes = await file.readAsBytes();
       final newState = await parseBackupState(utf8.decode(bytes));
       if (buildContext.mounted) {
+        showAlert(
+          buildContext,
+          "Backup Imported",
-        showAlert(buildContext, "Backup Imported", "Your backup was restored successfully.");
+          "Your backup was restored successfully.",
+        );
       }
       return newState;
     } on BackupParseException catch (err) {
@@ -140,6 +155,11 @@ class ImportAppStateAction extends ReduxAction<AppState> {
         showError(buildContext, err.message);
       }
       return null;
+    } catch (_) {
+      if (buildContext.mounted) {
+        showError(buildContext, "That file isn't a valid backup");
+      }
+      return null;
     }
   }
 }

lib/store/actions_state.dart CHANGED Viewed

@@ -1,13 +1,12 @@
 import "dart:developer";
 import "package:async_redux/async_redux.dart";
-import "package:flutter_soloud/flutter_soloud.dart";
 import "package:flutter/material.dart";
 import "package:only_bible_app/dialog.dart";
+import "package:only_bible_app/error_reporting.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";
-import "package:shared/shared.dart" show ErrorReporting;
 class ToggleEngTitlesAction extends ReduxAction<AppState> {
   @override
@@ -79,32 +78,21 @@ class TogglePlayAction extends ReduxAction<AppState> {
         final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
         try {
           final data = await convertText(audioVoice, v.text ?? "");
-          if (!SoLoud.instance.isInitialized) break;
+          if (!isAudioPlaybackInitialized) break;
-          final stream = SoLoud.instance.setBufferStream(
-            bufferingType: BufferingType.preserved,
-            sampleRate: 24000,
-            channels: Channels.mono,
-            format: BufferType.s16le,
-          );
-          SoLoud.instance.addAudioDataStream(stream, data);
+          await playAudioClip(data);
-          SoLoud.instance.setDataIsEnded(stream);
+          if (!isAudioPlaybackInitialized) break;
-          final handle = await SoLoud.instance.play(stream);
-          // Wait for playback to complete
-          await stream.soundEvents.firstWhere(
-            (e) =>
-                (e.event == SoundEventType.handleIsNoMoreValid &&
-                    e.handle == handle) ||
-                e.event == SoundEventType.soundDisposed,
-          );
         } catch (err) {
-          // If sources were disposed (user stopped playback), don't treat as error
+          // If playback was disposed (user stopped playback), don't treat as error
-          if (!SoLoud.instance.isInitialized) break;
+          if (!isAudioPlaybackInitialized) break;
           log(
             "Could not play audio",
             name: "play",
             error: (err.toString(), pathname),
           );
+          await ErrorReporting.report(
-          await ErrorReporting.report((err.toString(), pathname).toString(), null);
+            (err.toString(), pathname).toString(),
+            null,
+          );
           if (buildContext.mounted) {
             showError(buildContext, audioError);
           }
@@ -137,12 +125,15 @@ class SelectVerseAction extends ReduxAction<AppState> {
     );
     final newVerses = isSelected
         ? state.selectedVerses
+              .where(
+                (it) =>
+                    it.book != verse.book ||
-            .where((it) => it.book != verse.book || it.chapter != verse.chapter || it.index != verse.index)
+                    it.chapter != verse.chapter ||
+                    it.index != verse.index,
+              )
-            .toList()
+              .toList()
         : [...state.selectedVerses, verse];
-    return state.copy(
-      selectedVerses: newVerses,
+    return state.copy(selectedVerses: newVerses);
-    );
   }
 }
@@ -173,8 +164,14 @@ class SetHighlightAction extends ReduxAction<AppState> {
     }).toList();
     // Keep last 500 entries
     final updatedHistory = [...state.highlightHistory, ...newEntries];
+    final trimmed = updatedHistory.length > 500
-    final trimmed = updatedHistory.length > 500 ? updatedHistory.sublist(updatedHistory.length - 500) : updatedHistory;
+        ? updatedHistory.sublist(updatedHistory.length - 500)
+        : updatedHistory;
+    return state.copy(
+      highlights: updated,
+      selectedVerses: [],
-    return state.copy(highlights: updated, selectedVerses: [], highlightHistory: trimmed);
+      highlightHistory: trimmed,
+    );
   }
 }

lib/theme.dart ADDED Viewed

@@ -0,0 +1,343 @@
+import "package:flutter/material.dart";
+const lightColorScheme = ColorScheme(
+  brightness: Brightness.light,
+  primary: Color.fromARGB(255, 100, 127, 203),
+  onPrimary: Color(0xFFFFFFFF),
+  primaryContainer: Color(0xFFDAE2FF),
+  onPrimaryContainer: Color(0xFF001848),
+  secondary: Color(0xFF4C5C92),
+  onSecondary: Color(0xFFFFFFFF),
+  secondaryContainer: Color(0xFFDCE1FF),
+  onSecondaryContainer: Color(0xFF02174B),
+  tertiary: Color(0xFF7D4E7D),
+  onTertiary: Color(0xFFFFFFFF),
+  tertiaryContainer: Color(0xFFFFD6FA),
+  onTertiaryContainer: Color(0xFF320935),
+  error: Color(0xFFBA1A1A),
+  onError: Color(0xFFFFFFFF),
+  errorContainer: Color(0xFFFFDAD6),
+  onErrorContainer: Color(0xFF410002),
+  surface: Color(0xFFFFFFFF),
+  onSurface: Color(0xFF000000),
+  onSurfaceVariant: Color(0xFF45464F),
+  outline: Color.fromARGB(255, 157, 160, 171),
+  outlineVariant: Color(0xFFC5C6D0),
+  shadow: Color.fromARGB(255, 88, 85, 85),
+  scrim: Color(0xFF000000),
+  inverseSurface: Color(0xFF2F3036),
+  onInverseSurface: Color(0xFFF1F0F7),
+  inversePrimary: Color(0xFFB2C5FF),
+  surfaceDim: Color(0xFFDAD9E0),
+  surfaceBright: Color(0xFFFAF8FF),
+  surfaceContainerLowest: Color(0xFFFFFFFF),
+  surfaceContainerLow: Color(0xFFF4F3FA),
+  surfaceContainer: Color(0xFFEEEDF4),
+  surfaceContainerHigh: Color(0xFFE8E7EF),
+  surfaceContainerHighest: Color(0xFFE3E2E9),
+);
+const darkColorScheme = ColorScheme(
+  brightness: Brightness.dark,
+  // Accent: Claude Code permission/suggestion blue-purple — rgb(177,185,249)
+  primary: Color(0xFFB1B9F9),
+  onPrimary: Color(0xFF1A2050),
+  primaryContainer: Color(0xFF2A3580),
+  onPrimaryContainer: Color(0xFFDDE0FF),
+  secondary: Color(0xFFB1B9F9),
+  onSecondary: Color(0xFF1A2050),
+  secondaryContainer: Color(0xFF2A3580),
+  onSecondaryContainer: Color(0xFFDDE0FF),
+  // Tertiary: Claude Code brand orange — rgb(215,119,87)
+  tertiary: Color(0xFFD77757),
+  onTertiary: Color(0xFF4A1A00),
+  tertiaryContainer: Color(0xFF6B3020),
+  onTertiaryContainer: Color(0xFFFFDBCC),
+  // Error: Claude Code error — rgb(255,107,128)
+  error: Color(0xFFFF6B80),
+  onError: Color(0xFF690005),
+  errorContainer: Color(0xFF8C1D18),
+  onErrorContainer: Color(0xFFFFDAD6),
+  // Neutral dark gray — matches Claude Code desktop aesthetic (no blue tint)
+  surface: Color(0xFF1E1E1E),
+  onSurface: Color(0xFFE8E8E8),
+  // Secondary text: Claude Code inactive — rgb(153,153,153)
+  onSurfaceVariant: Color(0xFF999999),
+  outline: Color(0xFF666666),
+  outlineVariant: Color(0xFF3A3A3A),
+  shadow: Color(0xFF000000),
+  scrim: Color(0xFF000000),
+  inverseSurface: Color(0xFFE3E3E3),
+  onInverseSurface: Color(0xFF303030),
+  inversePrimary: Color(0xFF4A5AA0),
+  surfaceDim: Color(0xFF181818),
+  surfaceBright: Color(0xFF323232),
+  surfaceContainerLowest: Color(0xFF141414),
+  surfaceContainerLow: Color(0xFF222222),
+  surfaceContainer: Color(0xFF262626),
+  surfaceContainerHigh: Color(0xFF2C2C2C),
+  // Elevated panels: Claude Code userMessageBackground — rgb(55,55,55)
+  surfaceContainerHighest: Color(0xFF373737),
+);
+class AppTheme {
+  AppTheme._();
+  static final ThemeData light = ThemeData(
+    brightness: Brightness.light,
+    colorScheme: lightColorScheme,
+    useMaterial3: true,
+    applyElevationOverlayColor: false,
+    textSelectionTheme: TextSelectionThemeData(
+      cursorColor: Colors.black,
+      selectionHandleColor: Colors.black,
+      selectionColor: Colors.grey.shade200,
+    ),
+    inputDecorationTheme: const InputDecorationTheme(
+      focusColor: Colors.transparent,
+      hoverColor: Colors.transparent,
+      activeIndicatorBorder: BorderSide(color: Colors.black),
+      hintStyle: TextStyle(color: Colors.grey),
+    ),
+    appBarTheme: AppBarTheme(
+      backgroundColor: lightColorScheme.surface,
+      foregroundColor: lightColorScheme.onSurface,
+      elevation: 1,
+      // Material3 otherwise blends in a colorScheme.surfaceTint overlay
+      // proportional to elevation, making the AppBar a visibly different
+      // shade from the flat Scaffold background behind it.
+      surfaceTintColor: Colors.transparent,
+    ),
+    bottomSheetTheme: BottomSheetThemeData(
+      elevation: 10,
+      backgroundColor: lightColorScheme.surface,
+      shadowColor: lightColorScheme.scrim,
+      showDragHandle: true,
+      dragHandleSize: Size(50, 3),
+    ),
+    dialogTheme: const DialogThemeData(
+      elevation: 10,
+      shadowColor: Colors.black,
+      backgroundColor: Colors.white,
+      surfaceTintColor: Colors.white,
+      shape: Border(top: BorderSide(width: 1.5, color: Colors.black)),
+    ),
+    iconButtonTheme: IconButtonThemeData(
+      style: IconButton.styleFrom(enableFeedback: true),
+    ),
+    textButtonTheme: TextButtonThemeData(
+      style: TextButton.styleFrom(
+        enableFeedback: true,
+        padding: EdgeInsets.zero,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(4),
+          side: BorderSide(color: Colors.black, width: 1),
+        ),
+        elevation: 2,
+        shadowColor: Colors.black,
+        backgroundColor: lightColorScheme.surfaceContainerLow,
+        foregroundColor: Colors.black,
+        textStyle: const TextStyle(
+          fontSize: 18,
+          fontWeight: FontWeight.w500,
+          letterSpacing: 0,
+        ),
+      ),
+    ),
+    segmentedButtonTheme: SegmentedButtonThemeData(
+      style: ButtonStyle(
+        backgroundColor: WidgetStateProperty.resolveWith((states) {
+          if (states.contains(WidgetState.selected)) {
+            return lightColorScheme.primary;
+          }
+          return Colors.grey.shade100;
+        }),
+        foregroundColor: WidgetStateProperty.resolveWith((states) {
+          if (states.contains(WidgetState.selected)) {
+            return lightColorScheme.onPrimary;
+          }
+          return lightColorScheme.onSurface;
+        }),
+        textStyle: WidgetStatePropertyAll(
+          TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.w700,
+            color: lightColorScheme.onSurface,
+            letterSpacing: 0,
+          ),
+        ),
+      ),
+    ),
+    toggleButtonsTheme: ToggleButtonsThemeData(
+      borderRadius: const BorderRadius.all(Radius.circular(12)),
+      borderColor: lightColorScheme.scrim,
+      selectedBorderColor: lightColorScheme.scrim,
+      selectedColor: lightColorScheme.onPrimary,
+      fillColor: lightColorScheme.primary,
+      color: lightColorScheme.onSurface,
+      constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
+    ),
+    textTheme: TextTheme(
+      bodyMedium: TextStyle(
+        fontSize: 16,
+        fontWeight: FontWeight.w400,
+        wordSpacing: 0,
+        letterSpacing: 0,
+        color: lightColorScheme.onSurface,
+      ),
+      bodySmall: TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.w400,
+        wordSpacing: 0,
+        letterSpacing: 0,
+        color: lightColorScheme.onSurface,
+      ),
+      headlineLarge: TextStyle(
+        fontSize: 38,
+        fontWeight: FontWeight.w700,
+        color: lightColorScheme.secondary,
+      ),
+      headlineMedium: TextStyle(
+        color: lightColorScheme.onSurface,
+        fontSize: 24,
+        fontWeight: FontWeight.w500,
+        letterSpacing: 0.5,
+      ),
+      labelMedium: TextStyle(
+        fontSize: 13,
+        fontWeight: FontWeight.w700,
+        color: Color(0xFF9A1111),
+        letterSpacing: 0,
+      ),
+      labelLarge: TextStyle(
+        fontSize: 16,
+        fontWeight: FontWeight.w700,
+        color: lightColorScheme.onSurface,
+        letterSpacing: 0,
+      ),
+    ),
+  );
+  // Built from its own ThemeData(colorScheme: ...) root rather than
+  // light.copyWith(colorScheme: darkColorScheme) — copyWith only overrides
+  // the fields listed explicitly here, it never re-derives Material3
+  // defaults (scaffoldBackgroundColor, canvasColor, cardColor, dividerColor,
+  // ...) from the new colorScheme. Starting from light's already-resolved
+  // ThemeData left those pinned to the light scheme's white surface, which
+  // is why the Scaffold body stayed white in dark mode.
+  static final ThemeData dark =
+      ThemeData(
+        brightness: Brightness.dark,
+        colorScheme: darkColorScheme,
+        useMaterial3: true,
+        applyElevationOverlayColor: false,
+      ).copyWith(
+        inputDecorationTheme: InputDecorationTheme(
+          focusColor: Colors.transparent,
+          hoverColor: Colors.transparent,
+          activeIndicatorBorder: BorderSide(color: darkColorScheme.outline),
+          hintStyle: const TextStyle(color: Colors.grey),
+        ),
+        segmentedButtonTheme: SegmentedButtonThemeData(
+          style: ButtonStyle(
+            backgroundColor: WidgetStateProperty.resolveWith((states) {
+              if (states.contains(WidgetState.selected)) {
+                return darkColorScheme.primary;
+              }
+              return darkColorScheme.surfaceContainerHigh;
+            }),
+            foregroundColor: WidgetStateProperty.resolveWith((states) {
+              if (states.contains(WidgetState.selected)) {
+                return darkColorScheme.onPrimary;
+              }
+              return darkColorScheme.onSurface;
+            }),
+            textStyle: WidgetStatePropertyAll(
+              TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w700,
+                color: darkColorScheme.onSurface,
+                letterSpacing: 0,
+              ),
+            ),
+          ),
+        ),
+        toggleButtonsTheme: ToggleButtonsThemeData(
+          borderRadius: const BorderRadius.all(Radius.circular(12)),
+          borderColor: darkColorScheme.outline,
+          selectedBorderColor: darkColorScheme.outline,
+          selectedColor: darkColorScheme.onPrimary,
+          fillColor: darkColorScheme.primary,
+          color: darkColorScheme.onSurface,
+          constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
+        ),
+        appBarTheme: AppBarTheme(
+          backgroundColor: darkColorScheme.surface,
+          foregroundColor: darkColorScheme.onSurface,
+          elevation: 1,
+          surfaceTintColor: Colors.transparent,
+        ),
+        bottomSheetTheme: light.bottomSheetTheme.copyWith(
+          backgroundColor: darkColorScheme.surfaceContainerLow,
+          shadowColor: Colors.white,
+          surfaceTintColor: darkColorScheme.surfaceContainerLow,
+        ),
+        textSelectionTheme: TextSelectionThemeData(
+          cursorColor: Colors.white,
+          selectionHandleColor: Colors.white,
+          selectionColor: Colors.blueGrey.shade800,
+        ),
+        dialogTheme: DialogThemeData(
+          backgroundColor: darkColorScheme.surface,
+          elevation: 1,
+          shape: Border(
+            top: BorderSide(width: 1.5, color: darkColorScheme.outline),
+          ),
+        ),
+        iconButtonTheme: IconButtonThemeData(
+          style: IconButton.styleFrom(
+            enableFeedback: true,
+            foregroundColor: darkColorScheme.onSurface,
+          ),
+        ),
+        textButtonTheme: TextButtonThemeData(
+          style: TextButton.styleFrom(
+            enableFeedback: light.textButtonTheme.style!.enableFeedback,
+            padding: EdgeInsets.all(0),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(4),
+              side: BorderSide(color: darkColorScheme.onSurface, width: 1),
+            ),
+            textStyle: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w500,
+              letterSpacing: 0,
+            ),
+            elevation: 0,
+            shadowColor: Colors.white,
+            backgroundColor: darkColorScheme.surfaceContainerLow,
+            foregroundColor: darkColorScheme.primary,
+          ),
+        ),
+        textTheme: TextTheme(
+          bodyMedium: light.textTheme.bodyMedium!.copyWith(
+            color: darkColorScheme.onSurface,
+          ),
+          bodySmall: light.textTheme.bodyMedium!.copyWith(
+            color: darkColorScheme.onSurface,
+          ),
+          headlineLarge: light.textTheme.headlineLarge!.copyWith(
+            color: darkColorScheme.onSurface,
+          ),
+          headlineMedium: light.textTheme.headlineMedium!.copyWith(
+            color: darkColorScheme.onSurface,
+          ),
+          labelMedium: light.textTheme.labelMedium!.copyWith(
+            color: darkColorScheme.error,
+          ),
+          labelLarge: light.textTheme.labelLarge!.copyWith(
+            color: darkColorScheme.onSurface,
+          ),
+        ),
+      );
+}

lib/utils.dart CHANGED Viewed

@@ -1,10 +1,10 @@
 import "package:archive/archive.dart";
+import "package:audioplayers/audioplayers.dart";
 import "package:flutter/services.dart";
 import "package:flutter/foundation.dart"
     show TargetPlatform, compute, defaultTargetPlatform;
 import "package:flutter/material.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
-import "package:flutter_soloud/flutter_soloud.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 export "package:only_bible_app/bible_data.dart";
@@ -35,16 +35,25 @@ extension BibleExt on Bible {
 (int, int) clampBookChapter(Bible bible, int book, int chapter) {
   final books = bible.books ?? const [];
   if (books.isEmpty) return (0, 0);
+  final clampedBook = book < 0
+      ? 0
-  final clampedBook = book < 0 ? 0 : (book >= books.length ? books.length - 1 : book);
+      : (book >= books.length ? books.length - 1 : book);
   final chapters = books[clampedBook].chapters ?? const [];
   if (chapters.isEmpty) return (clampedBook, 0);
+  final clampedChapter = chapter < 0
+      ? 0
-  final clampedChapter = chapter < 0 ? 0 : (chapter >= chapters.length ? chapters.length - 1 : chapter);
+      : (chapter >= chapters.length ? chapters.length - 1 : chapter);
   return (clampedBook, clampedChapter);
 }
 /// Returns the (book, chapter) adjacent to [book]/[chapter], stepping forward
 /// or backward across book boundaries, or null if already at the very start/end.
-(int, int)? adjacentChapter(Bible bible, int book, int chapter, {required bool forward}) {
+(int, int)? adjacentChapter(
+  Bible bible,
+  int book,
+  int chapter, {
+  required bool forward,
+}) {
   final selectedBook = bible.books![book];
   if (forward) {
     if (selectedBook.chapters!.length > chapter + 1) {
@@ -132,13 +141,13 @@ Future<Uint8List> convertText(String langCode, String text) async {
         shortName: langCode,
         gender: "",
         locale: langCode,
-        sampleRateHertz: AudioOutputFormat.raw24khz16BitMonoPcm,
+        sampleRateHertz: AudioOutputFormat.audio24khz48kBitrateMonoMp3,
         voiceType: "",
         status: "",
         styles: [],
         roles: [],
       ),
-      audioFormat: AudioOutputFormat.raw24khz16BitMonoPcm,
+      audioFormat: AudioOutputFormat.audio24khz48kBitrateMonoMp3,
       rate: 0.90,
       text: text,
     ),
@@ -146,15 +155,30 @@ Future<Uint8List> convertText(String langCode, String text) async {
   return ttsResponse.audio.buffer.asUint8List();
 }
+AudioPlayer? _audioPlayer;
 bool isAudioPlaybackActive() {
-  return SoLoud.instance.isInitialized &&
+  return _audioPlayer?.state == PlayerState.playing;
-      SoLoud.instance.getActiveVoiceCount() > 0;
 }
+bool get isAudioPlaybackInitialized => _audioPlayer != null;
 Future<void> ensureAudioPlaybackInitialized() async {
-  if (!SoLoud.instance.isInitialized) {
-    await SoLoud.instance.init();
+  _audioPlayer ??= AudioPlayer();
-  }
+}
+/// Plays [mp3Data] and waits until it finishes, or until [stopAudioPlayback]
+/// cuts it short. No-ops if playback was already stopped.
+Future<void> playAudioClip(Uint8List mp3Data) async {
+  final player = _audioPlayer;
+  if (player == null) return;
+  await player.play(BytesSource(mp3Data, mimeType: "audio/mpeg"));
+  await player.onPlayerStateChanged.firstWhere(
+    (s) =>
+        s == PlayerState.completed ||
+        s == PlayerState.stopped ||
+        s == PlayerState.disposed,
+  );
 }
 Future<void>? _audioPlaybackStopFuture;
@@ -174,14 +198,10 @@ Future<void> stopAudioPlayback() {
 }
 Future<void> _stopAudioPlayback() async {
+  final player = _audioPlayer;
-  if (!SoLoud.instance.isInitialized) return;
+  if (player == null) return;
-  try {
+  _audioPlayer = null;
-    await SoLoud.instance.disposeAllSources();
+  await player.dispose();
-  } finally {
-    if (SoLoud.instance.isInitialized) {
-      SoLoud.instance.deinit();
-    }
-  }
 }
 Uint8List _decompressBible(Uint8List compressed) {
@@ -190,10 +210,13 @@ Uint8List _decompressBible(Uint8List compressed) {
 Future<Bible> loadBible(String name) async {
   final data = await rootBundle.load("assets/bibles/$name.bin.gz");
-  final decompressed = await compute(_decompressBible, data.buffer.asUint8List());
+  final decompressed = await compute(
+    _decompressBible,
+    data.buffer.asUint8List(),
+  );
   return Bible(decompressed);
 }
-// Error reporting now goes through ErrorReporting.report (package:shared) —
+// Error reporting now goes through ErrorReporting.report (error_reporting.dart) —
 // see main.dart's ErrorReporting.install call and its use in
 // actions_state.dart's audio-playback failure handler.

macos/Flutter/Flutter-Debug.xcconfig CHANGED Viewed

	@@ -1,2 +1 @@
1	- #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
2 1	#include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/Flutter-Release.xcconfig CHANGED Viewed

	@@ -1,2 +1 @@
1	- #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
2 1	#include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/GeneratedPluginRegistrant.swift CHANGED Viewed

@@ -5,18 +5,16 @@
 import FlutterMacOS
 import Foundation
+import audioplayers_darwin
 import connectivity_plus
-import file_picker
+import file_selector_macos
-import flutter_secure_storage_darwin
 import package_info_plus
 import share_plus
-import sqflite_darwin
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
-  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
-  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
 }

macos/Podfile DELETED Viewed

@@ -1,42 +0,0 @@
-platform :osx, '10.15'
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
-  end
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
-end
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-flutter_macos_podfile_setup
-target 'Runner' do
-  use_frameworks!
-  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
-end
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_macos_build_settings(target)
-  end
-end

macos/Podfile.lock DELETED Viewed

@@ -1,22 +0,0 @@
-PODS:
-  - flutter_soloud (0.0.1):
-    - FlutterMacOS
-  - FlutterMacOS (1.0.0)
-DEPENDENCIES:
-  - flutter_soloud (from `Flutter/ephemeral/.symlinks/plugins/flutter_soloud/macos`)
-  - FlutterMacOS (from `Flutter/ephemeral`)
-EXTERNAL SOURCES:
-  flutter_soloud:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_soloud/macos
-  FlutterMacOS:
-    :path: Flutter/ephemeral
-SPEC CHECKSUMS:
-  flutter_soloud: 93c20641a100d25bfbc84a8b86e867f350ef29ac
-  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
-PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
-COCOAPODS: 1.16.2

macos/Runner.xcodeproj/project.pbxproj CHANGED Viewed

@@ -21,7 +21,6 @@
 /* End PBXAggregateTarget section */
 /* Begin PBXBuildFile section */
-		24975236CA37842BE288C1EF /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50275D2F47C1000366FA62E4 /* Pods_RunnerTests.framework */; };
 		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
@@ -29,7 +28,6 @@
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
-		A5F01B2318AAC442B3788873 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C7846F35E82451F8353334E /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -66,7 +64,6 @@
 		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
-		334DCAC7AF1120FDF88EE10F /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* only_bible_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = only_bible_app.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -80,16 +77,9 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
-		35B9450ADD66E8BC4C4F3826 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		35CCE74F1920378D63AB4733 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		50275D2F47C1000366FA62E4 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		87E97379FB3EB86D1485488E /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		9C7846F35E82451F8353334E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BFAE72D8B9900A8C04CAB06F /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		C6CC86F2F862899310B2073C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -97,7 +87,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				24975236CA37842BE288C1EF /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -106,7 +95,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
-				A5F01B2318AAC442B3788873 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -139,8 +127,6 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				331C80D6294CF71000263BE5 /* RunnerTests */,
 				33CC10EE2044A3C60003C045 /* Products */,
-				D73912EC22F37F3D000D13A0 /* Frameworks */,
-				386D91C7345CD19195A06092 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -189,29 +175,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		386D91C7345CD19195A06092 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				C6CC86F2F862899310B2073C /* Pods-Runner.debug.xcconfig */,
-				35B9450ADD66E8BC4C4F3826 /* Pods-Runner.release.xcconfig */,
-				35CCE74F1920378D63AB4733 /* Pods-Runner.profile.xcconfig */,
-				334DCAC7AF1120FDF88EE10F /* Pods-RunnerTests.debug.xcconfig */,
-				87E97379FB3EB86D1485488E /* Pods-RunnerTests.release.xcconfig */,
-				BFAE72D8B9900A8C04CAB06F /* Pods-RunnerTests.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				9C7846F35E82451F8353334E /* Pods_Runner.framework */,
-				50275D2F47C1000366FA62E4 /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -219,7 +182,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				109FC7E83F5C961E0F9FC371 /* [CP] Check Pods Manifest.lock */,
 				331C80D1294CF70F00263BE5 /* Sources */,
 				331C80D2294CF70F00263BE5 /* Frameworks */,
 				331C80D3294CF70F00263BE5 /* Resources */,
@@ -238,13 +200,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				2FD51143F0581615244DC8B0 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				86A82F343DF3AEF021A46991 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -333,50 +293,6 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		109FC7E83F5C961E0F9FC371 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		2FD51143F0581615244DC8B0 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -415,23 +331,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		86A82F343DF3AEF021A46991 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -483,13 +382,12 @@
 /* Begin XCBuildConfiguration section */
 		331C80DB294CF71000263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 334DCAC7AF1120FDF88EE10F /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = sh.pyros.only-bible-app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/only_bible_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/only_bible_app";
@@ -498,13 +396,12 @@
 		};
 		331C80DC294CF71000263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 87E97379FB3EB86D1485488E /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = sh.pyros.only-bible-app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/only_bible_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/only_bible_app";
@@ -513,13 +410,12 @@
 		};
 		331C80DD294CF71000263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BFAE72D8B9900A8C04CAB06F /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CURRENT_PROJECT_VERSION = 5;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = sh.pyros.only-bible-app.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = "sh.pyros.only-bible-app.RunnerTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/only_bible_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/only_bible_app";

macos/Runner.xcworkspace/contents.xcworkspacedata CHANGED Viewed

@@ -4,7 +4,4 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

macos/Runner/Info.plist CHANGED Viewed

@@ -32,9 +32,5 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<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>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>
 </plist>

macos/fastlane/Fastfile CHANGED Viewed

@@ -60,15 +60,16 @@ platform :mac do
   end
   desc "Push a new release build to the Mac App Store"
-  lane :release do
+  lane :release do |options|
-    screenshots
+    screenshots unless options[:skip_screenshots]
     build
     api_key = api_key()
     upload_to_app_store(
       api_key: api_key,
       platform: "osx",
       pkg: lane_context[SharedValues::PKG_OUTPUT_PATH],
-      overwrite_screenshots: true
+      overwrite_screenshots: true,
+      precheck_include_in_app_purchases: false
     )
   end

macos/fastlane/report.xml CHANGED Viewed

@@ -5,32 +5,67 @@
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000162">
+      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.000187">
       </testcase>
-      <testcase classname="fastlane.lanes" name="1: Switch to mac api_key lane" time="5.4e-05">
+      <testcase classname="fastlane.lanes" name="01: Switch to mac build lane" time="0.000122">
       </testcase>
-      <testcase classname="fastlane.lanes" name="2: app_store_connect_api_key" time="0.001757">
+      <testcase classname="fastlane.lanes" name="02: Switch to mac certs lane" time="0.000138">
       </testcase>
-      <testcase classname="fastlane.lanes" name="3: cert" time="1.717703">
+      <testcase classname="fastlane.lanes" name="03: Switch to mac api_key lane" time="7.1e-05">
       </testcase>
-      <testcase classname="fastlane.lanes" name="4: sigh" time="1.570648">
+      <testcase classname="fastlane.lanes" name="04: app_store_connect_api_key" time="0.003265">
       </testcase>
-      <testcase classname="fastlane.lanes" name="5: cert" time="1.648573">
+      <testcase classname="fastlane.lanes" name="05: cert" time="1.472711">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="06: sigh" time="1.169831">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="07: cert" time="1.869459">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="08: cd ../.. &amp;&amp; flutter build macos --config-only" time="7.146192">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="09: build_mac_app" time="86.815746">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="10: Switch to mac api_key lane" time="0.000101">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="11: app_store_connect_api_key" time="0.00169">
+      </testcase>
+      <testcase classname="fastlane.lanes" name="12: upload_to_app_store" time="481.245784">
       </testcase>

pubspec.lock CHANGED Viewed

@@ -65,22 +65,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.0"
+  audioplayers:
+    dependency: "direct main"
-  aws_common:
+    description:
+      name: audioplayers
+      sha256: "2ba4bb2944baacbdd5372ff8254a8e7feb8c10d7739545e392f5605a8f618745"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.8.1"
+  audioplayers_android:
+    dependency: transitive
+    description:
+      name: audioplayers_android
+      sha256: f5ff5b15620fbab8cb0849e9636c48e2b96c3f0f71723bbbe2ad3c761b205f05
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.0"
+  audioplayers_darwin:
+    dependency: transitive
+    description:
+      name: audioplayers_darwin
+      sha256: "1ca553add991384ecf421b9569da850f3ab2472ffb83f6970b0416365abc51be"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
+  audioplayers_linux:
+    dependency: transitive
+    description:
+      name: audioplayers_linux
+      sha256: "15178b726b7cdee5364d0463c8d445630c4e0fb7d26612b73c767e7d25de9417"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  audioplayers_platform_interface:
     dependency: transitive
     description:
-      name: aws_common
+      name: audioplayers_platform_interface
-      sha256: "939b46121d41c6d6d1419a6f242baefa2403b67ab04919465022cff297b86763"
+      sha256: "765f6f0e6dca55cb471c9483fc77700564b3484d19198aca4ebb5147c6c85acb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.15"
+    version: "7.2.0"
-  aws_signature_v4:
+  audioplayers_web:
     dependency: transitive
     description:
-      name: aws_signature_v4
+      name: audioplayers_web
-      sha256: "83d3fd9402f2a4145ec96b972da779d8658f9505cdd52888d6cbcc2551f5ad88"
+      sha256: ae1e0103c865a03e273f6d13d97b93f5595eac09915729cd5e37ef96e2857319
       url: "https://pub.dev"
     source: hosted
+    version: "5.3.0"
+  audioplayers_windows:
+    dependency: transitive
+    description:
+      name: audioplayers_windows
+      sha256: a70ae82bba2dfcb6eb03dd4815d737a2d46d33ea5a96a03f535cfcaac490e413
+      url: "https://pub.dev"
+    source: hosted
-    version: "0.6.13"
+    version: "4.4.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -353,14 +393,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
-  file_picker:
+  file_selector:
     dependency: "direct main"
     description:
-      name: file_picker
+      name: file_selector
+      sha256: bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  file_selector_android:
+    dependency: transitive
+    description:
+      name: file_selector_android
+      sha256: "1d45e9910f68c16eb0c74f0b10097ad81aed516ea28054c027137e8f7d75e840"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.2+9"
+  file_selector_ios:
+    dependency: transitive
+    description:
+      name: file_selector_ios
+      sha256: e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.3+5"
+  file_selector_linux:
+    dependency: transitive
+    description:
+      name: file_selector_linux
+      sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4"
+  file_selector_macos:
+    dependency: transitive
+    description:
+      name: file_selector_macos
+      sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.5"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  file_selector_web:
+    dependency: transitive
+    description:
+      name: file_selector_web
-      sha256: "29cc1fdb20613876cc7afc529738c1c0f11a9ca159b010edad0c566ac330847e"
+      sha256: "73181fbc5257776d8ecaa6a94ab3c8e920ad143b9132a6d984a9271dfc6928d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.5"
+  file_selector_windows:
+    dependency: transitive
+    description:
+      name: file_selector_windows
+      sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.3"
+    version: "0.9.3+5"
   fixnum:
     dependency: transitive
     description:
@@ -390,14 +486,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
-  flutter_cache_manager:
-    dependency: transitive
-    description:
-      name: flutter_cache_manager
-      sha256: "1de7849213b4c73c85aca7e0ac687a9a5d82ccdb594366b9dcc26cb6a2189cd2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.2"
   flutter_driver:
     dependency: transitive
     description: flutter
@@ -443,70 +531,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.8"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.35"
-  flutter_secure_storage:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage
-      sha256: "7686b1d6a29985dcbb808c59518226e603e3bfa7c0ddfd1a0d00e4cda77c868e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.3.1"
-  flutter_secure_storage_darwin:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_darwin
-      sha256: "82329fa5cdf343773b1b6897dea959105a29f092454259edff92f9f6637e8149"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.2"
-  flutter_secure_storage_linux:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_linux
-      sha256: a5f35ddab43cf5c8215d2feb4ce1957851f28c5c37e6f04335066a0602087bf5
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  flutter_secure_storage_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_platform_interface
-      sha256: "06686df417f34fe9f963ed217b7fdce250e2f637ddd6c374d7eb054549770633"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  flutter_secure_storage_web:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_web
-      sha256: "073a62b3aeb866ab4ce795f960413948e51e5a42a9b0c8333b6daf5bb3208a1c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  flutter_secure_storage_windows:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_windows
-      sha256: "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  flutter_soloud:
-    dependency: "direct main"
-    description:
-      name: flutter_soloud
-      sha256: d275ff1fcaca64eab81189f260613b42787655d213013ab316ecd31bb52a5913
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.5.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -594,14 +618,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.6.0"
-  http2:
-    dependency: transitive
-    description:
-      name: http2
-      sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
   http_multi_server:
     dependency: transitive
     description:
@@ -783,14 +799,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "9.5.0"
-  os_detect:
-    dependency: transitive
-    description:
-      name: os_detect
-      sha256: "7d87c0dd98c6faf110d5aa498e9a6df02ffce4bb78cc9cfc8ad02929be9bb71f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
   package_config:
     dependency: transitive
     description:
@@ -959,14 +967,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.0"
-  rxdart:
-    dependency: transitive
-    description:
-      name: rxdart
-      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.28.0"
   serverpod_serialization:
     dependency: transitive
     description:
@@ -991,13 +991,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.0"
-  shared:
-    dependency: "direct main"
-    description:
-      path: "../r2-backed-apps/packages/shared"
-      relative: true
-    source: path
-    version: "0.0.1"
   shelf:
     dependency: transitive
     description:
@@ -1075,46 +1068,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
-  sqflite:
-    dependency: transitive
-    description:
-      name: sqflite
-      sha256: "58a799e6ac17dd32fbab93813d39ed835a75ccc0f8f85b8955fe318c6712b082"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  sqflite_android:
-    dependency: transitive
-    description:
-      name: sqflite_android
-      sha256: d0548f9d7422a2dae99ec6f8b0a3074463b132d216fa5ba0d230eeefc901983b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  sqflite_common:
-    dependency: transitive
-    description:
-      name: sqflite_common
-      sha256: "5bf6a55c166e73bf651ba7ec3ed486e577620e3dc8f3a9c6a258a8031b624590"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.11"
-  sqflite_darwin:
-    dependency: transitive
-    description:
-      name: sqflite_darwin
-      sha256: c86ca18b8f666bbf903924687fe21cc16fc385d086005067e26619ca530bef9f
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3+1"
-  sqflite_platform_interface:
-    dependency: transitive
-    description:
-      name: sqflite_platform_interface
-      sha256: f84939f84350d92d04416f8bc4dc52d3896aec7716cc9e80cf0146342139dc50
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
   stack_trace:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 name: only_bible_app
 description: The only bible app you will ever need
 publish_to: 'none'
-version: 3.6.1+20
+version: 3.7.0+23
 environment:
   sdk: '^3.12.2'
@@ -18,13 +18,11 @@ dependencies:
   async_redux: ^28.0.0
   flat_buffers: ^25.9.23
   go_router: ^17.1.0
-  flutter_soloud: ^3.5.4
   archive: ^4.0.9
   envied: ^1.3.8
-  file_picker: ^11.0.2
   flutter_azure_tts: ^1.0.0
-  shared:
+  audioplayers: ^6.8.1
-    path: ../r2-backed-apps/packages/shared
+  file_selector: ^1.1.0
 dev_dependencies:
   flutter_test:

readme.md CHANGED Viewed

@@ -67,60 +67,18 @@ signing details; iOS/macOS certs and provisioning profiles are fetched automatic
   For iOS/macOS, `overwrite_screenshots: true` is set so App Store Connect's existing
   screenshots are always replaced rather than skipped as duplicates.
-### android
+### All platforms at once
 ```
-cd android; fastlane deploy
+make release
 ```
-`fastlane deploy` regenerates screenshots, builds the appbundle and uploads to the Play Store in one step.
+Regenerates screenshots once, then builds, uploads and submits the appbundle to
-There is no separate `release` lane for android — `deploy` is the one to use.
+the Play Store, the ipa to the App Store, and the pkg to the Mac App Store,
+one after another. Equivalent to running `make release-android`,
+`make release-ios` and `make release-macos` in sequence — use those
+individually to release just one platform without the others.
-To upload an appbundle you've already built instead:
-```
-flutter build appbundle --release
-cd android; fastlane upload
-```
-### iOS
-Certificates and the App Store provisioning profile are created/reused automatically via `fastlane certs` (runs `cert` + `sigh` against App Store Connect), so no manual Xcode Signing tab setup is needed.
-```
-cd ios; fastlane release
-```
-`fastlane release` regenerates screenshots, ensures signing certs/provisioning profile, builds and submits to App Store Connect in one step.
-To upload an ipa you've already built instead:
-```
-flutter build ipa --release
-cd ios; fastlane upload
-```
-### macOS
-Certificates and the App Store provisioning profile are created/reused automatically via `fastlane certs` (runs `cert` + `sigh` against App Store Connect), so no manual Xcode Signing tab setup is needed.
-```
-cd macos; fastlane release
-```
-`fastlane release` regenerates screenshots, ensures signing certs/provisioning profile, builds, then uploads to App Store Connect and submits for review.
-To build a signed `only-bible-app.pkg` without uploading it:
-```
-cd macos; fastlane build
-```
-To upload a package you've already built (via `fastlane build` or Xcode) instead:
-```
-cd macos; fastlane upload
-```
 # Data Backup

test/app_logic_test.dart CHANGED Viewed

@@ -3,6 +3,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:go_router/go_router.dart";
 import "package:path_provider_platform_interface/path_provider_platform_interface.dart";
 import "package:only_bible_app/env.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
@@ -10,7 +11,7 @@ import "package:only_bible_app/store/actions_navigation.dart";
 import "package:only_bible_app/store/actions_state.dart";
 import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/store/app_state.dart";
-import "package:shared/shared.dart";
+import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 /// A tiny 3-book Bible used to exercise book/chapter boundary logic without
@@ -37,15 +38,30 @@ Bible buildTestBible() {
             index: 0,
             book: 0,
             verses: [
+              VerseObjectBuilder(
+                index: 0,
+                book: 0,
+                chapter: 0,
-              VerseObjectBuilder(index: 0, book: 0, chapter: 0, text: "In the beginning..."),
+                text: "In the beginning...",
+              ),
+              VerseObjectBuilder(
+                index: 1,
+                book: 0,
+                chapter: 0,
-              VerseObjectBuilder(index: 1, book: 0, chapter: 0, text: "And the earth..."),
+                text: "And the earth...",
+              ),
             ],
           ),
           ChapterObjectBuilder(
             index: 1,
             book: 0,
             verses: [
+              VerseObjectBuilder(
+                index: 0,
+                book: 0,
+                chapter: 1,
-              VerseObjectBuilder(index: 0, book: 0, chapter: 1, text: "Chapter two verse one"),
+                text: "Chapter two verse one",
+              ),
             ],
           ),
         ],
@@ -58,7 +74,12 @@ Bible buildTestBible() {
             index: 0,
             book: 1,
             verses: [
+              VerseObjectBuilder(
+                index: 0,
+                book: 1,
+                chapter: 0,
-              VerseObjectBuilder(index: 0, book: 1, chapter: 0, text: "Judges chapter one verse one"),
+                text: "Judges chapter one verse one",
+              ),
             ],
           ),
         ],
@@ -70,12 +91,26 @@ Bible buildTestBible() {
           ChapterObjectBuilder(
             index: 0,
             book: 2,
+            verses: [
+              VerseObjectBuilder(
+                index: 0,
+                book: 2,
+                chapter: 0,
-            verses: [VerseObjectBuilder(index: 0, book: 2, chapter: 0, text: "Rev 1:1")],
+                text: "Rev 1:1",
+              ),
+            ],
           ),
           ChapterObjectBuilder(
             index: 1,
             book: 2,
+            verses: [
+              VerseObjectBuilder(
+                index: 0,
+                book: 2,
+                chapter: 1,
-            verses: [VerseObjectBuilder(index: 0, book: 2, chapter: 1, text: "Rev 2:1")],
+                text: "Rev 2:1",
+              ),
+            ],
           ),
         ],
       ),
@@ -84,6 +119,20 @@ Bible buildTestBible() {
   return Bible(builder.toBytes());
 }
+/// A minimal router matching app.dart's real "/chapter/:bookIndex/:chapterIndex"
+/// route shape, for exercising navigation actions that call `router.push`/`pop`.
+GoRouter buildTestRouter() {
+  return GoRouter(
+    initialLocation: "/chapter/0/0",
+    routes: [
+      GoRoute(
+        path: "/chapter/:bookIndex/:chapterIndex",
+        builder: (context, state) => const SizedBox(),
+      ),
+    ],
+  );
+}
 class _FakePathProviderPlatform extends PathProviderPlatform {
   _FakePathProviderPlatform(this.path);
   final String path;
@@ -124,26 +173,35 @@ void main() {
   });
   group("safe bible accessors", () {
+    test(
-    test("bookAt returns null instead of throwing for an out-of-range index", () {
+      "bookAt returns null instead of throwing for an out-of-range index",
+      () {
-      final bible = buildTestBible();
+        final bible = buildTestBible();
-      expect(bible.bookAt(-1), isNull);
+        expect(bible.bookAt(-1), isNull);
-      expect(bible.bookAt(99), isNull);
+        expect(bible.bookAt(99), isNull);
-      expect(bible.bookAt(1)?.name, "Judges");
+        expect(bible.bookAt(1)?.name, "Judges");
+      },
-    });
+    );
+    test(
-    test("chapterAt returns null instead of throwing for an out-of-range index", () {
+      "chapterAt returns null instead of throwing for an out-of-range index",
+      () {
-      final genesis = buildTestBible().bookAt(0)!;
+        final genesis = buildTestBible().bookAt(0)!;
-      expect(genesis.chapterAt(-1), isNull);
+        expect(genesis.chapterAt(-1), isNull);
-      expect(genesis.chapterAt(99), isNull);
+        expect(genesis.chapterAt(99), isNull);
-      expect(genesis.chapterAt(1)?.index, 1);
+        expect(genesis.chapterAt(1)?.index, 1);
+      },
-    });
+    );
+    test(
-    test("verseAt returns null instead of throwing for an out-of-range index", () {
+      "verseAt returns null instead of throwing for an out-of-range index",
+      () {
-      final chapter = buildTestBible().bookAt(0)!.chapterAt(0)!;
+        final chapter = buildTestBible().bookAt(0)!.chapterAt(0)!;
-      expect(chapter.verseAt(-1), isNull);
+        expect(chapter.verseAt(-1), isNull);
-      expect(chapter.verseAt(99), isNull);
+        expect(chapter.verseAt(99), isNull);
-      expect(chapter.verseAt(1)?.text, "And the earth...");
+        expect(chapter.verseAt(1)?.text, "And the earth...");
+      },
-    });
+    );
   });
   group("Book.shortName", () {
@@ -155,13 +213,19 @@ void main() {
     test("disambiguates Judges vs Jude", () {
       expect(anyBook.shortName("Judges"), "Jdg");
       expect(anyBook.shortName("Jude"), "Jud");
+      expect(
+        anyBook.shortName("Judges"),
-      expect(anyBook.shortName("Judges"), isNot(equals(anyBook.shortName("Jude"))));
+        isNot(equals(anyBook.shortName("Jude"))),
+      );
     });
     test("disambiguates Philemon vs Philippians", () {
       expect(anyBook.shortName("Philemon"), "Phm");
       expect(anyBook.shortName("Philippians"), "Php");
+      expect(
+        anyBook.shortName("Philemon"),
-      expect(anyBook.shortName("Philemon"), isNot(equals(anyBook.shortName("Philippians"))));
+        isNot(equals(anyBook.shortName("Philippians"))),
+      );
     });
     test("does not throw for 3-letter book names", () {
@@ -172,7 +236,10 @@ void main() {
     test("keeps numbered-book abbreviations distinct", () {
       expect(anyBook.shortName("1 Samuel"), "1Sa");
       expect(anyBook.shortName("2 Samuel"), "2Sa");
+      expect(
+        anyBook.shortName("1 Timothy"),
-      expect(anyBook.shortName("1 Timothy"), isNot(equals(anyBook.shortName("1 Thessalonians"))));
+        isNot(equals(anyBook.shortName("1 Thessalonians"))),
+      );
     });
   });
@@ -186,7 +253,13 @@ void main() {
         fontSize: 20,
         themeMode: ThemeMode.dark,
         highlightHistory: [
+          HighlightHistoryEntry(
+            book: 0,
+            chapter: 0,
+            verseIndex: 0,
+            colorIndex: 1,
-          HighlightHistoryEntry(book: 0, chapter: 0, verseIndex: 0, colorIndex: 1, timestamp: DateTime.utc(2026, 1, 1)),
+            timestamp: DateTime.utc(2026, 1, 1),
+          ),
         ],
       );
       final restored = AppState.fromJson(state.toJson(), bible);
@@ -197,12 +270,18 @@ void main() {
       expect(restored.highlightHistory.single.book, 0);
     });
+    test(
-    test("clamps an out-of-range persisted savedBook/savedChapter instead of crashing", () {
+      "clamps an out-of-range persisted savedBook/savedChapter instead of crashing",
+      () {
-      final bible = buildTestBible();
+        final bible = buildTestBible();
-      final state = AppState.fromJson({"savedBook": 999, "savedChapter": 999}, bible);
+        final state = AppState.fromJson({
+          "savedBook": 999,
+          "savedChapter": 999,
+        }, bible);
-      expect(state.savedBook, 2);
+        expect(state.savedBook, 2);
-      expect(state.savedChapter, 1);
+        expect(state.savedChapter, 1);
+      },
-    });
+    );
     test("defaults missing fields", () {
       final bible = buildTestBible();
@@ -215,21 +294,24 @@ void main() {
   });
   group("SelectVerseAction", () {
+    test(
-    test("deselecting a verse only removes the matching book+chapter+index", () async {
+      "deselecting a verse only removes the matching book+chapter+index",
+      () async {
-      final bible = buildTestBible();
+        final bible = buildTestBible();
-      // Same verse index (0) in two different chapters of the same book -
+        // Same verse index (0) in two different chapters of the same book -
-      // exactly the collision the deselect-path bug missed.
+        // exactly the collision the deselect-path bug missed.
-      final verseInChapter0 = bible.bookAt(0)!.chapterAt(0)!.verseAt(0)!;
+        final verseInChapter0 = bible.bookAt(0)!.chapterAt(0)!.verseAt(0)!;
-      final verseInChapter1 = bible.bookAt(0)!.chapterAt(1)!.verseAt(0)!;
+        final verseInChapter1 = bible.bookAt(0)!.chapterAt(1)!.verseAt(0)!;
-      final store = Store<AppState>(initialState: AppState(bible: bible));
+        final store = Store<AppState>(initialState: AppState(bible: bible));
-      await store.dispatchAndWait(SelectVerseAction(verseInChapter0));
+        await store.dispatchAndWait(SelectVerseAction(verseInChapter0));
-      await store.dispatchAndWait(SelectVerseAction(verseInChapter1));
+        await store.dispatchAndWait(SelectVerseAction(verseInChapter1));
-      expect(store.state.selectedVerses.length, 2);
+        expect(store.state.selectedVerses.length, 2);
-      await store.dispatchAndWait(SelectVerseAction(verseInChapter0));
+        await store.dispatchAndWait(SelectVerseAction(verseInChapter0));
-      expect(store.state.selectedVerses, [verseInChapter1]);
+        expect(store.state.selectedVerses, [verseInChapter1]);
+      },
-    });
+    );
   });
   group("SetHighlightAction", () {
@@ -238,9 +320,17 @@ void main() {
       final verse = bible.bookAt(0)!.chapterAt(0)!.verseAt(0)!;
       final existingHistory = List.generate(
         500,
+        (i) => HighlightHistoryEntry(
+          book: 0,
+          chapter: 0,
+          verseIndex: 1,
+          colorIndex: 0,
+          timestamp: DateTime.utc(2026, 1, 1),
+        ),
+      );
+      final store = Store<AppState>(
-        (i) => HighlightHistoryEntry(book: 0, chapter: 0, verseIndex: 1, colorIndex: 0, timestamp: DateTime.utc(2026, 1, 1)),
+        initialState: AppState(bible: bible, highlightHistory: existingHistory),
       );
-      final store = Store<AppState>(initialState: AppState(bible: bible, highlightHistory: existingHistory));
       await store.dispatchAndWait(SetHighlightAction([verse], 2));
       expect(store.state.highlightHistory.length, 500);
       expect(store.state.highlights["0:0:0"], 2);
@@ -252,7 +342,11 @@ void main() {
       final bible = buildTestBible();
       final verse = bible.bookAt(0)!.chapterAt(0)!.verseAt(0)!;
       final store = Store<AppState>(
+        initialState: AppState(
+          bible: bible,
-        initialState: AppState(bible: bible, highlights: {"0:0:0": 1}, selectedVerses: [verse]),
+          highlights: {"0:0:0": 1},
+          selectedVerses: [verse],
+        ),
       );
       await store.dispatchAndWait(RemoveHighlightAction([verse]));
       expect(store.state.highlights.containsKey("0:0:0"), isFalse);
@@ -260,15 +354,6 @@ void main() {
     });
   });
-  // NextChapterAction/PreviousChapterAction/GoToChapterAction all call
-  // stopAudioPlayback(), which touches flutter_soloud's FFI bindings. Those
-  // bindings dlsym a native symbol that is only present once the plugin's
-  // native library is loaded by a real app process — never true in this
-  // headless `flutter test` VM — so dispatching those actions directly here
-  // always throws regardless of the app logic under test. Instead we test
-  // the pure decision logic each action delegates to (adjacentChapter) and
-  // the plain sync action (UpdateChapterAction) that the ordering fix in
-  // GoToChapterAction relies on.
   group("adjacentChapter", () {
     test("moves to the next chapter within the same book", () {
       final bible = buildTestBible();
@@ -304,7 +389,9 @@ void main() {
   group("UpdateChapterAction", () {
     test("updates savedBook/savedChapter", () async {
       final bible = buildTestBible();
+      final store = Store<AppState>(
-      final store = Store<AppState>(initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0));
+        initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0),
+      );
       await store.dispatchAndWait(UpdateChapterAction(1, 0));
       expect(store.state.savedBook, 1);
       expect(store.state.savedChapter, 0);
@@ -314,7 +401,9 @@ void main() {
   group("SyncCurrentChapterAction", () {
     test("is a no-op when book/chapter already match", () async {
       final bible = buildTestBible();
+      final store = Store<AppState>(
-      final store = Store<AppState>(initialState: AppState(bible: bible, savedBook: 1, savedChapter: 0));
+        initialState: AppState(bible: bible, savedBook: 1, savedChapter: 0),
+      );
       final stateBefore = store.state;
       await store.dispatchAndWait(SyncCurrentChapterAction(1, 0));
       expect(identical(store.state, stateBefore), isTrue);
@@ -322,19 +411,110 @@ void main() {
     test("updates state when book/chapter differ", () async {
       final bible = buildTestBible();
+      final store = Store<AppState>(
-      final store = Store<AppState>(initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0));
+        initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0),
+      );
       await store.dispatchAndWait(SyncCurrentChapterAction(1, 0));
       expect(store.state.savedBook, 1);
       expect(store.state.savedChapter, 0);
     });
   });
+  // These used to be untestable here: they all call stopAudioPlayback(),
+  // which touched flutter_soloud's FFI bindings and dlsym'd a native symbol
+  // only present once the plugin's native library was loaded by a real app
+  // process, crashing in this headless VM regardless of the logic under
+  // test. Switching to audioplayers (a plain platform-channel plugin, lazily
+  // constructed) removed that: stopAudioPlayback() is a no-op whenever
+  // playback was never started, which is always true here.
+  group("GoToChapterAction", () {
+    test("updates savedBook/savedChapter and pushes the route", () async {
+      final bible = buildTestBible();
+      final store = Store<AppState>(
+        initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0),
+      );
+      final router = buildTestRouter();
+      await store.dispatchAndWait(GoToChapterAction(router, 2, 1));
+      expect(store.state.savedBook, 2);
+      expect(store.state.savedChapter, 1);
+    });
+  });
-  group("theme", () {
+  group("NextChapterAction", () {
+    test("advances to the next chapter and updates saved state", () async {
+      final bible = buildTestBible();
+      final store = Store<AppState>(
+        initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0),
+      );
+      final router = buildTestRouter();
+      await store.dispatchAndWait(NextChapterAction(router, bible, 0, 0));
+      expect(store.state.savedBook, 0);
+      expect(store.state.savedChapter, 1);
+    });
-    test("dark theme labelMedium (verse numbers) uses the dark error accent, matching the light theme's dedicated red", () {
+    test("is a no-op after the very last chapter of the last book", () async {
+      final bible = buildTestBible();
+      final store = Store<AppState>(
-      expect(AppTheme.dark.textTheme.labelMedium!.color, darkColorScheme.error);
+        initialState: AppState(bible: bible, savedBook: 2, savedChapter: 1),
+      );
+      final router = buildTestRouter();
+      await store.dispatchAndWait(NextChapterAction(router, bible, 2, 1));
+      expect(store.state.savedBook, 2);
+      expect(store.state.savedChapter, 1);
+    });
+  });
+  group("PreviousChapterAction", () {
+    test("moves to the previous chapter and updates saved state", () async {
+      final bible = buildTestBible();
+      final store = Store<AppState>(
+        initialState: AppState(bible: bible, savedBook: 1, savedChapter: 0),
+      );
+      final router = buildTestRouter();
+      await store.dispatchAndWait(PreviousChapterAction(router, bible, 1, 0));
+      expect(store.state.savedBook, 0);
+      expect(store.state.savedChapter, 1);
     });
   });
+  group("PopChapterAction", () {
+    testWidgets("restores the pre-push savedBook/savedChapter synchronously, "
+        "without waiting on the router's pop-transition listener", (
+      tester,
+    ) async {
+      final bible = buildTestBible();
+      final store = Store<AppState>(
+        initialState: AppState(bible: bible, savedBook: 0, savedChapter: 0),
+      );
+      final router = buildTestRouter();
+      // A mounted Navigator is required for router.pop() to find something
+      // to pop — router.push() alone (used by the other actions above)
+      // doesn't need one.
+      await tester.pumpWidget(MaterialApp.router(routerConfig: router));
+      await store.dispatchAndWait(GoToChapterAction(router, 2, 1));
+      await tester.pumpAndSettle();
+      expect(store.state.savedBook, 2);
+      expect(store.state.savedChapter, 1);
+      await store.dispatchAndWait(PopChapterAction(router));
+      expect(store.state.savedBook, 0);
+      expect(store.state.savedChapter, 0);
+    });
+  });
+  group("theme", () {
+    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.error,
+        );
+      },
+    );
+  });
   group("Env", () {
     test("obfuscated secrets decode back to non-empty strings", () {
       expect(Env.errorReportSecret, isNotEmpty);
@@ -354,24 +534,43 @@ void main() {
       await tempDir.delete(recursive: true);
     });
+    test(
-    test("persistDifference writes atomically, leaving no leftover temp file", () async {
+      "persistDifference writes atomically, leaving no leftover temp file",
+      () async {
-      final bible = buildTestBible();
+        final bible = buildTestBible();
-      final persistor = AppPersistor();
+        final persistor = AppPersistor();
+        final state = AppState(
+          bible: bible,
+          savedBook: 1,
+          savedChapter: 0,
-      final state = AppState(bible: bible, savedBook: 1, savedChapter: 0, themeMode: ThemeMode.dark);
+          themeMode: ThemeMode.dark,
+        );
-      await persistor.persistDifference(lastPersistedState: null, newState: state);
+        await persistor.persistDifference(
+          lastPersistedState: null,
+          newState: state,
+        );
-      final json = await persistor.readJson();
+        final json = await persistor.readJson();
-      expect(json, isNotNull);
+        expect(json, isNotNull);
-      expect(json!["savedBook"], 1);
+        expect(json!["savedBook"], 1);
-      expect(json["themeMode"], "dark");
+        expect(json["themeMode"], "dark");
+        expect(
-      expect(await File("${tempDir.path}/app_state.json.tmp").exists(), isFalse);
+          await File("${tempDir.path}/app_state.json.tmp").exists(),
+          isFalse,
-    });
+        );
+      },
+    );
+    test(
-    test("readJson returns null for corrupt JSON instead of throwing", () async {
+      "readJson returns null for corrupt JSON instead of throwing",
+      () async {
-      final persistor = AppPersistor();
+        final persistor = AppPersistor();
+        await File(
-      await File("${tempDir.path}/app_state.json").writeAsString("{not valid json");
+          "${tempDir.path}/app_state.json",
+        ).writeAsString("{not valid json");
-      expect(await persistor.readJson(), isNull);
+        expect(await persistor.readJson(), isNull);
+      },
-    });
+    );
   });
 }

test/screenshot_test.dart CHANGED Viewed

@@ -10,7 +10,7 @@ import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/home.dart";
 import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/app_state.dart";
-import "package:shared/shared.dart";
+import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 import "package:path/path.dart" as path;

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.