From a252a5bc766cc05ed4dfeec481201a918c51b157 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 13 Aug 2021 15:01:01 +0200
Subject: [PATCH] PlayQueue: Mark SponsorBlock segments in seekbar

Fixes https://github.com/polymorphicshade/NewPipe/issues/89
---
 .../org/schabi/newpipe/player/PlayQueueActivity.java     | 9 +++++++++
 .../res/layout-land/activity_player_queue_control.xml    | 2 +-
 .../main/res/layout/activity_player_queue_control.xml    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index 13b66af80..2cd9d0c8d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
@@ -17,6 +18,7 @@ import android.widget.SeekBar;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -47,6 +49,7 @@ import java.util.List;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipe.util.SponsorBlockUtils.markSegments;
 import static org.schabi.newpipe.util.external_communication.ShareUtils.shareText;
 
 public final class PlayQueueActivity extends AppCompatActivity
@@ -225,6 +228,12 @@ public final class PlayQueueActivity extends AppCompatActivity
                 } else {
                     buildComponents();
                     if (player != null) {
+                        final PlayQueueItem item = player.getPlayQueue().getItem();
+                        final Context context = getApplicationContext();
+                        final SharedPreferences prefs =
+                                PreferenceManager.getDefaultSharedPreferences(context);
+                        markSegments(item, queueControlBinding.seekBar, context, prefs);
+
                         player.setActivityListener(PlayQueueActivity.this);
                     }
                 }
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 4b79d92f6..ade4f7f64 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -280,7 +280,7 @@
             tools:ignore="HardcodedText"
             tools:text="1:06:29" />
 
-        <androidx.appcompat.widget.AppCompatSeekBar
+        <org.schabi.newpipe.views.FocusAwareSeekBar
             android:id="@+id/seek_bar"
             style="@style/Widget.AppCompat.SeekBar"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index ec47992bb..b37935c7a 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -122,7 +122,7 @@
             tools:text="1:06:29" />
 
 
-        <androidx.appcompat.widget.AppCompatSeekBar
+        <org.schabi.newpipe.views.FocusAwareSeekBar
             android:id="@+id/seek_bar"
             style="@style/Widget.AppCompat.SeekBar"
             android:layout_width="0dp"