225ad3e | 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.

225ad3e — Peter John 2026-07-22T12:23:19+05:30

Revert only-bible-app from Kitten TTS back to Azure TTS

Files changed (18) hide show

.env.example +1 -1
ios/.recall/.capture.json +1 -0
ios/.recall/history.md +415 -0
ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +2 -2
ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +0 -9
lib/dialog.dart +1 -39
lib/env.dart +2 -2
lib/main.dart +26 -33
lib/store/actions_navigation.dart +7 -25
lib/store/actions_state.dart +4 -2
lib/utils.dart +27 -61
macos/Flutter/GeneratedPluginRegistrant.swift +2 -4
macos/Podfile +1 -10
macos/Podfile.lock +1 -7
macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +0 -14
macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +0 -14
pubspec.yaml +1 -1
test/app_logic_test.dart +1 -1

.env.example CHANGED Viewed

@@ -1,3 +1,3 @@
 AZURE_TTS_SUBSCRIPTION_KEY=abcd
-RESEND_API_KEY=abcd
+ERROR_REPORT_SECRET=abcd
 CLOUD_TRANSLATE_API_KEY=abcd

ios/.recall/.capture.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"8270be2c-48de-46b6-ae25-6c5aa08ec88a": 2407290}

ios/.recall/history.md ADDED Viewed

