only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app/.git only-bible-app
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.

f2bd2017 — pyrossh

Fix audio interfering with other apps playing audio at the same time

Files changed (6) hide show

lib/app.dart +1 -1
lib/main.dart +2 -3
lib/store/actions_navigation.dart +39 -16
lib/store/actions_state.dart +15 -7
lib/utils.dart +29 -3
web/index.html +2 -2

lib/app.dart CHANGED Viewed

@@ -76,7 +76,7 @@ class App extends StatelessWidget {
         child: Builder(
           builder: (context) => MaterialApp.router(
             routerConfig: _router,
-            title: "Bible",
+            title: "Only Bible App",
             debugShowCheckedModeBanner: false,
             themeMode: context.select((s) => s.darkMode) ? ThemeMode.dark : ThemeMode.light,
             theme: lightTheme,

lib/main.dart CHANGED Viewed

@@ -3,7 +3,6 @@ import "package:flutter/scheduler.dart";
 import "package:flutter/services.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
-import "package:flutter_soloud/flutter_soloud.dart";
 import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:async_redux/async_redux.dart";
 import "package:only_bible_app/app.dart";
@@ -72,7 +71,6 @@ void main() async {
     }
     return true;
   };
-  await SoLoud.instance.init();
   FlutterAzureTts.init(
     subscriptionKey: Env.ttsSubscriptionKey,
     region: "centralindia",
@@ -82,7 +80,8 @@ void main() async {
   final json = await persistor.readJson();
   final bibleName = json?["bibleName"] as String? ?? "en_kjv";
   final bible = await loadBible(bibleName);
+  final initialState =
-  final initialState = json != null ? AppState.fromJson(json, bible) : AppState(bible: bible);
+      json != null ? AppState.fromJson(json, bible) : AppState(bible: bible);
   final store = Store<AppState>(
     initialState: initialState,
     persistor: persistor,

lib/store/actions_navigation.dart CHANGED Viewed

@@ -1,6 +1,5 @@
 import "package:async_redux/async_redux.dart";
 import "package:flutter/material.dart";
-import "package:flutter_soloud/flutter_soloud.dart";
 import "package:go_router/go_router.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/store/app_state.dart";
@@ -119,23 +118,37 @@ class GoToChapterAction extends ReduxAction<AppState> {
   GoToChapterAction(this.router, this.book, this.chapter, {this.verse});
   @override
-  AppState reduce() {
+  Future<AppState> reduce() async {
-    SoLoud.instance.disposeAllSources();
+    await stopAudioPlayback();
     final navId = DateTime.now().millisecondsSinceEpoch;
+    if (book > state.savedBook ||
-    if (book > state.savedBook || (book == state.savedBook && chapter > state.savedChapter)) {
+        (book == state.savedBook && chapter > state.savedChapter)) {
       router.push(
         "/chapter/$book/$chapter",
+        extra: (
-        extra: (slideDir: TextDirection.ltr, scrollToVerse: verse, navId: navId),
+          slideDir: TextDirection.ltr,
+          scrollToVerse: verse,
+          navId: navId
+        ),
       );
+    } else if (book < state.savedBook ||
-    } else if (book < state.savedBook || (book == state.savedBook && chapter < state.savedChapter)) {
+        (book == state.savedBook && chapter < state.savedChapter)) {
       router.push(
         "/chapter/$book/$chapter",
+        extra: (
-        extra: (slideDir: TextDirection.rtl, scrollToVerse: verse, navId: navId),
+          slideDir: TextDirection.rtl,
+          scrollToVerse: verse,
+          navId: navId
+        ),
       );
     } else {
       router.push(
         "/chapter/$book/$chapter",
+        extra: (
-        extra: (slideDir: null as TextDirection?, scrollToVerse: verse, navId: navId),
+          slideDir: null as TextDirection?,
+          scrollToVerse: verse,
+          navId: navId
+        ),
       );
     }
     return state.copy(
@@ -172,7 +185,7 @@ class NextChapterAction extends ReduxAction<AppState> {
   NextChapterAction(this.router, this.bible, this.book, this.chapter);
   @override
-  AppState? reduce() {
+  Future<AppState?> reduce() async {
     final selectedBook = bible.books![book];
     int? newBook;
     int? newChapter;
@@ -187,10 +200,14 @@ class NextChapterAction extends ReduxAction<AppState> {
     }
     if (newBook == null) return null;
-    SoLoud.instance.disposeAllSources();
+    await stopAudioPlayback();
     router.pushReplacement(
       "/chapter/$newBook/$newChapter",
+      extra: (
+        slideDir: TextDirection.ltr,
+        scrollToVerse: null as int?,
-      extra: (slideDir: TextDirection.ltr, scrollToVerse: null as int?, navId: DateTime.now().millisecondsSinceEpoch),
+        navId: DateTime.now().millisecondsSinceEpoch
+      ),
     );
     return state.copy(
       savedBook: newBook,
@@ -209,7 +226,7 @@ class PreviousChapterAction extends ReduxAction<AppState> {
   PreviousChapterAction(this.router, this.bible, this.book, this.chapter);
   @override
-  AppState? reduce() {
+  Future<AppState?> reduce() async {
     final selectedBook = bible.books![book];
     int? newBook;
     int? newChapter;
@@ -224,10 +241,14 @@ class PreviousChapterAction extends ReduxAction<AppState> {
     }
     if (newBook == null) return null;
-    SoLoud.instance.disposeAllSources();
+    await stopAudioPlayback();
     router.pushReplacement(
       "/chapter/$newBook/$newChapter",
+      extra: (
+        slideDir: TextDirection.rtl,
+        scrollToVerse: null as int?,
-      extra: (slideDir: TextDirection.rtl, scrollToVerse: null as int?, navId: DateTime.now().millisecondsSinceEpoch),
+        navId: DateTime.now().millisecondsSinceEpoch
+      ),
     );
     return state.copy(
       savedBook: newBook,
@@ -266,8 +287,10 @@ class ShareVersesAction extends ReduxAction<AppState> {
   Future<AppState?> reduce() async {
     final chapter = verses.first.chapter + 1;
     final items = verses.sortedBy((e) => e.index).map((e) => e.index + 1);
+    final versesThrough =
-    final versesThrough = items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
+        items.length >= 3 ? "${items.first}-${items.last}" : items.join(",");
+    final version =
-    final version = state.bible.languageCode == "en" ? state.bible.languageNative : "";
+        state.bible.languageCode == "en" ? state.bible.languageNative : "";
     final title = "$bookName $chapter:$versesThrough $version";
     final text = verses.map((e) => _stripRedTags(e.text ?? "")).join("\n");
     await SharePlus.instance.share(

lib/store/actions_state.dart CHANGED Viewed

@@ -54,8 +54,8 @@ class TogglePlayAction extends ReduxAction<AppState> {
   @override
   Future<AppState?> reduce() async {
-    if (SoLoud.instance.getActiveVoiceCount() > 0) {
+    if (isAudioPlaybackActive()) {
-      await SoLoud.instance.disposeAllSources();
+      await stopAudioPlayback();
       return null;
     }
     final versesToPlay = List<Verse>.from(state.selectedVerses);
@@ -65,6 +65,7 @@ class TogglePlayAction extends ReduxAction<AppState> {
       final pathname = "${bible.name!}_${v.book}_${v.chapter}_${v.index}";
       try {
         final data = await convertText(audioVoice, v.text ?? "");
+        await ensureAudioPlaybackInitialized();
         final stream = SoLoud.instance.setBufferStream(
           bufferingType: BufferingType.preserved,
           format: BufferType.auto,
@@ -74,12 +75,14 @@ class TogglePlayAction extends ReduxAction<AppState> {
         final handle = await SoLoud.instance.play(stream);
         // Wait for playback to complete
         await stream.soundEvents.firstWhere(
+          (e) =>
-          (e) => e.event == SoundEventType.handleIsNoMoreValid && e.handle == handle,
+              (e.event == SoundEventType.handleIsNoMoreValid &&
+                  e.handle == handle) ||
+              e.event == SoundEventType.soundDisposed,
         );
-        await SoLoud.instance.disposeSource(stream);
       } catch (err) {
         // If sources were disposed (user stopped playback), don't treat as error
-        if (SoLoud.instance.getActiveVoiceCount() == 0) {
+        if (!SoLoud.instance.isInitialized || !isAudioPlaybackActive()) {
           return null;
         }
         log(
@@ -92,7 +95,9 @@ class TogglePlayAction extends ReduxAction<AppState> {
           showError(buildContext, audioError);
         }
         return null;
-      } finally {}
+      } finally {
+        await stopAudioPlayback();
+      }
     }
     return null;
   }
@@ -106,7 +111,10 @@ class SelectVerseAction extends ReduxAction<AppState> {
   @override
   AppState reduce() {
     final isSelected = state.selectedVerses.any(
+      (el) =>
+          el.book == verse.book &&
-      (el) => el.book == verse.book && el.chapter == verse.chapter && el.index == verse.index,
+          el.chapter == verse.chapter &&
+          el.index == verse.index,
     );
     final newVerses = isSelected
         ? state.selectedVerses.where((it) => it.index != verse.index).toList()

lib/utils.dart CHANGED Viewed

@@ -4,9 +4,11 @@ import "package:archive/archive.dart";
 import "package:http/http.dart" as http;
 import "package:flutter/services.dart";
 import "package:package_info_plus/package_info_plus.dart";
-import "package:flutter/foundation.dart" show TargetPlatform, defaultTargetPlatform, kDebugMode;
+import "package:flutter/foundation.dart"
+    show TargetPlatform, defaultTargetPlatform, kDebugMode;
 import "package:flutter/material.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
+import "package:flutter_soloud/flutter_soloud.dart";
 import "package:only_bible_app/env.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 export "package:only_bible_app/bible_data.dart";
@@ -31,7 +33,8 @@ extension BookExt on Book {
 }
 extension IterableUtils<E> on Iterable<E> {
-  Iterable<E> sortedBy(Comparable Function(E e) key) => toList()..sort((a, b) => key(a).compareTo(key(b)));
+  Iterable<E> sortedBy(Comparable Function(E e) key) =>
+      toList()..sort((a, b) => key(a).compareTo(key(b)));
   Iterable<E> removeBy(bool Function(E e) key) => toList()..removeWhere(key);
@@ -74,9 +77,32 @@ Future<Uint8List> convertText(String langCode, String text) async {
   return ttsResponse.audio.buffer.asUint8List();
 }
+bool isAudioPlaybackActive() {
+  return SoLoud.instance.isInitialized &&
+      SoLoud.instance.getActiveVoiceCount() > 0;
+}
+Future<void> ensureAudioPlaybackInitialized() async {
+  if (!SoLoud.instance.isInitialized) {
+    await SoLoud.instance.init();
+  }
+}
+Future<void> stopAudioPlayback() async {
+  if (!SoLoud.instance.isInitialized) return;
+  try {
+    await SoLoud.instance.disposeAllSources();
+  } finally {
+    if (SoLoud.instance.isInitialized) {
+      SoLoud.instance.deinit();
+    }
+  }
+}
 Future<Bible> loadBible(String name) async {
   final data = await rootBundle.load("assets/bibles/$name.bin.gz");
+  final decompressed =
-  final decompressed = const GZipDecoder().decodeBytes(data.buffer.asUint8List());
+      const GZipDecoder().decodeBytes(data.buffer.asUint8List());
   return Bible(decompressed);
 }

web/index.html CHANGED Viewed

@@ -21,13 +21,13 @@
   <!-- iOS meta tags & icons -->
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="web">
+  <meta name="apple-mobile-web-app-title" content="Only Bible App">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png">
-  <title>web</title>
+  <title>Only Bible App</title>
   <link rel="manifest" href="manifest.json">

~repos /only-bible-app

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