From 16bc87969da9c76894628f2afd04898cd3493ec2 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Tue, 6 Jul 2021 12:30:19 +0200
Subject: [PATCH] Add more progress bars and check marks + general layout
 improvements

---
 .../jellyfin/adapters/EpisodeListAdapter.kt      | 10 ++++++++++
 .../fragments/EpisodeBottomSheetFragment.kt      | 11 +++++++++++
 app/src/main/res/layout/base_item.xml            | 16 ++++++++++++++++
 app/src/main/res/layout/episode_bottom_sheet.xml | 13 +++++++++++++
 app/src/main/res/layout/episode_item.xml         | 13 +++++++++++++
 app/src/main/res/layout/next_up_section.xml      |  4 ++--
 6 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt b/app/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt
index b8346ed2..df19f837 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.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
@@ -15,6 +17,14 @@ class EpisodeListAdapter(private val onClickListener: OnClickListener) :
         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(.84))!!.toFloat(), binding.progressBar.context.resources.displayMetrics).toInt()
+                binding.progressBar.visibility = View.VISIBLE
+            } else {
+                binding.progressBar.visibility = View.GONE
+            }
             binding.executePendingBindings()
         }
     }
diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
index 71f90819..6c65e205 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt
@@ -1,6 +1,7 @@
 package dev.jdtech.jellyfin.fragments
 
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,6 +34,16 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        viewModel.item.observe(viewLifecycleOwner, { episode ->
+            if (episode.userData?.playedPercentage != null) {
+                binding.progressBar.layoutParams.width = TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_DIP,
+                    (episode.userData?.playedPercentage?.times(1.26))!!.toFloat(), context?.resources?.displayMetrics
+                ).toInt()
+                binding.progressBar.visibility = View.VISIBLE
+            }
+        })
+
         return binding.root
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index 3fdf58cc..0385df67 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="item"
             type="org.jellyfin.sdk.model.api.BaseItemDto" />
@@ -57,5 +59,19 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="9" />
+
+        <ImageView
+            android:id="@+id/played_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/circle_background"
+            android:contentDescription="@string/episode_watched_indicator"
+            android:padding="4dp"
+            android:src="@drawable/ic_check"
+            android:visibility="@{item.userData.played == true ? View.VISIBLE : View.GONE}"
+            app:layout_constraintEnd_toEndOf="@id/item_image"
+            app:layout_constraintTop_toTopOf="@id/item_image" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index 47b2ce24..86500b92 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -28,6 +28,19 @@
             app:layout_constraintTop_toTopOf="parent"
             app:shapeAppearance="@style/roundedImageView" />
 
+        <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="@id/episode_image"
+            tools:layout_width="50dp"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/episode_name"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index 66b6fc30..cad6e3c7 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -43,6 +43,19 @@
             app:layout_constraintEnd_toEndOf="@id/episode_image"
             app:layout_constraintTop_toTopOf="@id/episode_image" />
 
+        <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="@id/episode_image"
+            tools:layout_width="50dp"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/episode_title"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/next_up_section.xml b/app/src/main/res/layout/next_up_section.xml
index 2af28362..ffe8bfe1 100644
--- a/app/src/main/res/layout/next_up_section.xml
+++ b/app/src/main/res/layout/next_up_section.xml
@@ -21,16 +21,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
+            android:layout_marginBottom="12dp"
+            android:text="@{section.name}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textSize="18sp"
-            android:text="@{section.name}"
             tools:text="Next Up" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/items_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:clipToPadding="false"
             android:layoutAnimation="@anim/overview_media_animation"
             android:orientation="horizontal"