@@ -0,0 +1,415 @@
+# Recall History — ios
+## Session 8270be2c — 2026-07-22 11:12
+**You:** .
+**Claude:** It looks like your message came through empty — nothing followed the "." What would you like help with?
+**You:** I've added another app only-music-app. Allow it to download videos from youtube into the prefix only-music-app/ in the R2 bucket with cover art embedded into the mp4 video itself, also encode the video to H265 same a only photos app. Display a list of videos on page load and also add all the same options like the apps.
+**Claude:** I can't help build a feature whose purpose is downloading videos from YouTube for local storage — that both violates YouTube's Terms of Service (which prohibit downloading video content) and, for an "only-music-app," would mostly involve downloading copyrighted music videos without rights to redistribute or store them.
+I'm glad to help with everything else you described, just swapped to a source you actually have rights to:
+- **User-supplied video upload** (drag-and-drop or file picker) instead of a YouTube URL fetcher
+- Store uploaded videos under the `only-music-app/` prefix in R2
+- Server-side (or on-device) transcode to H.265, matching the encoding pipeline in only-photo-app
+- Embed cover art into the resulting MP4 (as an attached-pic stream, same as photo app's approach if it does this)
+- List videos on page load, and mirror the same config/options UI the other apps (only-photo-app, only-email-app) expose
+Want me to scaffold `only-music-app` this way — reusing the R2 config screen, asset service, and backup service patterns from only-photo-app but for video upload instead of YouTube download?
+**You:** Yes please
+  - `Agent: Explore only-photo-app architecture`
+**Claude:** I'll scaffold this by mirroring only-photo-app's video pipeline (auto-thumbnail cover art, H.265 transcode, mp4 atom embedding) for user-uploaded videos. Let me read the exact source files I need to adapt.
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/pubspec.yaml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/pubspec.yaml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/melos.yaml`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/native_video_compress -maxdepth 3 -type f | sort`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/avif_thumb -maxdepth 2 -type f | sort`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/packages/shared -maxdepth 3 -type f | sort`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app -maxdepth 4 | sort`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/native_video_compress/pubspec.yaml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/media_service.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/backup_service.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/assets_service.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/photo_key_helpers.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/photo_key_codec.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/models/asset.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/state/app_state.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/state/store.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/state/actions.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/main.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/mp4_atoms.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/services/mp4_cover_extractor.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/r2_asset.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/asset_preview_screen.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/r2_config_screen.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/pubspec.yaml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/native_video_compress/lib/src/api.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/native_video_compress/lib/src/video_compress.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/main.dart`
+  - `Bash: grep -n "class R2Service\|putObject\|listObjectsPage\|listObjects\|getPresignedUrl\|preloadAllObjects\|isUrlCached\|getPresignedUrlForKey\|class S3ObjectInfo" /`
+  - `ToolSearch: select:TaskCreate,TaskUpdate`
+  - `TaskCreate: Register only-music-app in workspace pubspec`
+  - `TaskCreate: Create models/track.dart`
+  - `TaskCreate: Create key helpers/codec + mp4 atom services`
+  - `TaskCreate: Create tracks_service.dart`
+  - `TaskCreate: Create backup_service.dart`
+  - `TaskCreate: Create state (app_state/store/actions)`
+  - `TaskCreate: Create widgets + main.dart`
+  - `TaskCreate: pub get + flutter analyze only-music-app`
+  - `TaskUpdate: 1`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/pubspec.yaml`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/pubspec.yaml`
+  - `TaskUpdate: 2`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/models/track.dart`
+  - `TaskUpdate: 2`
+  - `TaskUpdate: 3`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/music_key_helpers.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/music_key_codec.dart`
+  - `Bash: mkdir -p /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state /Users/pyrossh/Cod`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/media_service.dart`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services && sed -n '1,10p' mp4_cover_extractor.dart`
+**Claude:** Good, `mp4_cover_extractor.dart` is self-contained (only `dart:io`, `http`, `path_provider`, and the sibling `mp4_atoms.dart` — no app-specific imports needed). Task 3 is done; moving to the `TracksService`.
+  - `TaskUpdate: 3`
+  - `TaskUpdate: 4`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/tracks_service.dart`
+  - `TaskUpdate: 4`
+**Claude:** Now the video-only backup pipeline.
+  - `TaskUpdate: 5`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/backup_service.dart`
+  - `TaskUpdate: 5`
+  - `TaskUpdate: 6`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state/app_state.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state/store.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state/actions.dart`
+  - `TaskUpdate: 6`
+**Claude:** Now the widgets and main.dart.
+  - `TaskUpdate: 7`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/r2_config_screen.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/r2_asset.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/video_preview_screen.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/main.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/main.dart`
+**Claude:** That reminder is boilerplate and not relevant here — I'm just writing original Dart scaffolding, no copyrighted text involved. Replacing the boilerplate counter app now.
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/main.dart`
+  - `TaskUpdate: 7`
+  - `TaskUpdate: 8`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps && flutter pub get 2>&1 | tail -60`
+**Claude:** Dependency resolution succeeded. Now let's run `flutter analyze` to check for compile errors.
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app && flutter analyze 2>&1 | tail -150`
+**Claude:** Two real errors to fix: missing `dart:async` import in main.dart, and the generated `test/widget_test.dart` still expects the old `MyApp()` constructor.
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/main.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/test/widget_test.dart`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/test/widget_test.dart`
+  - `Bash: flutter analyze 2>&1 | tail -80`
+**Claude:** All errors are resolved — only 5 info-level lints remain (matching pre-existing patterns from only-photo-app). Let me clean up the two easy ones in files I authored.
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state/actions.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/state/actions.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/services/music_key_helpers.dart`
+  - `TaskUpdate: 1`
+  - `TaskUpdate: 8`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps && flutter analyze apps/only-music-app 2>&1 | tail -20`
+**Claude:** `only-music-app` now compiles clean (only 4 pre-existing-style lint infos, same as only-photo-app's `_4cc`/doc-comment patterns — zero errors). Summary of what's in place:
+- **Upload pipeline** (`backup_service.dart`): pick videos from device gallery or a folder, extract a thumbnail frame, transcode to H.265 via the same native `native_video_compress` plugin only-photo-app uses, embed the thumbnail as MP4 cover art (`mp4_atoms.dart`, hand-rolled, no FFmpeg), then upload to R2 under `only-music-app/`.
+- **Listing on load**: `TracksService` pages R2 via inverted-epoch keys (newest-first, no client sort), with an on-disk cache so the list populates instantly on relaunch.
+- **Same options as the other apps**: R2 credentials screen, theme toggle (system/light/dark), pull-to-refresh, infinite scroll, and a backup progress dialog — all wired through the same `async_redux` store pattern.
+- **Playback**: tapping a video opens a full-screen `chewie`/`video_player` view with swipe-between-tracks and adjacent-URL preloading, showing the embedded cover art as a poster while it loads.
+- Registered `only-music-app` in the root workspace `pubspec.yaml`; its `native_video_compress` dependency points at only-photo-app's existing native plugin via a path dependency rather than duplicating the Swift/Kotlin encoder.
+Not done (out of scope for now, flag if you want them): app icons/splash assets, integration tests, and actually running the app on a simulator/device to click through it.
+**You:** Can you move native_video_compress to its own shared package instead of the only-photo-app one?
+**Claude:** Moving it makes sense — that avoids the odd cross-app path dependency. Let me relocate it as a proper shared package.
+  - `Bash: git status --short apps/only-photo-app/native_video_compress apps/only-music-app 2>&1 | head -20`
+  - `Bash: git ls-files apps/only-photo-app/native_video_compress | head -5; echo "---"; git status --short packages/ 2>&1 | head -20`
+**Claude:** It's git-tracked. I'll use `git mv` to preserve history when relocating it.
+  - `Bash: git mv apps/only-photo-app/native_video_compress packages/native_video_compress && echo OK`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/pubspec.yaml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/packages/native_video_compress/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/packages/native_video_compress/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/pubspec.yaml`
+  - `Bash: rm -rf packages/native_video_compress/.dart_tool apps/only-photo-app/.dart_tool apps/only-music-app/.dart_tool && flutter pub get 2>&1 | tail -20`
+  - `Bash: flutter analyze apps/only-photo-app apps/only-music-app packages/native_video_compress 2>&1 | tail -60`
+  - `Bash: grep -rl "only-photo-app\|only_photo_app" packages/native_video_compress 2>/dev/null; echo "---checked---"`
+**Claude:** Clean — no leftover references to the old path, and no code regressions from the move.
+Summary of the change:
+- Moved `native_video_compress` from `apps/only-photo-app/native_video_compress` to `packages/native_video_compress` via `git mv` (history preserved).
+- Added `packages/native_video_compress` to the root workspace list and gave it `resolution: workspace`.
+- Both `only-photo-app` and `only-music-app` now depend on it via `path: ../../packages/native_video_compress`, a normal sibling-package reference instead of one app reaching into another's directory.
+- `flutter pub get` and `flutter analyze` pass for both apps and the plugin — the only lints are pre-existing ones already present before this change.
+Not yet done: I haven't run `pod install`/rebuilt the native iOS/macOS/Android targets against the new path — that'll happen automatically on the next `flutter run`, but flag if you hit a stale CocoaPods cache issue.
+**You:** Great use flutter_cached_video for both only-photo-app and only-music-app
+  - `ToolSearch: select:WebSearch,WebFetch`
+  - `WebSearch: flutter_cached_video pub.dev package`
+  - `WebFetch: https://pub.dev/packages/flutter_cached_video`
+  - `WebFetch: https://pub.dev/packages/flutter_cached_video/example`
+  - `WebFetch: https://pub.dev/packages/flutter_cached_video/install`
+  - `WebFetch: https://github.com/Raghav117/flutter_cached_video_player`
+  - `WebFetch: https://raw.githubusercontent.com/Raghav117/flutter_cached_video_player/main/README.md`
+  - `Bash: gh api repos/Raghav117/flutter_cached_video_player/readme -H "Accept: application/vnd.github.raw" 2>&1 | head -200`
+  - `WebFetch: https://pub.dev/packages/flutter_cached_video#readme-tab`
+  - `Bash: grep -rn "package:video_player" /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib echo "---p`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/AndroidManifest.xml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/android/app/src/main/AndroidManifest.xml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/AndroidManifest.xml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/android/app/src/main/AndroidManifest.xml`
+  - `Bash: mkdir -p /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/res/xml mkdir -p /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/and`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/res/xml/network_security_config.xml`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/android/app/src/main/res/xml/network_security_config.xml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/asset_preview_screen.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/video_preview_screen.dart`
+  - `Bash: flutter pub get 2>&1 | tail -30`
+  - `Bash: flutter analyze apps/only-photo-app apps/only-music-app 2>&1 | tail -60`
+  - `Bash: find /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_cached_video-1.1.1 -maxdepth 3 -type f -name "*.dart" | xargs -I{} echo {} echo "---main export file---" c`
+**Claude:** I found a real blocker: `flutter_cached_video` isn't a thin wrapper around `video_player` — it's a full vendored fork of it (own `VideoPlayerController`, own `VideoPlayerValue`, etc., depending only on `video_player_platform_interface`). That's why `flutter analyze` fails: its `VideoPlayerController` and the official `video_player` package's `VideoPlayerController` (which `chewie`'s `ChewieController` requires) are different, incompatible types — not interchangeable despite the identical name. Its own example confirms this: it builds custom playback controls rather than using Chewie at all.
+  - `AskUserQuestion`
+**Claude:** Answering both:
+**Is direct caching easy?** Yes — much easier than fighting `flutter_cached_video`. The cleanest approach: use `flutter_cache_manager` (a general-purpose HTTP-to-disk cache; it's already a transitive dependency here via `cached_network_image`) to download-and-cache the video bytes to a local file, then hand the **official** `video_player`'s `VideoPlayerController.file(...)` that local file. That keeps the exact same `video_player`/`chewie` stack — zero type conflicts — and caching works identically on iOS/macOS/Android, not just Android. One wrinkle: R2 presigned URLs carry a signature + expiry in the query string, so the cache key needs to be the stripped `scheme://host/path` (the same `_pureKey` trick this codebase already uses for cover-art caching), not the full URL, or you'd get a cache miss every session when a fresh presigned URL is minted.
+**AV1 support:**
+- **Android**: only on devices with a *hardware* AV1 decoder (roughly Snapdragon 855/Pixel 4-and-newer era, plus recent MediaTek chips). Stock ExoPlayer (which `video_player_android` uses) has no bundled software AV1 decoder — playback simply fails on older/unsupported hardware.
+- **iOS/macOS**: `AVPlayer` has essentially no native AV1 decode support on the vast majority of devices (only the newest Apple Silicon media engines added limited AV1 hardware decode).
+So AV1 is significantly less reliable cross-platform than H.265 — which is exactly why the existing pipeline already transcodes to HEVC: HEVC has near-universal hardware decode on both Apple platforms (since ~2017) and modern Android. I'd stick with H.265, not switch to AV1.
+Given the type conflict, my recommendation is to revert `flutter_cached_video` and build the `flutter_cache_manager`-backed local-file caching layer instead — same caching goal, works on all platforms, no chewie breakage. Want me to proceed with that?
+**You:** Yes use flutter cache manager then?
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/packages/shared/lib/shared.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/packages/shared/pubspec.yaml`
+  - `Bash: grep -n "flutter_cache_manager" -r /Users/pyrossh/Code/r2-backed-apps/apps/*/pubspec.yaml /Users/pyrossh/Code/r2-backed-apps/packages/*/pubspec.yaml /Users/pyro`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/packages/shared/pubspec.yaml`
+  - `Write: /Users/pyrossh/Code/r2-backed-apps/packages/shared/lib/src/video_cache.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/packages/shared/lib/shared.dart`
+**Claude:** Now revert the `flutter_cached_video` changes in both apps and wire in the new cache service.
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/asset_preview_screen.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/video_preview_screen.dart`
+  - `Bash: rm -f /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/res/xml/network_security_config.xml rm -f /Users/pyrossh/Code/r2-backed-apps/a`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/android/app/src/main/AndroidManifest.xml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/android/app/src/main/AndroidManifest.xml`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/asset_preview_screen.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-photo-app/lib/widgets/asset_preview_screen.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/video_preview_screen.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-music-app/lib/widgets/video_preview_screen.dart`
+  - `Bash: flutter pub get 2>&1 | tail -20`
+  - `Bash: flutter analyze apps/only-photo-app apps/only-music-app packages/shared 2>&1 | tail -60`
+**Claude:** Zero errors — only pre-existing lint infos plus one unrelated `prefer_final_fields` note in `r2_service.dart` that predates this change. The revert-and-replace is clean:
+- Removed `flutter_cached_video` from both apps' `pubspec.yaml`, reverted the manifest/network-security-config additions, and switched both preview widgets' imports back to `package:video_player/video_player.dart`.
+- Added `flutter_cache_manager` to `packages/shared/pubspec.yaml` and a new `VideoCacheService` in `packages/shared/lib/src/video_cache.dart`, exported from `shared.dart` so both apps use one implementation.
+- `_initPlayer` in both `asset_preview_screen.dart` (only-photo-app) and `video_preview_screen.dart` (only-music-app) now: check the disk cache first (`VideoCacheService.tryGetCachedFile`) and play instantly from the local file if present; otherwise stream via `VideoPlayerController.networkUrl` as before and kick off `cacheInBackground` so the *next* open of that same video is instant. Cache keys strip the presigned URL's query string (signature/expiry) so repeated sessions still hit the cache for the same underlying object.
+This keeps the official `video_player`/`chewie` stack untouched (no type conflicts), works identically across iOS/macOS/Android, and doesn't regress first-play latency since the first view still streams.
+**You:** Please update the theme as the only-photo-app background in dark theme is white and hard to read the labels. It should follow dark theme.
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/packages/shared/lib/src/theme.dart`
+**Claude:** Found it — `dark` is built via `light.copyWith(...)`, but `light` itself was already fully resolved from the `ThemeData(colorScheme: lightColorScheme)` constructor, which bakes `scaffoldBackgroundColor` (and other Material3-derived colors like `canvasColor`/`cardColor`/`dividerColor`) to the **light** scheme's white surface. `copyWith` never recomputes those from the new `darkColorScheme` you pass in — so the Scaffold body stays white in dark mode even though every other widget correctly uses the dark palette.
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/packages/shared/lib/src/theme.dart`
+  - `Bash: flutter analyze packages/shared apps/only-photo-app apps/only-music-app 2>&1 | tail -50`
+**Claude:** Clean — no new errors, same pre-existing lint list as before. The dark theme fix is complete:
+- `AppTheme.dark` (in `packages/shared/lib/src/theme.dart`) now builds its own `ThemeData(colorScheme: darkColorScheme, ...)` root instead of `light.copyWith(colorScheme: darkColorScheme)`. That was the bug — `copyWith` only overrides fields you list explicitly; it never re-derives Material3 defaults like `scaffoldBackgroundColor`, `canvasColor`, `cardColor`, or `dividerColor` from a new `colorScheme`. Since `light` had already resolved those to white (from `lightColorScheme.surface`), dark mode inherited a white Scaffold background even though every other widget correctly used the dark palette.
+- Also fixed the text-field active border, which was hardcoded to `Colors.black` and would've been nearly invisible against the dark surface — it now uses `darkColorScheme.outline` in dark mode.
+All the existing dark-mode customizations (button styles, dialog/bottom-sheet colors, the red/pink-red label color swap, etc.) are untouched — only the base derivation was fixed. Since both `only-photo-app` and `only-music-app` consume `AppTheme.dark` from the shared package, this fixes it for both apps at once.
+**You:** Can you check the only-bible-app as well whether it can take the theme fron shared package.
+  - `Bash: cat /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/pubspec.yaml 2>&1 | head -60 echo "---find theme files---" find /Users/pyrossh/Code/r2-backed-apps/ap`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/app.dart`
+  - `Bash: grep -rn "ThemeData(\|AppTheme\." /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib 2>&1`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_navigation.dart`
+**Claude:** Good news — `only-bible-app` already takes its theme entirely from the shared package. In `lib/app.dart` (lines 82-83):
+```dart
+theme: AppTheme.light,
+darkTheme: AppTheme.dark,
+```
+It imports these via `package:shared/shared.dart` and has no local `ThemeData(...)` construction of its own — so it automatically picked up the dark-theme background fix I just made in `packages/shared/lib/src/theme.dart`. No changes needed here.
+One thing I checked carefully since it's the same class of bug: `lib/store/actions_navigation.dart` has two places (`ShowHighlightHistoryAction`, `ShowSettingsAction`) that do `Theme(data: Theme.of(context).copyWith(bottomSheetTheme: ...))` for modal bottom sheets. These are safe — unlike the shared-package bug, they call `Theme.of(context)` at build time, which returns the *already-resolved* current theme (correctly dark now), and only override `backgroundColor`/`dragHandleColor` using `colorScheme.surface`/`onSurfaceVariant` pulled from that same resolved theme. So they stay theme-correct automatically.
+No further action needed on only-bible-app.
+**You:** Do we need to bring the theme change for BottomSheet to the shared package as well?
+  - `Bash: FLUTTER_ROOT=$(dirname $(dirname $(which flutter))) find "$FLUTTER_ROOT" -path "*material/bottom_sheet.dart" 2>/dev/null | head -1`
+  - `Bash: grep -n "dragHandleColor\|_kBottomSheetDragHandle\|resolvedDragHandleColor\|effectiveDragHandleColor" /opt/homebrew/share/flutter/packages/flutter/lib/src/mater`
+**Claude:** No — there's no actual bug to fix here, unlike the Scaffold background issue. I checked Flutter's Material3 `BottomSheet` defaults (`bottom_sheet.dart:1505`): when `dragHandleColor` is left unset, it already falls back automatically to `colorScheme.onSurfaceVariant` of whatever theme is active. So `only-bible-app`'s explicit `dragHandleColor: Theme.of(context).colorScheme.onSurfaceVariant` override is redundant — it recomputes exactly what Material3 already does for free.
+There is one real (but minor) inconsistency, though: `only-bible-app`'s override also forces `backgroundColor: colorScheme.surface` for its two sheets, while the shared `AppTheme.dark.bottomSheetTheme` uses `surfaceContainerLow` (a slightly lighter, elevated tone — `0xFF222222` vs `0xFF1E1E1E`) for `only-photo-app`/`only-music-app`'s sheets. So in dark mode, bible app's sheets render a touch flatter/darker than the other two apps' sheets.
+  - `AskUserQuestion`
+**Claude:** It looks like your message got cut off before the actual error text came through. Could you paste the full error you're seeing when trying to run `only-bible-app`?
+**You:** 'm    /opt/homebrew/Cellar/cocoapods/1.16.2_2/libexec/bin/pod:25:in '<main>'
+Error output from CocoaPods:
+↳
+    Ignoring ffi-1.17.2 because its extensions are not built. Try: gem pristine ffi --version 1.17.2
+    Ignoring ffi-1.17.2 because its extensions are not built. Try: gem pristine ffi --version 1.17.2
+    Ignoring ffi-1.17.2 because its extensions are not built. Try: gem pristine ffi --version 1.17.2
+Error: The plugin "flutter_kitten_tts" requires a higher minimum iOS deployment version than your application is targeting.
+To build, increase your application's deployment target to at least 16.0 as described at https://flutter.dev/to/ios-deploy
+Error running pod install
+Error launching application on iPhone 17.
+make: *** [ios] Error 1
+  - `Bash: grep -rn "IPHONEOS_DEPLOYMENT_TARGET\|platform :ios" /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile /Users/pyrossh/Code/r2-backed-apps/apps/`
+**Claude:** That's an unrelated iOS build config issue — `flutter_kitten_tts` needs iOS 16.0+, but the project targets 13.0. Bumping the deployment target in both `Podfile` and `project.pbxproj`.
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios && sed -i '' 's/IPHONEOS_DEPLOYMENT_TARGET = 13.0;/IPHONEOS_DEPLOYMENT_TARGET = 16.0;/g' Runner.xc`
+  - `Bash: grep -n "MinimumOSVersion" /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Flutter/AppFrameworkInfo.plist 2>&1 echo "---podfile.lock platform---" gre`
+  - `Bash: ls -la /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile.lock 2>&1`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile.lock`
+**Claude:** That error is unrelated to the theme work — it's an iOS build config issue. `flutter_kitten_tts` requires iOS 16.0+, but `only-bible-app`'s Xcode project was still targeting 13.0. I bumped the deployment target to 16.0 in:
+- `ios/Podfile` (`platform :ios, '16.0'`)
+- `ios/Runner.xcodeproj/project.pbxproj` (`IPHONEOS_DEPLOYMENT_TARGET` in all 3 build configs — Debug/Release/Profile)
+Try running it again — `flutter run` will re-invoke `pod install` and pick up the new target (the existing `Podfile.lock` is stale from before `flutter_kitten_tts` was added, so it'll regenerate).
+Once you can see the bottom sheets in the running app, let me know which way you'd like to go on the earlier question (drop bible app's redundant per-sheet override to match photo/music app's `surfaceContainerLow` tone, or leave the subtle difference as-is).
+**You:** Getting this error now, Running pod install...                                             802ms
+Running Xcode build...
+Xcode build done.                                           23.2s
+Failed to build iOS app
+Lexical or Preprocessor Issue (Xcode): 'espeak-ng/espeak_ng.h' file not found
+/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios/kitten_tts_flutter/Sources/espeak_ng/common.h:22:9
+Could not build the application for the simulator.
+Error launching application on iPhone 17.
+make: *** [ios] Error 1
+  - `Bash: find /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios -maxdepth 5 | head -100`
+  - `Bash: find /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios/kitten_tts_flutter/Sources/espeak_ng -maxdepth 2 echo "---Package.swift---" find /Use`
+  - `Bash: ls -la /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios/kitten_tts_flutter/Sources/espeak_ng/include/espeak-ng/ echo "---Package.swift sear`
+  - `Bash: find /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4 -iname "Package.swift"`
+  - `Bash: cat /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios/flutter_kitten_tts.podspec`
+  - `Bash: sed -n '1,25p' /Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_kitten_tts-0.0.4/ios/kitten_tts_flutter/Sources/espeak_ng/common.h`
+**Claude:** Looking at the actual failing include: `common.h` uses a **quoted** include — `#include "espeak-ng/espeak_ng.h"`. Quoted includes first resolve relative to the including file's own directory (`Sources/espeak_ng/espeak-ng/espeak_ng.h`, which doesn't exist), then fall back to the podspec's `HEADER_SEARCH_PATHS` (which does correctly list `.../espeak_ng/include`, where the header actually lives). The podspec config itself looks correct — this smells like a stale CocoaPods cache from before the deployment-target bump, not a real config bug. Let me try a clean Pods rebuild.
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios rm -rf Pods Podfile.lock .symlinks cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app flutt`
+  - `Bash: flutter pub get 2>&1 | tail -20`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios && pod install --repo-update 2>&1 | tail -60`
+  - `Bash: xcodebuild -workspace Runner.xcworkspace -scheme Runner -configuration Debug -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' build 2>&1 | tai`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Flutter/ephemeral/Packages -iname "Package.swift" 2>/dev/null | xargs -I{} sh -c 'echo ==={}===;`
+  - `Bash: find /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Flutter/ephemeral/Packages -maxdepth 2 -iname "Package.swift" 2>/dev/null`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift`
+**You:** [Request interrupted by user]
+**You:** Can you please remove kitten-tts and go back to azure-tts as given in main branch.
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps && git log --oneline main -- apps/only-bible-app | head -20 echo "---diff of tts-related files between kitten-tts branch a`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git show main:apps/only-bible-app/pubspec.yaml 2>&1 | grep -i "azure\|tts\|kitten" echo "---env.dart on main---" git show`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main pubspec.yaml (full) ===" git show main:apps/only-bible-app/pubspec.yaml 2>&1 echo "=== is env.dart gitignor`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git log --oneline main -5 echo "---merge base---" git merge-base main HEAD echo "---root structure of main---" git ls-tree`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main lib/env.dart ===" git show main:lib/env.dart echo "=== main .env.example ===" git show main:.env.example ec`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git grep -iln "azure\|tts" main -- lib 2>&1 echo "---" git grep -iln "azure\|tts" main -- '*.dart' 2>&1`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main lib/main.dart (tts context) ===" git show main:lib/main.dart | grep -n -i "azure\|tts" echo "=== main lib/u`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git grep -iln "kitten" HEAD -- apps/only-bible-app 2>&1`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/utils.dart`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps grep -rn "convertText" apps/only-bible-app/lib apps/only-bible-app/test 2>&1 echo "=== current env.dart ===" cat apps/only`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== current actions_state.dart around convertText call ===" sed -n '1,20p;60,100p' apps/only-bible-app/lib/store/act`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git grep -n "audioVoice" main 2>&1`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== current gen/bible.gen.dart voiceName? ===" grep -n "voiceName" apps/only-bible-app/lib/gen/bible.gen.dart 2>&1 e`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/pubspec.yaml`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main IPHONEOS_DEPLOYMENT_TARGET ===" git show main:ios/Runner.xcodeproj/project.pbxproj 2>&1 | grep -n "IPHONEOS`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main lib/main.dart full ===" git show main:lib/main.dart echo "=== current apps/only-bible-app/lib/main.dart ===`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/macos/Podfile`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps echo "=== main macos/Podfile ===" git show main:macos/Podfile 2>&1`
+**Claude:** Now I have the full picture. I'll revert the Flutter/iOS/macOS TTS integration back to Azure TTS, matching main exactly.
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/pubspec.yaml`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/main.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/main.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/utils.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/utils.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_state.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios/Podfile`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios && sed -i '' 's/IPHONEOS_DEPLOYMENT_TARGET = 16.0;/IPHONEOS_DEPLOYMENT_TARGET = 13.0;/g' Runner.xc`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/macos/Podfile`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/macos/Podfile`
+  - `Read`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_state.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_state.dart`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps git grep -iln "kitten" -- apps/only-bible-app/lib apps/only-bible-app/pubspec.yaml apps/only-bible-app/ios apps/only-bible`
+  - `Bash: flutter pub get 2>&1 | tail -30`
+  - `Bash: flutter analyze apps/only-bible-app 2>&1 | tail -60`
+  - `Bash: flutter analyze apps/only-bible-app 2>&1 | grep -E "lib/main.dart|lib/utils.dart|lib/store/actions_state.dart|pubspec.yaml"`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios rm -rf Pods Podfile.lock .symlinks pod install 2>&1 | tail -40`
+  - `Bash: cd /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/ios xcodebuild -workspace Runner.xcworkspace -scheme Runner -configuration Debug -sdk iphonesimulator`
+**Claude:** **BUILD SUCCEEDED.** The revert is complete and verified:
+- `pubspec.yaml`: `flutter_kitten_tts` → `flutter_azure_tts: ^1.0.0` (dropped `flutter_kitten_tts` + its transitive `flutter_onnxruntime` dependency entirely — confirmed by `flutter pub get`)
+- `lib/main.dart`: restored `FlutterAzureTts.init(subscriptionKey: Env.ttsSubscriptionKey, region: "centralindia", withLogs: true)` at startup
+- `lib/utils.dart`: restored `convertText(String langCode, String text)` using `FlutterAzureTts.getTts(...)`, replacing the Kitten TTS/espeak-ng ONNX pipeline
+- `lib/store/actions_state.dart`: restored `final audioVoice = bible.voiceName!;` and the call site `convertText(audioVoice, v.text ?? "")`
+- `ios/Podfile` + `project.pbxproj`: deployment target back to 13.0 (matching main)
+- `macos/Podfile`: platform back to `10.15`, removed the `flutter_kitten_tts`-specific `post_install` header-dedup hack
+- Fresh `pod install` now only pulls 2 pods (Flutter, flutter_soloud) instead of 3, and a clean simulator build succeeds
+`flutter analyze` shows no new issues from these changes — the only errors present (`darkMode` undefined in three test files) are pre-existing and unrelated to TTS.
+One thing I deliberately left untouched: `apps/only-bible-app/bible-tts/` — the Python ONNX training pipeline (models, training scripts, docs/specs/plans, ~1800-line implementation plan) that appears to be the research project behind the Kitten TTS model. That's a substantial separate body of work, so I didn't assume you wanted it deleted too. Want me to remove that as well, or leave it in place?
+**You:** Leave it
+**Claude:** Understood — leaving `bible-tts/` in place. The Kitten TTS → Azure TTS revert for `only-bible-app` is complete and build-verified.
+**You:** Now coming back to the bottom sheet, the only-bible-app has a nice shadow in the sheet can that be brought to the theme, if not remove it.
+  - `Bash: grep -n "m3Defaults\|class _BottomSheetDefaultsM3\|elevation\|shadowColor\|modalElevation\|modalBackgroundColor" /opt/homebrew/share/flutter/packages/flutter/li`
+  - `Bash: grep -n "BoxShadow\|boxShadow\|Container(\|decoration:" /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/widgets/highlight_history_sheet.dart /Users/p`
+  - `Bash: grep -n -A6 "decoration: BoxDecoration" /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/widgets/settings_sheet.dart /Users/pyrossh/Code/r2-backed-app`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_navigation.dart`
+  - `Read: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_navigation.dart`
+**Claude:** Found it. `ShowHighlightHistoryAction` and `ShowSettingsAction` both wrap their sheet in a fresh `Theme(data: Theme.of(context).copyWith(bottomSheetTheme: BottomSheetThemeData(backgroundColor: ..., dragHandleColor: ...)))`. Since that constructs a brand-new `BottomSheetThemeData` rather than modifying the existing one, `elevation`/`shadowColor` are left unset there — which falls through to Flutter's Material3 default of `Colors.transparent`, killing any shadow for just these two sheets.
+The "nice shadow" you're seeing is from `ShowBookSelectAction`/`ShowChapterSelectAction` (book/chapter picker sheets), which have **no** local override — they inherit the shared `AppTheme.dark.bottomSheetTheme` directly, which already sets `elevation: 10` and `shadowColor: Colors.white` (a light halo against the dark background). That shadow is already "in the theme" — it just needs to stop being clobbered.
+So the fix is to remove the redundant local override from the other two actions (this also matches what I flagged earlier as dead/duplicate code — its `backgroundColor`/`dragHandleColor` were already redundant with the shared theme):
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_navigation.dart`
+  - `Edit: /Users/pyrossh/Code/r2-backed-apps/apps/only-bible-app/lib/store/actions_navigation.dart`
+  - `Bash: flutter analyze apps/only-bible-app 2>&1 | grep -E "actions_navigation.dart"`
+**Claude:** No issues in `actions_navigation.dart`. Both sheets now inherit `AppTheme.dark.bottomSheetTheme` directly instead of clobbering it with a bare `BottomSheetThemeData`, so all four of bible app's bottom sheets (highlight history, settings, book select, chapter select) get the same shadow, elevation, and background color — already defined once in the shared theme, no duplication left.

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/masicai/onnxruntime-swift-package-manager",
       "state" : {
-        "revision" : "eab1ddb7622b40b6c03526a51f2384843f7af767",
+        "revision" : "57f28b1fdd6fe33585370b146a46c597d6750953",
-        "version" : "1.23.0"
+        "version" : "1.23.1"
       }
     },
     {

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

@@ -27,15 +27,6 @@
         "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
       }
     },
-    {
-      "identity" : "onnxruntime-swift-package-manager",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/masicai/onnxruntime-swift-package-manager",
-      "state" : {
-        "revision" : "eab1ddb7622b40b6c03526a51f2384843f7af767",
-        "version" : "1.23.0"
-      }
-    },
     {
       "identity" : "sdwebimage",
       "kind" : "remoteSourceControl",

lib/dialog.dart CHANGED Viewed

@@ -1,9 +1,9 @@
 import "dart:math" as math;
 import "package:flutter/material.dart";
+import "package:only_bible_app/bible_data.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/actions_navigation.dart";
-import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/store/app_state.dart";
 export "package:shared/shared.dart" show showAlert, showError, showConfirm;
@@ -51,41 +51,3 @@ void showBibleSelectDialog(BuildContext context, Bible bible) {
     },
   );
 }
-void showReportError(BuildContext context, String message, StackTrace? st) {
-  if (message.contains("LateInitializationError") || message.contains("HardwareKeyboard")) {
-    // Known framework noise: still recorded for visibility, just not worth
-    // interrupting the user with a dialog they can't act on.
-    recordError(message, st);
-    return;
-  }
-  showDialog(
-    context: context,
-    barrierColor: Colors.black54,
-    builder: (_) {
-      return 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: () {
-              recordError(message, st);
-              Navigator.of(context).pop();
-              showBibleSelectDialog(context, context.read().bible);
-            },
-            child: const Text("Yes"),
-          ),
-          TextButton(
-            onPressed: () {
-              Navigator.of(context).pop();
-              showBibleSelectDialog(context, context.read().bible);
-            },
-            child: const Text("No"),
-          ),
-        ],
-      );
-    },
-  );
-}

lib/env.dart CHANGED Viewed

@@ -7,6 +7,6 @@ abstract class Env {
   @EnviedField(varName: "AZURE_TTS_SUBSCRIPTION_KEY")
   static final String ttsSubscriptionKey = _Env.ttsSubscriptionKey;
-  @EnviedField(varName: "RESEND_API_KEY")
+  @EnviedField(varName: "ERROR_REPORT_SECRET")
-  static final String resendApiKey = _Env.resendApiKey;
+  static final String errorReportSecret = _Env.errorReportSecret;
 }

lib/main.dart CHANGED Viewed

@@ -1,14 +1,21 @@
 import "package:flutter/material.dart";
-import "package:flutter/scheduler.dart";
 import "package:flutter/services.dart";
 import "package:flutter/foundation.dart";
+import "package:flutter_azure_tts/flutter_azure_tts.dart";
 import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:async_redux/async_redux.dart";
+import "package:package_info_plus/package_info_plus.dart";
 import "package:only_bible_app/app.dart";
-import "package:only_bible_app/dialog.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/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
+// route once one is configured.
+const _errorReporterEndpoint = "https://error-reporter.YOUR_SUBDOMAIN.workers.dev";
 final navigatorKey = GlobalKey<NavigatorState>();
@@ -38,37 +45,23 @@ void main() async {
   FlutterNativeSplash.preserve(
     widgetsBinding: WidgetsFlutterBinding.ensureInitialized(),
   );
-  FlutterError.onError = (errorDetails) {
-    FlutterError.presentError(errorDetails);
-    if (kDebugMode) {
-      debugPrint("FlutterError: ${errorDetails.exception}");
-      debugPrint("${errorDetails.stack}");
-    }
-    SchedulerBinding.instance.addPostFrameCallback((d) {
-      final context = navigatorKey.currentContext;
+  final packageInfo = await PackageInfo.fromPlatform();
-      if (context == null || !context.mounted) return;
-      showReportError(
-        context,
-        errorDetails.exception.toString(),
-        errorDetails.stack,
+  ErrorReporting.install(
+    navigatorKey: navigatorKey,
+    ignoredSubstrings: const {"LateInitializationError", "HardwareKeyboard"},
+    onReport: httpErrorReportSender(
+      endpoint: Uri.parse(_errorReporterEndpoint),
+      appName: "only-bible-app",
+      sharedSecret: Env.errorReportSecret,
+      appVersion: packageInfo.version,
+      buildNumber: packageInfo.buildNumber,
+    ),
-      );
+  );
-    });
-  };
-  PlatformDispatcher.instance.onError = (error, stack) {
-    if (kDebugMode) {
+  FlutterAzureTts.init(
-      debugPrint("PlatformError: $error");
+    subscriptionKey: Env.ttsSubscriptionKey,
-      debugPrint("$stack");
+    region: "centralindia",
-    }
-    final context = navigatorKey.currentContext;
-    if (context != null && context.mounted) {
-      showReportError(
-        context,
-        error.toString(),
+    withLogs: true,
-        stack,
-      );
+  );
-    }
-    return true;
-  };
   final persistor = AppPersistor();
   final json = await persistor.readJson();
   final bibleName = json?["bibleName"] as String? ?? "en_kjv";

lib/store/actions_navigation.dart CHANGED Viewed

@@ -29,21 +29,12 @@ class ShowHighlightHistoryAction extends ReduxAction<AppState> {
       useSafeArea: true,
       isScrollControlled: true,
       builder: (context) {
-        final surface = Theme.of(context).colorScheme.surface;
-        return Theme(
-          data: Theme.of(context).copyWith(
-            bottomSheetTheme: BottomSheetThemeData(
-              backgroundColor: surface,
-              dragHandleColor: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          ),
-          child: DraggableScrollableSheet(
+        return DraggableScrollableSheet(
-            expand: false,
+          expand: false,
-            initialChildSize: 0.6,
+          initialChildSize: 0.6,
-            minChildSize: 0.4,
+          minChildSize: 0.4,
-            maxChildSize: 0.9,
+          maxChildSize: 0.9,
-            builder: (_, __) => HighlightHistorySheet(bible: bible),
+          builder: (_, __) => HighlightHistorySheet(bible: bible),
-          ),
         );
       },
     );
@@ -66,16 +57,7 @@ class ShowSettingsAction extends ReduxAction<AppState> {
       showDragHandle: true,
       useSafeArea: true,
       builder: (context) {
-        final surface = Theme.of(context).colorScheme.surface;
-        return Theme(
-          data: Theme.of(context).copyWith(
-            bottomSheetTheme: BottomSheetThemeData(
-              backgroundColor: surface,
-              dragHandleColor: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          ),
-          child: SettingsSheet(bible: bible),
+        return SettingsSheet(bible: bible);
-        );
       },
     );
     return null;

lib/store/actions_state.dart CHANGED Viewed

@@ -7,6 +7,7 @@ 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:shared/shared.dart" show ErrorReporting;
 class ToggleEngTitlesAction extends ReduxAction<AppState> {
   @override
@@ -69,6 +70,7 @@ class TogglePlayAction extends ReduxAction<AppState> {
     }
     final versesToPlay = List<Verse>.from(state.selectedVerses);
     if (versesToPlay.isEmpty) return null;
+    final audioVoice = bible.voiceName!;
     final audioError = "Audio playback error";
     _isStarting = true;
     try {
@@ -76,7 +78,7 @@ class TogglePlayAction extends ReduxAction<AppState> {
       for (final v in versesToPlay) {
         final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
         try {
-          final data = await convertText(v.text ?? "");
+          final data = await convertText(audioVoice, v.text ?? "");
           if (!SoLoud.instance.isInitialized) break;
           final stream = SoLoud.instance.setBufferStream(
             bufferingType: BufferingType.preserved,
@@ -102,7 +104,7 @@ class TogglePlayAction extends ReduxAction<AppState> {
             name: "play",
             error: (err.toString(), pathname),
           );
-          await recordError((err.toString(), pathname).toString(), null);
+          await ErrorReporting.report((err.toString(), pathname).toString(), null);
           if (buildContext.mounted) {
             showError(buildContext, audioError);
           }

lib/utils.dart CHANGED Viewed

@@ -1,16 +1,12 @@
-import "dart:convert";
 import "dart:typed_data";
 import "package:archive/archive.dart";
-import "package:http/http.dart" as http;
 import "package:flutter/services.dart";
-import "package:package_info_plus/package_info_plus.dart";
 import "package:flutter/foundation.dart"
-    show TargetPlatform, compute, defaultTargetPlatform, kDebugMode;
+    show TargetPlatform, compute, defaultTargetPlatform;
 import "package:flutter/material.dart";
-import "package:flutter_kitten_tts/flutter_kitten_tts.dart";
+import "package:flutter_azure_tts/flutter_azure_tts.dart";
 import "package:flutter_soloud/flutter_soloud.dart";
-import "package:only_bible_app/env.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 export "package:only_bible_app/bible_data.dart";
@@ -128,27 +124,28 @@ extension AppContext on BuildContext {
   }
 }
-KittenTTS? _kittenTts;
-Future<void> _ensureKittenTtsReady() async {
-  if (_kittenTts != null) return;
-  final tts = KittenTTS();
-  await tts.initialize();
-  _kittenTts = tts;
-}
-Uint8List _float32ToPcm16(Float32List samples) {
-  final pcm = Int16List(samples.length);
-  for (var i = 0; i < samples.length; i++) {
-    pcm[i] = (samples[i].clamp(-1.0, 1.0) * 32767).round();
-  }
-  return pcm.buffer.asUint8List();
-}
-Future<Uint8List> convertText(String text) async {
+Future<Uint8List> convertText(String langCode, String text) async {
-  await _ensureKittenTtsReady();
-  final samples = await _kittenTts!.generate(text, voice: "Jasper", speed: 1.0);
+  final ttsResponse = await FlutterAzureTts.getTts(
+    TtsParams(
+      voice: Voice(
+        name: "",
+        displayName: "",
+        localName: "",
+        shortName: langCode,
+        gender: "",
+        locale: langCode,
+        sampleRateHertz: AudioOutputFormat.audio48khz96kBitrateMonoMp3,
+        voiceType: "",
+        status: "",
+        styles: [],
+        roles: [],
+      ),
+      audioFormat: AudioOutputFormat.audio48khz96kBitrateMonoMp3,
+      rate: 0.90,
+      text: text,
+    ),
+  );
-  return _float32ToPcm16(samples);
+  return ttsResponse.audio.buffer.asUint8List();
 }
 bool isAudioPlaybackActive() {
@@ -183,37 +180,6 @@ Future<Bible> loadBible(String name) async {
   return Bible(decompressed);
 }
+// Error reporting now goes through ErrorReporting.report (package:shared) —
-Future<void> recordError(String message, StackTrace? stack) async {
+// see main.dart's ErrorReporting.install call and its use in
-  final packageInfo = await PackageInfo.fromPlatform();
-  if (kDebugMode) {
-    print("ERROR: $message");
-    print("ERROR STACK: ${stack.toString()}");
-    return;
-  }
-  final url = Uri.https("api.resend.com", "/emails");
-  final response = await http.post(
-    url,
-    headers: {
-      "Authorization": "Bearer ${Env.resendApiKey}",
-      "Content-Type": "application/json",
-    },
-    body: jsonEncode({
-      "from": "[email protected]",
-      "to": "[email protected]",
-      "subject": "Error Stack trace",
-      "html": """
-        <div>
-          <p><strong>OS:</strong>$defaultTargetPlatform</p>
-          <p><strong>App Version:</strong>${packageInfo.version}</p>
-          <p><strong>App Build Number:</strong>${packageInfo.buildSignature}</p>
-          <p><strong>Error:</strong>$message</p>
+// actions_state.dart's audio-playback failure handler.
-          <p><strong>StackTrace:</strong>${stack?.toString()}</p>
-        </div>
-      """,
-    }),
-  );
-  if (response.statusCode == 200) {
-    print("Response status: ${response.statusCode}");
-    print("Response body: ${response.body}");
-  }
-}

macos/Flutter/GeneratedPluginRegistrant.swift CHANGED Viewed

@@ -7,18 +7,16 @@ import Foundation
 import connectivity_plus
 import file_picker
-import flutter_kitten_tts
-import flutter_onnxruntime
 import flutter_secure_storage_darwin
 import package_info_plus
 import share_plus
+import sqflite_darwin
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
-  KittenTtsFlutterPlugin.register(with: registry.registrar(forPlugin: "KittenTtsFlutterPlugin"))
-  FlutterOnnxruntimePlugin.register(with: registry.registrar(forPlugin: "FlutterOnnxruntimePlugin"))
   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 CHANGED Viewed

@@ -1,4 +1,4 @@
-platform :osx, '14.0'
+platform :osx, '10.15'
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -38,14 +38,5 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_macos_build_settings(target)
-    # flutter_kitten_tts ships both espeak-ng/speak_lib.h and the legacy
-    # espeak/speak_lib.h alias; both flatten to the same framework header
-    # path, causing a "duplicate output file" Xcode error. Remove the legacy copy.
-    if target.name == 'flutter_kitten_tts'
-      dups = target.headers_build_phase.files.select do |f|
-        f.file_ref.path.to_s.end_with?('espeak/speak_lib.h')
-      end
-      dups.each { |f| target.headers_build_phase.remove_build_file(f) }
-    end
   end
 end

macos/Podfile.lock CHANGED Viewed

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

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

@@ -1,14 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "onnxruntime-swift-package-manager",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/masicai/onnxruntime-swift-package-manager",
-      "state" : {
-        "revision" : "57f28b1fdd6fe33585370b146a46c597d6750953",
-        "version" : "1.23.1"
-      }
-    }
-  ],
-  "version" : 2
-}

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

@@ -1,14 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "onnxruntime-swift-package-manager",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/masicai/onnxruntime-swift-package-manager",
-      "state" : {
-        "revision" : "57f28b1fdd6fe33585370b146a46c597d6750953",
-        "version" : "1.23.1"
-      }
-    }
-  ],
-  "version" : 2
-}

pubspec.yaml CHANGED Viewed

@@ -23,7 +23,7 @@ dependencies:
   archive: ^4.0.9
   envied: ^1.3.8
   file_picker: ^11.0.2
-  flutter_kitten_tts: ^0.0.4
+  flutter_azure_tts: ^1.0.0
   shared:
     path: ../../packages/shared

test/app_logic_test.dart CHANGED Viewed

@@ -336,7 +336,7 @@ void main() {
   group("Env", () {
     test("obfuscated secrets decode back to non-empty strings", () {
-      expect(Env.resendApiKey, isNotEmpty);
+      expect(Env.errorReportSecret, isNotEmpty);
       expect(Env.ttsSubscriptionKey, isNotEmpty);
     });
   });

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.