From 76dc8aef116a0d01fd59b5a74c704624c82f4c7d Mon Sep 17 00:00:00 2001
From: le-firehawk <firehawk@opayq.net>
Date: Sun, 29 Jun 2025 19:13:31 +0930
Subject: [PATCH] feat: Store and retrieve replay and shuffle states in
 preferences

---
 .../fragment/PlayerBottomSheetFragment.java   | 13 +++++++++++
 .../ui/fragment/PlayerControllerFragment.java | 12 ++++++++++
 .../tempo/util/Preferences.kt                 | 23 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java
index dafd1507..b3755ee3 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java
@@ -112,6 +112,9 @@ public class PlayerBottomSheetFragment extends Fragment {
             try {
                 MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
 
+                mediaBrowser.setShuffleModeEnabled(Preferences.isShuffleModeEnabled());
+                mediaBrowser.setRepeatMode(Preferences.getRepeatMode());
+
                 setMediaControllerListener(mediaBrowser);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -150,6 +153,16 @@ public class PlayerBottomSheetFragment extends Fragment {
             public void onEvents(Player player, Player.Events events) {
                 setHeaderNextButtonState(mediaBrowser.hasNextMediaItem());
             }
+
+            @Override
+            public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+                Preferences.setShuffleModeEnabled(shuffleModeEnabled);
+            }
+
+            @Override
+            public void onRepeatModeChanged(int repeatMode) {
+                Preferences.setRepeatMode(repeatMode);
+            }
         });
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
index 1d474db9..d1daae9b 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
@@ -140,6 +140,8 @@ public class PlayerControllerFragment extends Fragment {
                 MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
 
                 bind.nowPlayingMediaControllerView.setPlayer(mediaBrowser);
+                mediaBrowser.setShuffleModeEnabled(Preferences.isShuffleModeEnabled());
+                mediaBrowser.setRepeatMode(Preferences.getRepeatMode());
 
                 setMediaControllerListener(mediaBrowser);
             } catch (Exception e) {
@@ -160,6 +162,16 @@ public class PlayerControllerFragment extends Fragment {
                 setMetadata(mediaMetadata);
                 setMediaInfo(mediaMetadata);
             }
+
+            @Override
+            public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+                Preferences.setShuffleModeEnabled(shuffleModeEnabled);
+            }
+
+            @Override
+            public void onRepeatModeChanged(int repeatMode) {
+                Preferences.setRepeatMode(repeatMode);
+            }
         });
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
index 5cbe9035..e7a4c459 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -1,6 +1,7 @@
 package com.cappielloantonio.tempo.util
 
 import android.util.Log
+import androidx.media3.common.Player
 import com.cappielloantonio.tempo.App
 import com.cappielloantonio.tempo.model.HomeSector
 import com.cappielloantonio.tempo.subsonic.models.OpenSubsonicExtension
@@ -24,6 +25,8 @@ object Preferences {
     private const val NEXT_SERVER_SWITCH = "next_server_switch"
     private const val PLAYBACK_SPEED = "playback_speed"
     private const val SKIP_SILENCE = "skip_silence"
+    private const val SHUFFLE_MODE = "shuffle_mode"
+    private const val REPEAT_MODE = "repeat_mode"
     private const val IMAGE_CACHE_SIZE = "image_cache_size"
     private const val STREAMING_CACHE_SIZE = "streaming_cache_size"
     private const val IMAGE_SIZE = "image_size"
@@ -226,6 +229,26 @@ object Preferences {
         App.getInstance().preferences.edit().putBoolean(SKIP_SILENCE, isSkipSilenceMode).apply()
     }
 
+    @JvmStatic
+    fun isShuffleModeEnabled(): Boolean {
+        return App.getInstance().preferences.getBoolean(SHUFFLE_MODE, false)
+    }
+
+    @JvmStatic
+    fun setShuffleModeEnabled(shuffleModeEnabled: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(SHUFFLE_MODE, shuffleModeEnabled).apply()
+    }
+
+    @JvmStatic
+    fun getRepeatMode(): Int {
+        return App.getInstance().preferences.getInt(REPEAT_MODE, Player.REPEAT_MODE_OFF)
+    }
+
+    @JvmStatic
+    fun setRepeatMode(repeatMode: Int) {
+        App.getInstance().preferences.edit().putInt(REPEAT_MODE, repeatMode).apply()
+    }
+
     @JvmStatic
     fun getImageCacheSize(): Int {
         return App.getInstance().preferences.getString(IMAGE_CACHE_SIZE, "500")!!.toInt()