更改播放音频方式

lib/features/item_viewer/view/library_item_actions.dart

@@ -12,17 +12,14 @@ import 'package:vaani/features/downloads/providers/download_manager.dart'
         downloadManagerProvider,
         isItemDownloadedProvider,
         isItemDownloadingProvider,
-        itemDownloadProgressProvider,
+        itemDownloadProgressProvider;
-        simpleDownloadManagerProvider;
 import 'package:vaani/features/item_viewer/view/library_item_page.dart';
-import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
-import 'package:vaani/features/player/providers/audiobook_player.dart';
 import 'package:vaani/features/player/providers/player_form.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
 import 'package:vaani/generated/l10n.dart';
 import 'package:vaani/globals.dart';
 import 'package:vaani/router/router.dart';
 import 'package:vaani/settings/api_settings_provider.dart';
-import 'package:vaani/settings/app_settings_provider.dart';
 import 'package:vaani/shared/extensions/model_conversions.dart';
 import 'package:vaani/shared/utils.dart';
 
@@ -302,7 +299,7 @@ class AlreadyItemDownloadedButton extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isBookPlaying = ref.watch(audiobookPlayerProvider).book != null;
+    final isBookPlaying = ref.watch(playStateProvider).playing;
 
     return IconButton(
       onPressed: () {
@@ -435,9 +432,14 @@ class _LibraryItemPlayButton extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final book = item.media.asBookExpanded;
-    final player = ref.watch(audiobookPlayerProvider);
+    final session = ref.watch(sessionProvider.select((v) => v.session));
-    final isCurrentBookSetInPlayer = player.book == book;
+    final sessionLoading =
-    final isPlayingThisBook = player.playing && isCurrentBookSetInPlayer;
+        ref.watch(sessionLoadingProvider(book.libraryItemId));
+    final playerState = ref.watch(playStateProvider);
+    // final player = ref.watch(audiobookPlayerProvider);
+    final isCurrentBookSetInPlayer =
+        session?.libraryItemId == book.libraryItemId;
+    final isPlayingThisBook = playerState.playing && isCurrentBookSetInPlayer;
 
     final userMediaProgress = item.userMediaProgress;
     final isBookCompleted = userMediaProgress?.isFinished ?? false;
@@ -464,14 +466,13 @@ class _LibraryItemPlayButton extends HookConsumerWidget {
     }
 
     return ElevatedButton.icon(
-      onPressed: () => libraryItemPlayButtonOnPressed(
+      onPressed: () => session?.libraryItemId == book.libraryItemId
-        ref: ref,
+          ? ref.read(sessionProvider).load(book.libraryItemId, null)
-        book: book,
+          : ref.read(playerProvider).togglePlayPause(),
-        userMediaProgress: userMediaProgress,
-      ),
       icon: Hero(
         tag: HeroTagPrefixes.libraryItemPlayButton + book.libraryItemId,
         child: DynamicItemPlayIcon(
+          isLoading: sessionLoading,
           isCurrentBookSetInPlayer: isCurrentBookSetInPlayer,
           isPlayingThisBook: isPlayingThisBook,
           isBookCompleted: isBookCompleted,
@@ -493,15 +494,25 @@ class DynamicItemPlayIcon extends StatelessWidget {
     required this.isCurrentBookSetInPlayer,
     required this.isPlayingThisBook,
     required this.isBookCompleted,
+    this.isLoading = false,
   });
 
   final bool isCurrentBookSetInPlayer;
   final bool isPlayingThisBook;
   final bool isBookCompleted;
+  final bool isLoading;
 
   @override
   Widget build(BuildContext context) {
-    return Icon(
+    return isLoading
+        ? SizedBox(
+            // width: 20,
+            // height: 20,
+            child: CircularProgressIndicator(
+              strokeWidth: 4,
+            ),
+          )
+        : Icon(
             isCurrentBookSetInPlayer
                 ? isPlayingThisBook
                     ? Icons.pause_rounded
@@ -512,68 +523,3 @@ class DynamicItemPlayIcon extends StatelessWidget {
           );
   }
 }
-
-/// Handles the play button pressed on the library item
-Future<void> libraryItemPlayButtonOnPressed({
-  required WidgetRef ref,
-  required shelfsdk.BookExpanded book,
-  shelfsdk.MediaProgress? userMediaProgress,
-}) async {
-  appLogger.info('Pressed play/resume button');
-  final player = ref.watch(audiobookPlayerProvider);
-  // final bookSettings = ref.watch(bookSettingsProvider(book.libraryItemId));
-
-  final isCurrentBookSetInPlayer = player.book == book;
-  final isPlayingThisBook = player.playing && isCurrentBookSetInPlayer;
-
-  Future<void>? setSourceFuture;
-  // set the book to the player if not already set
-  if (!isCurrentBookSetInPlayer) {
-    appLogger.info('Setting the book ${book.libraryItemId}');
-    appLogger.info('Initial position: ${userMediaProgress?.currentTime}');
-    final downloadManager = ref.watch(simpleDownloadManagerProvider);
-    final libItem =
-        await ref.read(libraryItemProvider(book.libraryItemId).future);
-    final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
-    setSourceFuture = player.setSourceAudiobook(
-      book,
-      initialPosition: userMediaProgress?.currentTime,
-      downloadedUris: downloadedUris,
-    );
-  } else {
-    appLogger.info('Book was already set');
-    if (isPlayingThisBook) {
-      appLogger.info('Pausing the book');
-      await player.pause();
-      return;
-    }
-  }
-  // set the volume as this is the first time playing and dismissing causes the volume to go to 0
-  var bookPlayerSettings =
-      ref.read(bookSettingsProvider(book.libraryItemId)).playerSettings;
-  var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
-
-  var configurePlayerForEveryBook =
-      appPlayerSettings.configurePlayerForEveryBook;
-
-  await Future.wait([
-    setSourceFuture ?? Future.value(),
-    // set the volume
-    player.setVolume(
-      configurePlayerForEveryBook
-          ? bookPlayerSettings.preferredDefaultVolume ??
-              appPlayerSettings.preferredDefaultVolume
-          : appPlayerSettings.preferredDefaultVolume,
-    ),
-    // set the speed
-    player.setSpeed(
-      configurePlayerForEveryBook
-          ? bookPlayerSettings.preferredDefaultSpeed ??
-              appPlayerSettings.preferredDefaultSpeed
-          : appPlayerSettings.preferredDefaultSpeed,
-    ),
-  ]);
-
-  // toggle play/pause
-  await player.play();
-}

lib/features/playback_reporting/core/playback_reporter_session.dart

@@ -0,0 +1,277 @@
+import 'dart:async';
+
+import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart';
+import 'package:vaani/features/player/core/audiobook_player.dart';
+import 'package:vaani/shared/extensions/obfuscation.dart';
+
+final _logger = Logger('PlaybackReporter');
+
+/// this playback reporter will watch the player and report to the server
+///
+/// it will by default report every 10 seconds
+/// and also report when the player is paused/stopped/finished/playing
+class PlaybackReporter {
+  /// The player to watch
+  final AudiobookPlayer player;
+
+  /// the api to report to
+  final AudiobookshelfApi authenticatedApi;
+
+  /// The stopwatch to keep track of the time since the last report
+  ///
+  /// this should only run when media is playing
+  final _stopwatch = Stopwatch();
+
+  /// subscriptions to listen and then cancel when disposing
+  final List<StreamSubscription> _subscriptions = [];
+
+  Duration _reportingInterval;
+
+  /// the duration to wait before reporting
+  Duration get reportingInterval => _reportingInterval;
+  set reportingInterval(Duration value) {
+    _reportingInterval = value;
+    _cancelReportTimer();
+    _setReportTimerIfNotAlready();
+    _logger.info('set interval: $value');
+  }
+
+  /// the minimum duration to report
+  final Duration reportingDurationThreshold;
+
+  /// the duration to wait before starting the reporting
+  /// this is to ignore the initial duration in case user is browsing
+  final Duration? minimumPositionForReporting;
+
+  /// the duration to mark the book as complete when the time left is less than this
+  final Duration markCompleteWhenTimeLeft;
+
+  /// timer to report every 10 seconds
+  /// tracking the time since the last report
+  Timer? _reportTimer;
+
+  PlaybackReporter(
+    this.player,
+    this.authenticatedApi, {
+    required PlaybackSession session,
+    this.reportingDurationThreshold = const Duration(seconds: 1),
+    Duration reportingInterval = const Duration(seconds: 10),
+    this.minimumPositionForReporting,
+    this.markCompleteWhenTimeLeft = const Duration(seconds: 5),
+  })  : _reportingInterval = reportingInterval,
+        _session = session {
+    // initial conditions
+    if (player.playing) {
+      _stopwatch.start();
+      _setReportTimerIfNotAlready();
+      _logger.fine('starting stopwatch');
+    } else {
+      _logger.fine('not starting stopwatch');
+    }
+
+    _subscriptions.add(
+      player.playerStateStream.listen((state) async {
+        // set timer if any book is playing and cancel if not
+        if (player.book != null) {
+          if (state.playing) {
+            _setReportTimerIfNotAlready();
+          } else {
+            _cancelReportTimer();
+          }
+        } else if (player.book == null && _reportTimer != null) {
+          _logger.info('book is null, closing session');
+          await closeSession();
+          _cancelReportTimer();
+        }
+
+        // start or stop the stopwatch based on the playing state
+        if (state.playing) {
+          _stopwatch.start();
+          _logger.fine(
+            'player state observed, starting stopwatch at ${_stopwatch.elapsed}',
+          );
+        } else if (!state.playing) {
+          _stopwatch.stop();
+          _logger.fine(
+            'player state observed, stopping stopwatch at ${_stopwatch.elapsed}',
+          );
+          await tryReportPlayback(null);
+        }
+      }),
+    );
+
+    _logger.fine(
+      'initialized with reportingInterval: $reportingInterval, reportingDurationThreshold: $reportingDurationThreshold',
+    );
+    _logger.fine(
+      'initialized with minimumPositionForReporting: $minimumPositionForReporting, markCompleteWhenTimeLeft: $markCompleteWhenTimeLeft',
+    );
+  }
+
+  Future<void> tryReportPlayback(_) async {
+    _logger.fine(
+      'callback called when elapsed ${_stopwatch.elapsed}',
+    );
+    if (player.book != null &&
+        player.positionInBook >=
+            player.book!.duration - markCompleteWhenTimeLeft) {
+      _logger.info(
+        'marking complete as time left is less than $markCompleteWhenTimeLeft',
+      );
+      await markComplete();
+      return;
+    }
+    if (_stopwatch.elapsed > reportingDurationThreshold) {
+      _logger.fine(
+        'reporting now with elapsed ${_stopwatch.elapsed} > threshold $reportingDurationThreshold',
+      );
+      await syncCurrentPosition();
+    }
+  }
+
+  /// dispose the timer
+  Future<void> dispose() async {
+    for (var sub in _subscriptions) {
+      sub.cancel();
+    }
+    await closeSession();
+    _stopwatch.stop();
+    _reportTimer?.cancel();
+
+    _logger.fine('disposed');
+  }
+
+  /// current sessionId
+  /// this is used to report the playback
+  PlaybackSession? _session;
+  String? get sessionId => _session?.id;
+
+  Future<void> markComplete() async {
+    if (player.book == null) {
+      throw NoAudiobookPlayingError();
+    }
+    await authenticatedApi.me.createUpdateMediaProgress(
+      libraryItemId: player.book!.libraryItemId,
+      parameters: CreateUpdateProgressReqParams(
+        isFinished: true,
+        currentTime: player.positionInBook,
+        duration: player.book!.duration,
+      ),
+      responseErrorHandler: _responseErrorHandler,
+    );
+    _logger.info('Marked complete for book: ${player.book!.libraryItemId}');
+  }
+
+  Future<void> syncCurrentPosition() async {
+    final data = _getSyncData();
+    if (data == null) {
+      await closeSession();
+    }
+
+    final currentPosition = player.positionInBook;
+
+    await authenticatedApi.sessions.syncOpen(
+      sessionId: sessionId!,
+      parameters: _getSyncData()!,
+      responseErrorHandler: _responseErrorHandler,
+    );
+
+    _logger.fine(
+      'Synced position: $currentPosition with timeListened: ${_stopwatch.elapsed} for session: $sessionId',
+    );
+
+    // reset the stopwatch
+    _stopwatch.reset();
+  }
+
+  Future<void> closeSession() async {
+    if (sessionId == null) {
+      _logger.warning('No session to close');
+      return;
+    }
+
+    await authenticatedApi.sessions.closeOpen(
+      sessionId: sessionId!,
+      parameters: _getSyncData(),
+      responseErrorHandler: _responseErrorHandler,
+    );
+    _session = null;
+    _logger.info('Closed session');
+  }
+
+  void _setReportTimerIfNotAlready() {
+    if (_reportTimer != null) return;
+    _reportTimer = Timer.periodic(_reportingInterval, tryReportPlayback);
+    _logger.fine('set timer with interval: $_reportingInterval');
+  }
+
+  void _cancelReportTimer() {
+    _reportTimer?.cancel();
+    _reportTimer = null;
+    _logger.fine('cancelled timer');
+  }
+
+  void _responseErrorHandler(http.Response response, [error]) {
+    if (response.statusCode != 200) {
+      _logger.severe('Error with api: ${response.obfuscate()}, $error');
+      throw PlaybackSyncError(
+        'Error syncing position: ${response.body}, $error',
+      );
+    }
+  }
+
+  SyncSessionReqParams? _getSyncData() {
+    if (player.book?.libraryItemId != _session?.libraryItemId) {
+      _logger.info(
+        'Book changed, not syncing position for session: $sessionId',
+      );
+      return null;
+    }
+
+    // if in the ignore duration, don't sync
+    if (minimumPositionForReporting != null &&
+        player.positionInBook < minimumPositionForReporting!) {
+      // but if elapsed time is more than the minimumPositionForReporting, sync
+      if (_stopwatch.elapsed > minimumPositionForReporting!) {
+        _logger.info(
+          'Syncing position despite being less than minimumPositionForReporting as elapsed time is more: ${_stopwatch.elapsed}',
+        );
+      } else {
+        _logger.info(
+          'Ignoring sync for position: ${player.positionInBook} < $minimumPositionForReporting',
+        );
+        return null;
+      }
+    }
+
+    return SyncSessionReqParams(
+      currentTime: player.positionInBook,
+      timeListened: _stopwatch.elapsed,
+      duration: player.book?.duration ?? Duration.zero,
+    );
+  }
+}
+
+class PlaybackSyncError implements Exception {
+  String message;
+
+  PlaybackSyncError([this.message = 'Error syncing playback']);
+
+  @override
+  String toString() {
+    return 'PlaybackSyncError: $message';
+  }
+}
+
+class NoAudiobookPlayingError implements Exception {
+  String message;
+
+  NoAudiobookPlayingError([this.message = 'No audiobook is playing']);
+
+  @override
+  String toString() {
+    return 'NoAudiobookPlayingError: $message';
+  }
+}

lib/features/player/core/audiobook_player.dart

@@ -5,7 +5,7 @@ library;
 
 import 'package:collection/collection.dart';
 import 'package:just_audio/just_audio.dart';
-import 'package:just_audio_background/just_audio_background.dart';
+// import 'package:just_audio_background/just_audio_background.dart';
 import 'package:logging/logging.dart';
 import 'package:shelfsdk/audiobookshelf_api.dart';
 
@@ -124,19 +124,19 @@ class AudiobookPlayer extends AudioPlayer {
       // );
       return AudioSource.uri(
         retrievedUri,
-        tag: MediaItem(
+        // tag: MediaItem(
-          // Specify a unique ID for each media item:
+        //   // Specify a unique ID for each media item:
-          id: book.libraryItemId + track.index.toString(),
+        //   id: book.libraryItemId + track.index.toString(),
-          // Metadata to display in the notification:
+        //   // Metadata to display in the notification:
-          title: appSettings.notificationSettings.primaryTitle
+        //   title: appSettings.notificationSettings.primaryTitle
-              .formatNotificationTitle(book),
+        //       .formatNotificationTitle(book),
-          album: appSettings.notificationSettings.secondaryTitle
+        //   album: appSettings.notificationSettings.secondaryTitle
-              .formatNotificationTitle(book),
+        //       .formatNotificationTitle(book),
-          artUri: artworkUri ??
+        //   artUri: artworkUri ??
-              Uri.parse(
+        //       Uri.parse(
-                '$baseUrl/api/items/${book.libraryItemId}/cover?token=$token&width=800',
+        //         '$baseUrl/api/items/${book.libraryItemId}/cover?token=$token&width=800',
-              ),
+        //       ),
-        ),
+        // ),
       );
     }).toList();
     await setAudioSources(

lib/features/player/core/audiobook_player_session.dart

@@ -1,33 +1,30 @@
 // my_audio_handler.dart
+import 'dart:io';
+
 import 'package:audio_service/audio_service.dart';
 import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:shelfsdk/audiobookshelf_api.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
+import 'package:vaani/shared/extensions/chapter.dart';
 
 // add a small offset so the display does not show the previous chapter for a split second
 final offset = Duration(milliseconds: 10);
 
-class HookAudioHandler extends BaseAudioHandler {
+class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
   final AudioPlayer _player = AudioPlayer();
-  final List<AudioSource> _playlist = [];
+  // final List<AudioSource> _playlist = [];
   final Ref ref;
 
-  BookExpanded? _book;
+  PlaybackSessionExpanded? _session;
 
-  /// the authentication token to access the [AudioTrack.contentUrl]
+  AbsAudioHandler(this.ref) {
-  final String token;
-
-  /// the base url for the audio files
-  final Uri baseUrl;
-
-  HookAudioHandler(this.ref, {required this.token, required this.baseUrl}) {
     _setupAudioPlayer();
   }
 
   void _setupAudioPlayer() {
-    _player.setAudioSources(_playlist);
-
     // // 监听播放位置变化，更新全局位置
     // _player.positionStream.listen((position) {
     //   // _updateGlobalPosition(position);
@@ -42,49 +39,58 @@ class HookAudioHandler extends BaseAudioHandler {
 
     // 转发播放状态
     _player.playbackEventStream.map(_transformEvent).pipe(playbackState);
+    _player.playerStateStream.distinct().listen((event) {
+      ref.read(playStateProvider.notifier).setState(event);
+    });
   }
 
   // 加载有声书
   Future<void> setSourceAudiobook(
-    BookExpanded audiobook, {
+    PlaybackSessionExpanded playbackSession, {
-    Duration? initialPosition,
+    required Uri baseUrl,
+    required String token,
     List<Uri>? downloadedUris,
   }) async {
-    _book = audiobook;
+    _session = playbackSession;
-
-    // 清空现有播放列表
-    _playlist.clear();
 
     // 添加所有音轨
-    for (final track in audiobook.tracks) {
+    List<AudioSource> audioSources = [];
-      final audioSource = ProgressiveAudioSource(
+    for (final track in playbackSession.audioTracks) {
+      audioSources.add(
+        AudioSource.uri(
           _getUri(track, downloadedUris, baseUrl: baseUrl, token: token),
-        tag: MediaItem(
-          id: '${audiobook.libraryItemId}${track.index}',
-          title: track.title,
-          duration: track.duration,
         ),
       );
-      _playlist.add(audioSource);
     }
 
-    // 初始化队列显示
+    playMediaItem(
-    final mediaItems = audiobook.tracks
+      MediaItem(
-        .map(
+        id: playbackSession.libraryItemId,
-          (track) => MediaItem(
+        album: playbackSession.mediaMetadata.title,
-            id: '${audiobook.libraryItemId}${track.index}',
+        title: playbackSession.displayTitle,
-            title: track.title,
+        displaySubtitle: playbackSession.mediaType == MediaType.book
-            duration: track.duration,
+            ? (playbackSession.mediaMetadata as BookMetadata).subtitle
+            : null,
+        duration: playbackSession.duration,
+        artUri: Uri.parse(
+          '$baseUrl/api/items/${playbackSession.libraryItemId}/cover?token=$token',
         ),
-        )
+      ),
-        .toList();
+    );
-
+    final track = playbackSession.findTrackAtTime(playbackSession.currentTime);
-    queue.add(mediaItems);
+    final index = playbackSession.audioTracks.indexOf(track);
 
+    await _player.setAudioSources(
+      audioSources,
+      initialIndex: index,
+      initialPosition: playbackSession.currentTime - track.startOffset,
+    );
+    _player.seek(playbackSession.currentTime - track.startOffset, index: index);
+    await play();
     // 恢复上次播放位置（如果有）
-    if (initialPosition != null) {
+    // if (initialPosition != null) {
-      await seekToPosition(initialPosition);
+    //   await seekInBook(initialPosition);
-    }
+    // }
   }
 
   // // 音轨切换处理
@@ -97,19 +103,19 @@ class HookAudioHandler extends BaseAudioHandler {
 
   // 核心功能：跳转到指定章节
   Future<void> skipToChapter(int chapterId) async {
-    if (_book == null) return;
+    if (_session == null) return;
 
-    final chapter = _book!.chapters.firstWhere(
+    final chapter = _session!.chapters.firstWhere(
       (ch) => ch.id == chapterId,
       orElse: () => throw Exception('Chapter not found'),
     );
 
-    await seekToPosition(chapter.start + offset);
+    await seekInBook(chapter.start + offset);
   }
 
   Duration get positionInBook {
-    if (_book != null && _player.currentIndex != null) {
+    if (_session != null && _player.currentIndex != null) {
-      return _book!.tracks[_player.currentIndex!].startOffset +
+      return _session!.audioTracks[_player.currentIndex!].startOffset +
           _player.position;
     }
     return Duration.zero;
@@ -117,31 +123,61 @@ class HookAudioHandler extends BaseAudioHandler {
 
   // 当前音轨
   AudioTrack? get currentTrack {
-    if (_book == null) {
+    if (_session == null) {
       return null;
     }
-    return _book!.findTrackAtTime(positionInBook);
+    return _session!.findTrackAtTime(positionInBook);
   }
 
   // 当前章节
   BookChapter? get currentChapter {
-    if (_book == null) {
+    if (_session == null) {
       return null;
     }
-    return _book!.findChapterAtTime(positionInBook);
+    return _session!.findChapterAtTime(positionInBook);
+  }
+
+  Duration? get chapterDuration => currentChapter?.duration;
+  Stream<Duration> get positionStream => _player.positionStream;
+  Stream<Duration> get positionStreamInChapter {
+    return _player.positionStream.map((position) {
+      final currentIndex = _player.currentIndex;
+      if (_session == null || currentIndex == null) {
+        return Duration.zero;
+      }
+      final globalPosition =
+          position + _session!.audioTracks[currentIndex].startOffset;
+      final chapter = _session!.findChapterAtTime(globalPosition);
+      return globalPosition - chapter.start;
+    });
+  }
+
+  Future<void> togglePlayPause() {
+    // check if book is set
+    if (_session == null) {
+      return Future.value();
+    }
+
+    return switch (_player.playerState) {
+      PlayerState(playing: var isPlaying) => isPlaying ? pause() : play(),
+    };
   }
 
   // 播放控制方法
   @override
-  Future<void> play() => _player.play();
+  Future<void> play() async {
+    await _player.play();
+  }
 
   @override
-  Future<void> pause() => _player.pause();
+  Future<void> pause() async {
+    await _player.pause();
+  }
 
   // 重写上一曲/下一曲为章节导航
   @override
   Future<void> skipToNext() async {
-    if (_book == null) {
+    if (_session == null) {
       // 回退到默认行为
       return _player.seekToNext();
     }
@@ -150,17 +186,17 @@ class HookAudioHandler extends BaseAudioHandler {
       // 回退到默认行为
       return _player.seekToNext();
     }
-    final currentIndex = _book!.chapters.indexOf(chapter);
+    final chapterIndex = _session!.chapters.indexOf(chapter);
-    if (currentIndex < _book!.chapters.length - 1) {
+    if (chapterIndex < _session!.chapters.length - 1) {
       // 跳到下一章
-      final nextChapter = _book!.chapters[currentIndex + 1];
+      final nextChapter = _session!.chapters[chapterIndex + 1];
       await skipToChapter(nextChapter.id);
     }
   }
 
   @override
   Future<void> skipToPrevious() async {
-    if (_book == null) {
+    if (_session == null) {
       return _player.seekToPrevious();
     }
 
@@ -168,14 +204,14 @@ class HookAudioHandler extends BaseAudioHandler {
     if (chapter == null) {
       return _player.seekToPrevious();
     }
-    final currentIndex = _book!.chapters.indexOf(chapter);
+    final currentIndex = _session!.chapters.indexOf(chapter);
     if (currentIndex > 0) {
       // 跳到上一章
-      final prevChapter = _book!.chapters[currentIndex - 1];
+      final prevChapter = _session!.chapters[currentIndex - 1];
       await skipToChapter(prevChapter.id);
     } else {
       // 已经是第一章，回到开头
-      await seekToPosition(Duration.zero);
+      await seekInBook(Duration.zero);
     }
   }
 
@@ -188,15 +224,24 @@ class HookAudioHandler extends BaseAudioHandler {
     if (track != null) {
       startOffset = track.startOffset;
     }
-    await seekToPosition(startOffset + position);
+    await seekInBook(startOffset + position);
+  }
+
+  Future<void> setVolume(double volume) async {
+    await _player.setVolume(volume);
+  }
+
+  @override
+  Future<void> setSpeed(double speed) async {
+    await _player.setSpeed(speed);
   }
 
   // 核心功能：跳转到全局时间位置
-  Future<void> seekToPosition(Duration globalPosition) async {
+  Future<void> seekInBook(Duration globalPosition) async {
-    if (_book == null) return;
+    if (_session == null) return;
     // 找到目标音轨和在音轨内的位置
-    final track = _book!.findTrackAtTime(globalPosition);
+    final track = _session!.findTrackAtTime(globalPosition);
-    final index = _book!.tracks.indexOf(track);
+    final index = _session!.audioTracks.indexOf(track);
     Duration positionInTrack = globalPosition - track.startOffset;
     if (positionInTrack <= Duration.zero) {
       positionInTrack = offset;
@@ -205,13 +250,26 @@ class HookAudioHandler extends BaseAudioHandler {
     await _player.seek(positionInTrack, index: index);
   }
 
+  AudioPlayer get player => _player;
   PlaybackState _transformEvent(PlaybackEvent event) {
     return PlaybackState(
       controls: [
-        MediaControl.skipToPrevious,
+        if (kIsWeb || !Platform.isAndroid) MediaControl.skipToPrevious,
+        MediaControl.rewind,
         if (_player.playing) MediaControl.pause else MediaControl.play,
-        MediaControl.skipToNext,
+        MediaControl.stop,
+        MediaControl.fastForward,
+        if (kIsWeb || !Platform.isAndroid) MediaControl.skipToNext,
       ],
+      systemActions: {
+        if (kIsWeb || !Platform.isAndroid) MediaAction.skipToPrevious,
+        MediaAction.rewind,
+        MediaAction.fastForward,
+        MediaAction.stop,
+        MediaAction.setSpeed,
+        if (kIsWeb || !Platform.isAndroid) MediaAction.skipToNext,
+      },
+      androidCompactActionIndices: const [1, 2, 3],
       processingState: const {
             ProcessingState.idle: AudioProcessingState.idle,
             ProcessingState.loading: AudioProcessingState.loading,
@@ -225,6 +283,7 @@ class HookAudioHandler extends BaseAudioHandler {
       bufferedPosition: _player.bufferedPosition,
       speed: _player.speed,
       queueIndex: event.currentIndex,
+      captioningEnabled: false,
     );
   }
 }
@@ -246,7 +305,7 @@ Uri _getUri(
       Uri.parse('${baseUrl.toString()}${track.contentUrl}?token=$token');
 }
 
-extension BookExpandedExtension on BookExpanded {
+extension PlaybackSessionExpandedExtension on PlaybackSessionExpanded {
   BookChapter findChapterAtTime(Duration position) {
     return chapters.firstWhere(
       (element) {
@@ -257,16 +316,23 @@ extension BookExpandedExtension on BookExpanded {
   }
 
   AudioTrack findTrackAtTime(Duration position) {
-    return tracks.firstWhere(
+    return audioTracks.firstWhere(
       (element) {
         return element.startOffset <= position &&
             element.startOffset + element.duration >= position + offset;
       },
-      orElse: () => tracks.first,
+      orElse: () => audioTracks.first,
     );
   }
 
+  int findTrackIndexAtTime(Duration position) {
+    return audioTracks.indexWhere((element) {
+      return element.startOffset <= position &&
+          element.startOffset + element.duration >= position + offset;
+    });
+  }
+
   Duration getTrackStartOffset(int index) {
-    return tracks[index].startOffset;
+    return audioTracks[index].startOffset;
   }
 }

lib/features/player/core/init.dart

@@ -1,62 +1,62 @@
-import 'package:audio_service/audio_service.dart';
+// import 'package:audio_service/audio_service.dart';
-import 'package:audio_session/audio_session.dart';
+// import 'package:audio_session/audio_session.dart';
-import 'package:just_audio_background/just_audio_background.dart'
+// import 'package:just_audio_background/just_audio_background.dart'
-    show JustAudioBackground, NotificationConfig;
+//     show JustAudioBackground, NotificationConfig;
-import 'package:just_audio_media_kit/just_audio_media_kit.dart'
+// import 'package:just_audio_media_kit/just_audio_media_kit.dart'
-    show JustAudioMediaKit;
+//     show JustAudioMediaKit;
-import 'package:vaani/settings/app_settings_provider.dart';
+// import 'package:vaani/settings/app_settings_provider.dart';
-import 'package:vaani/settings/models/app_settings.dart';
+// import 'package:vaani/settings/models/app_settings.dart';
 
-Future<void> configurePlayer() async {
+// Future<void> configurePlayer() async {
-  // for playing audio on windows, linux
+//   // for playing audio on windows, linux
-  JustAudioMediaKit.ensureInitialized(windows: false);
+//   JustAudioMediaKit.ensureInitialized(windows: false);
 
-  // for configuring how this app will interact with other audio apps
+//   // for configuring how this app will interact with other audio apps
-  final session = await AudioSession.instance;
+//   final session = await AudioSession.instance;
-  await session.configure(const AudioSessionConfiguration.speech());
+//   await session.configure(const AudioSessionConfiguration.speech());
 
-  final appSettings = loadOrCreateAppSettings();
+//   final appSettings = loadOrCreateAppSettings();
 
-  // for playing audio in the background
+//   // for playing audio in the background
-  await JustAudioBackground.init(
+//   await JustAudioBackground.init(
-    androidNotificationChannelId: 'com.vaani.bg_demo.channel.audio',
+//     androidNotificationChannelId: 'com.vaani.bg_demo.channel.audio',
-    androidNotificationChannelName: 'Audio playback',
+//     androidNotificationChannelName: 'Audio playback',
-    androidNotificationOngoing: false,
+//     androidNotificationOngoing: false,
-    androidStopForegroundOnPause: false,
+//     androidStopForegroundOnPause: false,
-    androidNotificationChannelDescription: 'Audio playback in the background',
+//     androidNotificationChannelDescription: 'Audio playback in the background',
-    androidNotificationIcon: 'drawable/ic_stat_logo',
+//     androidNotificationIcon: 'drawable/ic_stat_logo',
-    rewindInterval: appSettings.notificationSettings.rewindInterval,
+//     rewindInterval: appSettings.notificationSettings.rewindInterval,
-    fastForwardInterval: appSettings.notificationSettings.fastForwardInterval,
+//     fastForwardInterval: appSettings.notificationSettings.fastForwardInterval,
-    androidShowNotificationBadge: false,
+//     androidShowNotificationBadge: false,
-    notificationConfigBuilder: (state) {
+//     notificationConfigBuilder: (state) {
-      final controls = [
+//       final controls = [
-        if (appSettings.notificationSettings.mediaControls
+//         if (appSettings.notificationSettings.mediaControls
-                .contains(NotificationMediaControl.skipToPreviousChapter) &&
+//                 .contains(NotificationMediaControl.skipToPreviousChapter) &&
-            state.hasPrevious)
+//             state.hasPrevious)
-          MediaControl.skipToPrevious,
+//           MediaControl.skipToPrevious,
-        if (appSettings.notificationSettings.mediaControls
+//         if (appSettings.notificationSettings.mediaControls
-            .contains(NotificationMediaControl.rewind))
+//             .contains(NotificationMediaControl.rewind))
-          MediaControl.rewind,
+//           MediaControl.rewind,
-        if (state.playing) MediaControl.pause else MediaControl.play,
+//         if (state.playing) MediaControl.pause else MediaControl.play,
-        if (appSettings.notificationSettings.mediaControls
+//         if (appSettings.notificationSettings.mediaControls
-            .contains(NotificationMediaControl.fastForward))
+//             .contains(NotificationMediaControl.fastForward))
-          MediaControl.fastForward,
+//           MediaControl.fastForward,
-        if (appSettings.notificationSettings.mediaControls
+//         if (appSettings.notificationSettings.mediaControls
-                .contains(NotificationMediaControl.skipToNextChapter) &&
+//                 .contains(NotificationMediaControl.skipToNextChapter) &&
-            state.hasNext)
+//             state.hasNext)
-          MediaControl.skipToNext,
+//           MediaControl.skipToNext,
-        if (appSettings.notificationSettings.mediaControls
+//         if (appSettings.notificationSettings.mediaControls
-            .contains(NotificationMediaControl.stop))
+//             .contains(NotificationMediaControl.stop))
-          MediaControl.stop,
+//           MediaControl.stop,
-      ];
+//       ];
-      return NotificationConfig(
+//       return NotificationConfig(
-        controls: controls,
+//         controls: controls,
-        systemActions: const {
+//         systemActions: const {
-          MediaAction.seek,
+//           MediaAction.seek,
-          MediaAction.seekForward,
+//           MediaAction.seekForward,
-          MediaAction.seekBackward,
+//           MediaAction.seekBackward,
-        },
+//         },
-      );
+//       );
-    },
+//     },
-  );
+//   );
-}
+// }

lib/features/player/providers/audiobook_player.dart

@@ -1,6 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk;
 import 'package:vaani/api/api_provider.dart';
 import 'package:vaani/features/player/core/audiobook_player.dart' as core;
 
@@ -38,9 +39,9 @@ class AudiobookPlayer extends _$AudiobookPlayer {
     ref.onDispose(player.dispose);
 
     // bind notify listeners to the player
-    player.playerStateStream.listen((_) {
+    // player.playerStateStream.listen((_) {
-      ref.notifyListeners();
+    //   ref.notifyListeners();
-    });
+    // });
 
     _logger.finer('created player');
 
@@ -51,6 +52,13 @@ class AudiobookPlayer extends _$AudiobookPlayer {
     await state.setSpeed(speed);
     ref.notifyListeners();
   }
+
+  Future<void> setSourceAudiobook({
+    required shelfsdk.BookExpanded book,
+    shelfsdk.MediaProgress? userMediaProgress,
+  }) async {
+    ref.notifyListeners();
+  }
 }
 
 @riverpod

lib/features/player/providers/audiobook_player.g.dart

@@ -43,7 +43,7 @@ final simpleAudiobookPlayerProvider =
 );
 
 typedef _$SimpleAudiobookPlayer = Notifier<core.AudiobookPlayer>;
-String _$audiobookPlayerHash() => r'0f180308067486896fec6a65a6afb0e6686ac4a0';
+String _$audiobookPlayerHash() => r'04448247e79c5d60b9fd6f98eeeb865f1e8d0ff8';
 
 /// See also [AudiobookPlayer].
 @ProviderFor(AudiobookPlayer)

lib/features/player/providers/currently_playing_provider.dart

@@ -12,8 +12,8 @@ final _logger = Logger('CurrentlyPlayingProvider');
 @riverpod
 BookExpanded? currentlyPlayingBook(Ref ref) {
   try {
-    final player = ref.watch(audiobookPlayerProvider);
+    final book = ref.watch(simpleAudiobookPlayerProvider.select((v) => v.book));
-    return player.book;
+    return book;
   } catch (e) {
     _logger.warning('Error getting currently playing book: $e');
     return null;

lib/features/player/providers/currently_playing_provider.g.dart

@@ -7,7 +7,7 @@ part of 'currently_playing_provider.dart';
 // **************************************************************************
 
 String _$currentlyPlayingBookHash() =>
-    r'e4258694c8f0d1e89651b330fae0f672ca13a484';
+    r'f2c47028340d253be9440dc29f835328ff30c0e6';
 
 /// See also [currentlyPlayingBook].
 @ProviderFor(currentlyPlayingBook)

lib/features/player/providers/session_provider.dart

@@ -0,0 +1,216 @@
+import 'package:audio_service/audio_service.dart';
+import 'package:http/http.dart' as http;
+import 'package:just_audio/just_audio.dart';
+import 'package:just_audio_media_kit/just_audio_media_kit.dart';
+import 'package:riverpod/riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:shelfsdk/audiobookshelf_api.dart' as core;
+import 'package:vaani/api/api_provider.dart';
+import 'package:vaani/api/library_item_provider.dart';
+import 'package:vaani/features/downloads/providers/download_manager.dart';
+import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
+import 'package:vaani/features/player/core/audiobook_player_session.dart';
+import 'package:vaani/globals.dart';
+import 'package:vaani/settings/app_settings_provider.dart';
+import 'package:vaani/shared/extensions/obfuscation.dart';
+
+part 'session_provider.g.dart';
+
+class SessionPlayer {
+  late final AbsAudioHandler _audioService;
+  core.PlaybackSessionExpanded? _session;
+  Ref ref;
+  SessionPlayer(this.ref);
+  void setAudioService(AbsAudioHandler audioPlayer) {
+    _audioService = audioPlayer;
+  }
+
+  Future<void> load(String id, String? episodeId) async {
+    ref.read(sessionLoadingProvider(id).notifier).setLoading();
+    final api = ref.read(authenticatedApiProvider);
+    final playBack = await api.items.play(
+      libraryItemId: id,
+      parameters: core.PlayItemReqParams(
+        deviceInfo: core.DeviceInfoReqParams(
+          clientVersion: appVersion,
+          manufacturer: deviceManufacturer,
+          model: deviceModel,
+          sdkVersion: deviceSdkVersion,
+          clientName: appName,
+          deviceName: deviceName,
+        ),
+        forceDirectPlay: false,
+        forceTranscode: false,
+        supportedMimeTypes: [
+          "audio/flac",
+          "audio/mpeg",
+          "audio/mp4",
+          "audio/ogg",
+          "audio/aac",
+          "audio/webm",
+        ],
+      ),
+      responseErrorHandler: _responseErrorHandler,
+    ) as core.PlaybackSessionExpanded;
+
+    final downloadManager = ref.read(simpleDownloadManagerProvider);
+    final libItem =
+        await ref.read(libraryItemProvider(playBack.libraryItemId).future);
+    final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
+
+    var bookPlayerSettings =
+        ref.read(bookSettingsProvider(playBack.libraryItemId)).playerSettings;
+    var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
+
+    var configurePlayerForEveryBook =
+        appPlayerSettings.configurePlayerForEveryBook;
+
+    await Future.wait([
+      _audioService.setSourceAudiobook(
+        playBack,
+        baseUrl: api.baseUrl,
+        token: api.token!,
+        downloadedUris: downloadedUris,
+      ),
+      // set the volume
+      _audioService.setVolume(
+        configurePlayerForEveryBook
+            ? bookPlayerSettings.preferredDefaultVolume ??
+                appPlayerSettings.preferredDefaultVolume
+            : appPlayerSettings.preferredDefaultVolume,
+      ),
+      // set the speed
+      _audioService.setSpeed(
+        configurePlayerForEveryBook
+            ? bookPlayerSettings.preferredDefaultSpeed ??
+                appPlayerSettings.preferredDefaultSpeed
+            : appPlayerSettings.preferredDefaultSpeed,
+      ),
+    ]);
+    _session = playBack;
+    ref.read(sessionLoadingProvider(id).notifier).setLoaded();
+    ref.notifyListeners();
+  }
+
+  AbsAudioHandler get audioService => _audioService;
+  core.PlaybackSession? get session => _session;
+
+  void _responseErrorHandler(http.Response response, [error]) {
+    if (response.statusCode != 200) {
+      appLogger.severe('Error with api: ${response.obfuscate()}, $error');
+      throw PlaybackSyncError(
+        'Error syncing position: ${response.body}, $error',
+      );
+    }
+  }
+}
+
+@Riverpod(keepAlive: true)
+class Player extends _$Player {
+  @override
+  AbsAudioHandler build() {
+    final audioService = ref.watch(sessionProvider).audioService;
+    // audioService.positionStream.listen((position){
+
+    // });
+    return audioService;
+  }
+
+  Future<void> togglePlayPause() => state.togglePlayPause();
+  Future<void> play() => state.play();
+  Future<void> pause() => state.pause();
+  Future<void> seekInBook(Duration globalPosition) =>
+      state.seekInBook(globalPosition);
+}
+
+@Riverpod(keepAlive: true)
+SessionPlayer session(Ref ref) {
+  return SessionPlayer(ref);
+}
+
+@Riverpod(keepAlive: true)
+class SessionLoading extends _$SessionLoading {
+  @override
+  bool build(String itemId) {
+    return false;
+  }
+
+  setLoading() {
+    state = true;
+  }
+
+  setLoaded() {
+    state = false;
+  }
+}
+
+@Riverpod(keepAlive: true)
+class PlayState extends _$PlayState {
+  @override
+  PlayerState build() {
+    return PlayerState(false, ProcessingState.idle);
+  }
+
+  void setState(PlayerState playerState) {
+    state = playerState;
+  }
+}
+
+@riverpod
+core.BookChapter? currentChapter(Ref ref) {
+  return ref.watch(playerProvider.select((v) => v.currentChapter));
+}
+
+@Riverpod(keepAlive: true)
+Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
+  // JustAudioMediaKit.ensureInitialized(windows: false);
+  JustAudioMediaKit.ensureInitialized();
+  final audioService = await AudioService.init(
+    builder: () => AbsAudioHandler(ref),
+    config: const AudioServiceConfig(
+      androidNotificationChannelId: 'com.vaani.rang.channel.audio',
+      androidNotificationChannelName: 'ABSPlayback',
+      androidNotificationChannelDescription:
+          'Needed to control audio from lock screen',
+      androidNotificationOngoing: false,
+      androidStopForegroundOnPause: false,
+      androidNotificationIcon: 'drawable/ic_stat_logo',
+      preloadArtwork: true,
+    ),
+  );
+  ref.read(sessionProvider).setAudioService(audioService);
+  return audioService;
+}
+
+// @Riverpod(keepAlive: true)
+// class PlaybackReporter extends _$PlaybackReporter {
+//   @override
+//   Future<core.PlaybackReporter> build() async {
+//     final playerSettings = ref.watch(appSettingsProvider).playerSettings;
+//     final player = ref.watch(playerProvider);
+//     final session = ref.watch(sessionProvider.select((v) => v.session));
+//     final api = ref.watch(authenticatedApiProvider);
+
+//     final reporter = core.PlaybackReporter(
+//       player.player,
+//       api,
+//       reportingInterval: playerSettings.playbackReportInterval,
+//       markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
+//       minimumPositionForReporting: playerSettings.minimumPositionForReporting,
+//       session: session,
+//     );
+//     ref.onDispose(reporter.dispose);
+//     return reporter;
+//   }
+// }
+
+class PlaybackSyncError implements Exception {
+  String message;
+
+  PlaybackSyncError([this.message = 'Error syncing playback']);
+
+  @override
+  String toString() {
+    return 'PlaybackSyncError: $message';
+  }
+}

lib/features/player/providers/session_provider.g.dart

@@ -0,0 +1,253 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'session_provider.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$sessionHash() => r'ae97659a7772abaa3c97644f39af6b3f05c75faf';
+
+/// See also [session].
+@ProviderFor(session)
+final sessionProvider = Provider<SessionPlayer>.internal(
+  session,
+  name: r'sessionProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$sessionHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef SessionRef = ProviderRef<SessionPlayer>;
+String _$currentChapterHash() => r'a2f43d62f77ce48e6ca34c89700443f67dbd78fe';
+
+/// See also [currentChapter].
+@ProviderFor(currentChapter)
+final currentChapterProvider = AutoDisposeProvider<core.BookChapter?>.internal(
+  currentChapter,
+  name: r'currentChapterProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$currentChapterHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef CurrentChapterRef = AutoDisposeProviderRef<core.BookChapter?>;
+String _$audioHandlerInitHash() => r'64bc78439049068ec6de6e19af657d410bde9581';
+
+/// See also [audioHandlerInit].
+@ProviderFor(audioHandlerInit)
+final audioHandlerInitProvider = FutureProvider<AbsAudioHandler>.internal(
+  audioHandlerInit,
+  name: r'audioHandlerInitProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$audioHandlerInitHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef AudioHandlerInitRef = FutureProviderRef<AbsAudioHandler>;
+String _$playerHash() => r'41cc626fd4a3317ce7e1ffa3c5e03206a9819231';
+
+/// See also [Player].
+@ProviderFor(Player)
+final playerProvider = NotifierProvider<Player, AbsAudioHandler>.internal(
+  Player.new,
+  name: r'playerProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$playerHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$Player = Notifier<AbsAudioHandler>;
+String _$sessionLoadingHash() => r'4688469dd8ac9f38063917ede032cfe1506a63a8';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$SessionLoading extends BuildlessNotifier<bool> {
+  late final String itemId;
+
+  bool build(
+    String itemId,
+  );
+}
+
+/// See also [SessionLoading].
+@ProviderFor(SessionLoading)
+const sessionLoadingProvider = SessionLoadingFamily();
+
+/// See also [SessionLoading].
+class SessionLoadingFamily extends Family<bool> {
+  /// See also [SessionLoading].
+  const SessionLoadingFamily();
+
+  /// See also [SessionLoading].
+  SessionLoadingProvider call(
+    String itemId,
+  ) {
+    return SessionLoadingProvider(
+      itemId,
+    );
+  }
+
+  @override
+  SessionLoadingProvider getProviderOverride(
+    covariant SessionLoadingProvider provider,
+  ) {
+    return call(
+      provider.itemId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'sessionLoadingProvider';
+}
+
+/// See also [SessionLoading].
+class SessionLoadingProvider
+    extends NotifierProviderImpl<SessionLoading, bool> {
+  /// See also [SessionLoading].
+  SessionLoadingProvider(
+    String itemId,
+  ) : this._internal(
+          () => SessionLoading()..itemId = itemId,
+          from: sessionLoadingProvider,
+          name: r'sessionLoadingProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$sessionLoadingHash,
+          dependencies: SessionLoadingFamily._dependencies,
+          allTransitiveDependencies:
+              SessionLoadingFamily._allTransitiveDependencies,
+          itemId: itemId,
+        );
+
+  SessionLoadingProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.itemId,
+  }) : super.internal();
+
+  final String itemId;
+
+  @override
+  bool runNotifierBuild(
+    covariant SessionLoading notifier,
+  ) {
+    return notifier.build(
+      itemId,
+    );
+  }
+
+  @override
+  Override overrideWith(SessionLoading Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: SessionLoadingProvider._internal(
+        () => create()..itemId = itemId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        itemId: itemId,
+      ),
+    );
+  }
+
+  @override
+  NotifierProviderElement<SessionLoading, bool> createElement() {
+    return _SessionLoadingProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SessionLoadingProvider && other.itemId == itemId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, itemId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SessionLoadingRef on NotifierProviderRef<bool> {
+  /// The parameter `itemId` of this provider.
+  String get itemId;
+}
+
+class _SessionLoadingProviderElement
+    extends NotifierProviderElement<SessionLoading, bool>
+    with SessionLoadingRef {
+  _SessionLoadingProviderElement(super.provider);
+
+  @override
+  String get itemId => (origin as SessionLoadingProvider).itemId;
+}
+
+String _$playStateHash() => r'5256c4154c4254e406593035bc54d917a9a059bf';
+
+/// See also [PlayState].
+@ProviderFor(PlayState)
+final playStateProvider = NotifierProvider<PlayState, PlayerState>.internal(
+  PlayState.new,
+  name: r'playStateProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$playStateHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$PlayState = Notifier<PlayerState>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/features/player/view/player_expanded.dart

@@ -3,10 +3,8 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:vaani/api/image_provider.dart';
-import 'package:vaani/api/library_item_provider.dart';
 import 'package:vaani/constants/sizes.dart';
-import 'package:vaani/features/player/providers/currently_playing_provider.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
 import 'package:vaani/features/player/view/widgets/player_player_pause_button.dart';
 import 'package:vaani/features/player/view/widgets/player_progress_bar.dart';
 import 'package:vaani/features/skip_start_end/player_skip_chapter_start_end.dart';
@@ -28,32 +26,20 @@ class PlayerExpanded extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final session = ref.watch(sessionProvider).session;
+    if (session == null) {
+      return SizedBox.shrink();
+    }
+
     /// all the properties that help in building the widget are calculated from the [percentageExpandedPlayer]
     /// however, some properties need to start later than 0% and end before 100%
-    final currentBook = ref.watch(currentlyPlayingBookProvider);
+    final currentChapter = ref.watch(currentChapterProvider);
-    if (currentBook == null) {
+    // final currentBookMetadata = ref.watch(currentBookMetadataProvider);
-      return const SizedBox.shrink();
-    }
-    final currentChapter = ref.watch(currentPlayingChapterProvider);
-    final currentBookMetadata = ref.watch(currentBookMetadataProvider);
     // max height of the player is the height of the screen
     final playerMaxHeight = MediaQuery.of(context).size.height;
     final availWidth = MediaQuery.of(context).size.width;
     // the image width when the player is expanded
     final imageSize = min(playerMaxHeight * 0.5, availWidth * 0.9);
-    final itemBeingPlayed =
-        ref.watch(libraryItemProvider(currentBook.libraryItemId));
-    final imageOfItemBeingPlayed = itemBeingPlayed.valueOrNull != null
-        ? ref.watch(
-            coverImageProvider(itemBeingPlayed.valueOrNull!.id),
-          )
-        : null;
-    final imgWidget = imageOfItemBeingPlayed?.valueOrNull != null
-        ? Image.memory(
-            imageOfItemBeingPlayed!.valueOrNull!,
-            fit: BoxFit.cover,
-          )
-        : const BookCoverSkeleton();
     return Scaffold(
       appBar: AppBar(
         leading: IconButton(
@@ -104,7 +90,7 @@ class PlayerExpanded extends HookConsumerWidget {
                       borderRadius: BorderRadius.circular(
                         AppElementSizes.borderRadiusRegular,
                       ),
-                      child: imgWidget,
+                      child: BookCoverWidget(),
                     ),
                   ),
                 ),
@@ -133,8 +119,8 @@ class PlayerExpanded extends HookConsumerWidget {
               padding: EdgeInsets.only(bottom: AppElementSizes.paddingRegular),
               child: Text(
                 [
-                  currentBookMetadata?.title ?? '',
+                  session.displayTitle,
-                  currentBookMetadata?.authorName ?? '',
+                  session.displayAuthor,
                 ].join(' - '),
                 style: Theme.of(context).textTheme.titleMedium?.copyWith(
                       color: Theme.of(context)

lib/features/player/view/player_minimized.dart

@@ -1,13 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:vaani/api/image_provider.dart';
-import 'package:vaani/api/library_item_provider.dart';
 import 'package:vaani/constants/sizes.dart';
-import 'package:vaani/features/player/providers/audiobook_player.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
-import 'package:vaani/features/player/providers/currently_playing_provider.dart';
 import 'package:vaani/features/player/view/widgets/player_player_pause_button.dart';
 import 'package:vaani/router/router.dart';
 import 'package:vaani/shared/widgets/shelves/book_shelf.dart';
@@ -20,25 +16,11 @@ class PlayerMinimized extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final currentBook = ref.watch(currentlyPlayingBookProvider);
+    final session = ref.watch(sessionProvider).session;
-    if (currentBook == null) {
+    if (session == null) {
-      return const SizedBox.shrink();
+      return SizedBox.shrink();
     }
-    final itemBeingPlayed =
+    final currentChapter = ref.watch(currentChapterProvider);
-        ref.watch(libraryItemProvider(currentBook.libraryItemId));
-    final imageOfItemBeingPlayed = itemBeingPlayed.valueOrNull != null
-        ? ref.watch(
-            coverImageProvider(itemBeingPlayed.valueOrNull!.id),
-          )
-        : null;
-    final imgWidget = imageOfItemBeingPlayed?.valueOrNull != null
-        ? Image.memory(
-            imageOfItemBeingPlayed!.valueOrNull!,
-            fit: BoxFit.cover,
-          )
-        : const BookCoverSkeleton();
-    final bookMetaExpanded = ref.watch(currentBookMetadataProvider);
-    final currentChapter = ref.watch(currentPlayingChapterProvider);
 
     return PlayerMinimizedFramework(
       children: [
@@ -51,7 +33,7 @@ class PlayerMinimized extends HookConsumerWidget {
               context.pushNamed(
                 Routes.libraryItem.name,
                 pathParameters: {
-                  Routes.libraryItem.pathParamName!: currentBook.libraryItemId,
+                  Routes.libraryItem.pathParamName!: session.libraryItemId,
                 },
               );
             },
@@ -59,7 +41,7 @@ class PlayerMinimized extends HookConsumerWidget {
               constraints: BoxConstraints(
                 maxWidth: playerMinimizedHeight,
               ),
-              child: imgWidget,
+              child: BookCoverWidget(),
             ),
           ),
         ),
@@ -76,14 +58,14 @@ class PlayerMinimized extends HookConsumerWidget {
               children: [
                 // AutoScrollText(
                 Text(
-                  '${bookMetaExpanded?.title ?? ''} - ${currentChapter?.title ?? ''}',
+                  '${session.displayTitle} - ${currentChapter?.title ?? ''}',
                   maxLines: 1, overflow: TextOverflow.ellipsis,
                   // velocity:
                   //     const Velocity(pixelsPerSecond: Offset(16, 0)),
                   style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
-                  bookMetaExpanded?.authorName ?? '',
+                  session.displayAuthor,
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                   style: Theme.of(context).textTheme.bodyMedium!.copyWith(
@@ -127,9 +109,9 @@ class PlayerMinimizedFramework extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final player = ref.watch(audiobookPlayerProvider);
+    final player = ref.watch(playerProvider);
     final progress =
-        useStream(player.positionStream, initialData: Duration.zero);
+        useStream(player.positionStreamInChapter, initialData: Duration.zero);
     return GestureDetector(
       onTap: () => context.pushNamed(Routes.player.name),
       child: Container(
@@ -147,7 +129,7 @@ class PlayerMinimizedFramework extends HookConsumerWidget {
                 // value: (progress.data ?? Duration.zero).inSeconds /
                 //     player.book!.duration.inSeconds,
                 value: (progress.data ?? Duration.zero).inSeconds /
-                    (player.duration?.inSeconds ?? 1),
+                    (player.chapterDuration?.inSeconds ?? 1),
                 color: Theme.of(context).colorScheme.onPrimaryContainer,
                 backgroundColor: Theme.of(context).colorScheme.primaryContainer,
               ),

lib/features/player/view/widgets/player_player_pause_button.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:vaani/constants/sizes.dart';
-import 'package:vaani/features/player/providers/audiobook_player.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
 
 class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
   const AudiobookPlayerPlayPauseButton({
@@ -15,18 +14,18 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
   final double iconSize;
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final player = ref.watch(audiobookPlayerProvider);
+    final playState = ref.watch(playStateProvider);
-    final playing = ref.watch(isPlayerPlayingProvider);
+    final player = ref.read(playerProvider.notifier);
     final playPauseController = useAnimationController(
       duration: const Duration(milliseconds: 200),
       initialValue: 1,
     );
-    if (playing) {
+    if (playState.playing) {
       playPauseController.forward();
     } else {
       playPauseController.reverse();
     }
-    return switch (player.processingState) {
+    return switch (playState.processingState) {
       ProcessingState.loading || ProcessingState.buffering => const Padding(
           padding: EdgeInsets.all(AppElementSizes.paddingRegular),
           child: CircularProgressIndicator(),

lib/framework.dart

@@ -0,0 +1,156 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:tray_manager/tray_manager.dart';
+import 'package:vaani/features/downloads/providers/download_manager.dart';
+import 'package:vaani/features/playback_reporting/providers/playback_reporter_provider.dart';
+import 'package:vaani/features/player/core/audiobook_player_session.dart';
+import 'package:vaani/features/player/providers/audiobook_player.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
+import 'package:vaani/features/shake_detection/providers/shake_detector.dart';
+import 'package:vaani/features/skip_start_end/skip_start_end_provider.dart';
+import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart';
+import 'package:vaani/globals.dart';
+import 'package:vaani/shared/utils/utils.dart';
+import 'package:window_manager/window_manager.dart';
+
+class Framework extends ConsumerStatefulWidget {
+  final Widget child;
+  final AbsAudioHandler? audioHandler;
+  const Framework({required this.child, this.audioHandler, super.key});
+
+  @override
+  ConsumerState<Framework> createState() => _FrameworkState();
+}
+
+class _FrameworkState extends ConsumerState<Framework>
+    with TrayListener, WindowListener {
+  @override
+  void initState() {
+    if (Utils.isDesktop()) {
+      windowManager.addListener(this);
+      _init();
+    }
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    trayManager.removeListener(this);
+    super.dispose();
+  }
+
+  void _init() async {
+    await trayManager.setIcon(
+      Utils.isWindows() ? 'assets/icon/logo.ico' : 'assets/icon/logo.png',
+    );
+    await trayManager.setToolTip(appName);
+    Menu menu = Menu(
+      items: [
+        MenuItem(
+          key: 'show_window',
+          // label: 'Show Window',
+          label: '显示主窗口',
+          onClick: (menuItem) => windowManager.show(),
+        ),
+        MenuItem.separator(),
+        MenuItem(
+          key: 'play_pause',
+          label: '播放/暂停',
+          onClick: (menuItem) =>
+              ref.read(audiobookPlayerProvider).togglePlayPause(),
+        ),
+        MenuItem(
+          key: 'previous',
+          label: '上一个',
+          onClick: (menuItem) =>
+              ref.read(audiobookPlayerProvider).seekToPrevious(),
+        ),
+        MenuItem(
+          key: 'next',
+          label: '下一个',
+          onClick: (menuItem) => ref.read(audiobookPlayerProvider).seekToNext(),
+        ),
+        MenuItem.separator(),
+        MenuItem(
+          key: 'exit_app',
+          // label: 'Exit App',
+          label: '退出',
+          onClick: (menuItem) => windowManager.destroy(),
+        ),
+      ],
+    );
+    await trayManager.setContextMenu(menu);
+    trayManager.addListener(this);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Eagerly initialize providers by watching them.
+    // By using "watch", the provider will stay alive and not be disposed.
+    final audioService = ref.watch(audioHandlerInitProvider);
+    try {
+      // ref.watch(simpleAudiobookPlayerProvider);
+      // ref.watch(sleepTimerProvider);
+      // ref.watch(playbackReporterProvider);
+      // ref.watch(simpleDownloadManagerProvider);
+      // ref.watch(shakeDetectorProvider);
+      // ref.watch(skipStartEndProvider);
+    } catch (e) {
+      debugPrintStack(stackTrace: StackTrace.current, label: e.toString());
+      appLogger.severe(e.toString());
+    }
+    return audioService.maybeWhen(
+      data: (_) {
+        return widget.child;
+      },
+      orElse: () => SizedBox.shrink(),
+    );
+  }
+
+  @override
+  void onTrayIconMouseDown() {
+    // do something, for example pop up the menu
+    // print('onTrayIconMouseDown');
+    windowManager.show();
+  }
+
+  @override
+  void onTrayIconMouseUp() {
+    // do something, for example pop up the menu
+    // print('onTrayIconMouseUp');
+  }
+
+  @override
+  void onTrayIconRightMouseDown() {
+    // do something
+    // print('onTrayIconRightMouseDown');
+    trayManager.popUpContextMenu(bringAppToFront: true);
+  }
+
+  @override
+  void onTrayIconRightMouseUp() {
+    // do something
+    // print('onTrayIconRightMouseUp');
+  }
+
+  // @override
+  // void onTrayMenuItemClick(MenuItem menuItem) {
+  //   print(menuItem.key);
+  //   if (menuItem.key == 'show_window') {
+  //     // do something
+  //   } else if (menuItem.key == 'exit_app') {
+  //     // do something
+
+  //   } else if (menuItem.key == 'play_pause'){
+
+  //   }
+  // }
+
+  @override
+  void onWindowClose() async {
+    final isPreventClose = await windowManager.isPreventClose();
+    if (isPreventClose) {
+      windowManager.hide();
+    }
+  }
+}

lib/generated/intl/messages_en.dart

@@ -54,10 +54,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "accountDeleteServer": MessageLookupByLibrary.simpleMessage(
       "Delete Server",
     ),
-        "accountInvalidURL":
+    "accountInvalidURL": MessageLookupByLibrary.simpleMessage("Invalid URL"),
-            MessageLookupByLibrary.simpleMessage("Invalid URL"),
+    "accountManage": MessageLookupByLibrary.simpleMessage("Manage Accounts"),
-        "accountManage":
-            MessageLookupByLibrary.simpleMessage("Manage Accounts"),
     "accountRegisteredServers": MessageLookupByLibrary.simpleMessage(
       "Registered Servers",
     ),
@@ -96,8 +94,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "autoTurnOnTimerAlways": MessageLookupByLibrary.simpleMessage(
       "Always Auto Turn On Timer",
     ),
-        "autoTurnOnTimerAlwaysDescription":
+    "autoTurnOnTimerAlwaysDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Always turn on the sleep timer, no matter what",
     ),
     "autoTurnOnTimerDescription": MessageLookupByLibrary.simpleMessage(
@@ -125,11 +122,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "bookAuthors": MessageLookupByLibrary.simpleMessage("Authors"),
     "bookDownloads": MessageLookupByLibrary.simpleMessage("Downloads"),
     "bookGenres": MessageLookupByLibrary.simpleMessage("Genres"),
-        "bookMetadataAbridged":
+    "bookMetadataAbridged": MessageLookupByLibrary.simpleMessage("Abridged"),
-            MessageLookupByLibrary.simpleMessage("Abridged"),
     "bookMetadataLength": MessageLookupByLibrary.simpleMessage("Length"),
-        "bookMetadataPublished":
+    "bookMetadataPublished": MessageLookupByLibrary.simpleMessage("Published"),
-            MessageLookupByLibrary.simpleMessage("Published"),
     "bookMetadataUnabridged": MessageLookupByLibrary.simpleMessage(
       "Unabridged",
     ),
@@ -171,13 +166,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "homeBookContinueSeries": MessageLookupByLibrary.simpleMessage(
       "Continue Series",
     ),
-        "homeBookContinueSeriesDescription":
+    "homeBookContinueSeriesDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Show play button for books in continue series shelf",
     ),
     "homeBookDiscover": MessageLookupByLibrary.simpleMessage("Discover"),
-        "homeBookListenAgain":
+    "homeBookListenAgain": MessageLookupByLibrary.simpleMessage("Listen Again"),
-            MessageLookupByLibrary.simpleMessage("Listen Again"),
     "homeBookListenAgainDescription": MessageLookupByLibrary.simpleMessage(
       "Show play button for all books in listen again shelf",
     ),
@@ -187,8 +180,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "homeBookRecentlyAdded": MessageLookupByLibrary.simpleMessage(
       "Recently Added",
     ),
-        "homeBookRecommended":
+    "homeBookRecommended": MessageLookupByLibrary.simpleMessage("Recommended"),
-            MessageLookupByLibrary.simpleMessage("Recommended"),
     "homeContinueListening": MessageLookupByLibrary.simpleMessage(
       "Continue Listening",
     ),
@@ -261,8 +253,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nmpSettingsMediaControls": MessageLookupByLibrary.simpleMessage(
       "Media Controls",
     ),
-        "nmpSettingsMediaControlsDescription":
+    "nmpSettingsMediaControlsDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Select the media controls to display",
     ),
     "nmpSettingsSelectOne": MessageLookupByLibrary.simpleMessage(
@@ -281,32 +272,27 @@ class MessageLookup extends MessageLookupByLibrary {
     "nmpSettingsSubTitleDescription": MessageLookupByLibrary.simpleMessage(
       "The subtitle of the notification\n",
     ),
-        "nmpSettingsTitle":
+    "nmpSettingsTitle": MessageLookupByLibrary.simpleMessage("Primary Title"),
-            MessageLookupByLibrary.simpleMessage("Primary Title"),
     "nmpSettingsTitleDescription": MessageLookupByLibrary.simpleMessage(
       "The title of the notification\n",
     ),
     "no": MessageLookupByLibrary.simpleMessage("No"),
-        "notImplemented":
+    "notImplemented": MessageLookupByLibrary.simpleMessage("Not implemented"),
-            MessageLookupByLibrary.simpleMessage("Not implemented"),
     "notificationMediaPlayer": MessageLookupByLibrary.simpleMessage(
       "Notification Media Player",
     ),
-        "notificationMediaPlayerDescription":
+    "notificationMediaPlayerDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Customize the media player in notifications",
     ),
     "ok": MessageLookupByLibrary.simpleMessage("OK"),
     "pause": MessageLookupByLibrary.simpleMessage("Pause"),
     "play": MessageLookupByLibrary.simpleMessage("Play"),
-        "playerSettings":
+    "playerSettings": MessageLookupByLibrary.simpleMessage("Player Settings"),
-            MessageLookupByLibrary.simpleMessage("Player Settings"),
     "playerSettingsCompleteTime": MessageLookupByLibrary.simpleMessage(
       "Mark Complete When Time Left",
     ),
     "playerSettingsCompleteTimeDescriptionHead":
-            MessageLookupByLibrary.simpleMessage(
+        MessageLookupByLibrary.simpleMessage("Mark complete when less than "),
-                "Mark complete when less than "),
     "playerSettingsCompleteTimeDescriptionTail":
         MessageLookupByLibrary.simpleMessage(" left in the book"),
     "playerSettingsDescription": MessageLookupByLibrary.simpleMessage(
@@ -321,8 +307,7 @@ class MessageLookup extends MessageLookupByLibrary {
         MessageLookupByLibrary.simpleMessage(
           "Show the progress of the current chapter in the player",
         ),
-        "playerSettingsDisplayTotalProgress":
+    "playerSettingsDisplayTotalProgress": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Show Total Progress",
     ),
     "playerSettingsDisplayTotalProgressDescription":
@@ -351,8 +336,7 @@ class MessageLookup extends MessageLookupByLibrary {
         ),
     "playerSettingsPlaybackReportingMinimumDescriptionTail":
         MessageLookupByLibrary.simpleMessage("of the book"),
-        "playerSettingsRememberForEveryBook":
+    "playerSettingsRememberForEveryBook": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Remember Player Settings for Every Book",
     ),
     "playerSettingsRememberForEveryBookDescription":
@@ -366,17 +350,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "playerSettingsSpeedOptions": MessageLookupByLibrary.simpleMessage(
       "Speed Options",
     ),
-        "playerSettingsSpeedOptionsSelect":
+    "playerSettingsSpeedOptionsSelect": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Select Speed Options",
     ),
-        "playerSettingsSpeedOptionsSelectAdd":
+    "playerSettingsSpeedOptionsSelectAdd": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Add Speed Option",
     ),
     "playerSettingsSpeedOptionsSelectAddHelper":
-            MessageLookupByLibrary.simpleMessage(
+        MessageLookupByLibrary.simpleMessage("Enter a new speed option to add"),
-                "Enter a new speed option to add"),
     "playerSettingsSpeedSelect": MessageLookupByLibrary.simpleMessage(
       "Select Speed",
     ),
@@ -424,8 +405,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shakeActivationThreshold": MessageLookupByLibrary.simpleMessage(
       "Shake Activation Threshold",
     ),
-        "shakeActivationThresholdDescription":
+    "shakeActivationThresholdDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "The higher the threshold, the harder you need to shake",
     ),
     "shakeDetector": MessageLookupByLibrary.simpleMessage("Shake Detector"),
@@ -463,8 +443,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "themeModeHighContrast": MessageLookupByLibrary.simpleMessage(
       "High Contrast Mode",
     ),
-        "themeModeHighContrastDescription":
+    "themeModeHighContrastDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Increase the contrast between the background and the text",
     ),
     "themeModeLight": MessageLookupByLibrary.simpleMessage("Light"),
@@ -479,8 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "themeSettingsColorsBook": MessageLookupByLibrary.simpleMessage(
       "Adaptive Theme on Item Page",
     ),
-        "themeSettingsColorsBookDescription":
+    "themeSettingsColorsBookDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "Get fancy with the colors on the item page at the cost of some performance",
     ),
     "themeSettingsColorsCurrent": MessageLookupByLibrary.simpleMessage(

lib/generated/intl/messages_zh.dart

@@ -50,8 +50,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "accountDeleteServer": MessageLookupByLibrary.simpleMessage("删除服务器"),
     "accountInvalidURL": MessageLookupByLibrary.simpleMessage("无效网址"),
     "accountManage": MessageLookupByLibrary.simpleMessage("帐户管理"),
-        "accountRegisteredServers":
+    "accountRegisteredServers": MessageLookupByLibrary.simpleMessage("已注册服务器"),
-            MessageLookupByLibrary.simpleMessage("已注册服务器"),
     "accountRemoveServerAndUsers": MessageLookupByLibrary.simpleMessage(
       "删除服务器和用户",
     ),
@@ -61,8 +60,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "accountRemoveServerAndUsersTail": MessageLookupByLibrary.simpleMessage(
       " 以及该应用程序中所有用户的登录信息。",
     ),
-        "accountRemoveUserLogin":
+    "accountRemoveUserLogin": MessageLookupByLibrary.simpleMessage("删除用户登录"),
-            MessageLookupByLibrary.simpleMessage("删除用户登录"),
     "accountRemoveUserLoginHead": MessageLookupByLibrary.simpleMessage(
       "这将删除用户 ",
     ),
@@ -74,15 +72,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "accountUsersCount": m1,
     "appSettings": MessageLookupByLibrary.simpleMessage("应用设置"),
     "appearance": MessageLookupByLibrary.simpleMessage("外观"),
-        "autoSleepTimerSettings":
+    "autoSleepTimerSettings": MessageLookupByLibrary.simpleMessage("自动睡眠定时器设置"),
-            MessageLookupByLibrary.simpleMessage("自动睡眠定时器设置"),
+    "autoTurnOnSleepTimer": MessageLookupByLibrary.simpleMessage("自动开启睡眠定时器"),
-        "autoTurnOnSleepTimer":
-            MessageLookupByLibrary.simpleMessage("自动开启睡眠定时器"),
     "autoTurnOnTimer": MessageLookupByLibrary.simpleMessage("自动开启定时器"),
-        "autoTurnOnTimerAlways":
+    "autoTurnOnTimerAlways": MessageLookupByLibrary.simpleMessage("始终自动开启定时器"),
-            MessageLookupByLibrary.simpleMessage("始终自动开启定时器"),
+    "autoTurnOnTimerAlwaysDescription": MessageLookupByLibrary.simpleMessage(
-        "autoTurnOnTimerAlwaysDescription":
-            MessageLookupByLibrary.simpleMessage(
       "总是打开睡眠定时器",
     ),
     "autoTurnOnTimerDescription": MessageLookupByLibrary.simpleMessage(
@@ -118,8 +112,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "copyToClipboardDescription": MessageLookupByLibrary.simpleMessage(
       "将应用程序设置复制到剪贴板",
     ),
-        "copyToClipboardToast":
+    "copyToClipboardToast": MessageLookupByLibrary.simpleMessage("设置已复制到剪贴板"),
-            MessageLookupByLibrary.simpleMessage("设置已复制到剪贴板"),
     "delete": MessageLookupByLibrary.simpleMessage("删除"),
     "deleteDialog": m2,
     "deleted": m3,
@@ -129,13 +122,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "general": MessageLookupByLibrary.simpleMessage("通用"),
     "help": MessageLookupByLibrary.simpleMessage("Help"),
     "home": MessageLookupByLibrary.simpleMessage("首页"),
-        "homeBookContinueListening":
+    "homeBookContinueListening": MessageLookupByLibrary.simpleMessage("继续收听"),
-            MessageLookupByLibrary.simpleMessage("继续收听"),
     "homeBookContinueListeningDescription":
         MessageLookupByLibrary.simpleMessage("继续收听书架上显示播放按钮"),
     "homeBookContinueSeries": MessageLookupByLibrary.simpleMessage("继续系列"),
-        "homeBookContinueSeriesDescription":
+    "homeBookContinueSeriesDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "继续系列书架上显示播放按钮",
     ),
     "homeBookDiscover": MessageLookupByLibrary.simpleMessage("发现"),
@@ -157,8 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "homePageSettingsOtherShelvesDescription":
         MessageLookupByLibrary.simpleMessage("显示所有剩余书架上所有书籍的播放按钮"),
-        "homePageSettingsQuickPlay":
+    "homePageSettingsQuickPlay": MessageLookupByLibrary.simpleMessage("继续播放"),
-            MessageLookupByLibrary.simpleMessage("继续播放"),
     "homeStartListening": MessageLookupByLibrary.simpleMessage("开始收听"),
     "language": MessageLookupByLibrary.simpleMessage("语言"),
     "languageDescription": MessageLookupByLibrary.simpleMessage("语言切换"),
@@ -175,8 +165,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "loginOpenID": MessageLookupByLibrary.simpleMessage("OpenID"),
     "loginPassword": MessageLookupByLibrary.simpleMessage("密码"),
     "loginServerClick": MessageLookupByLibrary.simpleMessage("单击此处"),
-        "loginServerConnected":
+    "loginServerConnected": MessageLookupByLibrary.simpleMessage("服务器已连接，请登录"),
-            MessageLookupByLibrary.simpleMessage("服务器已连接，请登录"),
     "loginServerNo": MessageLookupByLibrary.simpleMessage("没有服务器? "),
     "loginServerNoConnected": MessageLookupByLibrary.simpleMessage(
       "请输入您的AudiobookShelf服务器的URL",
@@ -189,10 +178,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "logs": MessageLookupByLibrary.simpleMessage("日志"),
     "nmpSettingsBackward": MessageLookupByLibrary.simpleMessage("快退间隔"),
     "nmpSettingsForward": MessageLookupByLibrary.simpleMessage("快进间隔"),
-        "nmpSettingsMediaControls":
+    "nmpSettingsMediaControls": MessageLookupByLibrary.simpleMessage("媒体控制"),
-            MessageLookupByLibrary.simpleMessage("媒体控制"),
+    "nmpSettingsMediaControlsDescription": MessageLookupByLibrary.simpleMessage(
-        "nmpSettingsMediaControlsDescription":
-            MessageLookupByLibrary.simpleMessage(
       "选择要显示的媒体控件",
     ),
     "nmpSettingsSelectOne": MessageLookupByLibrary.simpleMessage(
@@ -213,10 +200,8 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "no": MessageLookupByLibrary.simpleMessage("否"),
     "notImplemented": MessageLookupByLibrary.simpleMessage("未实现"),
-        "notificationMediaPlayer":
+    "notificationMediaPlayer": MessageLookupByLibrary.simpleMessage("通知媒体播放器"),
-            MessageLookupByLibrary.simpleMessage("通知媒体播放器"),
+    "notificationMediaPlayerDescription": MessageLookupByLibrary.simpleMessage(
-        "notificationMediaPlayerDescription":
-            MessageLookupByLibrary.simpleMessage(
       "在通知中自定义媒体播放器",
     ),
     "ok": MessageLookupByLibrary.simpleMessage("确定"),
@@ -238,8 +223,7 @@ class MessageLookup extends MessageLookupByLibrary {
         MessageLookupByLibrary.simpleMessage("显示章节进度"),
     "playerSettingsDisplayChapterProgressDescription":
         MessageLookupByLibrary.simpleMessage("在播放器中显示当前章节的进度"),
-        "playerSettingsDisplayTotalProgress":
+    "playerSettingsDisplayTotalProgress": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "显示总进度",
     ),
     "playerSettingsDisplayTotalProgressDescription":
@@ -262,8 +246,7 @@ class MessageLookup extends MessageLookupByLibrary {
         MessageLookupByLibrary.simpleMessage("不要报告本书前 "),
     "playerSettingsPlaybackReportingMinimumDescriptionTail":
         MessageLookupByLibrary.simpleMessage(" 的播放"),
-        "playerSettingsRememberForEveryBook":
+    "playerSettingsRememberForEveryBook": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "记住每本书的播放器设置",
     ),
     "playerSettingsRememberForEveryBookDescription":
@@ -275,18 +258,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "playerSettingsSpeedOptions": MessageLookupByLibrary.simpleMessage(
       "播放速度选项",
     ),
-        "playerSettingsSpeedOptionsSelect":
+    "playerSettingsSpeedOptionsSelect": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "播放速度选项",
     ),
-        "playerSettingsSpeedOptionsSelectAdd":
+    "playerSettingsSpeedOptionsSelectAdd": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "添加一个速度选项",
     ),
     "playerSettingsSpeedOptionsSelectAddHelper":
         MessageLookupByLibrary.simpleMessage("输入一个新的速度选项"),
-        "playerSettingsSpeedSelect":
+    "playerSettingsSpeedSelect": MessageLookupByLibrary.simpleMessage("选择播放速度"),
-            MessageLookupByLibrary.simpleMessage("选择播放速度"),
     "playerSettingsSpeedSelectHelper": MessageLookupByLibrary.simpleMessage(
       "输入默认的播放速度",
     ),
@@ -307,10 +287,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "restoreBackupHint": MessageLookupByLibrary.simpleMessage("将备份粘贴到此处"),
     "restoreBackupInvalid": MessageLookupByLibrary.simpleMessage("无效备份"),
     "restoreBackupSuccess": MessageLookupByLibrary.simpleMessage("设置已恢复"),
-        "restoreBackupValidator":
+    "restoreBackupValidator": MessageLookupByLibrary.simpleMessage("请将备份粘贴到此处"),
-            MessageLookupByLibrary.simpleMessage("请将备份粘贴到此处"),
+    "restoreDescription": MessageLookupByLibrary.simpleMessage("从备份中还原应用程序设置"),
-        "restoreDescription":
-            MessageLookupByLibrary.simpleMessage("从备份中还原应用程序设置"),
     "resume": MessageLookupByLibrary.simpleMessage("继续"),
     "retry": MessageLookupByLibrary.simpleMessage("重试"),
     "settings": MessageLookupByLibrary.simpleMessage("设置"),
@@ -318,10 +296,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "shakeActionDescription": MessageLookupByLibrary.simpleMessage(
       "检测到抖动时要执行的操作",
     ),
-        "shakeActivationThreshold":
+    "shakeActivationThreshold": MessageLookupByLibrary.simpleMessage("抖动激活阈值"),
-            MessageLookupByLibrary.simpleMessage("抖动激活阈值"),
+    "shakeActivationThresholdDescription": MessageLookupByLibrary.simpleMessage(
-        "shakeActivationThresholdDescription":
-            MessageLookupByLibrary.simpleMessage(
       "门槛越高，你就越难摇晃",
     ),
     "shakeDetector": MessageLookupByLibrary.simpleMessage("抖动检测器"),
@@ -332,8 +308,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shakeDetectorEnableDescription": MessageLookupByLibrary.simpleMessage(
       "启用抖动检测以执行各种操作",
     ),
-        "shakeDetectorSettings":
+    "shakeDetectorSettings": MessageLookupByLibrary.simpleMessage("抖动检测器设置"),
-            MessageLookupByLibrary.simpleMessage("抖动检测器设置"),
     "shakeFeedback": MessageLookupByLibrary.simpleMessage("抖动反馈"),
     "shakeFeedbackDescription": MessageLookupByLibrary.simpleMessage(
       "检测到抖动时给出的反馈",
@@ -348,21 +323,18 @@ class MessageLookup extends MessageLookupByLibrary {
     "themeMode": MessageLookupByLibrary.simpleMessage("主题模式"),
     "themeModeDark": MessageLookupByLibrary.simpleMessage("深色"),
     "themeModeHighContrast": MessageLookupByLibrary.simpleMessage("高对比度模式"),
-        "themeModeHighContrastDescription":
+    "themeModeHighContrastDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "增加背景和文本之间的对比度",
     ),
     "themeModeLight": MessageLookupByLibrary.simpleMessage("浅色"),
     "themeModeSystem": MessageLookupByLibrary.simpleMessage("跟随系统"),
     "themeSettings": MessageLookupByLibrary.simpleMessage("主题设置"),
     "themeSettingsColors": MessageLookupByLibrary.simpleMessage("主题色"),
-        "themeSettingsColorsAndroid":
+    "themeSettingsColorsAndroid": MessageLookupByLibrary.simpleMessage("主题色"),
-            MessageLookupByLibrary.simpleMessage("主题色"),
     "themeSettingsColorsBook": MessageLookupByLibrary.simpleMessage(
       "书籍详情页自适应主题",
     ),
-        "themeSettingsColorsBookDescription":
+    "themeSettingsColorsBookDescription": MessageLookupByLibrary.simpleMessage(
-            MessageLookupByLibrary.simpleMessage(
       "以牺牲一些性能为代价，对书籍详情页的颜色进行美化",
     ),
     "themeSettingsColorsCurrent": MessageLookupByLibrary.simpleMessage(
@@ -373,8 +345,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "themeSettingsColorsDescription": MessageLookupByLibrary.simpleMessage(
       "使用应用程序的系统主题色",
     ),
-        "themeSettingsDescription":
+    "themeSettingsDescription": MessageLookupByLibrary.simpleMessage("自定义应用主题"),
-            MessageLookupByLibrary.simpleMessage("自定义应用主题"),
     "timeSecond": m7,
     "unknown": MessageLookupByLibrary.simpleMessage("未知"),
     "webVersion": MessageLookupByLibrary.simpleMessage("Web版本"),

lib/main.dart

@@ -1,24 +1,20 @@
+import 'dart:io';
+
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:vaani/api/server_provider.dart';
 import 'package:vaani/db/storage.dart';
-import 'package:vaani/features/downloads/providers/download_manager.dart';
 import 'package:vaani/features/logging/core/logger.dart';
-import 'package:vaani/features/playback_reporting/providers/playback_reporter_provider.dart';
-import 'package:vaani/features/player/core/init.dart';
 import 'package:vaani/features/player/providers/audiobook_player.dart';
-import 'package:vaani/features/shake_detection/providers/shake_detector.dart';
+import 'package:vaani/framework.dart';
-import 'package:vaani/features/skip_start_end/skip_start_end_provider.dart';
-import 'package:vaani/features/sleep_timer/providers/sleep_timer_provider.dart';
 import 'package:vaani/generated/l10n.dart';
 import 'package:vaani/globals.dart';
-import 'package:vaani/models/tray.dart';
 import 'package:vaani/router/router.dart';
 import 'package:vaani/settings/api_settings_provider.dart';
 import 'package:vaani/settings/app_settings_provider.dart';
-import 'package:vaani/shared/utils/utils.dart';
 import 'package:vaani/theme/providers/system_theme_provider.dart';
 import 'package:vaani/theme/providers/theme_from_cover_provider.dart';
 import 'package:vaani/theme/theme.dart';
@@ -27,18 +23,8 @@ import 'package:window_manager/window_manager.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // 初始化窗口管理器
+  _runPlatformSpecificCode();
-  if (Utils.isDesktop()) {
+
-    await windowManager.ensureInitialized();
-    final windowOptions = WindowOptions(
-      minimumSize: Size(1050, 700),
-      center: true,
-      skipTaskbar: false,
-    );
-    await windowManager.waitUntilReadyToShow(windowOptions, () async {
-      await windowManager.setPreventClose(true);
-    });
-  }
   // Configure the App Metadata
   await initialize();
 
@@ -49,16 +35,47 @@ void main() async {
   await initStorage();
 
   // initialize audio player
-  await configurePlayer();
+  // await configurePlayer();
 
   // run the app
   runApp(
     const ProviderScope(
-      child: _EagerInitialization(child: TrayFramework(AbsApp())),
+      child: Framework(
+        // audioHandler: ,
+        child: AbsApp(),
+      ),
     ),
   );
 }
 
+Future<void> _runPlatformSpecificCode() async {
+  if (kIsWeb) return;
+  switch (Platform.operatingSystem) {
+    case 'android':
+      break;
+    case 'ios':
+      break;
+    case 'linux':
+      break;
+    case 'macos':
+      break;
+    case 'windows':
+      // 初始化窗口管理器
+      await windowManager.ensureInitialized();
+      final windowOptions = WindowOptions(
+        minimumSize: Size(1050, 700),
+        center: true,
+        skipTaskbar: false,
+      );
+      await windowManager.waitUntilReadyToShow(windowOptions, () async {
+        await windowManager.setPreventClose(true);
+      });
+      break;
+    default:
+      break;
+  }
+}
+
 var routerConfig = const MyAppRouter().config;
 
 class AbsApp extends ConsumerWidget {
@@ -172,29 +189,3 @@ class AbsApp extends ConsumerWidget {
     }
   }
 }
-
-// https://riverpod.dev/docs/essentials/eager_initialization
-// Eagerly initialize providers by watching them.
-class _EagerInitialization extends ConsumerWidget {
-  const _EagerInitialization({required this.child});
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // Eagerly initialize providers by watching them.
-    // By using "watch", the provider will stay alive and not be disposed.
-    try {
-      ref.watch(simpleAudiobookPlayerProvider);
-      ref.watch(sleepTimerProvider);
-      ref.watch(playbackReporterProvider);
-      ref.watch(simpleDownloadManagerProvider);
-      ref.watch(shakeDetectorProvider);
-      ref.watch(skipStartEndProvider);
-    } catch (e) {
-      debugPrintStack(stackTrace: StackTrace.current, label: e.toString());
-      appLogger.severe(e.toString());
-    }
-
-    return child;
-  }
-}

lib/models/tray.dart

@@ -22,7 +22,6 @@ class _TrayFrameworkState extends ConsumerState<TrayFramework>
       windowManager.addListener(this);
       _init();
     }
-
     super.initState();
   }
 

lib/router/scaffold_with_nav_bar.dart

@@ -80,9 +80,11 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
                         ? libraryIcon ?? item.activeIcon
                         : item.activeIcon,
                   ),
-                  label: Text(isDestinationLibrary
+                  label: Text(
+                    isDestinationLibrary
                         ? currentLibrary?.name ?? item.name
-                      : item.name),
+                        : item.name,
+                  ),
                   // tooltip: item.tooltip,
                 );
                 // if (isDestinationLibrary) {
@@ -101,7 +103,6 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
               }).toList(),
               selectedIndex: navigationShell.currentIndex,
               onDestinationSelected: (int index) {
-                print(index);
                 _onTap(context, index, ref);
               },
             ),
@@ -116,20 +117,16 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
   }
 
   Widget? buildNavBottom(BuildContext context, WidgetRef ref) {
-    final size = MediaQuery.of(context).size;
+    // final size = MediaQuery.of(context).size;
-    final playerProgress = ref.watch(playerHeightProvider);
+    // final playerProgress = ref.watch(playerHeightProvider);
-    final playerMaxHeight = size.height;
+    // final playerMaxHeight = size.height;
-    var percentExpandedMiniPlayer = (playerProgress - playerMinHeight) /
+    // var percentExpandedMiniPlayer = (playerProgress - playerMinHeight) /
-        (playerMaxHeight - playerMinHeight);
+    //     (playerMaxHeight - playerMinHeight);
-    // Clamp the value between 0 and 1
+    // // Clamp the value between 0 and 1
-    percentExpandedMiniPlayer = percentExpandedMiniPlayer.clamp(0.0, 1.0);
+    // percentExpandedMiniPlayer = percentExpandedMiniPlayer.clamp(0.0, 1.0);
-    return percentExpandedMiniPlayer != 1
+    return NavigationBar(
-        ? Opacity(
-            // Opacity is interpolated from 1 to 0 when player is expanded
-            opacity: 1 - percentExpandedMiniPlayer,
-            child: NavigationBar(
       elevation: 0.0,
-              height: bottomBarHeight * (1 - percentExpandedMiniPlayer),
+      height: bottomBarHeight.toDouble(),
 
       // TODO: get destinations from the navigationShell
       // Here, the items of BottomNavigationBar are hard coded. In a real
@@ -138,8 +135,7 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
       // `navigationShell.route.branches`.
       destinations: _navigationItems(context).map((item) {
         final isDestinationLibrary = item.name == S.of(context).library;
-                var currentLibrary =
+        var currentLibrary = ref.watch(currentLibraryProvider).valueOrNull;
-                    ref.watch(currentLibraryProvider).valueOrNull;
         final libraryIcon = AbsIcons.getIconByName(
           currentLibrary?.icon,
         );
@@ -161,8 +157,7 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
           return GestureDetector(
             onSecondaryTap: () => showLibrarySwitcher(context, ref),
             onDoubleTap: () => showLibrarySwitcher(context, ref),
-                    child:
+            child: destinationWidget, // Wrap the actual NavigationDestination
-                        destinationWidget, // Wrap the actual NavigationDestination
           );
         } else {
           // Return the unwrapped destination for other items
@@ -171,9 +166,7 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
       }).toList(),
       selectedIndex: navigationShell.currentIndex,
       onDestinationSelected: (int index) => _onTap(context, index, ref),
-            ),
+    );
-          )
-        : null;
   }
 
   List<_NavigationItem> _navigationItems(BuildContext context) {

lib/shared/widgets/shelves/book_shelf.dart

@@ -11,7 +11,7 @@ import 'package:vaani/api/image_provider.dart';
 import 'package:vaani/api/library_item_provider.dart' show libraryItemProvider;
 import 'package:vaani/constants/hero_tag_conventions.dart';
 import 'package:vaani/features/item_viewer/view/library_item_actions.dart';
-import 'package:vaani/features/player/providers/audiobook_player.dart';
+import 'package:vaani/features/player/providers/session_provider.dart';
 import 'package:vaani/router/models/library_item_extras.dart';
 import 'package:vaani/router/router.dart';
 import 'package:vaani/settings/app_settings_provider.dart';
@@ -212,10 +212,12 @@ class _BookOnShelfPlayButton extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final me = ref.watch(meProvider);
-    final player = ref.watch(audiobookPlayerProvider);
+    // final player = ref.watch(audiobookPlayerProvider);
-    final isCurrentBookSetInPlayer =
+    final session = ref.watch(sessionProvider.select((v) => v.session));
-        player.book?.libraryItemId == libraryItemId;
+    final sessionLoading = ref.watch(sessionLoadingProvider(libraryItemId));
-    final isPlayingThisBook = player.playing && isCurrentBookSetInPlayer;
+    final playerState = ref.watch(playStateProvider);
+    final isCurrentBookSetInPlayer = session?.libraryItemId == libraryItemId;
+    final isPlayingThisBook = playerState.playing && isCurrentBookSetInPlayer;
 
     final userProgress = me.valueOrNull?.mediaProgress
         ?.firstWhereOrNull((element) => element.libraryItemId == libraryItemId);
@@ -285,19 +287,13 @@ class _BookOnShelfPlayButton extends HookConsumerWidget {
                       .withValues(alpha: 0.9),
                 ),
               ),
-              onPressed: () async {
+              onPressed: () => session?.libraryItemId == libraryItemId
-                final book =
+                  ? ref.read(sessionProvider).load(libraryItemId, null)
-                    await ref.watch(libraryItemProvider(libraryItemId).future);
+                  : ref.read(playerProvider).togglePlayPause(),
-
-                libraryItemPlayButtonOnPressed(
-                  ref: ref,
-                  book: book.media.asBookExpanded,
-                  userMediaProgress: userProgress,
-                );
-              },
               icon: Hero(
                 tag: HeroTagPrefixes.libraryItemPlayButton + libraryItemId,
                 child: DynamicItemPlayIcon(
+                  isLoading: sessionLoading,
                   isBookCompleted: isBookCompleted,
                   isPlayingThisBook: isPlayingThisBook,
                   isCurrentBookSetInPlayer: isCurrentBookSetInPlayer,
@@ -336,3 +332,30 @@ class BookCoverSkeleton extends StatelessWidget {
     );
   }
 }
+
+class BookCoverWidget extends HookConsumerWidget {
+  const BookCoverWidget({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final session = ref.watch(sessionProvider).session;
+    if (session == null) {
+      return const BookCoverSkeleton();
+    }
+    final itemBeingPlayed =
+        ref.watch(libraryItemProvider(session.libraryItemId));
+    final imageOfItemBeingPlayed = itemBeingPlayed.valueOrNull != null
+        ? ref.watch(
+            coverImageProvider(itemBeingPlayed.valueOrNull!.id),
+          )
+        : null;
+    return imageOfItemBeingPlayed?.valueOrNull != null
+        ? Image.memory(
+            imageOfItemBeingPlayed!.valueOrNull!,
+            fit: BoxFit.cover,
+          )
+        : const BookCoverSkeleton();
+  }
+}

pubspec.lock

@@ -318,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
   custom_lint:
     dependency: "direct dev"
     description:
@@ -520,6 +528,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_platform_widgets:
+    dependency: "direct main"
+    description:
+      name: flutter_platform_widgets
+      sha256: "22a86564cb6cc0b93637c813ca91b0b1f61c2681a31e0f9d77590c1fa9f12020"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -762,15 +778,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.5"
-  just_audio_background:
-    dependency: "direct main"
-    description:
-      path: just_audio_background
-      ref: media-notification-config
-      resolved-ref: fce45f334f0838cb6f630548efb65fec40ff17b4
-      url: "https://github.com/Dr-Blank/just_audio"
-    source: git
-    version: "0.0.1-beta.15"
   just_audio_media_kit:
     dependency: "direct main"
     description:
@@ -795,14 +802,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.16"
-  just_audio_windows:
-    dependency: "direct main"
-    description:
-      name: just_audio_windows
-      sha256: b1ba5305d841c0e3883644e20fc11aaa23f28cfdd43ec20236d1e119a402ef29
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
   leak_tracker:
     dependency: transitive
     description:
@@ -915,6 +914,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  media_kit_libs_windows_audio:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_windows_audio
+      sha256: c2fd558cc87b9d89a801141fcdffe02e338a3b21a41a18fbd63d5b221a1b8e53
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
   menu_base:
     dependency: transitive
     description:

pubspec.yaml

@@ -22,7 +22,7 @@ environment:
   sdk: ">=3.3.4 <4.0.0"
   flutter: 3.32.0
 
-isar_version: &isar_version ^4.0.0-dev.13 # define the version to be used
+isar_version: &isar_version ^4.0.0-dev.14 # define the version to be used
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -42,7 +42,8 @@ dependencies:
   cached_network_image: ^3.3.1
   coast: ^2.0.2
   collection: ^1.18.0
-  # cupertino_icons: ^1.0.6
+  cupertino_icons: ^1.0.6
+  flutter_platform_widgets: ^9.0.0
   device_info_plus: ^11.3.3
   duration_picker: ^1.2.0
   dynamic_color: ^1.7.0
@@ -59,20 +60,20 @@ dependencies:
   go_router: ^14.0.2
   hive: ^4.0.0-dev.2 
   hooks_riverpod: ^2.5.1 
-  isar: ^4.0.0-dev.13
+  isar: ^4.0.0-dev.14
-  isar_flutter_libs: ^4.0.0-dev.13
+  isar_flutter_libs: ^4.0.0-dev.14
   json_annotation: ^4.9.0
   just_audio: ^0.10.5
-  just_audio_background: 
+  # just_audio_background: 
-    # TODO Remove git dep when https://github.com/ryanheise/just_audio/issues/912 is closed
+  #   # TODO Remove git dep when https://github.com/ryanheise/just_audio/issues/912 is closed
-    git:
+  #   git:
-      url: https://github.com/Dr-Blank/just_audio
+  #     url: https://github.com/Dr-Blank/just_audio
-      ref: media-notification-config
+  #     ref: media-notification-config
-      path: just_audio_background
+  #     path: just_audio_background
-  just_audio_windows: ^0.2.2
+  # just_audio_windows: ^0.2.2
   just_audio_media_kit: ^2.0.4
   media_kit_libs_linux: any
-  # media_kit_libs_windows_audio: any
+  media_kit_libs_windows_audio: any
   list_wheel_scroll_view_nls: ^0.0.3
   logging: ^1.2.0
   logging_appenders: ^1.3.1

windows/flutter/generated_plugin_registrant.cc

@@ -8,7 +8,7 @@
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
-#include <just_audio_windows/just_audio_windows_plugin.h>
+#include <media_kit_libs_windows_audio/media_kit_libs_windows_audio_plugin_c_api.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
@@ -21,8 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   IsarFlutterLibsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin"));
-  JustAudioWindowsPluginRegisterWithRegistrar(
+  MediaKitLibsWindowsAudioPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("JustAudioWindowsPlugin"));
+      registry->GetRegistrarForPlugin("MediaKitLibsWindowsAudioPluginCApi"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -5,7 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   isar_flutter_libs
-  just_audio_windows
+  media_kit_libs_windows_audio
   permission_handler_windows
   screen_retriever_windows
   share_plus