restore brightness when leaving app while a video is full screen

Changelog: changed

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt

@@ -455,6 +455,10 @@ class VideoDetailFragment() : MainFragment() {
                 activity?.enterPictureInPictureMode(params);
             }
         }
+
+        if (isFullscreen) {
+            viewDetail?.restoreBrightness()
+        }
     }
 
     fun forcePictureInPicture() {
@@ -487,6 +491,10 @@ class VideoDetailFragment() : MainFragment() {
         _isActive = true;
         _leavingPiP = false;
 
+        if (isFullscreen) {
+            _viewDetail?.saveBrightness()
+        }
+
         _viewDetail?.let {
             Logger.v(TAG, "onResume preventPictureInPicture=false");
             it.preventPictureInPicture = false;

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt

@@ -2485,6 +2485,13 @@ class VideoDetailView : ConstraintLayout {
         }
     }
 
+    fun saveBrightness() {
+        _player.gestureControl.saveBrightness()
+    }
+    fun restoreBrightness() {
+        _player.gestureControl.restoreBrightness()
+    }
+
     fun setFullscreen(fullscreen : Boolean) {
         Logger.i(TAG, "setFullscreen(fullscreen=$fullscreen)")
         _player.setFullScreen(fullscreen)

app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt

@@ -735,11 +735,7 @@ class GestureControlView : LinearLayout {
         _animatorBrightness?.start();
     }
 
-    fun setFullscreen(isFullScreen: Boolean) {
+    fun saveBrightness() {
-        resetZoomPan()
-
-        if (isFullScreen) {
-            if (Settings.instance.gestureControls.useSystemBrightness) {
         try {
             _originalBrightnessMode = android.provider.Settings.System.getInt(context.contentResolver, android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE)
 
@@ -754,18 +750,7 @@ class GestureControlView : LinearLayout {
             UIDialogs.toast(context, "useSystemBrightness disabled due to an error")
         }
     }
-
+    fun restoreBrightness() {
-            if (Settings.instance.gestureControls.useSystemVolume) {
-                val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-                val currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-                val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                _soundFactor = currentVolume.toFloat() / maxVolume.toFloat()
-            }
-
-            onBrightnessAdjusted.emit(_brightnessFactor);
-            onSoundAdjusted.emit(_soundFactor);
-        } else {
-            if (Settings.instance.gestureControls.useSystemBrightness) {
         if (Settings.instance.gestureControls.restoreSystemBrightness) {
             onBrightnessAdjusted.emit(_originalBrightnessFactor)
 
@@ -779,6 +764,28 @@ class GestureControlView : LinearLayout {
                 )
             }
         }
+    }
+
+    fun setFullscreen(isFullScreen: Boolean) {
+        resetZoomPan()
+
+        if (isFullScreen) {
+            if (Settings.instance.gestureControls.useSystemBrightness) {
+                saveBrightness()
+            }
+
+            if (Settings.instance.gestureControls.useSystemVolume) {
+                val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+                val currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                _soundFactor = currentVolume.toFloat() / maxVolume.toFloat()
+            }
+
+            onBrightnessAdjusted.emit(_brightnessFactor);
+            onSoundAdjusted.emit(_soundFactor);
+        } else {
+            if (Settings.instance.gestureControls.useSystemBrightness) {
+                restoreBrightness()
             } else {
                 onBrightnessAdjusted.emit(1.0f);
             }