From 4a80c2aab10fdd5a3ed4a6932ccb842c783750ad Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Tue, 10 Sep 2024 10:34:36 +0200
Subject: [PATCH] Moved Autoplay button to top and load recommendations now
 appropriately uses 'StatePlatform.instance.getContentRecommendations(v.url)'
 for local videos.

---
 .../mainactivity/main/VideoDetailView.kt      | 29 +++++++++----------
 app/src/main/res/layout/video_player_ui.xml   | 22 +++++---------
 .../res/layout/video_player_ui_fullscreen.xml | 22 +++++---------
 3 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 6d44996f..b001360c 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -2360,20 +2360,11 @@ class VideoDetailView : ConstraintLayout {
             _layoutRecommended.visibility = View.VISIBLE
             _commentsList.clear()
 
-            val url = _url
-            if (url != null) {
-                _layoutRecommended.addView(LoaderView(context).apply {
-                    layoutParams = LinearLayout.LayoutParams(60.dp(resources), 60.dp(resources))
-                    start()
-                })
-                _taskLoadRecommendations.run(url)
-            } else {
-                _layoutRecommended.addView(TextView(context).apply {
-                    layoutParams = LinearLayout.LayoutParams(60.dp(resources), 60.dp(resources))
-                    textSize = 12.0f
-                    text = "No recommendations found"
-                })
-            }
+            _layoutRecommended.addView(LoaderView(context).apply {
+                layoutParams = LinearLayout.LayoutParams(60.dp(resources), 60.dp(resources))
+                start()
+            })
+            _taskLoadRecommendations.run(null)
         }
     }
 
@@ -2767,7 +2758,15 @@ class VideoDetailView : ConstraintLayout {
             }
         } else TaskHandler(IPlatformVideoDetails::class.java, {fragment.lifecycleScope});
 
-    private val _taskLoadRecommendations = TaskHandler<String, IPager<IPlatformContent>?>(StateApp.instance.scopeGetter, { video?.getContentRecommendations(StatePlatform.instance.getContentClient(it)) })
+    private val _taskLoadRecommendations = TaskHandler<String?, IPager<IPlatformContent>?>(StateApp.instance.scopeGetter, {
+        video?.let { v ->
+            if (v is VideoLocal) {
+                StatePlatform.instance.getContentRecommendations(v.url)
+            } else {
+                video?.getContentRecommendations(StatePlatform.instance.getContentClient(v.url))
+            }
+        }
+    })
         .success { setRecommendations(it?.getResults()?.filter { it is IPlatformVideo }?.map { it as IPlatformVideo }, "No recommendations found") }
         .exception<Throwable> {
             setRecommendations(null, it.message)
diff --git a/app/src/main/res/layout/video_player_ui.xml b/app/src/main/res/layout/video_player_ui.xml
index 32a9f5cf..e849b942 100644
--- a/app/src/main/res/layout/video_player_ui.xml
+++ b/app/src/main/res/layout/video_player_ui.xml
@@ -29,6 +29,14 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent">
+        <ImageButton
+            android:id="@+id/button_autoplay"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:scaleType="fitCenter"
+            android:clickable="true"
+            android:padding="12dp"
+            app:srcCompat="@drawable/autoplay_24px" />
         <ImageButton
             android:id="@+id/button_cast"
             android:layout_width="50dp"
@@ -133,20 +141,6 @@
         android:scaleType="fitCenter"
         android:layout_marginBottom="18dp" />
 
-    <ImageButton
-        android:id="@+id/button_autoplay"
-        android:layout_width="55dp"
-        android:layout_height="40dp"
-        android:clickable="true"
-        app:srcCompat="@drawable/autoplay_24px"
-        app:layout_constraintRight_toLeftOf="@id/button_fullscreen"
-        app:layout_constraintBottom_toBottomOf="@id/button_fullscreen"
-        app:layout_constraintTop_toTopOf="@id/button_fullscreen"
-        android:paddingStart="5dp"
-        android:paddingTop="15dp"
-        android:paddingEnd="5dp"
-        android:scaleType="fitCenter"/>
-
     <TextView
         android:id="@+id/text_position"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/video_player_ui_fullscreen.xml b/app/src/main/res/layout/video_player_ui_fullscreen.xml
index d47c5a16..d4d93182 100644
--- a/app/src/main/res/layout/video_player_ui_fullscreen.xml
+++ b/app/src/main/res/layout/video_player_ui_fullscreen.xml
@@ -57,6 +57,14 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent">
+        <ImageButton
+            android:id="@+id/button_autoplay"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:scaleType="fitCenter"
+            android:clickable="true"
+            android:padding="12dp"
+            app:srcCompat="@drawable/autoplay_24px" />
         <ImageButton
             android:id="@+id/button_cast"
             android:layout_width="50dp"
@@ -147,20 +155,6 @@
         app:layout_constraintLeft_toRightOf="@id/layout_play_pause"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <ImageButton
-        android:id="@+id/button_autoplay"
-        android:layout_width="55dp"
-        android:layout_height="40dp"
-        android:clickable="true"
-        app:srcCompat="@drawable/autoplay_24px"
-        app:layout_constraintRight_toLeftOf="@id/button_fullscreen"
-        app:layout_constraintBottom_toBottomOf="@id/button_fullscreen"
-        app:layout_constraintTop_toTopOf="@id/button_fullscreen"
-        android:paddingStart="5dp"
-        android:paddingTop="15dp"
-        android:paddingEnd="5dp"
-        android:scaleType="fitCenter"/>
-
     <ImageButton
         android:id="@+id/button_fullscreen"
         android:layout_width="55dp"