From 9c54130597cfe70f2bf4d5a520f480cba5e656ea Mon Sep 17 00:00:00 2001
From: Frederik Feichtmeier <frederik.feichtmeier@gmail.com>
Date: Sat, 14 Dec 2024 15:29:20 +0100
Subject: [PATCH] fix: Playback Speed Setting Not Retained Between Sessions
 (#1094)

Fixes #1092
---
 lib/app/view/mobile_bottom_bar.dart       |  5 -----
 lib/common/data/player_state.dart         | 16 +++++++++++++---
 lib/constants.dart                        |  1 +
 lib/player/player_model.dart              |  4 ++--
 lib/player/player_service.dart            |  5 +++++
 lib/player/view/playback_rate_button.dart | 18 ++++++++----------
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/lib/app/view/mobile_bottom_bar.dart b/lib/app/view/mobile_bottom_bar.dart
index 8cb8573a5..87255d491 100644
--- a/lib/app/view/mobile_bottom_bar.dart
+++ b/lib/app/view/mobile_bottom_bar.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../extensions/build_context_x.dart';
-import '../../player/player_model.dart';
 import '../../player/view/bottom_player.dart';
 import '../app_model.dart';
 import 'mobile_navigation_bar.dart';
@@ -21,10 +20,6 @@ class MobileBottomBar extends StatelessWidget with WatchItMixin {
             mainAxisSize: MainAxisSize.min,
             children: [
               GestureDetector(
-                onVerticalDragUpdate: (details) {
-                  di<PlayerModel>().bottomPlayerHeight =
-                      context.mediaQuerySize.height - details.globalPosition.dy;
-                },
                 onVerticalDragEnd: (details) {
                   if (details.primaryVelocity != null &&
                       details.primaryVelocity! < 150) {
diff --git a/lib/common/data/player_state.dart b/lib/common/data/player_state.dart
index 5b52b2e12..eb94674cb 100644
--- a/lib/common/data/player_state.dart
+++ b/lib/common/data/player_state.dart
@@ -11,6 +11,7 @@ class PlayerState {
   final String? queueName;
   final List<Audio>? queue;
   final String? volume;
+  final String? rate;
 
   const PlayerState({
     this.position,
@@ -19,6 +20,7 @@ class PlayerState {
     this.queueName,
     this.queue,
     this.volume,
+    this.rate,
   });
 
   PlayerState copyWith({
@@ -28,6 +30,7 @@ class PlayerState {
     String? queueName,
     List<Audio>? queue,
     String? volume,
+    String? rate,
   }) {
     return PlayerState(
       position: position ?? this.position,
@@ -36,6 +39,7 @@ class PlayerState {
       queueName: queueName ?? this.queueName,
       queue: queue ?? this.queue,
       volume: volume ?? this.volume,
+      rate: rate ?? this.rate,
     );
   }
 
@@ -60,6 +64,9 @@ class PlayerState {
     if (volume != null) {
       result.addAll({'volume': volume});
     }
+    if (rate != null) {
+      result.addAll({'rate': rate});
+    }
 
     return result;
   }
@@ -74,6 +81,7 @@ class PlayerState {
           ? List<Audio>.from(map['queue']?.map((x) => Audio.fromMap(x)))
           : null,
       volume: map['volume'],
+      rate: map['rate'],
     );
   }
 
@@ -84,7 +92,7 @@ class PlayerState {
 
   @override
   String toString() {
-    return 'PlayerState(position: $position, duration: $duration, audio: $audio, queueName: $queueName, queue: $queue, volume: $volume)';
+    return 'PlayerState(position: $position, duration: $duration, audio: $audio, queueName: $queueName, queue: $queue, volume: $volume, rate: $rate,)';
   }
 
   @override
@@ -98,7 +106,8 @@ class PlayerState {
         other.audio == audio &&
         other.queueName == queueName &&
         listEquals(other.queue, queue) &&
-        other.volume == volume;
+        other.volume == volume &&
+        other.rate == rate;
   }
 
   @override
@@ -108,6 +117,7 @@ class PlayerState {
         audio.hashCode ^
         queueName.hashCode ^
         queue.hashCode ^
-        volume.hashCode;
+        volume.hashCode ^
+        rate.hashCode;
   }
 }
diff --git a/lib/constants.dart b/lib/constants.dart
index f708e1169..3ffbe7379 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -85,3 +85,4 @@ const kUseMoreAnimations = 'useMoreAnimations';
 const kShowPositionDuration = 'showPositionDuration';
 const kSettingsPageId = 'settings';
 const kHomePageId = 'homePage';
+const kPlaybackRate = 'playbackRate';
diff --git a/lib/player/player_model.dart b/lib/player/player_model.dart
index 9b34ba2ce..e85f989b6 100644
--- a/lib/player/player_model.dart
+++ b/lib/player/player_model.dart
@@ -9,8 +9,6 @@ import '../common/view/theme.dart';
 import '../radio/online_art_service.dart';
 import 'player_service.dart';
 
-const rateValues = [.75, 1.0, 1.25, 1.5, 1.75, 2.0];
-
 class PlayerModel extends SafeChangeNotifier {
   PlayerModel({
     required PlayerService service,
@@ -18,6 +16,8 @@ class PlayerModel extends SafeChangeNotifier {
   })  : _playerService = service,
         _onlineArtService = onlineArtService;
 
+  static const rateValues = [.75, 1.0, 1.25, 1.5, 1.75, 2.0];
+
   final PlayerService _playerService;
   final OnlineArtService _onlineArtService;
 
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index 8698ae9b1..d51576dfb 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -465,6 +465,10 @@ class PlayerService {
         setVolume(double.tryParse(playerState.volume!) ?? 100.0);
       }
 
+      if (playerState.rate != null) {
+        setRate(double.tryParse(playerState.rate!) ?? 1.0);
+      }
+
       _estimateNext();
 
       await _setMediaControlsMetaData(audio: playerState.audio!);
@@ -818,6 +822,7 @@ class PlayerService {
           _queue.audios.length <= 100 ? _queue.audios.take(100).toList() : null,
       queueName: _queue.audios.length <= 100 ? _queue.name : null,
       volume: _volume.toString(),
+      rate: _rate.toString(),
     );
 
     await writeJsonToFile(playerState.toMap(), kPlayerStateFileName);
diff --git a/lib/player/view/playback_rate_button.dart b/lib/player/view/playback_rate_button.dart
index 58d68a75c..f10a15de6 100644
--- a/lib/player/view/playback_rate_button.dart
+++ b/lib/player/view/playback_rate_button.dart
@@ -35,16 +35,14 @@ class PlaybackRateButton extends StatelessWidget with WatchItMixin {
                 : (color ?? theme.colorScheme.onSurface)),
       ),
       initialValue: rate,
-      itemBuilder: (context) {
-        return rateValues
-            .map(
-              (e) => PopupMenuItem(
-                onTap: () => setRate(e),
-                child: Text('x$e'),
-              ),
-            )
-            .toList();
-      },
+      itemBuilder: (context) => PlayerModel.rateValues
+          .map(
+            (e) => PopupMenuItem(
+              onTap: () => setRate(e),
+              child: Text('x$e'),
+            ),
+          )
+          .toList(),
     );
   }
 }