From 27a515f27fe2ce1860192e425805f0a217a566ce Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Thu, 1 Jul 2021 11:45:53 +0200
Subject: [PATCH] Improve Home Continue Watching section

---
 .../adapters/HomeEpisodeListAdapter.kt        | 15 +++++++++
 .../main/res/layout/fragment_media_info.xml   |  2 +-
 app/src/main/res/layout/home_episode_item.xml | 31 ++++++++++++++-----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt b/app/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
index 8ca86e0c..f934bcd3 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
@@ -1,6 +1,8 @@
 package dev.jdtech.jellyfin.adapters
 
+import android.util.TypedValue
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -13,6 +15,19 @@ class HomeEpisodeListAdapter : ListAdapter<BaseItemDto, HomeEpisodeListAdapter.E
         RecyclerView.ViewHolder(binding.root) {
         fun bind(episode: BaseItemDto) {
             binding.episode = episode
+            if (episode.userData?.playedPercentage != null) {
+                binding.progressBar.layoutParams.width = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                    (episode.userData?.playedPercentage?.times(2.24))!!.toFloat(), binding.progressBar.context.resources.displayMetrics).toInt()
+                binding.progressBar.visibility = View.VISIBLE
+            }
+
+            if (episode.type == "Movie") {
+                binding.primaryName.text = episode.name
+                binding.secondaryName.visibility = View.GONE
+            } else if (episode.type == "Episode") {
+                binding.primaryName.text = episode.seriesName
+            }
+
             binding.executePendingBindings()
         }
     }
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 57ea7cff..eeaed5ff 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -306,7 +306,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="24dp"
                     android:text="@{String.format(@string/episode_name_extended, viewModel.nextUp.parentIndexNumber, viewModel.nextUp.indexNumber, viewModel.nextUp.name)}"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     tools:text="The Girl Flautist" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/home_episode_item.xml b/app/src/main/res/layout/home_episode_item.xml
index cc046781..908ba740 100644
--- a/app/src/main/res/layout/home_episode_item.xml
+++ b/app/src/main/res/layout/home_episode_item.xml
@@ -20,35 +20,50 @@
             android:id="@+id/episode_image"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintDimensionRatio="H,16:9"
             android:scaleType="centerCrop"
             app:episodeImage="@{episode}"
+            app:layout_constraintDimensionRatio="H,16:9"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:shapeAppearanceOverlay="@style/roundedImageView" />
 
         <TextView
-            android:id="@+id/series_name"
+            android:id="@+id/primary_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:text="@{episode.seriesName}"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/episode_image"
             tools:text="Wonder Egg Priority" />
 
         <TextView
+            android:id="@+id/secondary_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:singleLine="true"
             android:text="@{String.format(@string/episode_name_extended, episode.parentIndexNumber, episode.indexNumber, episode.name)}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/series_name"
+            app:layout_constraintTop_toBottomOf="@id/primary_name"
             tools:text="The Girl Flautist" />
 
+        <FrameLayout
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="4dp"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/button_setup_background"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@id/episode_image"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:layout_width="50dp"
+            tools:visibility="visible" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file