only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs

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

76e070fe — pyrossh

update stuff

Files changed (44) hide show

.flutter-plugins-dependencies +1 -1
.gitignore +2 -16
l10n.yaml +3 -2
lib/app.dart +87 -83
lib/dialog.dart +3 -3
lib/{bible_generated.dart → gen/bible.gen.dart} +0 -0
lib/{l10n → gen/l10n}/app_localizations.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_bn.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_en.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_gu.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_hi.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_kn.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_ml.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_ne.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_or.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_pa.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_ta.dart +0 -0
lib/{l10n → gen/l10n}/app_localizations_te.dart +0 -0
lib/main.dart +24 -1
lib/navigation.dart +0 -231
lib/screens/bible_select_screen.dart +2 -2
lib/screens/book_select_screen.dart +3 -3
lib/screens/chapter_select_screen.dart +2 -2
lib/sheets/actions_sheet.dart +5 -5
lib/sheets/highlight_sheet.dart +0 -67
lib/sheets/settings_sheet.dart +8 -8
lib/store/actions.dart +1 -1
lib/store/app_navigator.dart +231 -0
lib/store/app_state.dart +1 -1
lib/utils.dart +2 -2
lib/widgets/chapter_app_bar.dart +9 -18
lib/widgets/verses_view.dart +6 -6
pubspec.yaml +3 -3
{lib/l10n → scripts/arb}/app_bn.arb +0 -0
{lib/l10n → scripts/arb}/app_en.arb +0 -0
{lib/l10n → scripts/arb}/app_gu.arb +0 -0
{lib/l10n → scripts/arb}/app_hi.arb +0 -0
{lib/l10n → scripts/arb}/app_kn.arb +0 -0
{lib/l10n → scripts/arb}/app_ml.arb +0 -0
{lib/l10n → scripts/arb}/app_ne.arb +0 -0
{lib/l10n → scripts/arb}/app_or.arb +0 -0
{lib/l10n → scripts/arb}/app_pa.arb +0 -0
{lib/l10n → scripts/arb}/app_ta.arb +0 -0
{lib/l10n → scripts/arb}/app_te.arb +0 -0

.flutter-plugins-dependencies CHANGED Viewed

	@@ -1 +1 @@
