fix: remember player brightness

Author: Priveetee

app/src/main/java/dev/typetype/android/data/preferences/DataStorePreferencesRepository.kt

@@ -28,6 +28,8 @@ class DataStorePreferencesRepository @Inject constructor(
             playerDoubleTapSeekEnabled = prefs[KEY_PLAYER_DOUBLE_TAP_SEEK] ?: true,
             playerSwipeSeekEnabled = prefs[KEY_PLAYER_SWIPE_SEEK] ?: true,
             playerSwipeBrightnessVolumeEnabled = prefs[KEY_PLAYER_SWIPE_BRIGHT_VOL] ?: true,
+            playerPlaybackBrightnessPercent = prefs[KEY_PLAYER_PLAYBACK_BRIGHTNESS]
+                ?.coerceIn(0, 100),
             playerLongPressSpeedEnabled = prefs[KEY_PLAYER_LONG_PRESS_SPEED] ?: true,
             playerAutoplayEnabled = prefs[KEY_PLAYER_AUTOPLAY] ?: true,
             playerAutoplayCountdownSeconds = (
@@ -57,6 +59,10 @@ class DataStorePreferencesRepository @Inject constructor(
         dataStore.edit { it[KEY_PLAYER_SWIPE_BRIGHT_VOL] = enabled }
     }
 
+    override suspend fun setPlayerPlaybackBrightnessPercent(percent: Int) {
+        dataStore.edit { it[KEY_PLAYER_PLAYBACK_BRIGHTNESS] = percent.coerceIn(0, 100) }
+    }
+
     override suspend fun setPlayerLongPressSpeedEnabled(enabled: Boolean) {
         dataStore.edit { it[KEY_PLAYER_LONG_PRESS_SPEED] = enabled }
     }
@@ -99,6 +105,7 @@ class DataStorePreferencesRepository @Inject constructor(
         val KEY_PLAYER_DOUBLE_TAP_SEEK = booleanPreferencesKey("player_double_tap_seek")
         val KEY_PLAYER_SWIPE_SEEK = booleanPreferencesKey("player_swipe_seek")
         val KEY_PLAYER_SWIPE_BRIGHT_VOL = booleanPreferencesKey("player_swipe_bright_vol")
+        val KEY_PLAYER_PLAYBACK_BRIGHTNESS = intPreferencesKey("player_playback_brightness")
         val KEY_PLAYER_LONG_PRESS_SPEED = booleanPreferencesKey("player_long_press_speed")
         val KEY_PLAYER_AUTOPLAY = booleanPreferencesKey("player_autoplay")
         val KEY_PLAYER_AUTOPLAY_COUNTDOWN = intPreferencesKey("player_autoplay_countdown_seconds")

app/src/main/java/dev/typetype/android/domain/preferences/AppPreferences.kt

@@ -5,6 +5,7 @@ data class AppPreferences(
     val playerDoubleTapSeekEnabled: Boolean = true,
     val playerSwipeSeekEnabled: Boolean = true,
     val playerSwipeBrightnessVolumeEnabled: Boolean = true,
+    val playerPlaybackBrightnessPercent: Int? = null,
     val playerLongPressSpeedEnabled: Boolean = true,
     val playerAutoplayEnabled: Boolean = true,
     val playerAutoplayCountdownSeconds: Int = 10,

app/src/main/java/dev/typetype/android/domain/preferences/PreferencesRepository.kt

@@ -8,6 +8,7 @@ interface PreferencesRepository {
     suspend fun setPlayerDoubleTapSeekEnabled(enabled: Boolean)
     suspend fun setPlayerSwipeSeekEnabled(enabled: Boolean)
     suspend fun setPlayerSwipeBrightnessVolumeEnabled(enabled: Boolean)
+    suspend fun setPlayerPlaybackBrightnessPercent(percent: Int)
     suspend fun setPlayerLongPressSpeedEnabled(enabled: Boolean)
     suspend fun setPlayerAutoplayEnabled(enabled: Boolean)
     suspend fun setPlayerAutoplayCountdownSeconds(seconds: Int)

app/src/main/java/dev/typetype/android/feature/player/LoadedPlayer.kt

@@ -16,7 +16,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -49,6 +48,7 @@ fun LoadedPlayer(
     isFavorited: Boolean,
     isInWatchLater: Boolean,
     gestureConfig: PlayerGestureConfig,
+    playbackBrightnessPercent: Int?,
     autoplayCountdownSeconds: Int,
     audioOnlyPlaybackDefault: Boolean?,
     userSettings: UserSettings,
@@ -81,9 +81,6 @@ fun LoadedPlayer(
     }
     var commentsVisible by remember { mutableStateOf(false) }
     var downloadPickerVisible by remember { mutableStateOf(false) }
-    var playbackBrightnessPercent by rememberSaveable(stream.id) {
-        mutableStateOf<Int?>(null)
-    }
     val selections = rememberPlayerPlaybackSelectionState(
         stream = stream,
         defaultQuality = userSettings.defaultQuality,
@@ -218,7 +215,9 @@ fun LoadedPlayer(
                             chapters = playbackChapters,
                             gestureConfig = gestureConfig,
                             playbackBrightnessPercent = playbackBrightnessPercent,
-                            onPlaybackBrightnessChange = { playbackBrightnessPercent = it },
+                            onPlaybackBrightnessChange = {
+                                onAction(PlayerAction.OnSetPlaybackBrightness(it))
+                            },
                             loadSubtitleCues = loadSubtitleCues,
                             captionStyles = userSettings.captionStyles,
                             danmakuState = danmakuState,

app/src/main/java/dev/typetype/android/feature/player/PlaybackBrightnessPreferenceController.kt

@@ -0,0 +1,26 @@
+package dev.typetype.android.feature.player
+
+import dev.typetype.android.domain.preferences.PreferencesRepository
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+internal class PlaybackBrightnessPreferenceController(
+    private val preferencesRepository: PreferencesRepository,
+    private val scope: CoroutineScope,
+) {
+    private var saveJob: Job? = null
+
+    fun update(percent: Int, onChanged: (Int) -> Unit) {
+        val value = percent.coerceIn(0, 100)
+        onChanged(value)
+        saveJob?.cancel()
+        saveJob = scope.launch {
+            delay(SAVE_DEBOUNCE_MS)
+            preferencesRepository.setPlayerPlaybackBrightnessPercent(value)
+        }
+    }
+}
+
+private const val SAVE_DEBOUNCE_MS = 180L

app/src/main/java/dev/typetype/android/feature/player/PlayerAction.kt

@@ -9,6 +9,7 @@ sealed interface PlayerAction {
     data object OnAdvanceQueue : PlayerAction
     data object OnCancelQueueAutoplay : PlayerAction
     data object OnToggleQueueAutoplayPause : PlayerAction
+    data class OnSetPlaybackBrightness(val percent: Int) : PlayerAction
     data class OnDownload(val selection: DownloadSelection) : PlayerAction
     data object OnOpenPlaylistPicker : PlayerAction
     data object OnDismissPlaylistPicker : PlayerAction

app/src/main/java/dev/typetype/android/feature/player/PlayerScreen.kt

@@ -162,6 +162,7 @@ fun PlayerScreen(
                     isFavorited = state.isFavorited,
                     isInWatchLater = state.isInWatchLater,
                     gestureConfig = state.gestureConfig,
+                    playbackBrightnessPercent = state.playbackBrightnessPercent,
                     autoplayCountdownSeconds = state.autoplayCountdownSeconds,
                     audioOnlyPlaybackDefault = state.audioOnlyPlaybackDefault,
                     userSettings = state.userSettings,

app/src/main/java/dev/typetype/android/feature/player/PlayerState.kt

@@ -18,6 +18,7 @@ data class PlayerState(
     val isFavorited: Boolean = false,
     val isInWatchLater: Boolean = false,
     val gestureConfig: PlayerGestureConfig = PlayerGestureConfig(),
+    val playbackBrightnessPercent: Int? = null,
     val autoplayCountdownSeconds: Int = 10,
     val audioOnlyPlaybackDefault: Boolean? = null,
     val userSettings: UserSettings = UserSettings(),

app/src/main/java/dev/typetype/android/feature/player/PlayerViewModel.kt

@@ -68,6 +68,10 @@ class PlayerViewModel @Inject constructor(
     private var loadStreamJob: Job? = null
     private var favoriteJob: Job? = null
     private var watchLaterJob: Job? = null
+    private val brightnessPreferences = PlaybackBrightnessPreferenceController(
+        preferencesRepository,
+        viewModelScope,
+    )
 
     init {
         viewModelScope.launch {
@@ -144,6 +148,7 @@ class PlayerViewModel @Inject constructor(
                             swipeBrightnessVolumeEnabled = prefs.playerSwipeBrightnessVolumeEnabled,
                             longPressSpeedEnabled = prefs.playerLongPressSpeedEnabled,
                         ),
+                        playbackBrightnessPercent = prefs.playerPlaybackBrightnessPercent,
                         autoplayCountdownSeconds = prefs.playerAutoplayCountdownSeconds,
                         audioOnlyPlaybackDefault = prefs.playerAudioOnlyPlayback,
                     )
@@ -172,6 +177,9 @@ class PlayerViewModel @Inject constructor(
             PlayerAction.OnCancelQueueAutoplay -> playbackQueueCoordinator.cancelAutoplay()
             PlayerAction.OnToggleQueueAutoplayPause ->
                 playbackQueueCoordinator.toggleAutoplayPause()
+            is PlayerAction.OnSetPlaybackBrightness -> brightnessPreferences.update(action.percent) {
+                _state.update { state -> state.copy(playbackBrightnessPercent = it) }
+            }
             is PlayerAction.OnDownload -> downloadCurrentVideo(action.selection)
             PlayerAction.OnOpenPlaylistPicker ->
                 _state.update { it.copy(playlistPickerVisible = true) }