From e3ff1cf4554bc1bea1333a456c62becb987fd01b Mon Sep 17 00:00:00 2001
From: KingLucius <a.aelfattah5@gmail.com>
Date: Thu, 25 Jul 2024 21:23:49 +0300
Subject: [PATCH] feat(UI): Show Episode Runtime (#1207)

---
 .../metaproviders/TraktProvider.kt            |  1 +
 .../cloudstream3/ui/result/EpisodeAdapter.kt  | 15 +++++++--
 .../cloudstream3/ui/result/ResultFragment.kt  |  3 ++
 .../ui/result/ResultViewModel2.kt             |  6 ++--
 .../main/res/layout/result_episode_large.xml  | 30 +++++++++++++----
 .../com/lagradost/cloudstream3/MainAPI.kt     | 32 +++++++++++++++++--
 6 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 7c375e0a..a1b9ff34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -236,6 +236,7 @@ open class TraktProvider : MainAPI() {
                             posterUrl = fixPath(episode.images?.screenshot?.firstOrNull()),
                             rating = episode.rating?.times(10)?.roundToInt(),
                             description = episode.overview,
+                            runTime = episode.runtime
                         ).apply {
                             this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
                             if (nextAir == null && this.date != null && this.date!! > unixTimeMS && this.season != 0) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index ed5e51f1..06be6bd5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -27,7 +27,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 const val ACTION_PLAY_EPISODE_IN_PLAYER = 1
 const val ACTION_PLAY_EPISODE_IN_VLC_PLAYER = 2
@@ -58,6 +59,7 @@ const val ACTION_MARK_AS_WATCHED = 18
 const val ACTION_FCAST = 19
 
 const val TV_EP_SIZE = 400
+
 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
 
 class EpisodeAdapter(
@@ -274,7 +276,10 @@ class EpisodeAdapter(
                         episodeDate.setText(
                             txt(
                                 R.string.episode_upcoming_format,
-                                secondsToReadable(card.airDate.minus(unixTimeMS).div(1000).toInt(), "")
+                                secondsToReadable(
+                                    card.airDate.minus(unixTimeMS).div(1000).toInt(),
+                                    ""
+                                )
                             )
                         )
                     } else {
@@ -292,6 +297,12 @@ class EpisodeAdapter(
                     episodeDate.isVisible = false
                 }
 
+                episodeRuntime.setText(
+                    txt(
+                        card.runTime?.times(60L)?.toInt()?.let { secondsToReadable(it, "") }
+                    )
+                )
+
                 if (isLayout(EMULATOR or PHONE)) {
                     episodePoster.setOnClickListener {
                         clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index c687eaa0..3eab0c71 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -51,6 +51,7 @@ data class ResultEpisode(
     /** Sum of all previous season episode counts + episode */
     val totalEpisodeIndex: Int? = null,
     val airDate: Long? = null,
+    val runTime: Int? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {
@@ -87,6 +88,7 @@ fun buildResultEpisode(
     parentId: Int,
     totalEpisodeIndex: Int? = null,
     airDate: Long? = null,
+    runTime: Int? = null,
 ): ResultEpisode {
     val posDur = getViewPos(id)
     val videoWatchState = getVideoWatchState(id) ?: VideoWatchState.None
@@ -111,6 +113,7 @@ fun buildResultEpisode(
         videoWatchState,
         totalEpisodeIndex,
         airDate,
+        runTime,
     )
 }
 
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 8e8dfe30..5086426f 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
@@ -2371,7 +2371,8 @@ class ResultViewModel2 : ViewModel() {
                                     loadResponse.type,
                                     mainId,
                                     totalIndex,
-                                    airDate = i.date
+                                    airDate = i.date,
+                                    runTime = i.runTime,
                                 )
 
                             val season = eps.seasonIndex ?: 0
@@ -2426,7 +2427,8 @@ class ResultViewModel2 : ViewModel() {
                                 loadResponse.type,
                                 mainId,
                                 totalIndex,
-                                airDate = episode.date
+                                airDate = episode.date,
+                                runTime = episode.runTime,
                             )
 
                         val season = ep.seasonIndex ?: 0
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index e5a6881a..935beac1 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -44,7 +44,7 @@
                     android:nextFocusRight="@id/download_button"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/example_poster"
-                    tools:visibility="invisible"/>
+                    tools:visibility="invisible" />
 
                 <ImageView
                     android:id="@+id/episode_play_icon"
@@ -53,7 +53,7 @@
                     android:layout_gravity="center"
                     android:contentDescription="@string/play_episode"
                     android:src="@drawable/play_button"
-                    tools:visibility="invisible"/>
+                    tools:visibility="invisible" />
 
                 <ImageView
                     android:id="@+id/episode_upcoming_icon"
@@ -106,12 +106,29 @@
                         tools:text="1. Jobless" />
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/episode_rating"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="?attr/grayTextColor"
-                    tools:text="Rated: 8.8" />
+                    android:layout_gravity="start"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/episode_rating"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:textColor="?attr/grayTextColor"
+                        tools:text="Rated: 8.8" />
+
+                    <TextView
+                        android:id="@+id/episode_runtime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:textColor="?attr/grayTextColor"
+                        tools:text="80min" />
+
+                </LinearLayout>
 
                 <TextView
                     android:id="@+id/episode_date"
@@ -119,6 +136,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/grayTextColor"
                     tools:text="15 Apr 2024" />
+
             </LinearLayout>
 
             <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index aa08cb59..50dd667b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -1700,7 +1700,17 @@ suspend fun MainAPI.newMovieLoadResponse(
     builder.initializer()
     return builder
 }
-
+/** Episode information that will be passed to LoadLinks function & showed on UI
+ * @property data string used as main LoadLinks fun parameter.
+ * @property name Name of the Episode.
+ * @property season Season number.
+ * @property episode Episode number.
+ * @property posterUrl URL of Episode's poster image.
+ * @property rating Episode rating.
+ * @property date Episode air date, see addDate.
+ * @property runTime Episode runtime in seconds.
+ * @see[addDate]
+ * */
 data class Episode(
     var data: String,
     var name: String? = null,
@@ -1710,7 +1720,25 @@ data class Episode(
     var rating: Int? = null,
     var description: String? = null,
     var date: Long? = null,
-)
+    var runTime: Int? = null,
+) {
+    /**
+     * Secondary constructor for backwards compatibility without runTime.
+     *  TODO Remove this constructor after there is a new stable release and extensions are updated to support runTime.
+     */
+    constructor(
+        data: String,
+        name: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        posterUrl: String? = null,
+        rating: Int? = null,
+        description: String? = null,
+        date: Long? = null,
+    ) : this(
+        data, name, season, episode, posterUrl, rating, description, date, null
+    )
+}
 
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
     try {