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.

a3ef5901 — pyrossh

refactor state management

Files changed (25) hide show

.flutter-plugins-dependencies +1 -1
ios/Podfile.lock +6 -0
lib/app.dart +126 -89
lib/main.dart +3 -3
lib/navigation.dart +28 -40
lib/screens/bible_select_screen.dart +9 -7
lib/screens/book_select_screen.dart +1 -2
lib/screens/chapter_select_screen.dart +1 -2
lib/screens/chapter_view_screen.dart +4 -5
lib/sheets/actions_sheet.dart +12 -6
lib/sheets/highlight_sheet.dart +26 -8
lib/sheets/settings_sheet.dart +62 -25
lib/store/actions.dart +105 -23
lib/store/app_persistor.dart +49 -0
lib/store/app_state.dart +182 -0
lib/store/buffer_audio_source.dart +25 -0
lib/store/state.dart +0 -307
lib/store/storage.dart +0 -25
lib/utils.dart +9 -6
lib/widgets/verses_view.dart +97 -80
macos/Flutter/GeneratedPluginRegistrant.swift +2 -0
pubspec.lock +84 -20
pubspec.yaml +1 -2
windows/flutter/generated_plugin_registrant.cc +3 -0
windows/flutter/generated_plugins.cmake +1 -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":"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":"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":"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":"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":"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":"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":"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-21 18:21:22.875489","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 09:38:40.134140","version":"3.41.4","swift_package_manager_enabled":{"ios":false,"macos":false}}

ios/Podfile.lock CHANGED Viewed

@@ -3,6 +3,8 @@ PODS:
     - Flutter
   - audio_session (0.0.1):
     - Flutter
