Skip to content

fix: seek buttons always visible if double tap to seek disabled #7573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2025
Merged

fix: seek buttons always visible if double tap to seek disabled #7573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,22 +392,22 @@ abstract class CustomExoPlayerView(
private fun initRewindAndForward() {
val seekIncrementText = (PlayerHelper.seekIncrement / 1000).toString()
listOf(
doubleTapOverlayBinding.rewindTV,
doubleTapOverlayBinding.forwardTV,
binding.forwardTV,
binding.rewindTV
doubleTapOverlayBinding.rewindLayout.rewindTV,
doubleTapOverlayBinding.forwardLayout.forwardTV,
binding.seekButtonForward.forwardTV,
binding.seekButtonRewind.rewindTV
).forEach {
it.text = seekIncrementText
}
binding.forwardBTN.setOnClickListener {
binding.seekButtonForward.forwardBTN.setOnClickListener {
player?.seekBy(PlayerHelper.seekIncrement)
}
binding.rewindBTN.setOnClickListener {
binding.seekButtonRewind.rewindBTN.setOnClickListener {
player?.seekBy(-PlayerHelper.seekIncrement)
}
if (PlayerHelper.doubleTapToSeek) return

listOf(binding.forwardBTN, binding.rewindBTN).forEach {
listOf(binding.seekButtonForward.forwardBTN, binding.seekButtonRewind.rewindBTN).forEach {
it.isVisible = true
}
}
Expand Down Expand Up @@ -474,8 +474,8 @@ abstract class CustomExoPlayerView(
binding.playPauseBTN.isVisible = isLocked

if (!PlayerHelper.doubleTapToSeek) {
binding.rewindBTN.isVisible = isLocked
binding.forwardBTN.isVisible = isLocked
binding.seekButtonRewind.rewindBTN.isVisible = isLocked
binding.seekButtonForward.forwardBTN.isVisible = isLocked
}

// hide the dimming background overlay if locked
Expand All @@ -499,12 +499,12 @@ abstract class CustomExoPlayerView(

// show the rewind button
doubleTapOverlayBinding.apply {
animateSeeking(rewindBTN, rewindIV, rewindTV, true)
animateSeeking(rewindLayout.rewindBTN, rewindLayout.rewindIV, rewindLayout.rewindTV, true)

// start callback to hide the button
runnableHandler.removeCallbacksAndMessages(HIDE_REWIND_BUTTON_TOKEN)
runnableHandler.postDelayed(700, HIDE_REWIND_BUTTON_TOKEN) {
rewindBTN.isGone = true
rewindLayout.rewindBTN.isGone = true
}
}
}
Expand All @@ -514,12 +514,12 @@ abstract class CustomExoPlayerView(

// show the forward button
doubleTapOverlayBinding.apply {
animateSeeking(forwardBTN, forwardIV, forwardTV, false)
animateSeeking(forwardLayout.forwardBTN, forwardLayout.forwardIV, forwardLayout.forwardTV, false)

// start callback to hide the button
runnableHandler.removeCallbacksAndMessages(HIDE_FORWARD_BUTTON_TOKEN)
runnableHandler.postDelayed(700, HIDE_FORWARD_BUTTON_TOKEN) {
forwardBTN.isGone = true
forwardLayout.forwardBTN.isGone = true
}
}
}
Expand Down
54 changes: 8 additions & 46 deletions app/src/main/res/layout/double_tap_overlay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,10 @@
android:clipToPadding="false"
android:focusable="false">

<FrameLayout
android:id="@+id/rewindBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible">

<ImageView
android:id="@+id/rewindIV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_rewind"
app:tint="@android:color/white" />

<TextView
android:id="@+id/rewindTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white"
android:translationZ="1dp" />

</FrameLayout>
<include
android:id="@+id/rewindLayout"
layout="@layout/seek_button_rewind"
android:visibility="invisible" />

</FrameLayout>

Expand All @@ -59,29 +40,10 @@
android:clipToPadding="false"
android:focusable="false">

<FrameLayout
android:id="@+id/forwardBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible">

<ImageView
android:id="@+id/forwardIV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_forward"
app:tint="@android:color/white" />

<TextView
android:id="@+id/forwardTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white"
android:translationZ="1dp" />

</FrameLayout>
<include
android:id="@+id/forwardLayout"
layout="@layout/seek_button_forward"
android:visibility="invisible" />

</FrameLayout>

Expand Down
64 changes: 12 additions & 52 deletions app/src/main/res/layout/exo_styled_player_control_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@
android:gravity="center"
android:padding="20dp">

<include
android:id="@+id/seek_button_rewind"
layout="@layout/seek_button_rewind"
android:visibility="invisible"
tools:visibility="visible" />

<ImageView
android:id="@+id/skip_prev"
style="@style/PlayerControlCenter"
Expand All @@ -139,32 +145,6 @@
android:visibility="invisible"
app:tint="@android:color/white" />

<FrameLayout
android:id="@+id/rewindBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleX="0.8"
android:scaleY="0.8"
android:visibility="gone">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_rewind"
app:tint="@android:color/white" />

<TextView
android:id="@+id/rewindTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white" />

</FrameLayout>

<ImageButton
android:id="@+id/playPauseBTN"
style="@style/ExoStyledControls.Button.Center.PlayPause"
Expand All @@ -173,32 +153,6 @@
android:src="@drawable/ic_play"
app:tint="@android:color/white" />

<FrameLayout
android:id="@+id/forwardBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleX="0.8"
android:scaleY="0.8"
android:visibility="gone">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_forward"
app:tint="@android:color/white" />

<TextView
android:id="@+id/forwardTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white" />

</FrameLayout>

<ImageView
android:id="@+id/skip_next"
style="@style/PlayerControlCenter"
Expand All @@ -207,6 +161,12 @@
android:visibility="invisible"
app:tint="@android:color/white" />

<include
android:id="@+id/seek_button_forward"
layout="@layout/seek_button_forward"
android:visibility="invisible"
tools:visibility="visible" />

</LinearLayout>

<LinearLayout
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/res/layout/seek_button_forward.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/forwardBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">

<ImageView
android:id="@+id/forwardIV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_forward"
app:tint="@android:color/white" />

<TextView
android:id="@+id/forwardTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white"
android:translationZ="1dp" />

</FrameLayout>
24 changes: 24 additions & 0 deletions app/src/main/res/layout/seek_button_rewind.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rewindBTN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">

<ImageView
android:id="@+id/rewindIV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_rewind"
app:tint="@android:color/white" />

<TextView
android:id="@+id/rewindTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/white"
android:translationZ="1dp" />

</FrameLayout>
Loading