From 7f7ff4fae41fba6061c8c43b790fa590096efff0 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sat, 18 Jun 2022 18:21:30 +0200
Subject: [PATCH] seek increment option

---
 .../libretube/fragments/PlayerFragment.kt     | 10 +++++----
 .../preferences/AppearanceSettings.kt         |  7 ++++++
 app/src/main/res/drawable/ic_skip.xml         | 11 ++++++++++
 app/src/main/res/values/array.xml             | 22 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/player_settings.xml      | 11 +++++++++-
 6 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_skip.xml

diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 0feca3e6a..55b74e3b3 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -811,7 +811,9 @@ class PlayerFragment : Fragment() {
     private fun createExoPlayer(view: View) {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         val playbackSpeed = sharedPreferences.getString("playback_speed", "1F")?.toFloat()
-        val bufferingGoal = sharedPreferences.getString("buffering_goal", "50")?.toInt()!!
+        // multiply by thousand: s -> ms
+        val bufferingGoal = sharedPreferences.getString("buffering_goal", "50")?.toInt()!! * 1000
+        val seekIncrement = sharedPreferences.getString("seek_increment", "5")?.toLong()!! * 1000
 
         val cronetEngine: CronetEngine = CronetHelper.getCronetEngine()
         val cronetDataSourceFactory: CronetDataSource.Factory =
@@ -834,7 +836,7 @@ class PlayerFragment : Fragment() {
             .setBackBuffer(1000 * 60 * 3, true)
             .setBufferDurationsMs(
                 DefaultLoadControl.DEFAULT_MIN_BUFFER_MS,
-                bufferingGoal * 1000, // buffering goal, s -> ms
+                bufferingGoal,
                 DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
                 DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
             )
@@ -843,8 +845,8 @@ class PlayerFragment : Fragment() {
         exoPlayer = ExoPlayer.Builder(view.context)
             .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))
             .setLoadControl(loadControl)
-            .setSeekBackIncrementMs(5000)
-            .setSeekForwardIncrementMs(5000)
+            .setSeekBackIncrementMs(seekIncrement)
+            .setSeekForwardIncrementMs(seekIncrement)
             .build()
 
         exoPlayer.setAudioAttributes(audioAttributes, true)
diff --git a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
index cb269fb28..ea88a50f4 100644
--- a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
@@ -5,6 +5,7 @@ import android.widget.TextView
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
 import com.github.libretube.R
 import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.ThemeHelper
@@ -42,5 +43,11 @@ class AppearanceSettings : PreferenceFragmentCompat() {
             requireMainActivityRestart = true
             true
         }
+
+        val hideTrending = findPreference<SwitchPreference>("hide_trending_page")
+        hideTrending?.setOnPreferenceChangeListener { _, _ ->
+            requireMainActivityRestart = true
+            true
+        }
     }
 }
diff --git a/app/src/main/res/drawable/ic_skip.xml b/app/src/main/res/drawable/ic_skip.xml
new file mode 100644
index 000000000..d88b792d4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#111918"
+        android:pathData="M20.164,16 L5.098,28.555V3.445ZM12.631,3.445V8.088L22.125,16 12.631,23.912v4.643L27.697,16Z"
+        android:strokeWidth="1" />
+</vector>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 85c925c48..9e3bbd5e3 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -635,6 +635,7 @@
         <item>1.25x</item>
         <item>1.5x</item>
         <item>2x</item>
+        <item>4x</item>
     </string-array>
     <string-array name="playbackSpeedValues">
         <item>0.25F</item>
@@ -644,6 +645,7 @@
         <item>1.25F</item>
         <item>1.5F</item>
         <item>2F</item>
+        <item>4F</item>
     </string-array>
 
     <string-array name="downloadLocation">
@@ -660,6 +662,13 @@
     </string-array>
 
     <string-array name="bufferingGoal">
+        <item>50s</item>
+        <item>100s</item>
+        <item>200s</item>
+        <item>300s</item>
+        <item>450s</item>
+    </string-array>
+    <string-array name="bufferingGoalValues">
         <item>50</item>
         <item>100</item>
         <item>200</item>
@@ -672,4 +681,17 @@
         <item>MPEG_4</item>
     </string-array>
 
+    <string-array name="seekIncrement">
+        <item>5s</item>
+        <item>10s</item>
+        <item>20s</item>
+        <item>30s</item>
+    </string-array>
+    <string-array name="seekIncrementValues">
+        <item>5</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 527a7ca25..ccef71a22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,4 +195,5 @@
     <string name="quality">Quality</string>
     <string name="behavior">Behavior</string>
     <string name="player_summary">Quality and player behavior</string>
+    <string name="seek_increment">Seek increment</string>
 </resources>
diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml
index 28694c416..477897df2 100644
--- a/app/src/main/res/xml/player_settings.xml
+++ b/app/src/main/res/xml/player_settings.xml
@@ -35,11 +35,20 @@
             app:title="@string/playback_speed"
             app:useSimpleSummaryProvider="true" />
 
+        <ListPreference
+            android:icon="@drawable/ic_skip"
+            app:defaultValue="5"
+            app:entries="@array/seekIncrement"
+            app:entryValues="@array/seekIncrementValues"
+            app:key="seek_increment"
+            app:title="@string/seek_increment"
+            app:useSimpleSummaryProvider="true" />
+
         <ListPreference
             android:icon="@drawable/ic_time"
             app:defaultValue="50"
             app:entries="@array/bufferingGoal"
-            app:entryValues="@array/bufferingGoal"
+            app:entryValues="@array/bufferingGoalValues"
             app:key="buffering_goal"
             app:summary="@string/buffering_goal_summary"
             app:title="@string/buffering_goal" />