From 1bc17dae1040743f55437ce59ca77ca2d9cece6e Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Thu, 16 Nov 2023 16:27:43 +0100
Subject: [PATCH 1/5] Trailers: extract to TmdbTools2, add for shows.

---
 .../movies/details/MovieTrailersLoader.kt     | 50 +---------
 .../seriesguide/tmdbapi/TmdbTools2.kt         | 93 +++++++++++++++++++
 2 files changed, 95 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieTrailersLoader.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieTrailersLoader.kt
index dc4967541e..bce51195a1 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieTrailersLoader.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieTrailersLoader.kt
@@ -4,13 +4,8 @@
 package com.battlelancer.seriesguide.movies.details
 
 import android.content.Context
-import com.battlelancer.seriesguide.SgApp
-import com.battlelancer.seriesguide.movies.MoviesSettings.getMoviesLanguage
-import com.battlelancer.seriesguide.util.Errors
+import com.battlelancer.seriesguide.tmdbapi.TmdbTools2
 import com.uwetrottmann.androidutils.GenericSimpleLoader
-import com.uwetrottmann.tmdb2.entities.Videos
-import com.uwetrottmann.tmdb2.enumerations.VideoType
-import timber.log.Timber
 
 /**
  * Loads a YouTube movie trailer from TMDb. Tries to get a local trailer, if not falls back to
@@ -20,48 +15,7 @@ class MovieTrailersLoader(context: Context, private val tmdbId: Int) :
     GenericSimpleLoader<String?>(context) {
 
     override fun loadInBackground(): String? {
-        // try to get a local trailer
-        val trailer = getTrailerVideoId(
-            getMoviesLanguage(context), "get local movie trailer"
-        )
-        if (trailer != null) {
-            return trailer
-        }
-        Timber.d("Did not find a local movie trailer.")
-
-        // fall back to default language trailer
-        return getTrailerVideoId(null, "get default movie trailer")
-    }
-
-    private fun getTrailerVideoId(language: String?, action: String): String? {
-        val moviesService = SgApp.getServicesComponent(context).moviesService()
-        try {
-            val response = moviesService.videos(tmdbId, language).execute()
-            if (response.isSuccessful) {
-                return extractTrailer(response.body())
-            } else {
-                Errors.logAndReport(action, response)
-            }
-        } catch (e: Exception) {
-            Errors.logAndReport(action, e)
-        }
-        return null
+        return TmdbTools2().getMovieTrailerYoutubeId(context, tmdbId)
     }
 
-    private fun extractTrailer(videos: Videos?): String? {
-        val results = videos?.results
-        if (results == null || results.size == 0) {
-            return null
-        }
-
-        // Pick the first YouTube trailer
-        for (video in results) {
-            val videoId = video.key
-            if (video.type == VideoType.TRAILER && "YouTube" == video.site
-                && !videoId.isNullOrEmpty()) {
-                return videoId
-            }
-        }
-        return null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools2.kt b/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools2.kt
index ef298f158e..2f41f8127a 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools2.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools2.kt
@@ -5,6 +5,7 @@ package com.battlelancer.seriesguide.tmdbapi
 
 import android.content.Context
 import com.battlelancer.seriesguide.SgApp
+import com.battlelancer.seriesguide.movies.MoviesSettings
 import com.battlelancer.seriesguide.provider.SgRoomDatabase
 import com.battlelancer.seriesguide.util.Errors
 import com.battlelancer.seriesguide.util.isRetryError
@@ -26,16 +27,19 @@ import com.uwetrottmann.tmdb2.entities.TmdbDate
 import com.uwetrottmann.tmdb2.entities.TvEpisode
 import com.uwetrottmann.tmdb2.entities.TvShow
 import com.uwetrottmann.tmdb2.entities.TvShowResultsPage
+import com.uwetrottmann.tmdb2.entities.Videos
 import com.uwetrottmann.tmdb2.entities.WatchProviders
 import com.uwetrottmann.tmdb2.enumerations.AppendToResponseItem
 import com.uwetrottmann.tmdb2.enumerations.ExternalSource
 import com.uwetrottmann.tmdb2.enumerations.SortBy
+import com.uwetrottmann.tmdb2.enumerations.VideoType
 import com.uwetrottmann.tmdb2.services.PeopleService
 import com.uwetrottmann.tmdb2.services.TvEpisodesService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.awaitResponse
 import retrofit2.create
+import timber.log.Timber
 import java.util.Calendar
 import java.util.Date
 
@@ -224,6 +228,95 @@ class TmdbTools2 {
         return null
     }
 
+    fun getShowTrailerYoutubeId(
+        context: Context,
+        showTmdbId: Int,
+        languageCode: String
+    ): Result<String?, TmdbError> {
+        val action = "get show trailer"
+        val tmdb = SgApp.getServicesComponent(context.applicationContext).tmdb()
+        return runCatching {
+            tmdb.tvService()
+                .videos(showTmdbId, languageCode)
+                .execute()
+        }.mapError {
+            Errors.logAndReport(action, it)
+            if (it.isRetryError()) TmdbRetry else TmdbStop
+        }.andThen {
+            if (it.isSuccessful) {
+                val results = it.body()?.results
+                if (results != null) {
+                    return@andThen Ok(extractTrailer(it.body()))
+                } else {
+                    Errors.logAndReport(action, it, "results is null")
+                }
+            } else {
+                Errors.logAndReport(action, it)
+            }
+            return@andThen Err(TmdbStop)
+        }
+    }
+
+    /**
+     * Loads a YouTube movie trailer from TMDb. Tries to get a local trailer, if not falls back to
+     * English.
+     */
+    fun getMovieTrailerYoutubeId(
+        context: Context,
+        movieTmdbId: Int
+    ): String? {
+        // try to get a local trailer
+        val trailer = getMovieTrailerYoutubeId(
+            context, movieTmdbId, MoviesSettings.getMoviesLanguage(context), "get local movie trailer"
+        )
+        if (trailer != null) {
+            return trailer
+        }
+        Timber.d("Did not find a local movie trailer.")
+
+        // fall back to default language trailer
+        return getMovieTrailerYoutubeId(
+            context, movieTmdbId, null, "get default movie trailer"
+        )
+    }
+
+    private fun getMovieTrailerYoutubeId(
+        context: Context,
+        movieTmdbId: Int,
+        languageCode: String?,
+        action: String
+    ): String? {
+        val moviesService = SgApp.getServicesComponent(context).moviesService()
+        try {
+            val response = moviesService.videos(movieTmdbId, languageCode).execute()
+            if (response.isSuccessful) {
+                return extractTrailer(response.body())
+            } else {
+                Errors.logAndReport(action, response)
+            }
+        } catch (e: Exception) {
+            Errors.logAndReport(action, e)
+        }
+        return null
+    }
+
+    private fun extractTrailer(videos: Videos?): String? {
+        val results = videos?.results
+        if (results == null || results.size == 0) {
+            return null
+        }
+
+        // Pick the first YouTube trailer
+        for (video in results) {
+            val videoId = video.key
+            if (video.type == VideoType.TRAILER && "YouTube" == video.site
+                && !videoId.isNullOrEmpty()) {
+                return videoId
+            }
+        }
+        return null
+    }
+
     suspend fun getShowWatchProviders(
         tmdb: Tmdb,
         language: String,

From 7993945d3e6dc48621f1a15a31111d3c4fece6b4 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Thu, 16 Nov 2023 16:42:37 +0100
Subject: [PATCH 2/5] Trailers: add trailer button to add show dialog.

---
 .../search/discover/AddShowDialogFragment.kt  | 12 ++++++++++
 .../search/discover/AddShowDialogViewModel.kt |  8 +++++++
 app/src/main/res/layout/dialog_addshow.xml    | 23 ++++++++++++++++---
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
index 656a8b53dd..908e483f48 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogFragment.kt
@@ -26,6 +26,7 @@ import com.battlelancer.seriesguide.ui.OverviewActivity
 import com.battlelancer.seriesguide.ui.dialogs.L10nDialogFragment
 import com.battlelancer.seriesguide.util.ImageTools
 import com.battlelancer.seriesguide.util.LanguageTools
+import com.battlelancer.seriesguide.util.ServiceUtils
 import com.battlelancer.seriesguide.util.TextTools
 import com.battlelancer.seriesguide.util.TimeTools
 import com.battlelancer.seriesguide.util.ViewTools
@@ -152,6 +153,17 @@ class AddShowDialogFragment : AppCompatDialogFragment() {
                 this.binding?.textViewAddDescription?.isGone = false
                 populateShowViews(show)
             }
+            model.trailer.observe(this) { videoId ->
+                this.binding?.buttonAddTrailer?.apply {
+                    if (videoId != null) {
+                        setOnClickListener { ServiceUtils.openYoutube(videoId, requireContext()) }
+                        isEnabled = true
+                    } else {
+                        setOnClickListener(null)
+                        isEnabled = false
+                    }
+                }
+            }
             model.watchProvider.observe(this) { watchInfo ->
                 this.binding?.buttonAddStreamingSearch?.let {
                     val providerInfo = StreamingSearch.configureButton(it, watchInfo, false)
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogViewModel.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogViewModel.kt
index f860b81cf6..e190266d6e 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogViewModel.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowDialogViewModel.kt
@@ -17,6 +17,7 @@ import com.battlelancer.seriesguide.SgApp
 import com.battlelancer.seriesguide.shows.database.SgShow2
 import com.battlelancer.seriesguide.shows.tools.GetShowTools.GetShowError.GetShowDoesNotExist
 import com.battlelancer.seriesguide.streaming.StreamingSearch
+import com.battlelancer.seriesguide.tmdbapi.TmdbTools2
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.onSuccess
 import kotlinx.coroutines.Dispatchers
@@ -35,6 +36,7 @@ class AddShowDialogViewModel(
 
     val languageCode = MutableLiveData<String>()
     val showDetails: LiveData<ShowDetails>
+    val trailer: LiveData<String?>
 
     init {
         // Set original value for region.
@@ -66,6 +68,12 @@ class AddShowDialogViewModel(
                     }
             }
         }
+        this.trailer = languageCode.switchMap { languageCode ->
+            liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
+                TmdbTools2().getShowTrailerYoutubeId(application, showTmdbId, languageCode)
+                    .onSuccess { emit(it) }
+            }
+        }
     }
 
     private val watchInfoMediator = MediatorLiveData<StreamingSearch.WatchInfo>().apply {
diff --git a/app/src/main/res/layout/dialog_addshow.xml b/app/src/main/res/layout/dialog_addshow.xml
index ffc6488018..cf1b40d7dc 100644
--- a/app/src/main/res/layout/dialog_addshow.xml
+++ b/app/src/main/res/layout/dialog_addshow.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2023 Uwe Trottmann -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -76,12 +80,25 @@
 
             </RelativeLayout>
 
+            <Button
+                android:id="@+id/buttonAddTrailer"
+                style="@style/Widget.SeriesGuide.Button.Outlined"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/containerShowInfo"
+                android:layout_marginLeft="@dimen/default_padding"
+                android:layout_marginTop="@dimen/default_padding"
+                android:layout_marginRight="@dimen/default_padding"
+                android:text="@string/trailer"
+                app:icon="@drawable/ic_movie_white_24dp"
+                app:iconGravity="start" />
+
             <Button
                 android:id="@+id/buttonAddLanguage"
                 style="@style/Widget.SeriesGuide.Button.Borderless.Default"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/containerShowInfo"
+                android:layout_below="@+id/buttonAddTrailer"
                 android:layout_marginLeft="@dimen/default_padding"
                 android:layout_marginTop="@dimen/default_padding"
                 android:layout_marginRight="@dimen/default_padding"
@@ -178,9 +195,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/buttonAddDisplaySimilar"
-                android:maxWidth="@dimen/max_width_text_size_body"
                 android:layout_marginStart="@dimen/default_padding"
-                android:layout_marginEnd="@dimen/default_padding">
+                android:layout_marginEnd="@dimen/default_padding"
+                android:maxWidth="@dimen/max_width_text_size_body">
 
                 <!-- MaterialButton ignores line breaks here (wtf?), so use separate TextView. -->
                 <Button

From 5c6860eaf03664acf0cd41645690b6f72609c6c5 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 08:26:26 +0100
Subject: [PATCH 3/5] LanguageTools: language code in data is never null.

---
 .../java/com/battlelancer/seriesguide/util/LanguageTools.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/LanguageTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/LanguageTools.kt
index bd111237d5..09daeda1d9 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/LanguageTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/LanguageTools.kt
@@ -91,7 +91,7 @@ object LanguageTools {
         return null
     }
 
-    data class LanguageData(val languageCode: String?, val languageString: String)
+    data class LanguageData(val languageCode: String, val languageString: String)
 
     /**
      * Based on the first two letters gets the language display name. Except for

From b41bd1b92b1be89b8cea3b21111e9622310c713d Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 08:27:45 +0100
Subject: [PATCH 4/5] Show details: allow sheet buttons to adjust for larger
 text size.

---
 app/src/main/res/layout/fragment_show_narrow.xml  | 6 +++---
 app/src/main/res/layout/fragment_show_regular.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_show_narrow.xml b/app/src/main/res/layout/fragment_show_narrow.xml
index 7f947f174b..3abaded9d8 100644
--- a/app/src/main/res/layout/fragment_show_narrow.xml
+++ b/app/src/main/res/layout/fragment_show_narrow.xml
@@ -163,7 +163,7 @@
             android:id="@+id/buttonShowSimilar"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/title_similar_shows"
             app:icon="@drawable/ic_search_white_24dp"
             app:iconGravity="start" />
@@ -172,7 +172,7 @@
             android:id="@+id/buttonShowShare"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/share_show"
             app:icon="@drawable/ic_share_white_24dp"
             app:iconGravity="start" />
@@ -181,7 +181,7 @@
             android:id="@+id/buttonShowComments"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/comments"
             app:icon="@drawable/ic_forum_black_24dp"
             app:iconGravity="start" />
diff --git a/app/src/main/res/layout/fragment_show_regular.xml b/app/src/main/res/layout/fragment_show_regular.xml
index 29fb126d5c..c22684718d 100644
--- a/app/src/main/res/layout/fragment_show_regular.xml
+++ b/app/src/main/res/layout/fragment_show_regular.xml
@@ -156,7 +156,7 @@
             android:id="@+id/buttonShowSimilar"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/title_similar_shows"
             app:icon="@drawable/ic_search_white_24dp"
             app:iconGravity="start" />
@@ -165,7 +165,7 @@
             android:id="@+id/buttonShowShare"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/share_show"
             app:icon="@drawable/ic_share_white_24dp"
             app:iconGravity="start" />
@@ -174,7 +174,7 @@
             android:id="@+id/buttonShowComments"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="wrap_content"
             android:text="@string/comments"
             app:icon="@drawable/ic_forum_black_24dp"
             app:iconGravity="start" />

From fa7bd05ac269e7e8e432482debe74be71c91d85d Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 17 Nov 2023 08:28:48 +0100
Subject: [PATCH 5/5] Trailers: add trailer button to show details.

---
 .../shows/overview/ShowFragment.kt            | 15 ++++++
 .../shows/overview/ShowViewModel.kt           | 48 +++++++++++++------
 .../main/res/layout/fragment_show_narrow.xml  | 12 +++++
 .../main/res/layout/fragment_show_regular.xml | 12 +++++
 4 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
index c3d4b144c9..612e411174 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
@@ -102,6 +102,7 @@ class ShowFragment() : Fragment() {
         val buttonShortcut: Button
         val buttonLanguage: Button
         val buttonRate: View
+        val buttonTrailer: Button
         val buttonSimilar: Button
         val buttonImdb: Button
         val buttonShowMetacritic: Button
@@ -140,6 +141,7 @@ class ShowFragment() : Fragment() {
             buttonShortcut = view.findViewById(R.id.buttonShowShortcut)
             buttonLanguage = view.findViewById(R.id.buttonShowLanguage)
             buttonRate = view.findViewById(R.id.containerRatings)
+            buttonTrailer = view.findViewById(R.id.buttonShowTrailer)
             buttonSimilar = view.findViewById(R.id.buttonShowSimilar)
             buttonImdb = view.findViewById(R.id.buttonShowImdb)
             buttonShowMetacritic = view.findViewById(R.id.buttonShowMetacritic)
@@ -406,6 +408,19 @@ class ShowFragment() : Fragment() {
         binding.textViewRatingVotes.text = showForUi.traktVotes
         binding.textViewRatingUser.text = showForUi.traktUserRating
 
+        // Trailer button
+        binding.buttonTrailer.apply {
+            if (showForUi.trailerVideoId != null) {
+                setOnClickListener {
+                    ServiceUtils.openYoutube(showForUi.trailerVideoId, requireContext())
+                }
+                isEnabled = true
+            } else {
+                setOnClickListener(null)
+                isEnabled = false
+            }
+        }
+
         // Similar shows button.
         binding.buttonSimilar.setOnClickListener {
             show.tmdbId?.also {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
index 575d935952..0cbeca158b 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
@@ -20,6 +20,7 @@ import com.battlelancer.seriesguide.util.LanguageTools
 import com.battlelancer.seriesguide.util.TextTools
 import com.battlelancer.seriesguide.util.TimeTools
 import com.battlelancer.seriesguide.util.Utils
+import com.github.michaelbull.result.onSuccess
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -45,7 +46,8 @@ class ShowViewModel(application: Application) : AndroidViewModel(application) {
         val genres: String,
         val traktRating: String,
         val traktVotes: String,
-        val traktUserRating: String
+        val traktUserRating: String,
+        val trailerVideoId: String?
     )
 
     // Mediator to compute some additional data for the UI in the background.
@@ -99,20 +101,38 @@ class ShowViewModel(application: Application) : AndroidViewModel(application) {
                     val traktUserRating =
                         TraktTools.buildUserRatingString(application, show.ratingUser)
 
+                    val databaseValues = ShowForUi(
+                        show,
+                        timeOrNull,
+                        baseInfo,
+                        overviewStyled,
+                        languageData,
+                        country,
+                        releaseYear,
+                        lastUpdated,
+                        genres,
+                        traktRating, traktVotes, traktUserRating,
+                        null
+                    )
+
                     withContext(Dispatchers.Main) {
-                        showForUi.value =
-                            ShowForUi(
-                                show,
-                                timeOrNull,
-                                baseInfo,
-                                overviewStyled,
-                                languageData,
-                                country,
-                                releaseYear,
-                                lastUpdated,
-                                genres,
-                                traktRating, traktVotes, traktUserRating
-                            )
+                        showForUi.value = databaseValues
+                    }
+
+                    // Do network request after returning data from the database
+                    val showTmdbId = show.tmdbId
+                    if (showTmdbId != null && languageData != null) {
+                        TmdbTools2().getShowTrailerYoutubeId(
+                            application,
+                            show.tmdbId,
+                            languageData.languageCode
+                        ).onSuccess {
+                            if (it != null) {
+                                withContext(Dispatchers.Main) {
+                                    showForUi.value = databaseValues.copy(trailerVideoId = it)
+                                }
+                            }
+                        }
                     }
                 }
             }
diff --git a/app/src/main/res/layout/fragment_show_narrow.xml b/app/src/main/res/layout/fragment_show_narrow.xml
index 3abaded9d8..f2a72e4e34 100644
--- a/app/src/main/res/layout/fragment_show_narrow.xml
+++ b/app/src/main/res/layout/fragment_show_narrow.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- Copyright 2023 Uwe Trottmann -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
 <!-- Enable nested scrolling to scroll app bar, fix fling to top registering. -->
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -159,6 +162,15 @@
 
         </com.google.android.material.card.MaterialCardView>
 
+        <Button
+            android:id="@+id/buttonShowTrailer"
+            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/trailer"
+            app:icon="@drawable/ic_movie_white_24dp"
+            app:iconGravity="start" />
+
         <Button
             android:id="@+id/buttonShowSimilar"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
diff --git a/app/src/main/res/layout/fragment_show_regular.xml b/app/src/main/res/layout/fragment_show_regular.xml
index c22684718d..ceceb6e315 100644
--- a/app/src/main/res/layout/fragment_show_regular.xml
+++ b/app/src/main/res/layout/fragment_show_regular.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- Copyright 2023 Uwe Trottmann -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
 <!-- Enable nested scrolling to scroll app bar, fix fling to top registering. -->
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -152,6 +155,15 @@
 
         </com.google.android.material.card.MaterialCardView>
 
+        <Button
+            android:id="@+id/buttonShowTrailer"
+            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/trailer"
+            app:icon="@drawable/ic_movie_white_24dp"
+            app:iconGravity="start" />
+
         <Button
             android:id="@+id/buttonShowSimilar"
             style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"