From e0a3cb5f0ab1625983838aa233bcaa3e7ae8f576 Mon Sep 17 00:00:00 2001
From: coxju <coxju>
Date: Wed, 3 Jan 2024 21:59:36 +0530
Subject: [PATCH] adding icon button to show current

---
 .../ui/result/ResultFragmentPhone.kt          |   4 +
 .../ui/result/ResultViewModel2.kt             |  12 +-
 app/src/main/res/layout/fragment_result.xml   | 158 +++++++++++-------
 3 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index ad34309c..8ed11536 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -564,6 +564,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         )
                     )
                 }
+                showCurrentButton.isVisible = !resume.isMovie;
+                showCurrentButton.setOnClickListener {
+                    viewModel.restoreSeasonAndRange()
+                }
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 59e324ab..3714f48f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -2472,25 +2472,25 @@ class ResultViewModel2 : ViewModel() {
             )
         }
 
-        restoreSeasonAndRange(resume)
-
         return ResumeWatchingStatus(progress = progress, isMovie = isMovie, result = episode)
     }
 
-    private fun restoreSeasonAndRange(resume: VideoDownloadHelper.ResumeWatching) {
+    fun restoreSeasonAndRange() {
+        val correctId = currentId ?: return
+        val resume = getLastWatched(correctId)
         // restore season based on resume details
-        resume.season?.apply {
+        resume?.season?.apply {
             changeSeason(this)
         }
 
         // restore dubStatus based on resume details
-        resume.dubStatus?.apply {
+        resume?.dubStatus?.apply {
             changeDubStatus(this)
         }
 
         // restore range based on resume details
         currentRanges[currentIndex]?.first {
-            it.endEpisode >= resume.episode ?: 0
+            it.endEpisode >= resume?.episode ?: 0
         }?.apply {
             changeRange(this)
         }
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 70461518..ab19c186 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -733,76 +733,104 @@
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <LinearLayout
+                            <HorizontalScrollView
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="10dp"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal">
+                                android:fadingEdge="horizontal"
+                                android:requiresFadingEdge="horizontal">
 
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_season_button"
-                                    style="@style/MultiSelectButton"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
-                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
-                                    android:nextFocusLeft="@id/result_episode_select"
-                                    android:nextFocusRight="@id/result_episode_select"
-                                    android:nextFocusUp="@id/result_description"
-                                    android:nextFocusDown="@id/result_episodes"
-                                    android:paddingStart="10dp"
-                                    android:paddingEnd="5dp"
-                                    android:visibility="gone"
-                                    tools:text="Season 1"
-                                    tools:visibility="visible" />
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_episode_select"
-                                    style="@style/MultiSelectButton"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
-                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
-                                    android:nextFocusLeft="@id/result_season_button"
-                                    android:nextFocusRight="@id/result_season_button"
-                                    android:nextFocusUp="@id/result_description"
-                                    android:nextFocusDown="@id/result_episodes"
-                                    android:paddingStart="10dp"
-                                    android:paddingEnd="5dp"
-                                    android:visibility="gone"
-                                    tools:text="50-100"
-                                    tools:visibility="visible" />
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_dub_select"
-                                    style="@style/MultiSelectButton"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
-                                    android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
-                                    android:nextFocusLeft="@id/result_season_button"
-                                    android:nextFocusRight="@id/result_season_button"
-                                    android:nextFocusUp="@id/result_description"
-                                    android:nextFocusDown="@id/result_episodes"
-                                    android:paddingStart="10dp"
-                                    android:paddingEnd="5dp"
-                                    android:visibility="gone"
-                                    tools:text="Dubbed"
-                                    tools:visibility="visible" />
-
-                                <TextView
-                                    android:id="@+id/result_episodes_text"
+                                <LinearLayout
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="center_vertical"
-                                    android:paddingTop="10dp"
-                                    android:paddingBottom="10dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="8 Episodes" />
-                            </LinearLayout>
+                                    android:layout_marginBottom="10dp"
+                                    android:gravity="center_vertical"
+                                    android:orientation="horizontal">
+                                    <ImageView
+                                        android:id="@+id/show_current_button"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="match_parent"
+                                        android:background="@drawable/outline_drawable_less"
+                                        android:focusable="true"
+                                        android:padding="10dp"
+                                        android:src="@drawable/ic_outline_remove_red_eye_24"
+                                        app:tint="?attr/white"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="0dp"
+                                        android:layout_marginEnd="10dp"
+                                        android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
+                                        android:nextFocusLeft="@id/show_current_button"
+                                        android:nextFocusRight="@id/result_season_button"
+                                        android:nextFocusUp="@id/result_description"
+                                        android:nextFocusDown="@id/result_episodes"
+                                        android:paddingStart="10dp"
+                                        android:paddingEnd="5dp"
+                                        android:visibility="gone"
+                                        tools:visibility="visible"/>
+
+                                    <com.google.android.material.button.MaterialButton
+                                        android:id="@+id/result_season_button"
+                                        style="@style/MultiSelectButton"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="0dp"
+                                        android:layout_marginEnd="10dp"
+                                        android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
+                                        android:nextFocusLeft="@id/show_current_button"
+                                        android:nextFocusRight="@id/result_episode_select"
+                                        android:nextFocusUp="@id/result_description"
+                                        android:nextFocusDown="@id/result_episodes"
+                                        android:paddingStart="10dp"
+                                        android:paddingEnd="5dp"
+                                        android:visibility="gone"
+                                        tools:text="Season 1"
+                                        tools:visibility="visible" />
+
+                                    <com.google.android.material.button.MaterialButton
+                                        android:id="@+id/result_episode_select"
+                                        style="@style/MultiSelectButton"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="0dp"
+                                        android:layout_marginEnd="10dp"
+                                        android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
+                                        android:nextFocusLeft="@id/result_season_button"
+                                        android:nextFocusRight="@id/result_season_button"
+                                        android:nextFocusUp="@id/result_description"
+                                        android:nextFocusDown="@id/result_episodes"
+                                        android:paddingStart="10dp"
+                                        android:paddingEnd="5dp"
+                                        android:visibility="gone"
+                                        tools:text="50-100"
+                                        tools:visibility="visible" />
+
+                                    <com.google.android.material.button.MaterialButton
+                                        android:id="@+id/result_dub_select"
+                                        style="@style/MultiSelectButton"
+                                        android:layout_gravity="center_vertical"
+                                        android:layout_marginStart="0dp"
+                                        android:layout_marginEnd="10dp"
+                                        android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
+                                        android:nextFocusLeft="@id/result_season_button"
+                                        android:nextFocusRight="@id/result_season_button"
+                                        android:nextFocusUp="@id/result_description"
+                                        android:nextFocusDown="@id/result_episodes"
+                                        android:paddingStart="10dp"
+                                        android:paddingEnd="5dp"
+                                        android:visibility="gone"
+                                        tools:text="Dubbed"
+                                        tools:visibility="visible" />
+
+                                    <TextView
+                                        android:id="@+id/result_episodes_text"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center_vertical"
+                                        android:paddingTop="10dp"
+                                        android:paddingBottom="10dp"
+                                        android:textColor="?attr/textColor"
+                                        android:textSize="17sp"
+                                        android:textStyle="normal"
+                                        tools:text="8 Episodes" />
+                                </LinearLayout>
+                            </HorizontalScrollView>
 
 
                             <!--TODO add next airing-->