From 79322161056b05c21d741d2bc5fc06f004a12a77 Mon Sep 17 00:00:00 2001
From: Cd16d <98320806+cd16b@users.noreply.github.com>
Date: Sat, 24 Jun 2023 16:34:33 +0200
Subject: [PATCH] fix: configureInsets() for lockedControls, volume progress
 bar smoothness, gesture not working if the player was locked (#408)

* fix: volume progress bar smoothness

* fix: configureInsets() for lockedControls

* fix: gesture not working if the player was locked and used back gesture
---
 .../src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt      | 5 ++++-
 .../java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt    | 4 ++--
 app/phone/src/main/res/layout/exo_locked_controls.xml        | 2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

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<View>(R.id.player_controls)
+        val lockedControls = binding.playerView.findViewById<View>(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<View>(R.id.back_button_alt).setOnClickListener {
             finish()
-            isControlsLocked = false
         }
 
         val videoNameTextView = binding.playerView.findViewById<TextView>(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 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="38dp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toStartOf="@id/extra_buttons_alt"
             app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +41,6 @@
             android:id="@+id/extra_buttons_alt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">