diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt index 143e80d9..413ab7b6 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt @@ -55,8 +55,12 @@ class PlayerActivity : BasePlayerActivity() { binding.playerView.player = viewModel.player val playerControls = binding.playerView.findViewById(R.id.player_controls) + val lockedControls = binding.playerView.findViewById(R.id.locked_player_view) + + isControlsLocked = false configureInsets(playerControls) + configureInsets(lockedControls) if (appPreferences.playerGestures) { playerGestureHelper = PlayerGestureHelper( @@ -73,7 +77,6 @@ class PlayerActivity : BasePlayerActivity() { binding.playerView.findViewById(R.id.back_button_alt).setOnClickListener { finish() - isControlsLocked = false } val videoNameTextView = binding.playerView.findViewById(R.id.video_name) diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt index 793d4197..a95b79d3 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt @@ -163,8 +163,8 @@ class PlayerGestureHelper( audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, swipeGestureValueTrackerVolume.toInt(), 0) activity.binding.gestureVolumeLayout.visibility = View.VISIBLE - activity.binding.gestureVolumeProgressBar.max = maxVolume - activity.binding.gestureVolumeProgressBar.progress = swipeGestureValueTrackerVolume.toInt() + activity.binding.gestureVolumeProgressBar.max = maxVolume.times(100) + activity.binding.gestureVolumeProgressBar.progress = swipeGestureValueTrackerVolume.times(100).toInt() val process = (swipeGestureValueTrackerVolume / maxVolume.toFloat()).times(100).toInt() activity.binding.gestureVolumeText.text = "$process%" activity.binding.gestureVolumeImage.setImageLevel(process) diff --git a/app/phone/src/main/res/layout/exo_locked_controls.xml b/app/phone/src/main/res/layout/exo_locked_controls.xml index 2bc487f0..b743d6dd 100644 --- a/app/phone/src/main/res/layout/exo_locked_controls.xml +++ b/app/phone/src/main/res/layout/exo_locked_controls.xml @@ -17,7 +17,6 @@