aaa

lib/features/player/view/audiobook_player.dart

@@ -31,8 +31,7 @@ class AudiobookPlayer extends HookConsumerWidget {
     if (currentBook == null) {
       return const SizedBox.shrink();
     }
-    final itemBeingPlayed =
+    final itemBeingPlayed = ref.watch(libraryItemProvider(currentBook.libraryItemId));
-        ref.watch(libraryItemProvider(currentBook.libraryItemId));
     final player = ref.watch(audiobookPlayerProvider);
     final imageOfItemBeingPlayed = itemBeingPlayed.valueOrNull != null
         ? ref.watch(
@@ -65,8 +64,7 @@ class AudiobookPlayer extends HookConsumerWidget {
       themeOfLibraryItemProvider(
         itemBeingPlayed.valueOrNull?.id,
         brightness: Theme.of(context).brightness,
-        highContrast: appSettings.themeSettings.highContrast ||
+        highContrast: appSettings.themeSettings.highContrast || MediaQuery.of(context).highContrast,
-            MediaQuery.of(context).highContrast,
       ),
     );
 
@@ -88,14 +86,14 @@ class AudiobookPlayer extends HookConsumerWidget {
         onDragDown: (percentage) async {
           // preferred volume
           // set volume to 0 when dragging down
-          await player
+          await player.setVolume(preferredVolume * (1 - percentage.clamp(0, .75)));
-              .setVolume(preferredVolume * (1 - percentage.clamp(0, .75)));
         },
         minHeight: playerMinHeight,
         // subtract the height of notches and other system UI
         maxHeight: playerMaxHeight,
         controller: audioBookMiniplayerController,
         elevation: 4,
+        duration: Duration(seconds: 3),
         onDismissed: () {
           // add a delay before closing the player
           // to allow the user to see the player closing
@@ -103,15 +101,13 @@ class AudiobookPlayer extends HookConsumerWidget {
             player.setSourceAudiobook(null);
           });
         },
-        curve: Curves.easeOut,
+        curve: Curves.linear,
         builder: (height, percentage) {
           // at what point should the player switch from miniplayer to expanded player
           // also at this point the image should be at its max size and in the center of the player
           final miniplayerPercentageDeclaration =
-              (maxImgSize - playerMinHeight) /
+              (maxImgSize - playerMinHeight) / (playerMaxHeight - playerMinHeight);
-                  (playerMaxHeight - playerMinHeight);
+          final bool isFormMiniplayer = percentage < miniplayerPercentageDeclaration;
-          final bool isFormMiniplayer =
-              percentage < miniplayerPercentageDeclaration;
 
           if (!isFormMiniplayer) {
             // this calculation needs a refactor
@@ -211,17 +207,14 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
 
     // now find the chapter that corresponds to the current time
     // and calculate the progress of the current chapter
-    final currentChapterProgress = currentChapter == null
+    final currentChapterProgress =
-        ? null
+        currentChapter == null ? null : (player.positionInBook - currentChapter.start);
-        : (player.positionInBook - currentChapter.start);
 
-    final currentChapterBuffered = currentChapter == null
+    final currentChapterBuffered =
-        ? null
+        currentChapter == null ? null : (player.bufferedPositionInBook - currentChapter.start);
-        : (player.bufferedPositionInBook - currentChapter.start);
 
     return ProgressBar(
-      progress:
+      progress: currentChapterProgress ?? position.data ?? const Duration(seconds: 0),
-          currentChapterProgress ?? position.data ?? const Duration(seconds: 0),
       total: currentChapter == null
           ? player.book?.duration ?? const Duration(seconds: 0)
           : currentChapter.end - currentChapter.start,
@@ -232,8 +225,7 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
         );
       },
       thumbRadius: 8,
-      buffered:
+      buffered: currentChapterBuffered ?? buffered.data ?? const Duration(seconds: 0),
-          currentChapterBuffered ?? buffered.data ?? const Duration(seconds: 0),
       bufferedBarColor: Theme.of(context).colorScheme.secondary,
       timeLabelType: TimeLabelType.remainingTime,
       timeLabelLocation: TimeLabelLocation.below,

lib/features/player/view/player_when_expanded.dart

@@ -43,9 +43,9 @@ class PlayerWhenExpanded extends HookConsumerWidget {
           earlyEnd,
         )
         .clamp(0.0, 1.0);
+
     final currentChapter = ref.watch(currentPlayingChapterProvider);
     final currentBookMetadata = ref.watch(currentBookMetadataProvider);
-
     return Column(
       children: [
         // sized box for system status bar; not needed as not full screen
@@ -104,10 +104,7 @@ class PlayerWhenExpanded extends HookConsumerWidget {
               decoration: BoxDecoration(
                 boxShadow: [
                   BoxShadow(
-                    color: Theme.of(context)
+                    color: Theme.of(context).colorScheme.primary.withValues(alpha: 0.1),
-                        .colorScheme
-                        .primary
-                        .withValues(alpha: 0.1),
                     blurRadius: 32 * earlyPercentage,
                     spreadRadius: 8 * earlyPercentage,
                     // offset: Offset(0, 16 * earlyPercentage),
@@ -131,6 +128,7 @@ class PlayerWhenExpanded extends HookConsumerWidget {
         ),
 
         // the chapter title
+        if (earlyPercentage > 0.4)
           Opacity(
             opacity: earlyPercentage,
             child: Padding(
@@ -154,6 +152,7 @@ class PlayerWhenExpanded extends HookConsumerWidget {
           ),
 
         // the book name and author
+        if (earlyPercentage > 0.5)
           Opacity(
             opacity: earlyPercentage,
             child: Padding(
@@ -170,10 +169,7 @@ class PlayerWhenExpanded extends HookConsumerWidget {
                   currentBookMetadata?.authorName ?? '',
                 ].join(' - '),
                 style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    color: Theme.of(context)
+                      color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.7),
-                        .colorScheme
-                        .onSurface
-                        .withValues(alpha: 0.7),
                     ),
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
@@ -182,8 +178,9 @@ class PlayerWhenExpanded extends HookConsumerWidget {
             ),
           ),
 
-        const Spacer(),
+        if (earlyPercentage > 0.5) const Spacer(),
         // the progress bar
+        if (earlyPercentage > 0.6)
           Opacity(
             opacity: earlyPercentage,
             child: SizedBox(
@@ -198,9 +195,10 @@ class PlayerWhenExpanded extends HookConsumerWidget {
               ),
             ),
           ),
-        const Spacer(),
+        if (earlyPercentage > 0.6) const Spacer(),
 
         // the chapter skip buttons, seek 30 seconds back and forward, and play/pause button
+        if (earlyPercentage > 0.8)
           Opacity(
             opacity: earlyPercentage,
             child: SizedBox(
@@ -223,9 +221,10 @@ class PlayerWhenExpanded extends HookConsumerWidget {
               ),
             ),
           ),
-        const Spacer(),
+        if (earlyPercentage > 0.8) const Spacer(),
 
         // speed control, sleep timer, chapter list, and settings
+        if (earlyPercentage > 0.9)
           Opacity(
             opacity: earlyPercentage,
             child: Padding(

lib/features/player/view/player_when_minimized.dart

@@ -32,8 +32,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final player = ref.watch(audiobookPlayerProvider);
     final vanishingPercentage = 1 - percentageMiniplayer;
-    final progress =
+    final progress = useStream(player.slowPositionStream, initialData: Duration.zero);
-        useStream(player.slowPositionStream, initialData: Duration.zero);
 
     final bookMetaExpanded = ref.watch(currentBookMetadataProvider);
 
@@ -46,8 +45,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
             // image
             Padding(
               padding: EdgeInsets.symmetric(
-                horizontal:
+                horizontal: ((availWidth - maxImgSize) / 2) * percentageMiniplayer,
-                    ((availWidth - maxImgSize) / 2) * percentageMiniplayer,
               ),
               child: InkWell(
                 onTap: () {
@@ -55,8 +53,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
                   context.pushNamed(
                     Routes.libraryItem.name,
                     pathParameters: {
-                      Routes.libraryItem.pathParamName!:
+                      Routes.libraryItem.pathParamName!: player.book!.libraryItemId,
-                          player.book!.libraryItemId,
                     },
                   );
                 },
@@ -90,10 +87,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                       style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            color: Theme.of(context)
+                            color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.7),
-                                .colorScheme
-                                .onSurface
-                                .withValues(alpha: 0.7),
                           ),
                     ),
                   ],
@@ -106,7 +100,9 @@ class PlayerWhenMinimized extends HookConsumerWidget {
             //     controller.animateToHeight(state: PanelState.MAX);
             //   },
             // ),
+
             // rewind button
+            if (vanishingPercentage > 0.6)
               Opacity(
                 opacity: vanishingPercentage,
                 child: Padding(
@@ -121,6 +117,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
                 ),
               ),
             // play/pause button
+            if (vanishingPercentage > 0.8)
               Opacity(
                 opacity: vanishingPercentage,
                 child: Padding(
@@ -135,8 +132,7 @@ class PlayerWhenMinimized extends HookConsumerWidget {
         SizedBox(
           height: barHeight,
           child: LinearProgressIndicator(
-            value: (progress.data ?? Duration.zero).inSeconds /
+            value: (progress.data ?? Duration.zero).inSeconds / player.book!.duration.inSeconds,
-                player.book!.duration.inSeconds,
             color: Theme.of(context).colorScheme.onPrimaryContainer,
             backgroundColor: Theme.of(context).colorScheme.primaryContainer,
           ),