From d10dc5322e3cb315a5ca22357e90cd6fff9fc468 Mon Sep 17 00:00:00 2001
From: self-similarity <137652432+self-similarity@users.noreply.github.com>
Date: Sat, 5 Aug 2023 04:18:16 +0200
Subject: [PATCH] - Auto focus popups - Checkmarks on selectable buttons

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 13 +++++++++++-
 .../cloudstream3/ui/result/SelectAdaptor.kt   | 20 +++----------------
 .../main/res/color/button_selector_color.xml  |  6 ++++++
 app/src/main/res/layout/result_selection.xml  |  2 +-
 app/src/main/res/values/styles.xml            |  5 +++++
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/color/button_selector_color.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 4a807544..e0d50cc3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1273,7 +1273,18 @@ class GeneratorPlayer : FullScreenPlayer() {
                 from, to
             ).apply {
                 addListener(onEnd = {
-                    if (!show) playerBinding?.skipChapterButton?.isVisible = false
+                    if (show) {
+                        if (!isShowing) {
+                            // Automatically request focus if the menu is not opened
+                            playerBinding?.skipChapterButton?.requestFocus()
+                        }
+                    } else {
+                        playerBinding?.skipChapterButton?.isVisible = false
+                        if (!isShowing) {
+                            // Automatically return focus to play pause
+                            playerBinding?.playerPausePlay?.requestFocus()
+                        }
+                    }
                 })
                 addUpdateListener { valueAnimator ->
                     val value = valueAnimator.animatedValue as Int
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
index bcf401ea..6fe45730 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
@@ -45,19 +45,9 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
         if(newIndex == selectedIndex) return
         val oldIndex = selectedIndex
         selectedIndex = newIndex
-        recyclerView.apply {
-            for (i in 0 until itemCount) {
-                val viewHolder = getChildViewHolder( getChildAt(i) ?: continue) ?: continue
-                val pos = viewHolder.absoluteAdapterPosition
-                if (viewHolder is SelectViewHolder) {
-                    if (pos == oldIndex) {
-                        viewHolder.update(false)
-                    } else if (pos == newIndex) {
-                        viewHolder.update(true)
-                    }
-                }
-            }
-        }
+
+        notifyItemChanged(selectedIndex)
+        notifyItemChanged(oldIndex)
     }
 
     fun updateSelectionList(newList: List<SelectData>) {
@@ -79,10 +69,6 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
         RecyclerView.ViewHolder(binding.root) {
         private val item: MaterialButton = binding.root
 
-        fun update(isSelected: Boolean) {
-            item.isSelected = isSelected
-        }
-
         fun bind(
             data: SelectData, isSelected: Boolean, callback: (Any) -> Unit
         ) {
diff --git a/app/src/main/res/color/button_selector_color.xml b/app/src/main/res/color/button_selector_color.xml
new file mode 100644
index 00000000..9975946d
--- /dev/null
+++ b/app/src/main/res/color/button_selector_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:state_focused="true" android:color="@color/black"/>
+    <item android:state_selected="true" android:state_focused="false" android:color="@color/white"/>
+    <item android:color="@color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_selection.xml b/app/src/main/res/layout/result_selection.xml
index 925c65c9..368c8384 100644
--- a/app/src/main/res/layout/result_selection.xml
+++ b/app/src/main/res/layout/result_selection.xml
@@ -2,7 +2,7 @@
 
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/RegularButtonTV"
+    style="@style/SelectableButtonTV"
     android:layout_gravity="start"
     android:layout_margin="2dp"
     android:minWidth="115dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5a92a7f3..4d1fa924 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -737,6 +737,11 @@
         <item name="android:layout_marginEnd">0dp</item>
     </style>
 
+    <style name="SelectableButtonTV" parent="RegularButtonTV">
+        <item name="icon">@drawable/cpv_preset_checked</item>
+        <item name="iconTint">@color/button_selector_color</item>
+    </style>
+
     <style name="RegularButtonTV">
         <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="android:stateListAnimator">@null</item>