+  - connectivity_plus (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_native_splash (2.4.3):
     - Flutter
@@ -27,6 +29,7 @@ PODS:
 DEPENDENCIES:
   - app_review (from `.symlinks/plugins/app_review/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
@@ -42,6 +45,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/app_review/ios"
   audio_session:
     :path: ".symlinks/plugins/audio_session/ios"
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
   Flutter:
     :path: Flutter
   flutter_native_splash:
@@ -64,6 +69,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_review: f75e3250ef5694e328a5ecb3f4c445bc7b32d821
   audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e

lib/app.dart CHANGED Viewed

@@ -1,3 +1,4 @@
+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";
@@ -6,114 +7,150 @@ import "package:only_bible_app/screens/book_select_screen.dart";
 import "package:only_bible_app/screens/chapter_select_screen.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/screens/webview_screen.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/store/app_persistor.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 final globalNavigatorKey = GlobalKey<NavigatorState>();
+final persistor = AppPersistor();
+final Store<AppState> store = Store<AppState>(
+  initialState: const AppState(),
+  persistor: persistor,
+);
+final GoRouter router = buildRouter();
+GoRouter buildRouter() {
+  final s = store.state;
-final router = GoRouter(
+  return GoRouter(
-  navigatorKey: globalNavigatorKey,
+    navigatorKey: globalNavigatorKey,
-  initialLocation: firstOpenAtom.value
+    initialLocation: s.firstOpen
-      ? "/bible"
+        ? "/bible"
-      : "/chapter/${Uri.encodeComponent(bibleNameAtom.value)}/${savedBookAtom.value}/${savedChapterAtom.value}",
+        : "/chapter/${Uri.encodeComponent(s.bibleName)}/${s.savedBook}/${s.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(
+              transitionsBuilder:
-      path: "/chapter/:bibleName/:bookIndex/:chapterIndex",
-      pageBuilder: (context, state) {
+                  (context, animation, secondaryAnimation, child) {
+                const begin = Offset(1.0, 0.0);
-        final bibleName =
+                const end = Offset.zero;
-            Uri.decodeComponent(state.pathParameters["bibleName"]!);
+                const curve = Curves.ease;
-        final bookIndex = int.parse(state.pathParameters["bookIndex"]!);
-        final chapterIndex = int.parse(state.pathParameters["chapterIndex"]!);
-        final slideDir = state.extra as TextDirection?;
+                final tween = Tween(begin: begin, end: end)
+                    .chain(CurveTween(curve: curve));
-        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(
+            child: BookSelectScreen(bibleName: bibleName),
+          );
+        },
+      ),
+      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) {
+          final url = state.extra as String;
+          return NoTransitionPage(
+            child: WebViewScreen(url: url),
+          );
+        },
+      ),
+    ],
+  );
-        }
+}
-        return NoTransitionPage(
-          key: state.pageKey,
-          child: ChapterViewScreen(
-            bibleName: bibleName,
-            bookIndex: bookIndex,
-            chapterIndex: chapterIndex,
-          ),
-        );
-      },
-    ),
-    GoRoute(
-      path: "/books/:bibleName",
-      pageBuilder: (context, state) {
-        final bibleName =
-            Uri.decodeComponent(state.pathParameters["bibleName"]!);
-        return NoTransitionPage(
-          child: BookSelectScreen(bibleName: bibleName),
-        );
-      },
-    ),
-    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) {
-        final url = state.extra as String;
-        return NoTransitionPage(
-          child: WebViewScreen(url: url),
-        );
-      },
-    ),
-  ],
-);
 class App extends StatelessWidget {
   const App({super.key});
   @override
   Widget build(BuildContext context) {
-    return MaterialApp.router(
+    return StoreProvider<AppState>(
+      store: store,
+      child: StoreConnector<AppState, _AppVm>(
+        vm: () => _AppVmFactory(),
+        builder: (context, vm) => MaterialApp.router(
-      routerConfig: router,
+          routerConfig: router,
-      onGenerateTitle: (context) => context.l.title,
+          onGenerateTitle: (context) => context.l.title,
-      localizationsDelegates: AppLocalizations.localizationsDelegates,
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
-      supportedLocales: AppLocalizations.supportedLocales,
+          supportedLocales: AppLocalizations.supportedLocales,
-      debugShowCheckedModeBanner: false,
+          debugShowCheckedModeBanner: false,
-      themeMode: darkModeAtom.watch(context) ? ThemeMode.dark : ThemeMode.light,
+          themeMode: vm.darkMode ? ThemeMode.dark : ThemeMode.light,
-      theme: lightTheme,
+          theme: lightTheme,
-      darkTheme: darkTheme,
+          darkTheme: darkTheme,
-      locale: Locale(languageCodeAtom.watch(context)),
+          locale: Locale(vm.languageCode),
+        ),
+      ),
+    );
+  }
+}
+class _AppVm extends Vm {
+  final bool darkMode;
+  final String languageCode;
+  _AppVm({
+    required this.darkMode,
+    required this.languageCode,
+  }) : super(equals: [darkMode, languageCode]);
+}
+class _AppVmFactory extends VmFactory<AppState, App, _AppVm> {
+  @override
+  _AppVm fromStore() {
+    return _AppVm(
+      darkMode: state.darkMode,
+      languageCode: state.languageCode,
     );
   }
 }

lib/main.dart CHANGED Viewed

@@ -8,9 +8,9 @@ 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/navigation.dart";
-import "package:only_bible_app/store/state.dart";
 void main() async {
+  // await store.persistor.readState();
   // FlutterError.onError = (errorDetails) {
   //   SchedulerBinding.instance.addPostFrameCallback((d) {
   //     showReportError(
@@ -34,13 +34,13 @@ void main() async {
   //   widgetsBinding: WidgetsFlutterBinding.ensureInitialized(),
   // );
   usePathUrlStrategy();
+  WidgetsFlutterBinding.ensureInitialized();
   FlutterAzureTts.init(
     subscriptionKey: "a9d2d78796924a2a9df2b6d5c1c4a576",
     region: "centralindia",
     withLogs: true,
   );
-  // await initState();
-  // updateStatusBar(darkModeAtom.value);
+  updateStatusBar(store.state.darkMode);
   runApp(const App());
   // FlutterNativeSplash.remove();
 }

lib/navigation.dart CHANGED Viewed

@@ -1,4 +1,3 @@
-import "package:atoms_state/atoms_state.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:app_review/app_review.dart";
@@ -6,32 +5,11 @@ import "package:go_router/go_router.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/sheets/settings_sheet.dart";
 import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/app_state.dart";
+import "package:only_bible_app/app.dart";
 import "package:only_bible_app/utils.dart";
 import "package:share_plus/share_plus.dart";
-final actionsShownAtom = Atom(
-  key: "actionsShown",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is SetActionsShown) {
-      return action.value;
-    }
-    return state;
-  },
-);
-final highlightsShownAtom = Atom(
-  key: "highlightsShown",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is SetHighlightsShown) {
-      return action.value;
-    }
-    return state;
-  },
-);
 String _chapterPath(String bibleName, int book, int chapter) {
   return "/chapter/${Uri.encodeComponent(bibleName)}/$book/$chapter";
 }
@@ -65,8 +43,12 @@ void pushBookChapter(
   int chapter,
   TextDirection? dir,
 ) {
-  dispatch(UpdateChapter(book, chapter));
+  store.dispatch(UpdateChapterAction(book, chapter));
+  if (store.state.isPlaying) {
+    AppState.player.pause();
+    store.dispatch(SetPlayingAction(false));
+  }
-  clearEvents(context);
+  hideActions(context);
   context.push(_chapterPath(bibleName, book, chapter), extra: dir);
 }
@@ -76,8 +58,12 @@ void replaceBookChapter(
   int book,
   int chapter,
 ) {
-  dispatch(UpdateChapter(book, chapter));
+  store.dispatch(UpdateChapterAction(book, chapter));
+  if (store.state.isPlaying) {
+    AppState.player.pause();
+    store.dispatch(SetPlayingAction(false));
+  }
-  clearEvents(context);
+  hideActions(context);
   context.go(_chapterPath(bibleName, book, chapter));
 }
@@ -169,7 +155,7 @@ Future<void> updateCurrentBible(
   int chapter,
 ) async {
   hideActions(context);
-  dispatch(UpdateBible(name, code));
+  store.dispatch(UpdateBibleAction(name, code));
   context.go(_chapterPath(name, book, chapter));
 }
@@ -201,7 +187,13 @@ Future<void> shareVerses(
   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,
-  await Share.share("$title\n$text", subject: title);
+      text: "$title\n$text",
+    ),
+  );
   hideActions(context);
 }
@@ -217,24 +209,20 @@ void showSettings(BuildContext context, Bible bible) {
 }
 void showActions(BuildContext context, Bible bible) {
-  if (!actionsShownAtom.value) {
-    dispatch(const SetActionsShown(true));
+  store.dispatch(SetActionsShownAction(true));
-  }
 }
 void hideActions(BuildContext context) {
-  if (actionsShownAtom.value) {
-    dispatch(const SetActionsShown(false));
+  store.dispatch(SetActionsShownAction(false));
-    dispatch(const ClearSelectedVerses());
+  store.dispatch(ClearSelectedVersesAction());
-  }
 }
 void showHighlights(BuildContext context) {
-  dispatch(const SetHighlightsShown(true));
+  store.dispatch(SetHighlightsShownAction(true));
 }
 void hideHighlights(BuildContext context) {
-  if (highlightsShownAtom.value) {
+  if (store.state.highlightsShown) {
-    dispatch(const SetHighlightsShown(false));
+    store.dispatch(SetHighlightsShownAction(false));
   }
 }

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,8 +1,7 @@
-import "package:atoms_state/atoms_state.dart";
 import "package:flutter/material.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/app.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";
@@ -17,7 +16,10 @@ class BibleSelectScreen extends StatelessWidget {
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),
         slivers: [
+          SliverHeading(
-          SliverHeading(title: context.l.bibleSelectTitle, showClose: !firstOpenAtom.value),
+            title: context.l.bibleSelectTitle,
+            showClose: !store.state.firstOpen,
+          ),
           SliverTileGrid(
             listType: ListType.extraLarge,
             children: List.of(
@@ -33,15 +35,15 @@ class BibleSelectScreen extends StatelessWidget {
                         )
                       : Text(l.languageTitle, textScaleFactor: 1.1),
                   onPressed: () {
-                    if (firstOpenAtom.value) {
+                    if (store.state.firstOpen) {
-                      dispatch(FirstOpenDone());
+                      store.dispatch(FirstOpenDoneAction());
                     }
                     updateCurrentBible(
                       context,
                       l.languageTitle,
                       l.localeName,
-                      savedBookAtom.value,
+                      store.state.savedBook,
-                      savedChapterAtom.value,
+                      store.state.savedChapter,
                     );
                   },
                 );

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -1,7 +1,6 @@
 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/state.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";
@@ -24,7 +23,7 @@ class BookSelectScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
-      future: bibleAtom.getValue(bibleName),
+      future: loadBible(bibleName),
       builder: (context, state) {
         return state.when(
           loading: () => ColoredBox(

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -1,7 +1,6 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
-import "package:only_bible_app/store/state.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";
@@ -17,7 +16,7 @@ class ChapterSelectScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
-      future: bibleAtom.getValue(bibleName),
+      future: loadBible(bibleName),
       builder: (context, state) {
         return state.when(
           loading: () => ColoredBox(

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,9 +1,8 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
-import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/sheets/actions_sheet.dart";
 import "package:only_bible_app/sheets/highlight_sheet.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/chapter_app_bar.dart";
 import "package:only_bible_app/widgets/verses_view.dart";
@@ -23,7 +22,7 @@ class ChapterViewScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder(
-      future: bibleAtom.getValue(bibleName),
+      future: loadBible(bibleName),
       builder: (context, state) {
         return state.when(
           loading: () => ColoredBox(
@@ -42,9 +41,9 @@ class ChapterViewScreen extends StatelessWidget {
                 child: Column(
                   children: [
                     Expanded(child: VersesView(bible: bible, chapter: chapter)),
-                    if (highlightsShownAtom.watch(context))
+                    if (context.state.highlightsShown)
                       const HighlightSheet()
-                    else if (actionsShownAtom.watch(context))
+                    else if (context.state.actionsShown)
                       ActionsSheet(bible: bible),
                   ],
                 ),

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,7 +1,8 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/app.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/actions.dart";
 import "package:only_bible_app/utils.dart";
 class ActionsSheet extends StatelessWidget {
@@ -11,10 +12,10 @@ class ActionsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final iconColor = darkModeAtom.value
+    final iconColor = store.state.darkMode
         ? Colors.white.withOpacity(0.9)
         : Colors.black.withOpacity(0.9);
-    final audioIcon = isPlaying.watch(context)
+    final audioIcon = context.state.isPlaying
         ? Icons.pause_circle_outline
         : Icons.play_circle_outline;
     return Container(
@@ -26,7 +27,12 @@ class ActionsSheet extends StatelessWidget {
         children: [
           IconButton(
             padding: EdgeInsets.zero,
+            onPressed: () {
-            onPressed: () => removeHighlight(context),
+              store.dispatch(RemoveHighlightAction(
+                List<Verse>.from(store.state.selectedVerses),
+              ));
+              hideActions(context);
+            },
             icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
           ),
           IconButton(
@@ -37,14 +43,14 @@ class ActionsSheet extends StatelessWidget {
           IconButton(
             padding: EdgeInsets.zero,
             onPressed: () {
-              onPlay(context, bible);
+              store.state.onPlay(context, bible);
             },
             icon: Icon(audioIcon, size: 34, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
             onPressed: () =>
-                shareVerses(context, bible, selectedVersesAtom.value),
+                shareVerses(context, bible, store.state.selectedVerses),
             icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
           ),
         ],

lib/sheets/highlight_sheet.dart CHANGED Viewed

@@ -1,5 +1,8 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/app.dart";
+import "package:only_bible_app/models.dart";
+import "package:only_bible_app/navigation.dart";
-import "package:only_bible_app/store/state.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";
@@ -9,11 +12,15 @@ class HighlightSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final iconColor = darkModeAtom.value
+    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,
+      ));
-      setHighlight(context, index);
+      hideActions(context);
     }
     return Container(
@@ -25,27 +32,38 @@ class HighlightSheet extends StatelessWidget {
         children: [
           IconButton(
             padding: EdgeInsets.zero,
+            onPressed: () {
+              store.dispatch(
+                RemoveHighlightAction(
-            onPressed: () => removeHighlight(context),
+                  List<Verse>.from(store.state.selectedVerses),
+                ),
+              );
+              hideActions(context);
+            },
             icon: Icon(Icons.cancel_outlined, size: 28, color: iconColor),
           ),
           HighlightButton(
             index: 0,
+            color:
-            color: darkModeAtom.value ? darkHighlights[0] : lightHighlights[0],
+                store.state.darkMode ? darkHighlights[0] : lightHighlights[0],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 1,
+            color:
-            color: darkModeAtom.value ? darkHighlights[1] : lightHighlights[1],
+                store.state.darkMode ? darkHighlights[1] : lightHighlights[1],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 2,
+            color:
-            color: darkModeAtom.value ? darkHighlights[2] : lightHighlights[2],
+                store.state.darkMode ? darkHighlights[2] : lightHighlights[2],
             onHighlightSelected: onHighlight,
           ),
           HighlightButton(
             index: 3,
+            color:
-            color: darkModeAtom.value ? darkHighlights[3] : lightHighlights[3],
+                store.state.darkMode ? darkHighlights[3] : lightHighlights[3],
             onHighlightSelected: onHighlight,
           ),
         ],

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,9 +1,8 @@
-import "package:atoms_state/atoms_state.dart";
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/store/actions.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/app.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
@@ -25,26 +24,33 @@ class SettingsSheet extends StatelessWidget {
       ),
       sections: [
         SettingsSection(
+          title: Text(
+            context.l.settingsTitle,
-          title: Text(context.l.settingsTitle, style: context.theme.textTheme.headlineMedium),
+            style: context.theme.textTheme.headlineMedium,
+          ),
           margin: const EdgeInsetsDirectional.symmetric(horizontal: 20),
           tiles: [
             SettingsTile.navigation(
+              leading:
-              leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
+                  const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
               value: Text(bible.name),
               onPressed: changeBible,
             ),
             SettingsTile.navigation(
+              leading:
-              leading: const Icon(Icons.color_lens_outlined, color: Colors.green),
+                  const Icon(Icons.color_lens_outlined, color: Colors.green),
               title: Text(context.l.themeTitle),
               trailing: ToggleButtons(
                 onPressed: (int index) {
-                  dispatch(ToggleDarkMode());
+                  store.dispatch(ToggleDarkModeAction());
                 },
                 highlightColor: Colors.transparent,
                 borderColor: Colors.grey,
                 borderRadius: const BorderRadius.all(Radius.circular(25)),
+                selectedColor: store.state.darkMode
+                    ? Colors.lightBlue.shade300
-                selectedColor: darkModeAtom.value ? Colors.lightBlue.shade300 : Colors.yellowAccent.shade700,
+                    : Colors.yellowAccent.shade700,
                 selectedBorderColor: Colors.grey,
                 color: Colors.grey,
                 fillColor: Colors.transparent,
@@ -52,7 +58,7 @@ class SettingsSheet extends StatelessWidget {
                   minHeight: 36.0,
                   minWidth: 50.0,
                 ),
-                isSelected: [!darkModeAtom.value, darkModeAtom.value],
+                isSelected: [!store.state.darkMode, store.state.darkMode],
                 children: const [
                   Icon(Icons.light_mode),
                   Icon(Icons.dark_mode),
@@ -61,37 +67,61 @@ class SettingsSheet extends StatelessWidget {
             ),
             SettingsTile(
               title: Text(context.l.incrementFontTitle),
+              leading: Icon(
+                Icons.font_download,
-              leading: Icon(Icons.font_download, color: context.theme.colorScheme.onSurface),
+                color: context.theme.colorScheme.onSurface,
+              ),
               trailing: IconButton(
-                onPressed: () => dispatch(const UpdateTextScale(0.1)),
+                onPressed: () => store.dispatch(UpdateTextScaleAction(0.1)),
+                icon: const Icon(
-                icon: const Icon(Icons.add_circle_outline, size: 32, color: Colors.redAccent),
+                  Icons.add_circle_outline,
+                  size: 32,
+                  color: Colors.redAccent,
+                ),
               ),
             ),
             SettingsTile(
               title: Text(context.l.decrementFontTitle),
+              leading: Icon(
+                Icons.font_download,
-              leading: Icon(Icons.font_download, color: context.theme.colorScheme.onSurface),
+                color: context.theme.colorScheme.onSurface,
+              ),
               trailing: IconButton(
-                onPressed: () => dispatch(const UpdateTextScale(-0.1)),
+                onPressed: () => store.dispatch(UpdateTextScaleAction(-0.1)),
+                icon: const Icon(
-                icon: const Icon(Icons.remove_circle_outline, size: 32, color: Colors.blueAccent),
+                  Icons.remove_circle_outline,
+                  size: 32,
+                  color: Colors.blueAccent,
+                ),
               ),
             ),
             SettingsTile.switchTile(
-              initialValue: boldFontAtom.watch(context),
+              initialValue: context.state.boldFont,
+              leading: Icon(
+                Icons.format_bold,
-              leading: Icon(Icons.format_bold, color: context.theme.colorScheme.onSurface),
+                color: context.theme.colorScheme.onSurface,
+              ),
               title: Text(context.l.boldFontTitle),
-              onToggle: (value) => dispatch(ToggleBoldFont()),
+              onToggle: (value) => store.dispatch(ToggleBoldFontAction()),
             ),
             SettingsTile.switchTile(
-              initialValue: engTitlesAtom.watch(context),
+              initialValue: context.state.engTitles,
+              leading:
-              leading: Icon(Icons.abc, color: context.theme.colorScheme.onSurface),
+                  Icon(Icons.abc, color: context.theme.colorScheme.onSurface),
               title: Text(context.l.engTitles),
-              onToggle: (value) => dispatch(ToggleEngTitles()),
+              onToggle: (value) => store.dispatch(ToggleEngTitlesAction()),
             ),
           ],
         ),
         SettingsSection(
+          title: Text(
+            context.l.aboutUsTitle,
-          title: Text(context.l.aboutUsTitle, style: context.theme.textTheme.headlineMedium),
+            style: context.theme.textTheme.headlineMedium,
+          ),
-          margin: const EdgeInsetsDirectional.symmetric(horizontal: 20, vertical: 20),
+          margin: const EdgeInsetsDirectional.symmetric(
+            horizontal: 20,
+            vertical: 20,
+          ),
           tiles: [
             SettingsTile.navigation(
               leading: const Icon(Icons.policy_outlined, color: Colors.brown),
@@ -99,12 +129,16 @@ class SettingsSheet extends StatelessWidget {
               onPressed: showPrivacyPolicy,
             ),
             SettingsTile.navigation(
+              leading: const Icon(
-              leading: const Icon(Icons.description_outlined, color: Colors.blueGrey),
+                Icons.description_outlined,
+                color: Colors.blueGrey,
+              ),
               title: Text(context.l.termsAndConditionsTitle),
               onPressed: showTermsAndConditions,
             ),
             SettingsTile.navigation(
+              leading:
-              leading: const Icon(Icons.share_outlined, color: Colors.blueAccent),
+                  const Icon(Icons.share_outlined, color: Colors.blueAccent),
               title: Text(context.l.shareAppTitle),
               onPressed: shareAppLink,
             ),
@@ -114,7 +148,10 @@ class SettingsSheet extends StatelessWidget {
               onPressed: rateApp,
             ),
             SettingsTile.navigation(
+              leading: Icon(
+                Icons.info_outline,
-              leading: Icon(Icons.info_outline, color: context.theme.colorScheme.onSurface),
+                color: context.theme.colorScheme.onSurface,
+              ),
               title: Text(context.l.aboutUsTitle),
               onPressed: showAboutUs,
             ),

lib/store/actions.dart CHANGED Viewed

@@ -1,60 +1,142 @@
+import "package:async_redux/async_redux.dart";
 import "package:only_bible_app/models.dart";
+import "package:only_bible_app/store/app_state.dart";
-sealed class AppAction {}
-class FirstOpenDone implements AppAction {}
+class FirstOpenDoneAction extends ReduxAction<AppState> {
+  @override
+  AppState reduce() => state.copy(firstOpen: false);
+}
-class UpdateBible implements AppAction {
+class UpdateBibleAction extends ReduxAction<AppState> {
   final String name;
   final String code;
-  const UpdateBible(this.name, this.code);
+  UpdateBibleAction(this.name, this.code);
+  @override
+  AppState reduce() => state.copy(bibleName: name, languageCode: code);
 }
-class ToggleEngTitles implements AppAction {}
+class ToggleEngTitlesAction extends ReduxAction<AppState> {
+  @override
+  AppState reduce() => state.copy(engTitles: !state.engTitles);
+}
-class ToggleBoldFont implements AppAction {}
+class ToggleBoldFontAction extends ReduxAction<AppState> {
+  @override
+  AppState reduce() => state.copy(boldFont: !state.boldFont);
+}
-class ToggleDarkMode implements AppAction {}
+class ToggleDarkModeAction extends ReduxAction<AppState> {
+  @override
+  AppState reduce() => state.copy(darkMode: !state.darkMode);
+}
-class UpdateTextScale implements AppAction {
+class UpdateTextScaleAction extends ReduxAction<AppState> {
   final double value;
-  const UpdateTextScale(this.value);
+  UpdateTextScaleAction(this.value);
+  @override
+  AppState reduce() => state.copy(textScale: state.textScale + value);
 }
-class UpdateChapter implements AppAction {
+class UpdateChapterAction extends ReduxAction<AppState> {
   final int book;
   final int chapter;
-  const UpdateChapter(this.book, this.chapter);
+  UpdateChapterAction(this.book, this.chapter);
+  @override
+  AppState reduce() => state.copy(savedBook: book, savedChapter: chapter);
 }
-class SetPlaying implements AppAction {
+class SetPlayingAction extends ReduxAction<AppState> {
   final bool value;
-  const SetPlaying(this.value);
+  SetPlayingAction(this.value);
+  @override
+  AppState reduce() => state.copy(isPlaying: value);
 }
-class SelectVerse implements AppAction {
+class SelectVerseAction extends ReduxAction<AppState> {
   final Verse verse;
-  const SelectVerse(this.verse);
+  SelectVerseAction(this.verse);
+  @override
+  AppState reduce() {
+    final isSelected = state.selectedVerses.any(
+      (el) =>
+          el.book == verse.book &&
+          el.chapter == verse.chapter &&
+          el.index == verse.index,
+    );
+    if (isSelected) {
+      return state.copy(
+        selectedVerses: state.selectedVerses
+            .where((it) => it.index != verse.index)
+            .toList(),
+      );
+    } else {
+      return state.copy(
+        selectedVerses: [...state.selectedVerses, verse],
+      );
+    }
+  }
 }
-class ClearSelectedVerses implements AppAction {
+class ClearSelectedVersesAction extends ReduxAction<AppState> {
+  @override
-  const ClearSelectedVerses();
+  AppState reduce() => state.copy(selectedVerses: []);
 }
-class SetActionsShown implements AppAction {
+class SetActionsShownAction extends ReduxAction<AppState> {
   final bool value;
-  const SetActionsShown(this.value);
+  SetActionsShownAction(this.value);
+  @override
+  AppState reduce() => state.copy(actionsShown: value);
 }
-class SetHighlightsShown implements AppAction {
+class SetHighlightsShownAction extends ReduxAction<AppState> {
   final bool value;
-  const SetHighlightsShown(this.value);
+  SetHighlightsShownAction(this.value);
+  @override
+  AppState reduce() => state.copy(highlightsShown: value);
+}
+class SetHighlightAction extends ReduxAction<AppState> {
+  final List<Verse> verses;
+  final int colorIndex;
+  SetHighlightAction(this.verses, this.colorIndex);
+  @override
+  AppState reduce() {
+    final updated = Map<String, int>.from(state.highlights);
+    for (final v in verses) {
+      updated["${v.book}:${v.chapter}:${v.index}"] = colorIndex;
+    }
+    return state.copy(highlights: updated);
+  }
+}
+class RemoveHighlightAction extends ReduxAction<AppState> {
+  final List<Verse> verses;
+  RemoveHighlightAction(this.verses);
+  @override
+  AppState reduce() {
+    final updated = Map<String, int>.from(state.highlights);
+    for (final v in verses) {
+      updated.remove("${v.book}:${v.chapter}:${v.index}");
+    }
+    return state.copy(highlights: updated);
+  }
 }

lib/store/app_persistor.dart ADDED Viewed

@@ -0,0 +1,49 @@
+import "dart:convert";
+import "dart:io";
+import "package:path_provider/path_provider.dart";
+import "package:async_redux/async_redux.dart";
+import "package:only_bible_app/store/app_state.dart";
+class AppPersistor extends Persistor<AppState> {
+  static const _fileName = "app_state.json";
+  Future<File> get _file async {
+    final dir = await getApplicationDocumentsDirectory();
+    return File("${dir.path}/$_fileName");
+  }
+  @override
+  Future<AppState?> readState() async {
+    try {
+      final file = await _file;
+      if (await file.exists()) {
+        final contents = await file.readAsString();
+        final json = jsonDecode(contents) as Map<String, dynamic>;
+        return AppState.fromJson(json);
+      }
+    } catch (_) {}
+    return null;
+  }
+  @override
+  Future<void> deleteState() async {
+    final file = await _file;
+    if (await file.exists()) {
+      await file.delete();
+    }
+  }
+  @override
+  Future<void> persistDifference({
+    required AppState? lastPersistedState,
+    required AppState newState,
+  }) async {
+    final file = await _file;
+    final contents = jsonEncode(newState.toJson());
+    await file.writeAsString(contents);
+  }
+  @override
+  Duration? get throttle => const Duration(seconds: 1);
+}

lib/store/app_state.dart ADDED Viewed

@@ -0,0 +1,182 @@
+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/models.dart";
+import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/app.dart";
+import "package:only_bible_app/store/buffer_audio_source.dart";
+import "package:only_bible_app/theme.dart";
+import "package:only_bible_app/utils.dart";
+class AppState {
+  static final player = AudioPlayer();
+  static final noteTextController = TextEditingController();
+  final bool firstOpen;
+  final String languageCode;
+  final String bibleName;
+  final bool engTitles;
+  final bool boldFont;
+  final bool darkMode;
+  final double textScale;
+  final int savedBook;
+  final int savedChapter;
+  final bool isPlaying;
+  final List<Verse> selectedVerses;
+  final bool actionsShown;
+  final bool highlightsShown;
+  final Map<String, int> highlights;
+  const AppState({
+    this.firstOpen = true,
+    this.languageCode = "en",
+    this.bibleName = "English",
+    this.engTitles = false,
+    this.boldFont = false,
+    this.darkMode = false,
+    this.textScale = 0.0,
+    this.savedBook = 0,
+    this.savedChapter = 0,
+    this.isPlaying = false,
+    this.selectedVerses = const [],
+    this.actionsShown = false,
+    this.highlightsShown = false,
+    this.highlights = const {},
+  });
+  AppState copy({
+    bool? firstOpen,
+    String? languageCode,
+    String? bibleName,
+    bool? engTitles,
+    bool? boldFont,
+    bool? darkMode,
+    double? textScale,
+    int? savedBook,
+    int? savedChapter,
+    bool? isPlaying,
+    List<Verse>? selectedVerses,
+    bool? actionsShown,
+    bool? highlightsShown,
+    Map<String, int>? highlights,
+  }) {
+    return AppState(
+      firstOpen: firstOpen ?? this.firstOpen,
+      languageCode: languageCode ?? this.languageCode,
+      bibleName: bibleName ?? this.bibleName,
+      engTitles: engTitles ?? this.engTitles,
+      boldFont: boldFont ?? this.boldFont,
+      darkMode: darkMode ?? this.darkMode,
+      textScale: textScale ?? this.textScale,
+      savedBook: savedBook ?? this.savedBook,
+      savedChapter: savedChapter ?? this.savedChapter,
+      isPlaying: isPlaying ?? this.isPlaying,
+      selectedVerses: selectedVerses ?? this.selectedVerses,
+      actionsShown: actionsShown ?? this.actionsShown,
+      highlightsShown: highlightsShown ?? this.highlightsShown,
+      highlights: highlights ?? this.highlights,
+    );
+  }
+  Map<String, dynamic> toJson() => {
+        "firstOpen": firstOpen,
+        "languageCode": languageCode,
+        "bibleName": bibleName,
+        "engTitles": engTitles,
+        "boldFont": boldFont,
+        "darkMode": darkMode,
+        "textScale": textScale,
+        "savedBook": savedBook,
+        "savedChapter": savedChapter,
+        "highlights": highlights,
+      };
+  factory AppState.fromJson(Map<String, dynamic> json) => AppState(
+        firstOpen: json["firstOpen"] as bool? ?? true,
+        languageCode: json["languageCode"] as String? ?? "en",
+        bibleName: json["bibleName"] as String? ?? "English",
+        engTitles: json["engTitles"] as bool? ?? false,
+        boldFont: json["boldFont"] as bool? ?? false,
+        darkMode: json["darkMode"] as bool? ?? false,
+        textScale: (json["textScale"] as num?)?.toDouble() ?? 0.0,
+        savedBook: json["savedBook"] as int? ?? 0,
+        savedChapter: json["savedChapter"] as int? ?? 0,
+        highlights: (json["highlights"] as Map<String, dynamic>?)
+                ?.map((k, v) => MapEntry(k, v as int)) ??
+            const {},
+      );
+  Color? getHighlight(Verse v) {
+    final key = "${v.book}:${v.chapter}:${v.index}";
+    final index = highlights[key];
+    if (index == null) return null;
+    return darkMode ? darkHighlights[index] : lightHighlights[index];
+  }
+  bool isVerseSelected(Verse v) {
+    return selectedVerses.any(
+      (el) =>
+          el.book == v.book && el.chapter == v.chapter && el.index == v.index,
+    );
+  }
+  TextStyle getHighlightStyle(BuildContext context, Verse v, bool heading) {
+    final isSelected = selectedVerses.any(
+      (el) =>
+          el.book == v.book && el.chapter == v.chapter && el.index == v.index,
+    );
+    if (!heading && isSelected) {
+      return TextStyle(
+        backgroundColor: darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
+      );
+    }
+    final highlight = getHighlight(v);
+    if (darkMode) {
+      return TextStyle(
+        backgroundColor: highlight?.withValues(alpha: 0.7),
+        color: highlight != null
+            ? Colors.white
+            : Theme.of(context).colorScheme.onSurface,
+      );
+    }
+    return TextStyle(
+      backgroundColor: highlight ?? Theme.of(context).colorScheme.surface,
+    );
+  }
+  Future<void> onPlay(BuildContext context, Bible bible) async {
+    final versesToPlay = List<Verse>.from(store.state.selectedVerses);
+    if (store.state.isPlaying) {
+      await player.pause();
+      store.dispatch(SetPlayingAction(false));
+    } else {
+      store.dispatch(SetPlayingAction(true));
+      for (final v in versesToPlay) {
+        final pathname = "${bible.name}_${v.book}_${v.chapter}_${v.index}";
+        try {
+          final data =
+              await convertText(context.currentLang.audioVoice, v.text);
+          await player.setAudioSource(BufferAudioSource(data));
+          await player.play();
+          await player.stop();
+        } catch (err) {
+          log(
+            "Could not play audio",
+            name: "play",
+            error: (err.toString(), pathname),
+          );
+          recordError((err.toString(), pathname).toString(), null);
+          if (context.mounted) {
+            showError(context, context.l.audioError);
+          }
+          return;
+        } finally {
+          await player.pause();
+          store.dispatch(SetPlayingAction(false));
+        }
+      }
+    }
+  }
+}

lib/store/buffer_audio_source.dart ADDED Viewed

@@ -0,0 +1,25 @@
+import "package:flutter/services.dart";
+import "package:just_audio/just_audio.dart";
+class BufferAudioSource extends StreamAudioSource {
+  final Uint8List _buffer;
+  BufferAudioSource(this._buffer);
+  @override
+  Future<StreamAudioResponse> request([int? start, int? end]) {
+    start = start ?? 0;
+    end = end ?? _buffer.length;
+    return Future.value(
+      StreamAudioResponse(
+        sourceLength: _buffer.length,
+        contentLength: end - start,
+        offset: start,
+        contentType: "audio/mpeg",
+        stream:
+            Stream.value(List<int>.from(_buffer.skip(start).take(end - start))),
+      ),
+    );
+  }
+}

lib/store/state.dart DELETED Viewed

@@ -1,307 +0,0 @@
-import "dart:developer";
-import "package:atoms_state/atoms_state.dart";
-import "package:flutter/material.dart";
-import "package:flutter/services.dart";
-import "package:get_storage/get_storage.dart";
-import "package:just_audio/just_audio.dart";
-import "package:only_bible_app/dialog.dart";
-import "package:only_bible_app/models.dart";
-import "package:only_bible_app/store/storage.dart";
-import "package:only_bible_app/theme.dart";
-import "package:only_bible_app/utils.dart";
-import "package:only_bible_app/navigation.dart";
-import "package:only_bible_app/store/actions.dart";
-import "package:path_provider/path_provider.dart";
-final box = GetStorage("only-bible-app-prefs");
-final player = AudioPlayer();
-final noteTextController = TextEditingController();
-final storage = FileStorage(box: box);
-Future<void> initState() async {
-  await box.initStorage;
-}
-final bibleAtom = AsyncAtom(
-  callback: loadBible,
-);
-final firstOpenAtom = Atom(
-  storage: storage,
-  key: "firstOpen",
-  initialState: true,
-  reducer: (state, action) {
-    if (action is FirstOpenDone) {
-      return false;
-    }
-    return state;
-  },
-);
-final languageCodeAtom = Atom(
-  storage: storage,
-  key: "languageCode",
-  initialState: "en",
-  reducer: (state, action) {
-    if (action is UpdateBible) {
-      return action.code;
-    }
-    return state;
-  },
-);
-final bibleNameAtom = Atom(
-  storage: storage,
-  key: "bibleName",
-  initialState: "English",
-  reducer: (state, action) {
-    if (action is UpdateBible) {
-      return action.name;
-    }
-    return state;
-  },
-);
-final engTitlesAtom = Atom(
-  storage: storage,
-  key: "engTitles",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is ToggleEngTitles) {
-      return !state;
-    }
-    return state;
-  },
-);
-final boldFontAtom = Atom(
-  storage: storage,
-  key: "boldFont",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is ToggleBoldFont) {
-      return !state;
-    }
-    return state;
-  },
-);
-final darkModeAtom = Atom(
-  storage: storage,
-  key: "darkMode",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is ToggleDarkMode) {
-      updateStatusBar(!state);
-      return !state;
-    }
-    return state;
-  },
-);
-final textScaleAtom = Atom(
-  storage: storage,
-  key: "textScale",
-  initialState: 0.0,
-  reducer: (state, action) {
-    if (action is UpdateTextScale) {
-      return state += action.value;
-    }
-    return state;
-  },
-);
-final savedBookAtom = Atom(
-  storage: storage,
-  key: "savedBook",
-  initialState: 0,
-  reducer: (state, action) {
-    if (action is UpdateChapter) {
-      return action.book;
-    }
-    return state;
-  },
-);
-final savedChapterAtom = Atom(
-  storage: storage,
-  key: "savedChapter",
-  initialState: 0,
-  reducer: (state, action) {
-    if (action is UpdateChapter) {
-      return action.chapter;
-    }
-    return state;
-  },
-);
-final isPlaying = Atom(
-  key: "isPlaying",
-  initialState: false,
-  reducer: (state, action) {
-    if (action is SetPlaying) {
-      return action.value;
-    }
-    return state;
-  },
-);
-final selectedVersesAtom = Atom<List<Verse>, AppAction>(
-  key: "selectedVerses",
-  initialState: [],
-  reducer: (state, action) {
-    if (action is SelectVerse) {
-      if (isVerseSelected(action.verse)) {
-        return (state as List<Verse>)
-            .removeBy((it) => it.index == action.verse.index)
-            .toList();
-      } else {
-        return (state as List<Verse>).addBy(action.verse).toList();
-      }
-    }
-    if (action is ClearSelectedVerses) {
-      return List<Verse>.from([]);
-    }
-    return state;
-  },
-);
-Color? getHighlight(Verse v) {
-  final key = "${v.book}:${v.chapter}:${v.index}:highlight";
-  if (box.hasData(key)) {
-// box.remove(key);
-// print(box.read(key));
-    final index = box.read<int>(key);
-    if (index == null) {
-      return null;
-    }
-    return darkModeAtom.value ? darkHighlights[index] : lightHighlights[index];
-  }
-  return null;
-}
-void setHighlight(BuildContext context, int index) {
-  for (final v in selectedVersesAtom.value) {
-    box.write("${v.book}:${v.chapter}:${v.index}:highlight", index);
-  }
-  box.save();
-  hideActions(context);
-}
-void removeHighlight(BuildContext context) {
-  for (final v in selectedVersesAtom.value) {
-    box.remove("${v.book}:${v.chapter}:${v.index}:highlight");
-  }
-  box.save();
-  hideActions(context);
-}
-bool isVerseSelected(Verse v) {
-  return selectedVersesAtom.value.any((el) =>
-      el.book == v.book && el.chapter == v.chapter && el.index == v.index,);
-}
-bool watchVerseSelected(BuildContext context, Verse v) {
-  return selectedVersesAtom.watch(context).any((el) =>
-      el.book == v.book && el.chapter == v.chapter && el.index == v.index,);
-}
-void onVerseSelected(BuildContext context, Bible bible, Verse v) {
-  dispatch(SelectVerse(v));
-  if (selectedVersesAtom.value.isNotEmpty) {
-    showActions(context, bible);
-  }
-  if (selectedVersesAtom.value.isEmpty) {
-    hideActions(context);
-  }
-}
-TextStyle getHighlightStyle(BuildContext context, Verse v, bool heading) {
-  if (!heading && watchVerseSelected(context, v)) {
-    return TextStyle(
-      backgroundColor:
-          darkModeAtom.value ? Colors.grey.shade800 : Colors.grey.shade200,
-    );
-  }
-  if (darkModeAtom.watch(context)) {
-// return TextStyle(
-//   color: getHighlight(v) ?? context.theme.colorScheme.onBackground,
-// );
-    return TextStyle(
-      backgroundColor: getHighlight(v)?.withOpacity(0.7),
-      color: getHighlight(v) != null
-          ? Colors.white
-          : context.theme.colorScheme.onSurface,
-    );
-  }
-  return TextStyle(
-    backgroundColor: getHighlight(v) ?? context.theme.colorScheme.surface,
-  );
-}
-void clearEvents(BuildContext context) {
-  if (isPlaying.value) {
-    pause();
-  }
-  hideActions(context);
-}
-Future<void> pause() async {
-  await player.pause();
-  dispatch(const SetPlaying(false));
-}
-class BufferAudioSource extends StreamAudioSource {
-  final Uint8List _buffer;
-  BufferAudioSource(this._buffer);
-  @override
-  Future<StreamAudioResponse> request([int? start, int? end]) {
-    start = start ?? 0;
-    end = end ?? _buffer.length;
-    return Future.value(
-      StreamAudioResponse(
-        sourceLength: _buffer.length,
-        contentLength: end - start,
-        offset: start,
-        contentType: "audio/mpeg",
-        stream:
-            Stream.value(List<int>.from(_buffer.skip(start).take(end - start))),
-      ),
-    );
-  }
-}
-Future<void> onPlay(BuildContext context, Bible bible) async {
-  final versesToPlay = List<Verse>.from(selectedVersesAtom.value);
-  if (isPlaying.value) {
-    pause();
-  } else {
-    dispatch(const SetPlaying(true));
-    for (final v in versesToPlay) {
-      final directory = await getTemporaryDirectory();
-      final pathname = "${bible.name}_${v.book}_${v.chapter}_${v.index}";
-      try {
-        final data = await convertText(context.currentLang.audioVoice, v.text);
-        await player.setAudioSource(BufferAudioSource(data));
-        await player.play();
-        await player.stop();
-      } catch (err) {
-        log(
-          "Could not play audio",
-          name: "play",
-          error: (err.toString(), pathname),
-        );
-        recordError((err.toString(), pathname).toString(), null);
-        if (context.mounted) {
-          showError(context, context.l.audioError);
-        }
-        return;
-      } finally {
-        pause();
-      }
-    }
-  }
-}

lib/store/storage.dart DELETED Viewed

@@ -1,25 +0,0 @@
-import "package:atoms_state/atoms_state.dart";
-import "package:get_storage/get_storage.dart";
-class FileStorage<T> implements Storage {
-  GetStorage box;
-  FileStorage({required this.box});
-  @override
-  T? get<T>(String key) {
-    return box.read(key);
-  }
-  @override
-  Future<void> delete(String key) async {
-    await box.remove(key);
-    await box.save();
-  }
-  @override
-  Future<void> set(String key, value) async {
-    await box.write(key, value);
-    await box.save();
-  }
-}

lib/utils.dart CHANGED Viewed

@@ -1,10 +1,12 @@
 import "dart:convert";
+import "package:async_redux/async_redux.dart";
 import "package:http/http.dart" as http;
 import "package:flutter/services.dart";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/env.dart";
 import "package:only_bible_app/models.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/app_state.dart";
 import "package:package_info_plus/package_info_plus.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart"
@@ -41,13 +43,14 @@ extension AsyncSnapshotUtils<E> on AsyncSnapshot<E> {
 extension AppContext on BuildContext {
   ThemeData get theme => Theme.of(this);
-  AppLocalizations get l =>
+  AppState get state => StoreProvider.state<AppState>(this);
-      engTitlesAtom.watch(this) && languageCodeAtom.watch(this) != "en"
+  AppLocalizations get l => state.engTitles && state.languageCode != "en"
-          ? lookupAppLocalizations(const Locale("en"))
+      ? lookupAppLocalizations(const Locale("en"))
-          : AppLocalizations.of(this)!;
+      : AppLocalizations.of(this)!;
   AppLocalizations get currentLang => supportedLocalizations
-      .firstWhere((el) => el.languageCode == languageCodeAtom.value);
+      .firstWhere((el) => el.languageCode == state.languageCode);
   double get actionsHeight {
     if (isIOS()) {

lib/widgets/verses_view.dart CHANGED Viewed

@@ -3,7 +3,9 @@ import "package:flutter/material.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
+import "package:only_bible_app/app.dart";
-import "package:only_bible_app/store/state.dart";
+import "package:only_bible_app/store/actions.dart";
+import "package:only_bible_app/utils.dart";
 class VersesView extends StatelessWidget {
   final Bible bible;
@@ -15,94 +17,109 @@ class VersesView extends StatelessWidget {
   Widget build(BuildContext context) {
     final textStyle = DefaultTextStyle.of(context).style;
     return SwipeDetector(
-        onSwipeLeft: (offset) {
+      onSwipeLeft: (offset) {
-          nextChapter(context, bible, chapter.book, chapter.index);
+        nextChapter(context, bible, chapter.book, chapter.index);
-        },
+      },
-        onSwipeRight: (offset) {
+      onSwipeRight: (offset) {
-          previousChapter(context, bible, chapter.book, chapter.index);
+        previousChapter(context, bible, chapter.book, chapter.index);
-        },
+      },
-        child: Column(
+      child: Column(
-          children: [
+        children: [
-            Expanded(
+          Expanded(
-              child: SingleChildScrollView(
+            child: SingleChildScrollView(
-                physics: const BouncingScrollPhysics(),
+              physics: const BouncingScrollPhysics(),
-                child: Padding(
+              child: Padding(
-                  padding: const EdgeInsets.only(left: 20, right: 20),
+                padding: const EdgeInsets.only(left: 20, right: 20),
-                  child: Column(
+                child: Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
+                  children: [
-                      // const Padding(
+                    // const Padding(
-                      //   padding: EdgeInsets.only(top: 0),
+                    //   padding: EdgeInsets.only(top: 0),
-                      // ),
+                    // ),
-                      Align(
+                    Align(
-                        alignment: Alignment.centerLeft,
+                      alignment: Alignment.centerLeft,
-                        child: Text.rich(
+                      child: Text.rich(
-                          textScaler: TextScaler.linear(
+                        textScaler: TextScaler.linear(
-                              1.1 + textScaleAtom.watch(context) / 2,),
+                          1.1 + context.state.textScale / 2,
+                        ),
-                          textAlign: TextAlign.left,
+                        textAlign: TextAlign.left,
-                          TextSpan(
+                        TextSpan(
-                            style: boldFontAtom.watch(context)
+                          style: context.state.boldFont
-                                ? textStyle.copyWith(
+                              ? textStyle.copyWith(
-                                    fontWeight: FontWeight.w500,
+                                  fontWeight: FontWeight.w500,
-                                  )
+                                )
-                                : textStyle,
+                              : textStyle,
-                            children: chapter.verses
+                          children: chapter.verses
-                                .map(
+                              .map(
-                                  (v) => [
+                                (v) => [
-                                    if (v.heading != "")
+                                  if (v.heading != "")
-                                      TextSpan(
-                                        text:
-                                            "${v.heading.replaceAll("<br>", "\n")}\n",
-                                        style:
-                                            getHighlightStyle(context, v, true)
-                                                .copyWith(
-                                          fontSize: 18,
-                                          fontWeight: FontWeight.w600,
-                                          height: 2,
-                                        ),
-                                      ),
-                                    WidgetSpan(
-                                      child: Transform.translate(
-                                        offset: const Offset(0, -2),
-                                        child: Text("${v.index + 1} ",
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelMedium,),
-                                      ),
-                                    ),
                                     TextSpan(
-                                      text: "${v.text}\n",
-                                      style:
+                                      text:
+                                          "${v.heading.replaceAll("<br>", "\n")}\n",
+                                      style: context.state
-                                          getHighlightStyle(context, v, false),
+                                          .getHighlightStyle(context, v, true)
-                                      recognizer: TapGestureRecognizer()
+                                          .copyWith(
-                                        ..onTap = () {
+                                            fontSize: 18,
-                                          onVerseSelected(context, bible, v);
+                                            fontWeight: FontWeight.w600,
+                                            height: 2,
-                                        },
+                                          ),
                                     ),
-                                    const WidgetSpan(
+                                  WidgetSpan(
+                                    child: Transform.translate(
+                                      offset: const Offset(0, -2),
-                                      child: Padding(
+                                      child: Text(
-                                        padding: EdgeInsets.only(
+                                        "${v.index + 1} ",
-                                            top: 16, bottom: 16,),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .labelMedium,
                                       ),
                                     ),
+                                  ),
+                                  TextSpan(
+                                    text: "${v.text}\n",
+                                    style: context.state
+                                        .getHighlightStyle(context, v, false),
+                                    recognizer: TapGestureRecognizer()
+                                      ..onTap = () {
+                                        store.dispatch(SelectVerseAction(v));
+                                        if (store
+                                            .state.selectedVerses.isNotEmpty) {
+                                          showActions(context, bible);
+                                        }
+                                        if (store
+                                            .state.selectedVerses.isEmpty) {
+                                          hideActions(context);
+                                        }
+                                      },
+                                  ),
+                                  const WidgetSpan(
+                                    child: Padding(
+                                      padding: EdgeInsets.only(
+                                        top: 16,
+                                        bottom: 16,
+                                      ),
+                                    ),
+                                  ),
-                                  ],
+                                ],
-                                )
+                              )
-                                .expand((element) => element)
+                              .expand((element) => element)
-                                .toList(),
+                              .toList(),
-                          ),
                         ),
                       ),
+                    ),
-                      Padding(
+                    Padding(
-                        padding: EdgeInsets.only(
+                      padding: EdgeInsets.only(
-                            bottom: actionsShownAtom.watch(context) ? 120 : 0,),
+                        bottom: context.state.actionsShown ? 120 : 0,
                       ),
+                    ),
-                    ],
+                  ],
-                  ),
                 ),
               ),
             ),
+          ),
-          ],
+        ],
-        ),);
+      ),
+    );
   }
 }

macos/Flutter/GeneratedPluginRegistrant.swift CHANGED Viewed

@@ -7,6 +7,7 @@ import Foundation
 import app_review
 import audio_session
+import connectivity_plus
 import just_audio
 import package_info_plus
 import share_plus
@@ -17,6 +18,7 @@ import webview_flutter_wkwebview
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppReviewPlugin.register(with: registry.registrar(forPlugin: "AppReviewPlugin"))
   AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

pubspec.lock CHANGED Viewed

@@ -57,14 +57,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
-  atoms_state:
+  async_redux:
     dependency: "direct main"
     description:
-      name: atoms_state
+      name: async_redux
-      sha256: "25ffb62bf5f0bdf4ee437e32d450fa55dc5e6ceadda6056b1b7d13f1549cff9c"
+      sha256: "3f214bcc112a3033a137f47307de30d793a66ff4ee033c1fa6232bbd2e575df0"
       url: "https://pub.dev"
     source: hosted
+    version: "27.1.1"
+  async_redux_core:
+    dependency: transitive
+    description:
+      name: async_redux_core
+      sha256: "7c1075bc14304ae23352ccea5fe16515720a6d4d5a8f6d0e65ae63dc4b243c27"
+      url: "https://pub.dev"
+    source: hosted
-    version: "0.0.2"
+    version: "1.5.0"
   audio_session:
     dependency: transitive
     description:
@@ -201,6 +209,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  connectivity_plus:
+    dependency: transitive
+    description:
+      name: connectivity_plus
+      sha256: "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   convert:
     dependency: transitive
     description:
@@ -265,6 +289,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  dbus:
+    dependency: transitive
+    description:
+      name: dbus
+      sha256: d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.12"
   equatable:
     dependency: transitive
     description:
@@ -281,6 +313,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.3"
+  fast_immutable_collections:
+    dependency: transitive
+    description:
+      name: fast_immutable_collections
+      sha256: "19f70498af299cbce5ff919dbbecd5abfd9d0c28139004f68d3810ce23dedfb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.1.0"
   ffi:
     dependency: transitive
     description:
@@ -399,22 +439,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  get:
-    dependency: transitive
-    description:
-      name: get
-      sha256: "5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.7.3"
-  get_storage:
-    dependency: "direct main"
-    description:
-      name: get_storage
-      sha256: "39db1fffe779d0c22b3a744376e86febe4ade43bf65e06eab5af707dc84185a2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
   glob:
     dependency: transitive
     description:
@@ -487,6 +511,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  i18n_extension_core:
+    dependency: transitive
+    description:
+      name: i18n_extension_core
+      sha256: "5d17d355b95882e803f89c97cad610ab7967a798f8e519563d274f7888bc968e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.2"
   image:
     dependency: transitive
     description:
@@ -636,6 +668,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.6"
+  nm:
+    dependency: transitive
+    description:
+      name: nm
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   node_preamble:
     dependency: transitive
     description:
@@ -812,6 +852,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  serverpod_serialization:
+    dependency: transitive
+    description:
+      name: serverpod_serialization
+      sha256: "6b087d9e6075dec0973c31220b0ba09f67d31d79cb691f689a704e4b7f8343a3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.4"
   settings_ui:
     dependency: "direct main"
     description:
@@ -953,6 +1001,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.2"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1169,6 +1225,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  weak_map:
+    dependency: transitive
+    description:
+      name: weak_map
+      sha256: "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.1"
   web:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -21,16 +21,15 @@ dependencies:
   flutter_swipe_detector: ^2.0.0
   cupertino_icons: ^1.0.8
   settings_ui: ^2.0.2
-  get_storage: ^2.1.1
   share_plus: ^12.0.1
   url_launcher: ^6.3.2
   package_info_plus: ^9.0.0
   flutter_azure_tts: ^1.0.0
   http: ^1.6.0
-  atoms_state: ^0.0.2
   webview_flutter: ^4.13.1
   app_review: ^3.0.0
   go_router: ^17.1.0
+  async_redux: ^27.1.1
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc CHANGED Viewed

@@ -6,10 +6,13 @@
 #include "generated_plugin_registrant.h"
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake CHANGED Viewed

@@ -3,6 +3,7 @@
 #
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus
   share_plus
   url_launcher_windows
 )

~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