From 1202049d7b8a9771dab531c78cd720d327f567cc Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sat, 9 Jul 2022 19:25:06 +0200
Subject: [PATCH] dynamic chapter name

---
 .../libretube/fragments/PlayerFragment.kt     | 39 ++++++++++++++++---
 app/src/main/res/drawable/ic_arrow_right.xml  | 11 ++++++
 .../layout/exo_styled_player_control_view.xml | 19 ++++++---
 3 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_arrow_right.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 dfc90e585..e4e8a6645 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -90,7 +90,9 @@ import kotlinx.coroutines.launch
 import org.chromium.net.CronetEngine
 import retrofit2.HttpException
 import java.io.IOException
+import java.util.*
 import java.util.concurrent.Executors
+import kotlin.collections.ArrayList
 import kotlin.math.abs
 
 var isFullScreen = false
@@ -137,6 +139,7 @@ class PlayerFragment : Fragment() {
     private lateinit var title: String
     private lateinit var uploader: String
     private lateinit var thumbnailUrl: String
+    private lateinit var chapters: List<ChapterSegment>
     private val sponsorBlockPrefs = SponsorBlockPrefs()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -335,7 +338,7 @@ class PlayerFragment : Fragment() {
         binding.linLayout.visibility = View.GONE
         playerBinding.fullscreen.setImageResource(R.drawable.ic_fullscreen_exit)
         playerBinding.exoTitle.visibility = View.VISIBLE
-        playerBinding.chapterName.visibility = View.VISIBLE
+        if (chapters.isNotEmpty()) playerBinding.chapterLL.visibility = View.VISIBLE
 
         val mainActivity = activity as MainActivity
         val fullscreenOrientationPref = PreferenceHelper
@@ -373,7 +376,7 @@ class PlayerFragment : Fragment() {
         binding.linLayout.visibility = View.VISIBLE
         playerBinding.fullscreen.setImageResource(R.drawable.ic_fullscreen)
         playerBinding.exoTitle.visibility = View.INVISIBLE
-        playerBinding.chapterName.visibility = View.INVISIBLE
+        playerBinding.chapterLL.visibility = View.INVISIBLE
 
         scaleControls(1F)
 
@@ -712,7 +715,10 @@ class PlayerFragment : Fragment() {
         enableDoubleTapToSeek()
 
         // init the chapters recyclerview
-        if (response.chapters != null) initializeChapters(response.chapters)
+        if (response.chapters != null) {
+            chapters = response.chapters
+            initializeChapters()
+        }
 
         // Listener for play and pause icon change
         exoPlayer.addListener(object : Player.Listener {
@@ -938,7 +944,7 @@ class PlayerFragment : Fragment() {
         })
     }
 
-    private fun initializeChapters(chapters: List<ChapterSegment>) {
+    private fun initializeChapters() {
         if (chapters.isNotEmpty()) {
             // enable chapters in the video description
             binding.chaptersRecView.layoutManager =
@@ -955,8 +961,7 @@ class PlayerFragment : Fragment() {
             chapters.forEach {
                 titles += it.title!!
             }
-            playerBinding.chapterName.text = chapters[0].title
-            playerBinding.chapterName.setOnClickListener{
+            playerBinding.chapterLL.setOnClickListener {
                 MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.chapters)
                     .setItems(titles.toTypedArray()) { _, index ->
@@ -965,9 +970,31 @@ class PlayerFragment : Fragment() {
                     }
                     .show()
             }
+            setCurrentChapterName()
         }
     }
 
+    // set the name of the video chapter in the exoPlayerView
+    private fun setCurrentChapterName() {
+        // call the function again in 100ms
+        exoPlayerView.postDelayed(this::setCurrentChapterName, 100)
+
+        val currentPosition = exoPlayer.currentPosition
+        var chapterName: String? = null
+        val reversedChapters = chapters.toMutableList()
+
+        // reverse the chapters to start at the end
+        reversedChapters.reverse()
+        reversedChapters.forEach {
+            // check whether the chapter start is greater than the current player position
+            if (it.start!! * 1000 >= currentPosition) chapterName = it.title
+        }
+        Log.e(TAG, chapterName.toString())
+        // change the chapter name textView text to the chapterName
+        if (chapterName != null && chapterName != playerBinding.chapterName.text)
+            playerBinding.chapterName.text = chapterName
+    }
+
     private fun setMediaSource(
         subtitle: MutableList<SubtitleConfiguration>,
         videoUri: Uri,
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
new file mode 100644
index 000000000..fdda75ce4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z" />
+</vector>
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index c5f9540f5..1473dad8d 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -137,17 +137,26 @@
                 style="@style/ExoStyledControls.TimeText.Duration" />
 
             <LinearLayout
-                android:id="@+id/chapter_fullscreen"
+                android:id="@+id/chapterLL"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/chapter_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:textSize="16sp"
-                    android:visibility="gone" />
+                    android:layout_gravity="center"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginStart="3dp"
+                    android:src="@drawable/ic_arrow_right" />
 
             </LinearLayout>