1	- {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/opt/homebrew/share/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","shared_darwin_source":true,"native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_ios-6.4.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_wkwebview","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.24.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/opt/homebrew/share/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.21/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.28/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_android-4.10.13/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","shared_darwin_source":true,"native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_wkwebview","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.24.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":false,"dependencies":["url_launcher_linux"],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":["url_launcher_windows"],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","dependencies":[],"dev_dependency":false},{"name":"just_audio_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio_web-0.4.16/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","dependencies":["url_launcher_web"],"dev_dependency":false},{"name":"shared_preferences_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.2/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"app_review","dependencies":[]},{"name":"audio_session","dependencies":[]},{"name":"connectivity_plus","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"integration_test","dependencies":[]},{"name":"just_audio","dependencies":["just_audio_web","audio_session","path_provider"]},{"name":"just_audio_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"share_plus","dependencies":["url_launcher_web","url_launcher_windows","url_launcher_linux"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2026-03-22 15:10:29.334091","version":"3.41.4","swift_package_manager_enabled":{"ios":false,"macos":false}}
1	+ {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/opt/homebrew/share/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","shared_darwin_source":true,"native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_ios-6.4.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_wkwebview","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.24.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"integration_test","path":"/opt/homebrew/share/flutter/packages/integration_test/","native_build":true,"dependencies":[],"dev_dependency":true},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_android-2.2.22/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.21/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.28/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_android","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_android-4.10.13/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"app_review","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/app_review-3.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"just_audio","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio-0.10.5/","shared_darwin_source":true,"native_build":true,"dependencies":["audio_session"],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_foundation-2.6.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.6/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"webview_flutter_wkwebview","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.24.1/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":false,"dependencies":["url_launcher_linux"],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","native_build":true,"dependencies":["url_launcher_windows"],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.5/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"audio_session","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/audio_session-0.2.3/","dependencies":[],"dev_dependency":false},{"name":"connectivity_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/connectivity_plus-7.0.0/","dependencies":[],"dev_dependency":false},{"name":"flutter_native_splash","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/flutter_native_splash-2.4.7/","dependencies":[],"dev_dependency":false},{"name":"just_audio_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/just_audio_web-0.4.16/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/package_info_plus-9.0.0/","dependencies":[],"dev_dependency":false},{"name":"share_plus","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/share_plus-12.0.1/","dependencies":["url_launcher_web"],"dev_dependency":false},{"name":"shared_preferences_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/Users/pyrossh/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.2/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"app_review","dependencies":[]},{"name":"audio_session","dependencies":[]},{"name":"connectivity_plus","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"integration_test","dependencies":[]},{"name":"just_audio","dependencies":["just_audio_web","audio_session","path_provider"]},{"name":"just_audio_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"share_plus","dependencies":["url_launcher_web","url_launcher_windows","url_launcher_linux"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2026-03-22 18:21:58.914600","version":"3.41.5","swift_package_manager_enabled":{"ios":false,"macos":false}}

.gitignore CHANGED Viewed

@@ -1,25 +1,11 @@
 *.iml
 .gradle
-.kotlin
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
 /build
-/app/release
-/captures
-.externalNativeBuild
-.cxx
 local.properties
 keystore.properties
 upload-keystore.jks
 svc.json
 .dart_tool
-.idea
-composeApp
-target
-ui
+ui
+.flutter-plugins-dependencies

l10n.yaml CHANGED Viewed

@@ -1,3 +1,4 @@
-arb-dir: lib/l10n
+arb-dir: scripts/arb
 template-arb-file: app_en.arb
-output-localization-file: app_localizations.dart
+output-localization-file: app_localizations.dart
+output-dir: lib/gen/l10n

lib/app.dart CHANGED Viewed

@@ -1,7 +1,8 @@
 import "package:async_redux/async_redux.dart";
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
-import "package:only_bible_app/l10n/app_localizations.dart";
+import "package:only_bible_app/gen/l10n/app_localizations.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/screens/bible_select_screen.dart";
 import "package:only_bible_app/screens/book_select_screen.dart";
 import "package:only_bible_app/screens/chapter_select_screen.dart";
@@ -20,97 +21,100 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return StoreProvider<AppState>(
       store: store,
+      child: AppNavigatorProvider(
+        navigator: AppNavigator(),
-      child: StoreConnector<AppState, _AppVm>(
+        child: StoreConnector<AppState, _AppVm>(
-        vm: () => _AppVmFactory(),
+          vm: () => _AppVmFactory(),
-        builder: (context, vm) => MaterialApp.router(
+          builder: (context, vm) => MaterialApp.router(
-          routerConfig: GoRouter(
+            routerConfig: GoRouter(
-            navigatorKey: globalNavigatorKey,
+              navigatorKey: globalNavigatorKey,
-            initialLocation: context.state.firstOpen
+              initialLocation: context.state.firstOpen
-                ? "/bible"
+                  ? "/bible"
-                : "/chapter/${Uri.encodeComponent(context.state.bibleName)}/${context.state.savedBook}/${context.state.savedChapter}",
+                  : "/chapter/${Uri.encodeComponent(context.state.bibleName)}/${context.state.savedBook}/${context.state.savedChapter}",
-            routes: [
+              routes: [
-              GoRoute(
+                GoRoute(
-                path: "/bible",
+                  path: "/bible",
-                pageBuilder: (context, state) => const NoTransitionPage(
+                  pageBuilder: (context, state) => const NoTransitionPage(
-                  child: BibleSelectScreen(),
+                    child: BibleSelectScreen(),
+                  ),
                 ),
+                GoRoute(
+                  path: "/chapter/:bibleName/:bookIndex/:chapterIndex",
+                  pageBuilder: (context, state) {
+                    final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
+                    final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
+                    final chapterIndex = int.parse(state.pathParameters["chapterIndex"]!);
+                    final slideDir = state.extra as TextDirection?;
+                    if (slideDir != null) {
+                      return CustomTransitionPage(
+                        key: state.pageKey,
+                        child: ChapterViewScreen(
+                          bibleName: bibleName,
+                          bookIndex: bookIndex,
+                          chapterIndex: chapterIndex,
-              ),
+                        ),
-              GoRoute(
-                path: "/chapter/:bibleName/:bookIndex/:chapterIndex",
-                pageBuilder: (context, state) {
+                        transitionsBuilder: (context, animation, secondaryAnimation, child) {
+                          const begin = Offset(1.0, 0.0);
+                          const end = Offset.zero;
+                          const curve = Curves.ease;
-                  final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
+                          final tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
-                  final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
-                  final chapterIndex = int.parse(state.pathParameters["chapterIndex"]!);
-                  final slideDir = state.extra as TextDirection?;
-                  if (slideDir != null) {
+                          return SlideTransition(
+                            textDirection: slideDir,
+                            position: animation.drive(tween),
+                            child: child,
+                          );
+                        },
+                      );
+                    }
-                    return CustomTransitionPage(
+                    return NoTransitionPage(
                       key: state.pageKey,
                       child: ChapterViewScreen(
                         bibleName: bibleName,
                         bookIndex: bookIndex,
                         chapterIndex: chapterIndex,
                       ),
-                      transitionsBuilder: (context, animation, secondaryAnimation, child) {
-                        const begin = Offset(1.0, 0.0);
-                        const end = Offset.zero;
-                        const curve = Curves.ease;
-                        final tween = Tween(begin: begin, end: end).chain(CurveTween(curve: curve));
-                        return SlideTransition(
-                          textDirection: slideDir,
-                          position: animation.drive(tween),
-                          child: child,
-                        );
-                      },
                     );
-                  }
+                  },
+                ),
+                GoRoute(
+                  path: "/books/:bibleName",
+                  pageBuilder: (context, state) {
+                    final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
-                  return NoTransitionPage(
+                    return NoTransitionPage(
-                    key: state.pageKey,
-                    child: ChapterViewScreen(
-                      bibleName: bibleName,
+                      child: BookSelectScreen(bibleName: bibleName),
+                    );
-                      bookIndex: bookIndex,
+                  },
-                      chapterIndex: chapterIndex,
-                    ),
+                ),
+                GoRoute(
+                  path: "/chapters/:bibleName/:bookIndex",
+                  pageBuilder: (context, state) {
+                    final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
+                    final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
+                    return NoTransitionPage(
+                      child: ChapterSelectScreen(bibleName: bibleName, bookIndex: bookIndex),
-                  );
+                    );
-                },
+                  },
-              ),
+                ),
-              GoRoute(
+                GoRoute(
-                path: "/books/:bibleName",
+                  path: "/webview",
-                pageBuilder: (context, state) {
+                  pageBuilder: (context, state) {
-                  final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
+                    final url = state.extra as String;
-                  return NoTransitionPage(
+                    return NoTransitionPage(
-                    child: BookSelectScreen(bibleName: bibleName),
+                      child: WebViewScreen(url: url),
-                  );
+                    );
-                },
+                  },
-              ),
+                ),
-              GoRoute(
-                path: "/chapters/:bibleName/:bookIndex",
-                pageBuilder: (context, state) {
-                  final bibleName = Uri.decodeComponent(state.pathParameters["bibleName"]!);
-                  final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
-                  return NoTransitionPage(
-                    child: ChapterSelectScreen(bibleName: bibleName, bookIndex: bookIndex),
-                  );
-                },
+              ],
-              ),
+            ),
-              GoRoute(
-                path: "/webview",
-                pageBuilder: (context, state) {
+            onGenerateTitle: (context) => context.l.title,
-                  final url = state.extra as String;
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
-                  return NoTransitionPage(
+            debugShowCheckedModeBanner: false,
+            themeMode: vm.darkMode ? ThemeMode.dark : ThemeMode.light,
+            theme: lightTheme,
+            darkTheme: darkTheme,
-                    child: WebViewScreen(url: url),
+            locale: Locale(vm.languageCode),
-                  );
-                },
-              ),
-            ],
           ),
-          onGenerateTitle: (context) => context.l.title,
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          debugShowCheckedModeBanner: false,
-          themeMode: vm.darkMode ? ThemeMode.dark : ThemeMode.light,
-          theme: lightTheme,
-          darkTheme: darkTheme,
-          locale: Locale(vm.languageCode),
         ),
       ),
     );

lib/dialog.dart CHANGED Viewed

@@ -1,7 +1,7 @@
 import "dart:ui";
 import "package:flutter/material.dart";
 import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 void showAlert(BuildContext context, String title, String message) {
   showDialog(
@@ -50,13 +50,13 @@ void showReportError(BuildContext context, String message, StackTrace? st) {
             TextButton(
               onPressed: () {
                 recordError(message, st);
-                changeBible(context);
+                context.nav.changeBible(context);
               },
               child: const Text("Yes"),
             ),
             TextButton(
               onPressed: () {
-                changeBible(context);
+                context.nav.changeBible(context);
               },
               child: const Text("No"),
             ),

lib/{bible_generated.dart → gen/bible.gen.dart} RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_bn.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_en.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_gu.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_hi.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_kn.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_ml.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_ne.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_or.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_pa.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_ta.dart RENAMED Viewed

File without changes

lib/{l10n → gen/l10n}/app_localizations_te.dart RENAMED Viewed

File without changes

lib/main.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:flutter/services.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter/scheduler.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
@@ -7,11 +8,33 @@ import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:async_redux/async_redux.dart";
 import "package:only_bible_app/app.dart";
 import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/store/app_state.dart";
+void updateStatusBar(bool v) {
+  if (v) {
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(
+        systemNavigationBarColor: Color(0xFF1F1F22),
+        statusBarColor: Color(0xFF1F1F22),
+        systemNavigationBarIconBrightness: Brightness.light,
+        statusBarIconBrightness: Brightness.light,
+      ),
+    );
+  } else {
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.white,
+        statusBarColor: Colors.white,
+        systemNavigationBarIconBrightness: Brightness.dark,
+        statusBarIconBrightness: Brightness.dark,
+      ),
+    );
+  }
+}
 void main() async {
   final globalNavigatorKey = GlobalKey<NavigatorState>();
   final persistor = AppPersistor();

lib/navigation.dart DELETED Viewed

@@ -1,231 +0,0 @@
-import "package:flutter/material.dart";
-import "package:flutter/services.dart";
-import "package:app_review/app_review.dart";
-import "package:go_router/go_router.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/sheets/actions_sheet.dart";
-import "package:only_bible_app/sheets/settings_sheet.dart";
-import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/app_state.dart";
-import "package:only_bible_app/utils.dart";
-import "package:share_plus/share_plus.dart";
-String _chapterPath(String bibleName, int book, int chapter) {
-  return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
-}
-void updateStatusBar(bool v) {
-  if (v) {
-    SystemChrome.setSystemUIOverlayStyle(
-      const SystemUiOverlayStyle(
-        systemNavigationBarColor: Color(0xFF1F1F22),
-        statusBarColor: Color(0xFF1F1F22),
-        systemNavigationBarIconBrightness: Brightness.light,
-        statusBarIconBrightness: Brightness.light,
-      ),
-    );
-  } else {
-    SystemChrome.setSystemUIOverlayStyle(
-      const SystemUiOverlayStyle(
-        systemNavigationBarColor: Colors.white,
-        statusBarColor: Colors.white,
-        systemNavigationBarIconBrightness: Brightness.dark,
-        statusBarIconBrightness: Brightness.dark,
-      ),
-    );
-  }
-}
-void pushBookChapter(
-  BuildContext context,
-  String bibleName,
-  int book,
-  int chapter,
-  TextDirection? dir,
-) {
-  context.dispatch(UpdateChapterAction(book, chapter));
-  if (context.state.isPlaying) {
-    AppState.player.pause();
-    context.dispatch(SetPlayingAction(false));
-  }
-  hideActions(context);
-  context.push(_chapterPath(bibleName, book, chapter), extra: dir);
-}
-void replaceBookChapter(
-  BuildContext context,
-  String bibleName,
-  int book,
-  int chapter,
-) {
-  context.dispatch(UpdateChapterAction(book, chapter));
-  if (context.state.isPlaying) {
-    AppState.player.pause();
-    context.dispatch(SetPlayingAction(false));
-  }
-  hideActions(context);
-  context.go(_chapterPath(bibleName, book, chapter));
-}
-void nextChapter(BuildContext context, Bible bible, int book, int chapter) {
-  final selectedBook = bible.books![book];
-  if (selectedBook.chapters!.length > chapter + 1) {
-    pushBookChapter(
-      context,
-      bible.name!,
-      selectedBook.index,
-      chapter + 1,
-      TextDirection.ltr,
-    );
-  } else {
-    if (selectedBook.index + 1 < bible.books!.length) {
-      final nextBook = bible.books![selectedBook.index + 1];
-      pushBookChapter(
-        context,
-        bible.name!,
-        nextBook.index,
-        0,
-        TextDirection.ltr,
-      );
-    }
-  }
-}
-void previousChapter(BuildContext context, Bible bible, int book, int chapter) {
-  final selectedBook = bible.books![book];
-  if (chapter - 1 >= 0) {
-    pushBookChapter(
-      context,
-      bible.name!,
-      selectedBook.index,
-      chapter - 1,
-      TextDirection.rtl,
-    );
-  } else {
-    if (selectedBook.index - 1 >= 0) {
-      final prevBook = bible.books![selectedBook.index - 1];
-      pushBookChapter(
-        context,
-        bible.name!,
-        prevBook.index,
-        prevBook.chapters!.length - 1,
-        TextDirection.rtl,
-      );
-    }
-  }
-}
-void showAboutUs(BuildContext context) {
-  context.push("/webview", extra: "https://onlybible.app/about-us");
-}
-void showPrivacyPolicy(BuildContext context) {
-  context.push("/webview", extra: "https://onlybible.app/privacy-policy");
-}
-void showTermsAndConditions(BuildContext context) {
-  context.push("/webview", extra: "https://onlybible.app/terms-and-conditions");
-}
-void changeBible(BuildContext context) {
-  context.go("/bible");
-}
-void changeBibleFromHeader(BuildContext context) {
-  context.push("/bible");
-}
-void changeBook(BuildContext context, Bible bible) {
-  context.push("/books/${Uri.encodeComponent(bible.name!)}");
-}
-void changeChapter(BuildContext context, Bible bible, Book book, int index) {
-  context.push("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
-}
-Future<void> updateCurrentBible(
-  BuildContext context,
-  String name,
-  String code,
-  int book,
-  int chapter,
-) async {
-  hideActions(context);
-  await context.dispatchAndWait(UpdateBibleAction(name, code));
-  await context.dispatchAndWait(LoadBibleAction());
-  context.go(_chapterPath(name, book, chapter));
-}
-void shareAppLink(BuildContext context) {
-  if (isAndroid()) {
-    Share.share(
-      subject: "Only Bible App",
-      "https://play.google.com/store/apps/details?id=sh.pyros.only_bible_app",
-    );
-  } else {
-    Share.share(
-      subject: "Only Bible App",
-      "https://apps.apple.com/us/app/only-bible-app/id6467606465",
-    );
-  }
-}
-Future<void> rateApp(BuildContext context) async {
-  AppReview.requestReview;
-}
-Future<void> shareVerses(BuildContext context, Bible bible, List<Verse> verses) async {
-  final name = context.bookNames[verses.first.book];
-  final chapter = verses.first.chapter + 1;
-  final items = verses.sortedBy((e) => e.index).map((e) => e.index + 1);
-  final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
-  final version = context.currentLang.languageCode == "en" ? "KJV" : "";
-  final title = "$name $chapter:$versesThrough $version";
-  final text = verses.map((e) => e.text ?? "").join("\n");
-  await SharePlus.instance.share(
-    ShareParams(
-      title: title,
-      subject: title,
-      text: "$title\n$text",
-    ),
-  );
-  hideActions(context);
-}
-void showSettings(BuildContext context, Bible bible) {
-  showModalBottomSheet(
-    context: context,
-    isDismissible: true,
-    enableDrag: true,
-    showDragHandle: true,
-    useSafeArea: true,
-    builder: (context) => SettingsSheet(bible: bible),
-  );
-}
-OverlayEntry? _actionsOverlay;
-void showActions(BuildContext context, Bible bible) {
-  _actionsOverlay?.remove();
-  _actionsOverlay = null;
-  final overlay = Overlay.of(context);
-  _actionsOverlay = OverlayEntry(
-    builder: (context) {
-      final bottomPadding = MediaQuery.of(context).padding.bottom;
-      return Align(
-        alignment: Alignment.bottomCenter,
-        child: Padding(
-          padding: EdgeInsets.only(bottom: bottomPadding + 40, left: 20, right: 20),
-          child: ActionsSheet(bible: bible),
-        ),
-      );
-    },
-  );
-  overlay.insert(_actionsOverlay!);
-}
-void hideActions(BuildContext context) {
-  _actionsOverlay?.remove();
-  _actionsOverlay = null;
-  context.dispatch(ClearSelectedVersesAction());
-}

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -37,7 +37,7 @@ class BibleSelectScreen extends StatelessWidget {
                     if (context.state.firstOpen) {
                       context.dispatch(FirstOpenDoneAction());
                     }
-                    updateCurrentBible(
+                    context.nav.updateCurrentBible(
                       context,
                       l.languageTitle,
                       l.localeName,

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -1,11 +1,11 @@
 import "package:flutter/material.dart";
 import "package:go_router/go_router.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
 import "package:only_bible_app/widgets/sliver_tile_grid.dart";
-import "package:only_bible_app/bible_generated.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
 class BookSelectScreen extends StatelessWidget {
   final String bibleName;
@@ -15,7 +15,7 @@ class BookSelectScreen extends StatelessWidget {
   dynamic onBookSelected(BuildContext context, Bible bible, int index) {
     final book = bible.books![index];
     if (book.chapters!.length == 1) {
-      return replaceBookChapter(context, bible.name!, index, 0);
+      return context.nav.replaceBookChapter(context, bible.name!, index, 0);
     }
     context.go("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
   }

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
 import "package:only_bible_app/widgets/sliver_tile_grid.dart";
@@ -30,7 +30,7 @@ class ChapterSelectScreen extends StatelessWidget {
             children: List.generate(book.chapters!.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
-                onPressed: () => replaceBookChapter(context, bible.name!, bookIndex, index),
+                onPressed: () => context.nav.replaceBookChapter(context, bible.name!, bookIndex, index),
               );
             }),
           ),

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
@@ -23,7 +23,7 @@ class ActionsSheet extends StatelessWidget {
           index,
         ),
       );
-      hideActions(context);
+      context.nav.hideActions(context);
     }
     return Material(
@@ -44,7 +44,7 @@ class ActionsSheet extends StatelessWidget {
                     List<Verse>.from(context.state.selectedVerses),
                   ),
                 );
-                hideActions(context);
+                context.nav.hideActions(context);
               },
               icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
             ),
@@ -77,7 +77,7 @@ class ActionsSheet extends StatelessWidget {
             ),
             IconButton(
               padding: EdgeInsets.zero,
-              onPressed: () => shareVerses(context, bible, context.state.selectedVerses),
+              onPressed: () => context.nav.shareVerses(context, bible, context.state.selectedVerses),
               icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
             ),
           ],

lib/sheets/highlight_sheet.dart DELETED Viewed

@@ -1,67 +0,0 @@
-import "package:flutter/material.dart";
-import "package:only_bible_app/app.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/navigation.dart";
-import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/theme.dart";
-import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/widgets/highlight_button.dart";
-class HighlightSheet extends StatelessWidget {
-  const HighlightSheet({super.key});
-  @override
-  Widget build(BuildContext context) {
-    final iconColor = store.state.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
-    void onHighlight(int index) {
-      store.dispatch(SetHighlightAction(
-        List<Verse>.from(store.state.selectedVerses),
-        index,
-      ));
-      hideActions(context);
-    }
-    return Container(
-      height: 50,
-      color: context.theme.colorScheme.surface,
-      padding: const EdgeInsets.only(left: 20, right: 20),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceAround,
-        children: [
-          IconButton(
-            padding: EdgeInsets.zero,
-            onPressed: () {
-              store.dispatch(
-                RemoveHighlightAction(
-                  List<Verse>.from(store.state.selectedVerses),
-                ),
-              );
-              hideActions(context);
-            },
-            icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
-          ),
-          HighlightButton(
-            index: 0,
-            color: store.state.darkMode ? darkHighlights[0] : lightHighlights[0],
-            onHighlightSelected: onHighlight,
-          ),
-          HighlightButton(
-            index: 1,
-            color: store.state.darkMode ? darkHighlights[1] : lightHighlights[1],
-            onHighlightSelected: onHighlight,
-          ),
-          HighlightButton(
-            index: 2,
-            color: store.state.darkMode ? darkHighlights[2] : lightHighlights[2],
-            onHighlightSelected: onHighlight,
-          ),
-          HighlightButton(
-            index: 3,
-            color: store.state.darkMode ? darkHighlights[3] : lightHighlights[3],
-            onHighlightSelected: onHighlight,
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
@@ -33,7 +33,7 @@ class SettingsSheet extends StatelessWidget {
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
               value: Text(bible.name!),
-              onPressed: changeBible,
+              onPressed: context.nav.changeBible,
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.color_lens_outlined, color: Colors.green),
@@ -120,7 +120,7 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.policy_outlined, color: Colors.brown),
               title: Text(context.l.privacyPolicyTitle),
-              onPressed: showPrivacyPolicy,
+              onPressed: context.nav.showPrivacyPolicy,
             ),
             SettingsTile.navigation(
               leading: const Icon(
@@ -128,17 +128,17 @@ class SettingsSheet extends StatelessWidget {
                 color: Colors.blueGrey,
               ),
               title: Text(context.l.termsAndConditionsTitle),
-              onPressed: showTermsAndConditions,
+              onPressed: context.nav.showTermsAndConditions,
             ),
             SettingsTile.navigation(
               leading: const Icon(Icons.share_outlined, color: Colors.blueAccent),
               title: Text(context.l.shareAppTitle),
-              onPressed: shareAppLink,
+              onPressed: context.nav.shareAppLink,
             ),
             SettingsTile.navigation(
               leading: Icon(Icons.star, color: Colors.yellowAccent.shade700),
               title: Text(context.l.rateAppTitle),
-              onPressed: rateApp,
+              onPressed: context.nav.rateApp,
             ),
             SettingsTile.navigation(
               leading: Icon(
@@ -146,7 +146,7 @@ class SettingsSheet extends StatelessWidget {
                 color: context.theme.colorScheme.onSurface,
               ),
               title: Text(context.l.aboutUsTitle),
-              onPressed: showAboutUs,
+              onPressed: context.nav.showAboutUs,
             ),
           ],
         ),

lib/store/actions.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:async_redux/async_redux.dart";
-import "package:only_bible_app/bible_generated.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";

lib/store/app_navigator.dart ADDED Viewed

@@ -0,0 +1,231 @@
+import "package:flutter/material.dart";
+import "package:app_review/app_review.dart";
+import "package:go_router/go_router.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/sheets/actions_sheet.dart";
+import "package:only_bible_app/sheets/settings_sheet.dart";
+import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/utils.dart";
+import "package:share_plus/share_plus.dart";
+class AppNavigatorProvider extends InheritedWidget {
+  final AppNavigator navigator;
+  const AppNavigatorProvider({
+    super.key,
+    required this.navigator,
+    required super.child,
+  });
+  static AppNavigator of(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<AppNavigatorProvider>()!.navigator;
+  }
+  @override
+  bool updateShouldNotify(AppNavigatorProvider oldWidget) => false;
+}
+extension AppNavigatorContext on BuildContext {
+  AppNavigator get nav => AppNavigatorProvider.of(this);
+}
+class AppNavigator {
+  OverlayEntry? _actionsOverlay;
+  String _chapterPath(String bibleName, int book, int chapter) {
+    return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
+  }
+  void pushBookChapter(
+    BuildContext context,
+    String bibleName,
+    int book,
+    int chapter,
+    TextDirection? dir,
+  ) {
+    context.dispatch(UpdateChapterAction(book, chapter));
+    if (context.state.isPlaying) {
+      AppState.player.pause();
+      context.dispatch(SetPlayingAction(false));
+    }
+    hideActions(context);
+    context.push(_chapterPath(bibleName, book, chapter), extra: dir);
+  }
+  void replaceBookChapter(
+    BuildContext context,
+    String bibleName,
+    int book,
+    int chapter,
+  ) {
+    context.dispatch(UpdateChapterAction(book, chapter));
+    if (context.state.isPlaying) {
+      AppState.player.pause();
+      context.dispatch(SetPlayingAction(false));
+    }
+    hideActions(context);
+    context.go(_chapterPath(bibleName, book, chapter));
+  }
+  void nextChapter(BuildContext context, Bible bible, int book, int chapter) {
+    final selectedBook = bible.books![book];
+    if (selectedBook.chapters!.length > chapter + 1) {
+      pushBookChapter(
+        context,
+        bible.name!,
+        selectedBook.index,
+        chapter + 1,
+        TextDirection.ltr,
+      );
+    } else {
+      if (selectedBook.index + 1 < bible.books!.length) {
+        final nextBook = bible.books![selectedBook.index + 1];
+        pushBookChapter(
+          context,
+          bible.name!,
+          nextBook.index,
+          0,
+          TextDirection.ltr,
+        );
+      }
+    }
+  }
+  void previousChapter(BuildContext context, Bible bible, int book, int chapter) {
+    final selectedBook = bible.books![book];
+    if (chapter - 1 >= 0) {
+      pushBookChapter(
+        context,
+        bible.name!,
+        selectedBook.index,
+        chapter - 1,
+        TextDirection.rtl,
+      );
+    } else {
+      if (selectedBook.index - 1 >= 0) {
+        final prevBook = bible.books![selectedBook.index - 1];
+        pushBookChapter(
+          context,
+          bible.name!,
+          prevBook.index,
+          prevBook.chapters!.length - 1,
+          TextDirection.rtl,
+        );
+      }
+    }
+  }
+  void showAboutUs(BuildContext context) {
+    context.push("/webview", extra: "https://onlybible.app/about-us");
+  }
+  void showPrivacyPolicy(BuildContext context) {
+    context.push("/webview", extra: "https://onlybible.app/privacy-policy");
+  }
+  void showTermsAndConditions(BuildContext context) {
+    context.push("/webview", extra: "https://onlybible.app/terms-and-conditions");
+  }
+  void changeBible(BuildContext context) {
+    context.go("/bible");
+  }
+  void changeBibleFromHeader(BuildContext context) {
+    context.push("/bible");
+  }
+  void changeBook(BuildContext context, Bible bible) {
+    context.push("/books/${Uri.encodeComponent(bible.name!)}");
+  }
+  void changeChapter(BuildContext context, Bible bible, Book book, int index) {
+    context.push("/chapters/${Uri.encodeComponent(bible.name!)}/${book.index}");
+  }
+  Future<void> updateCurrentBible(
+    BuildContext context,
+    String name,
+    String code,
+    int book,
+    int chapter,
+  ) async {
+    hideActions(context);
+    await context.dispatchAndWait(UpdateBibleAction(name, code));
+    await context.dispatchAndWait(LoadBibleAction());
+    context.go(_chapterPath(name, book, chapter));
+  }
+  void shareAppLink(BuildContext context) {
+    if (isAndroid()) {
+      Share.share(
+        subject: "Only Bible App",
+        "https://play.google.com/store/apps/details?id=sh.pyros.only_bible_app",
+      );
+    } else {
+      Share.share(
+        subject: "Only Bible App",
+        "https://apps.apple.com/us/app/only-bible-app/id6467606465",
+      );
+    }
+  }
+  Future<void> rateApp(BuildContext context) async {
+    AppReview.requestReview;
+  }
+  Future<void> shareVerses(BuildContext context, Bible bible, List<Verse> verses) async {
+    final name = context.bookNames[verses.first.book];
+    final chapter = verses.first.chapter + 1;
+    final items = verses.sortedBy((e) => e.index).map((e) => e.index + 1);
+    final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
+    final version = context.currentLang.languageCode == "en" ? "KJV" : "";
+    final title = "$name $chapter:$versesThrough $version";
+    final text = verses.map((e) => e.text ?? "").join("\n");
+    await SharePlus.instance.share(
+      ShareParams(
+        title: title,
+        subject: title,
+        text: "$title\n$text",
+      ),
+    );
+    hideActions(context);
+  }
+  void showSettings(BuildContext context, Bible bible) {
+    showModalBottomSheet(
+      context: context,
+      isDismissible: true,
+      enableDrag: true,
+      showDragHandle: true,
+      useSafeArea: true,
+      builder: (context) => SettingsSheet(bible: bible),
+    );
+  }
+  void showActions(BuildContext context, Bible bible) {
+    _actionsOverlay?.remove();
+    _actionsOverlay = null;
+    final overlay = Overlay.of(context);
+    _actionsOverlay = OverlayEntry(
+      builder: (context) {
+        final bottomPadding = MediaQuery.of(context).padding.bottom;
+        return Align(
+          alignment: Alignment.bottomCenter,
+          child: Padding(
+            padding: EdgeInsets.only(bottom: bottomPadding + 40, left: 20, right: 20),
+            child: ActionsSheet(bible: bible),
+          ),
+        );
+      },
+    );
+    overlay.insert(_actionsOverlay!);
+  }
+  void hideActions(BuildContext context) {
+    _actionsOverlay?.remove();
+    _actionsOverlay = null;
+    context.dispatch(ClearSelectedVersesAction());
+  }
+}

lib/store/app_state.dart CHANGED Viewed

@@ -2,7 +2,7 @@ import "dart:developer";
 import "package:flutter/material.dart";
 import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/bible_generated.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/store/buffer_audio_source.dart";
 import "package:only_bible_app/theme.dart";

lib/utils.dart CHANGED Viewed

@@ -7,11 +7,11 @@ import "package:package_info_plus/package_info_plus.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart" show TargetPlatform, defaultTargetPlatform, kDebugMode;
 import "package:flutter/material.dart";
-import "package:only_bible_app/l10n/app_localizations.dart";
+import "package:only_bible_app/gen/l10n/app_localizations.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/env.dart";
-import "package:only_bible_app/bible_generated.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/app_state.dart";
 extension BibleExt on Bible {

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -1,6 +1,6 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/utils.dart";
 class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -30,21 +30,12 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => changeChapter(context, bible, book, book.index),
+              onTap: () => context.nav.changeChapter(context, bible, book, book.index),
-              onLongPress: () => changeBook(context, bible),
+              onLongPress: () => context.nav.changeBook(context, bible),
-              child: Row(
+              child: Text(
-                children: [
-                  Text(
-                    "$bookName ${chapter.index + 1}",
+                "$bookName ${chapter.index + 1}",
-                    style: Theme.of(context).textTheme.headlineMedium,
+                style: Theme.of(context).textTheme.headlineMedium,
-                    key: const Key("bookTitle"),
+                key: const Key("bookTitle"),
-                  ),
-                  Icon(
-                    Icons.expand_more,
-                    size: 28,
-                    color: Theme.of(context).textTheme.headlineMedium!.color,
-                  ),
-                ],
               ),
             ),
             Expanded(
@@ -56,7 +47,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                     child: IconButton(
                       padding: EdgeInsets.zero,
                       icon: const Icon(Icons.more_vert, size: 24),
-                      onPressed: () => showSettings(context, bible),
+                      onPressed: () => context.nav.showSettings(context, bible),
                     ),
                   ),
                 ],

lib/widgets/verses_view.dart CHANGED Viewed

@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
-import "package:only_bible_app/bible_generated.dart";
-import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
@@ -14,9 +14,9 @@ class VersesView extends StatelessWidget {
   void _onVerseTap(BuildContext context, Verse v) {
     context.dispatch(SelectVerseAction(v));
     if (context.state.selectedVerses.isNotEmpty) {
-      showActions(context, bible);
+      context.nav.showActions(context, bible);
     } else {
-      hideActions(context);
+      context.nav.hideActions(context);
     }
   }
@@ -27,8 +27,8 @@ class VersesView extends StatelessWidget {
     final theme = Theme.of(context).textTheme;
     final baseStyle = appState.boldFont ? textStyle.copyWith(fontWeight: FontWeight.w500) : textStyle;
     return SwipeDetector(
-      onSwipeLeft: (offset) => nextChapter(context, bible, chapter.book, chapter.index),
+      onSwipeLeft: (offset) => context.nav.nextChapter(context, bible, chapter.book, chapter.index),
-      onSwipeRight: (offset) => previousChapter(context, bible, chapter.book, chapter.index),
+      onSwipeRight: (offset) => context.nav.previousChapter(context, bible, chapter.book, chapter.index),
       child: SingleChildScrollView(
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.symmetric(horizontal: 20),

pubspec.yaml CHANGED Viewed

@@ -39,11 +39,11 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^6.0.0
   flutter_launcher_icons: ^0.14.4
-  test: ^1.24.3
+  test: ^1.30.0
   build_runner: any
   flutter_gen_runner: any
   html: any
 flutter:
   generate: true
   uses-material-design: true
@@ -61,7 +61,7 @@ flutter:
           weight: 700
 flutter_launcher_icons:
-  android: false
+  android: true
   ios: true
   image_path: "assets/icon.png"
   remove_alpha_ios: true

{lib/l10n → scripts/arb}/app_bn.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_en.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_gu.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_hi.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_kn.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_ml.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_ne.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_or.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_pa.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_ta.arb RENAMED Viewed

File without changes

{lib/l10n → scripts/arb}/app_te.arb RENAMED Viewed

File without changes

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git Discussions: https://groups.google.com/g/rust-embed-devs

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

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs