A cross platform Audiobookshelf client for Android and iOS
Dart
Chromecast fixes, multi-channel audio, speed button, queue auto-download, widget radius
Nathan Poulson6f532ba8a51a
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.ktsindex 9b2d69f4..7fc6c49d 100644--- a/android/app/build.gradle.kts+++ b/android/app/build.gradle.kts@@ -74,4 +74,5 @@ flutter {dependencies {coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")+ implementation("com.google.android.gms:play-services-cast-framework:21.5.0")}\ No newline at end of filediff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xmlindex 55c5ef87..75316599 100644--- a/android/app/src/main/AndroidManifest.xml+++ b/android/app/src/main/AndroidManifest.xml@@ -77,7 +77,7 @@<!-- Chromecast Metadata --><meta-dataandroid:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"- android:value="com.felnanuke.google_cast.GoogleCastOptionsProvider" />+ android:value="com.barnabas.absorb.AbsorbCastOptionsProvider" /><!-- Send covers to AA while offline --><providerdiff --git a/android/app/src/main/kotlin/com/barnabas/absorb/AbsorbCastOptionsProvider.kt b/android/app/src/main/kotlin/com/barnabas/absorb/AbsorbCastOptionsProvider.ktnew file mode 100644index 00000000..0b604360--- /dev/null+++ b/android/app/src/main/kotlin/com/barnabas/absorb/AbsorbCastOptionsProvider.kt@@ -0,0 +1,38 @@+package com.barnabas.absorb++import android.content.Context+import com.google.android.gms.cast.framework.CastOptions+import com.google.android.gms.cast.framework.OptionsProvider+import com.google.android.gms.cast.framework.SessionProvider+import com.google.android.gms.cast.framework.media.CastMediaOptions+import com.google.android.gms.cast.framework.media.NotificationOptions+import com.felnanuke.google_cast.GoogleCastOptionsProvider++/**+ * Wraps the flutter_chrome_cast plugin's OptionsProvider and adds+ * NotificationOptions so the Cast SDK shows its default media notification+ * with play/pause controls during casting.+ */+class AbsorbCastOptionsProvider : OptionsProvider {+ private val delegate = GoogleCastOptionsProvider()++ override fun getCastOptions(context: Context): CastOptions {+ val base = delegate.getCastOptions(context)+ val notificationOptions = NotificationOptions.Builder()+ .build()+ val mediaOptions = CastMediaOptions.Builder()+ .setNotificationOptions(notificationOptions)+ .build()+ return CastOptions.Builder()+ .setReceiverApplicationId(base.receiverApplicationId)+ .setLaunchOptions(base.launchOptions)+ .setResumeSavedSession(true)+ .setEnableReconnectionService(true)+ .setCastMediaOptions(mediaOptions)+ .build()+ }++ override fun getAdditionalSessionProviders(context: Context): MutableList<SessionProvider>? {+ return delegate.getAdditionalSessionProviders(context)+ }+}diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.ktindex ea930c50..e36117d2 100644--- a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt+++ b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt@@ -358,4 +358,5 @@ class MainActivity : AudioServiceActivity() {releaseEffects()super.onDestroy()}+}diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/NowPlayingWidget.kt b/android/app/src/main/kotlin/com/barnabas/absorb/NowPlayingWidget.ktindex 768f714e..6242a93f 100644--- a/android/app/src/main/kotlin/com/barnabas/absorb/NowPlayingWidget.kt+++ b/android/app/src/main/kotlin/com/barnabas/absorb/NowPlayingWidget.kt@@ -159,7 +159,7 @@ class NowPlayingWidget : AppWidgetProvider() {val options = BitmapFactory.Options().apply { inSampleSize = 2 }val bitmap = BitmapFactory.decodeFile(file.absolutePath, options)if (bitmap != null) {- views.setImageViewBitmap(R.id.widget_cover, roundBitmap(bitmap, 18f, context))+ views.setImageViewBitmap(R.id.widget_cover, roundBitmap(bitmap, 24f, context))} else {views.setImageViewResource(R.id.widget_cover, R.mipmap.ic_launcher)}diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dartindex 8f6a7c7e..96c33c44 100644--- a/lib/providers/library_provider.dart+++ b/lib/providers/library_provider.dart@@ -497,7 +497,10 @@ class LibraryProvider extends ChangeNotifier {AudioPlayerService.setOnBookFinishedCallback(markFinishedLocally);AudioPlayerService.setOnPlayStartedCallback((key) {_checkRollingDownloads(key);- _checkQueueAutoDownloads(key);+ // Delay queue auto-download so the absorbing queue has time to+ // reorder (moveToFront) before we check positions. Without this,+ // switching between adjacent books triggers unnecessary downloads.+ Future.delayed(const Duration(seconds: 2), () => _checkQueueAutoDownloads(key));_checkAutoDownloadOnStream(key);});AudioPlayerService.setOnPlaybackStateChangedCallback((playing) {@@ -2216,6 +2219,7 @@ class LibraryProvider extends ChangeNotifier {// Slide the rolling download window forward for the finished item's series_checkRollingDownloads(itemId);+ _checkQueueAutoDownloads(itemId);// Auto-delete finished download if the setting is enabledif (DownloadService().isDownloaded(itemId)) {diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex c477fd55..e68c6cf7 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -1464,11 +1464,11 @@ class AudioPlayerService extends ChangeNotifier {return 'Player failed to initialize';}- // Stop Chromecast if currently casting+ // Don't start local playback while castingfinal cast = ChromecastService();if (cast.isCasting) {- debugPrint('[Player] Stopping Chromecast before local playback');- await cast.stopCasting();+ debugPrint('[Player] Cast active - skipping local playback');+ return null;}_api = api;diff --git a/lib/services/chromecast_service.dart b/lib/services/chromecast_service.dartindex c59018b3..c012d4a1 100644--- a/lib/services/chromecast_service.dart+++ b/lib/services/chromecast_service.dart@@ -1,6 +1,7 @@import 'dart:async';import 'dart:io';import 'package:flutter/material.dart';+import 'package:flutter_chrome_cast/flutter_chrome_cast.dart';import 'package:wakelock_plus/wakelock_plus.dart';import 'api_service.dart';@@ -133,6 +134,7 @@ class ChromecastService extends ChangeNotifier {void _onDisconnected() {if (_castingItemId != null && _castPosition > Duration.zero) _saveProgressLocal();+_connectionState = CastConnectionState.disconnected;_playbackState = CastPlaybackState.idle;_connectedDeviceName = null;@@ -145,6 +147,7 @@ class ChromecastService extends ChangeNotifier {_positionSub?.cancel();_syncTimer?.cancel();_updateWakeLock(false);+_onPlaybackStateChangedCallback?.call(false);notifyListeners();}@@ -172,6 +175,7 @@ class ChromecastService extends ChangeNotifier {if (wasPlaying != nowPlaying) {_onPlaybackStateChangedCallback?.call(nowPlaying);_updateWakeLock(nowPlaying);+}// Detect playback completion: was playing/buffering → now idle@@ -188,6 +192,12 @@ class ChromecastService extends ChangeNotifier {}notifyListeners();+ }, onError: (e) {+ debugPrint('[Cast] mediaStatusStream error - re-subscribing: $e');+ _listenToMediaStatus();+ }, onDone: () {+ debugPrint('[Cast] mediaStatusStream completed - re-subscribing');+ if (isConnected) _listenToMediaStatus();});}@@ -205,6 +215,12 @@ class ChromecastService extends ChangeNotifier {_castPosition = pos;}}+ }, onError: (e) {+ debugPrint('[Cast] positionStream error - re-subscribing: $e');+ _listenToPosition();+ }, onDone: () {+ debugPrint('[Cast] positionStream completed - re-subscribing');+ if (isConnected) _listenToPosition();});_syncTimer?.cancel();_syncTimer = Timer.periodic(const Duration(seconds: 15), (_) {@@ -307,6 +323,13 @@ class ChromecastService extends ChangeNotifier {else if (startTime == 0 && serverPos > 0) startTime = serverPos;}+ // Update duration from server if we don't have it (common for podcast episodes)+ final serverDuration = (sessionData['duration'] as num?)?.toDouble() ?? 0;+ if (_castingDuration <= 0 && serverDuration > 0) {+ _castingDuration = serverDuration;+ debugPrint('[Cast] Updated duration from server: ${serverDuration}s');+ }+final audioTracks = sessionData['audioTracks'] as List<dynamic>?;debugPrint('[Cast] Audio tracks count: ${audioTracks?.length ?? 0}');if (audioTracks == null || audioTracks.isEmpty) {@@ -615,6 +638,8 @@ class ChromecastService extends ChangeNotifier {await _saveProgressLocal();await _syncProgressToServer();try { await GoogleCastRemoteMediaClient.instance.stop(); } catch (_) {}++_playbackState = CastPlaybackState.idle;_castingItemId = _castingEpisodeId = _castingTitle = _castingAuthor = _castingCoverUrl = null;_castingDuration = 0; _castingChapters = [];@@ -673,6 +698,7 @@ class ChromecastService extends ChangeNotifier {}// Clear casting state but keep connection+_syncTimer?.cancel();_castingItemId = _castingEpisodeId = _castingTitle = _castingAuthor = _castingCoverUrl = null;_castingDuration = 0;@@ -695,16 +721,10 @@ class ChromecastService extends ChangeNotifier {final ct = _castPosition.inMilliseconds / 1000.0;if (ct <= 0) return;try {- final sessionData = _castingEpisodeId != null- ? await _api!.startEpisodePlaybackSession(_castingItemId!, _castingEpisodeId!)- : await _api!.startPlaybackSession(_castingItemId!);- if (sessionData != null) {- final sid = sessionData['id'] as String?;- if (sid != null) {- await _api!.syncPlaybackSession(sid, currentTime: ct, duration: _castingDuration);- await _api!.closePlaybackSession(sid);- }- }+ final progressId = _castingEpisodeId != null+ ? '$_castingItemId-$_castingEpisodeId'+ : _castingItemId!;+ await _api!.updateProgress(progressId, currentTime: ct, duration: _castingDuration);} catch (e) {debugPrint('[Cast] Server sync error: $e');}diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dartindex 49901734..55855609 100644--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@ -693,16 +693,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClifinal castActive = ChromecastService().isCasting && !_buttonOrder.take(_visibleButtonCount).contains('cast');return GestureDetector(behavior: HitTestBehavior.opaque,- onTap: castActive- ? () => showModalBottomSheet(- context: context,- backgroundColor: Theme.of(context).bottomSheetTheme.backgroundColor,- shape: const RoundedRectangleBorder(- borderRadius: BorderRadius.vertical(top: Radius.circular(24)),- ),- builder: (_) => const CastControlSheet(),- )- : () => _showMoreMenu(context, accent, tt),+ onTap: () => _showMoreMenu(context, accent, tt),child: Container(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),decoration: BoxDecoration(diff --git a/lib/widgets/card_buttons.dart b/lib/widgets/card_buttons.dartindex 92ac81e8..91fbc9f7 100644--- a/lib/widgets/card_buttons.dart+++ b/lib/widgets/card_buttons.dart@@ -325,7 +325,7 @@ class CardSpeedButtonInline extends StatelessWidget {final fontSize = compact ? 10.0 : (large ? 15.0 : 13.0);final radius = compact ? 10.0 : (large ? 16.0 : 14.0);return ListenableBuilder(- listenable: cast,+ listenable: Listenable.merge([cast, player]),builder: (context, _) {final castNow = itemId != null && cast.isCasting && cast.castingItemId == itemId;final enabledNow = isActive || castNow;diff --git a/lib/widgets/chromecast_button.dart b/lib/widgets/chromecast_button.dartindex 7b6d5b94..f9c4d0c6 100644--- a/lib/widgets/chromecast_button.dart+++ b/lib/widgets/chromecast_button.dart@@ -35,8 +35,7 @@ void showCastDevicePicker(const SizedBox(height: 16),Text('Cast to Device', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: cs.onSurface)),const SizedBox(height: 16),- SizedBox(- height: 400,+ Flexible(child: StreamBuilder<List<GoogleCastDevice>>(stream: cast.devicesStream,builder: (_, snap) {diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dartindex fa4a254d..d073c96b 100644--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@ -774,16 +774,7 @@ class _ExpandedCardState extends State<ExpandedCard> {final castActive = ChromecastService().isCasting && !_buttonOrder.take(_visibleButtonCount).contains('cast');return GestureDetector(behavior: HitTestBehavior.opaque,- onTap: castActive- ? () => showModalBottomSheet(- context: context,- backgroundColor: Theme.of(context).bottomSheetTheme.backgroundColor,- shape: const RoundedRectangleBorder(- borderRadius: BorderRadius.vertical(top: Radius.circular(24)),- ),- builder: (_) => const CastControlSheet(),- )- : () => _showMoreMenu(context, accent, tt),+ onTap: () => _showMoreMenu(context, accent, tt),child: Container(padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),decoration: BoxDecoration(