Merge 258259f7c1 into e697bf7554

app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt

@@ -4,6 +4,7 @@ import android.net.Uri
 import com.lagradost.cloudstream3.*
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTMDbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
@@ -166,6 +167,7 @@ open class TraktProvider : MainAPI() {
             val episodes = mutableListOf<Episode>()
             val seasons = parseJson<List<Seasons>>(resSeasons)
             val seasonsNames = mutableListOf<SeasonData>()
+            var nextAir:  NextAiring? = null
 
             seasons.forEach { season ->
 
@@ -215,6 +217,13 @@ open class TraktProvider : MainAPI() {
                             description = episode.overview,
                         ).apply {
                             this.addDate(episode.firstAired)
+                            if (nextAir == null && this.date != null && this.date!! > unixTimeMS) {
+                                nextAir = NextAiring(
+                                    episode = this.episode!!,
+                                    unixTime = this.date!!.div(1000L),
+                                    season = if (this.season == 1) null else this.season,
+                                )
+                            }
                         }
                     )
                 }
@@ -240,6 +249,7 @@ open class TraktProvider : MainAPI() {
                 this.actors = actors
                 this.comingSoon = isUpcoming(mediaDetails.released)
                 //posterHeaders
+                this.nextAiring = nextAir
                 this.seasonNames = seasonsNames
                 this.backgroundPosterUrl = getOriginalWidthImageUrl(backDropUrl)
                 this.contentRating = mediaDetails.certification

app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt

@@ -703,7 +703,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             playerCenterMenu.isGone = isGone
             playerLock.isGone = !isShowing
             //player_media_route_button?.isClickable = !isGone
-            playerGoBackHolder.isGone = isGone
+            playerGoBackHolder.isGone = isGone || isLayout(TV or EMULATOR)
             playerSourcesBtt.isGone = isGone
             playerSkipEpisode.isClickable = !isGone
         }

app/src/main/res/layout/fragment_player_tv.xml

@@ -48,8 +48,6 @@
             android:clickable="true"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:nextFocusLeft="@id/player_loading_go_back"
-            android:nextFocusUp="@id/player_loading_go_back"
             android:text="@string/skip_loading"
 
             android:visibility="gone"
@@ -62,11 +60,13 @@
             android:layout_height="50dp"
             android:layout_gravity="center" />
 
+        <!-- Hide the back button for now maybe we need it later -->
         <FrameLayout
             android:id="@+id/video_go_back_holder_holder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 

app/src/main/res/layout/player_custom_layout_tv.xml

@@ -240,7 +240,7 @@
                         android:id="@+id/player_video_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="end"
+                        android:gravity="center"
                         android:textColor="@color/white"
                         android:textSize="16sp"
                         android:textStyle="bold"
@@ -250,25 +250,28 @@
                         android:id="@+id/player_video_title_rez"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="end"
+                        android:gravity="center"
                         android:textColor="@color/white"
                         android:textSize="16sp"
                         tools:text="1920x1080" />
 
-                    <FrameLayout
-                        android:id="@+id/player_episode_filler_holder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:layout_marginTop="2dp">
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_episode_filler"
-                            style="@style/SmallBlackButton"
-                            android:text="@string/filler" />
-                    </FrameLayout>
                 </LinearLayout>
 
+                <FrameLayout
+                    android:id="@+id/player_episode_filler_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="20dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/player_episode_filler"
+                        style="@style/SmallBlackButton"
+                        android:focusable="false"
+                        android:text="@string/filler" />
+                </FrameLayout>
+
                 <!-- Removed as it has no use anymore-->
                 <!--<androidx.mediarouter.app.MediaRouteButton
                         android:id="@+id/player_media_route_button"
@@ -281,11 +284,13 @@
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />-->
 
+                <!-- Hide the back button for now maybe we need it later -->
                 <FrameLayout
                     android:id="@+id/player_go_back_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:visibility="gone"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
@@ -306,6 +311,7 @@
                         android:clickable="true"
                         android:contentDescription="@string/go_back_img_des"
                         android:focusable="true"
+                        android:visibility="gone"
                         android:tag="@string/tv_no_focus_tag" />
                 </FrameLayout>
             </FrameLayout>