Filter shows by watch provider

app/src/androidTest/java/com/battlelancer/seriesguide/provider/MigrationTest.kt

@@ -386,6 +386,26 @@ class MigrationTest {
         }
     }
 
+    @Test
+    fun migrationFrom51To52_newWatchProviderColumn() {
+        val dbOld = migrationTestHelper
+            .createDatabase(TEST_DB_NAME, SgRoomDatabase.VERSION_51_CUSTOM_RELEASE_TIME)
+        dbOld.execSQL(
+            "INSERT INTO sg_watch_provider " +
+                    "(provider_id, provider_name, display_priority, logo_path, type, enabled) " +
+                    "VALUES " +
+                    "(1, 'Test provider', 1, 'logo-path', 1, 1)"
+        )
+        dbOld.close()
+
+        val db = getMigratedDatabase(SgRoomDatabase.VERSION_52_WATCH_PROVIDER_FILTERS)
+        queryAndAssert(db, "SELECT filter_local FROM sg_watch_provider") { provider ->
+            // New filter_local column value should default to false (0)
+            assertThat(provider.isNull(0)).isFalse()
+            assertThat(provider.getInt(0)).isEqualTo(0)
+        }
+    }
+
     /**
      * Validate test data for version [SgRoomDatabase.VERSION_49_AUTO_ID_MIGRATION] or higher.
      *
@@ -406,7 +426,10 @@ class MigrationTest {
             assertThat(it.getInt(2)).isEqualTo(SHOW49.runtime)
             assertThat(it.getString(3)).isEqualTo(SHOW49.poster)
         }
-        queryAndAssert(db, "SELECT season_tmdb_id, series_id, season_number, season_order FROM sg_season") {
+        queryAndAssert(
+            db,
+            "SELECT season_tmdb_id, series_id, season_number, season_order FROM sg_season"
+        ) {
             assertThat(it.getString(0)).isEqualTo(SEASON49.tmdbId)
             assertThat(it.getLong(1)).isEqualTo(showId)
             assertThat(it.getInt(2)).isEqualTo(SEASON49.number)

app/src/main/java/com/battlelancer/seriesguide/SgApp.kt

@@ -108,6 +108,11 @@ class SgApp : Application() {
 
         const val RELEASE_VERSION_59_BETA1 = 2105900
 
+        /**
+         * Added show watch provider mapping table.
+         */
+        const val RELEASE_VERSION_72_0_1 = 2107201
+
         /**
          * The content authority used to identify the SeriesGuide [android.content.ContentProvider].
          */

app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt

@@ -511,7 +511,7 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
             binding.frameLayoutMoviePoster.isClickable = false
             binding.frameLayoutMoviePoster.isFocusable = false
         } else {
-            val smallImageUrl = (TmdbSettings.getImageBaseUrl(activity)
+            val smallImageUrl = (TmdbSettings.getImageBaseUrl(requireContext())
                     + TmdbSettings.POSTER_SIZE_SPEC_W342 + tmdbMovie.poster_path)
             ImageTools.loadWithPicasso(requireContext(), smallImageUrl)
                 .into(binding.imageViewMoviePoster, object : Callback.EmptyCallback() {
@@ -558,8 +558,9 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
             binding.frameLayoutMoviePoster.also {
                 it.isFocusable = true
                 it.setOnClickListener { view ->
+                    val posterPath = tmdbMovie.poster_path ?: return@setOnClickListener
                     val largeImageUrl =
-                        TmdbSettings.getImageOriginalUrl(activity, tmdbMovie.poster_path)
+                        TmdbSettings.getImageOriginalUrl(requireContext(), posterPath)
                     val intent = FullscreenImageActivity.intent(
                         requireActivity(),
                         smallImageUrl,

app/src/main/java/com/battlelancer/seriesguide/preferences/SgPreferencesFragment.kt

@@ -339,9 +339,7 @@ class SgPreferencesFragment : BasePreferencesFragment(),
             return true
         }
         if (StreamingSearch.KEY_SETTING_REGION == key) {
-            StreamingSearchConfigureDialog().safeShow(
-                supportFragmentManager, "streaming-service"
-            )
+            StreamingSearchConfigureDialog.show(supportFragmentManager)
             return true
         }
         if (DisplaySettings.KEY_SHOWS_TIME_OFFSET == key) {

app/src/main/java/com/battlelancer/seriesguide/provider/SgRoomDatabase.kt

@@ -35,6 +35,7 @@ import com.battlelancer.seriesguide.shows.history.SgActivity
 import com.battlelancer.seriesguide.shows.history.SgActivityHelper
 import com.battlelancer.seriesguide.streaming.SgWatchProvider
 import com.battlelancer.seriesguide.streaming.SgWatchProviderHelper
+import com.battlelancer.seriesguide.streaming.SgWatchProviderShowMapping
 import timber.log.Timber
 
 @Database(
@@ -50,13 +51,18 @@ import timber.log.Timber
         SgMovie::class,
         SgActivity::class,
         SgJob::class,
-        SgWatchProvider::class
+        SgWatchProvider::class,
+        SgWatchProviderShowMapping::class,
     ],
     version = SgRoomDatabase.VERSION,
     autoMigrations = [
         AutoMigration(
             from = SgRoomDatabase.VERSION_50_WATCH_PROVIDERS,
             to = SgRoomDatabase.VERSION_51_CUSTOM_RELEASE_TIME
+        ),
+        AutoMigration(
+            from = SgRoomDatabase.VERSION_51_CUSTOM_RELEASE_TIME,
+            to = SgRoomDatabase.VERSION_52_WATCH_PROVIDER_FILTERS
         )
     ]
 )
@@ -117,7 +123,13 @@ abstract class SgRoomDatabase : RoomDatabase() {
          * Add custom release time, day offset and time zone to shows.
          */
         const val VERSION_51_CUSTOM_RELEASE_TIME = 51
-        const val VERSION = VERSION_51_CUSTOM_RELEASE_TIME
+
+        /**
+         * - Add [SgWatchProviderShowMapping]
+         * - Add [SgWatchProvider.filter_local]
+         */
+        const val VERSION_52_WATCH_PROVIDER_FILTERS = 52
+        const val VERSION = VERSION_52_WATCH_PROVIDER_FILTERS
 
         @Volatile
         private var instance: SgRoomDatabase? = null

app/src/main/java/com/battlelancer/seriesguide/settings/TmdbSettings.kt

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2014, 2016-2018, 2020-2021, 2023-2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.settings
+
+import android.content.Context
+import android.text.format.DateUtils
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import com.battlelancer.seriesguide.settings.DisplaySettings.isVeryHighDensityScreen
+
+object TmdbSettings {
+
+    private const val KEY_LAST_UPDATED = "com.uwetrottmann.seriesguide.tmdb.lastupdated"
+
+    /* If the image URL changes the old one should be working for a while. If watch providers
+    change, typically only affects new shows or new seasons. As users likely check a show once a
+     week, updating weekly should be fine. */
+    private const val UPDATE_INTERVAL_MS = 7 * DateUtils.DAY_IN_MILLIS
+
+    private const val KEY_TMDB_BASE_URL = "com.battlelancer.seriesguide.tmdb.baseurl"
+    const val POSTER_SIZE_SPEC_W154 = "w154"
+    const val POSTER_SIZE_SPEC_W342 = "w342"
+    private const val STILL_SIZE_SPEC_W300 = "w300"
+    private const val IMAGE_SIZE_SPEC_ORIGINAL = "original"
+    const val DEFAULT_BASE_URL = "https://image.tmdb.org/t/p/"
+
+    fun isConfigurationUpToDate(context: Context): Boolean {
+        val lastUpdatedMs =
+            PreferenceManager.getDefaultSharedPreferences(context).getLong(KEY_LAST_UPDATED, 0)
+        return lastUpdatedMs + UPDATE_INTERVAL_MS >= System.currentTimeMillis()
+    }
+
+    fun setConfigurationLastUpdatedNow(context: Context) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit {
+            putLong(KEY_LAST_UPDATED, System.currentTimeMillis())
+        }
+    }
+
+    /**
+     * Saves the base URL, unless it's empty or blank.
+     */
+    fun setImageBaseUrl(context: Context, url: String) {
+        if (url.isEmpty() || url.isBlank()) return
+        PreferenceManager.getDefaultSharedPreferences(context).edit {
+            putString(KEY_TMDB_BASE_URL, url)
+        }
+    }
+
+    @JvmStatic
+    fun getImageBaseUrl(context: Context): String {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+            .getString(KEY_TMDB_BASE_URL, null) ?: DEFAULT_BASE_URL
+    }
+
+    fun getImageOriginalUrl(context: Context, path: String): String {
+        return getImageBaseUrl(context) + IMAGE_SIZE_SPEC_ORIGINAL + path
+    }
+
+    /**
+     * Returns base image URL based on screen density.
+     */
+    @JvmStatic
+    fun getPosterBaseUrl(context: Context): String {
+        return if (isVeryHighDensityScreen(context)) {
+            getImageBaseUrl(context) + POSTER_SIZE_SPEC_W342
+        } else {
+            getImageBaseUrl(context) + POSTER_SIZE_SPEC_W154
+        }
+    }
+
+    fun getStillUrl(context: Context, path: String): String {
+        return getImageBaseUrl(context) + STILL_SIZE_SPEC_W300 + path
+    }
+}

app/src/main/java/com/battlelancer/seriesguide/shows/FilterShowsView.kt

@@ -6,7 +6,7 @@ package com.battlelancer.seriesguide.shows
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.widget.LinearLayout
+import android.widget.FrameLayout
 import com.battlelancer.seriesguide.R
 import com.battlelancer.seriesguide.databinding.ViewFilterShowsBinding
 import com.battlelancer.seriesguide.shows.ShowsDistillationSettings.ShowFilter
@@ -16,12 +16,11 @@ class FilterShowsView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
+) : FrameLayout(context, attrs, defStyleAttr) {
 
     val binding: ViewFilterShowsBinding
 
     init {
-        orientation = VERTICAL
         // can't do in onFinishInflate as that is only called when inflating from XML
         binding = ViewFilterShowsBinding.inflate(LayoutInflater.from(context), this)
 

app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt

@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2019-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.shows
 
@@ -9,23 +9,30 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.edit
+import androidx.core.view.isGone
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager
 import com.battlelancer.seriesguide.R
 import com.battlelancer.seriesguide.appwidget.ListWidgetProvider
 import com.battlelancer.seriesguide.databinding.DialogShowsDistillationBinding
 import com.battlelancer.seriesguide.settings.AdvancedSettings
 import com.battlelancer.seriesguide.settings.DisplaySettings
 import com.battlelancer.seriesguide.shows.ShowsDistillationSettings.ShowFilter
+import com.battlelancer.seriesguide.streaming.SgWatchProvider
+import com.battlelancer.seriesguide.streaming.StreamingSearchInfoDialog
 import com.battlelancer.seriesguide.ui.dialogs.SingleChoiceDialogFragment
 import com.battlelancer.seriesguide.util.TaskManager
-import com.battlelancer.seriesguide.util.ThemeUtils.setDefaultStyle
 import com.battlelancer.seriesguide.util.safeShow
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 
 class ShowsDistillationFragment : AppCompatDialogFragment() {
 
+    private val model: ShowsDistillationViewModel by viewModels()
     private var binding: DialogShowsDistillationBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -43,23 +50,58 @@ class ShowsDistillationFragment : AppCompatDialogFragment() {
 
         val binding = DialogShowsDistillationBinding.inflate(inflater, container, false)
 
-        val tabsAdapter = ShowsDistillationPageAdapter(
-            requireContext(),
-            ShowFilter.fromSettings(requireContext()),
-            filterListener,
-            SortShowsView.ShowSortOrder.fromSettings(requireContext()),
-            sortOrderListener
-        )
-        val viewPager = binding.viewPagerShowsDistillation
-        viewPager.adapter = tabsAdapter
-        binding.tabLayoutShowsDistillation.setDefaultStyle()
-        binding.tabLayoutShowsDistillation.setViewPager(viewPager)
-
-        // ensure size matches children in any case
-        // (on some devices did not resize correctly, Android layouting change?)
-        viewPager.post {
-            @Suppress("UNNECESSARY_SAFE_CALL") // view might already been unbound
-            viewPager?.requestLayout()
+        val initialShowFilter = ShowFilter.fromSettings(requireContext())
+        val initialShowSortOrder = SortShowsView.ShowSortOrder.fromSettings(requireContext())
+
+        binding.apply {
+            filterShowsView.isGone = false
+            watchProvidersFilterView.isGone = true
+            sortShowsView.isGone = true
+
+            tabLayoutShowsDistillation.addOnTabSelectedListener(object : OnTabSelectedListener {
+                override fun onTabSelected(tab: TabLayout.Tab?) {
+                    val position = tab?.position ?: return
+                    filterShowsView.isGone = position != 0
+                    watchProvidersFilterView.isGone = position != 1
+                    sortShowsView.isGone = position != 2
+                }
+
+                override fun onTabUnselected(tab: TabLayout.Tab?) {
+                }
+
+                override fun onTabReselected(tab: TabLayout.Tab?) {
+                }
+
+            })
+
+            filterShowsView.apply {
+                setInitialFilter(
+                    initialShowFilter,
+                    DisplaySettings.isNoReleasedEpisodes(context)
+                )
+                setFilterListener(filterListener)
+            }
+            watchProvidersFilterView.apply {
+                // ComposeView in a fragment: dispose already when fragment is destroyed
+                setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+                setContent {
+                    WatchProviderFilter(
+                        watchProvidersFlow = model.watchProvidersFlow,
+                        onProviderFilterChange = { provider: SgWatchProvider, checked: Boolean ->
+                            model.changeWatchProviderFilter(
+                                provider,
+                                checked
+                            )
+                        },
+                        onProviderIncludeAny = { model.removeWatchProviderFilter() },
+                        onSelectRegion = { StreamingSearchInfoDialog.show(parentFragmentManager) }
+                    )
+                }
+            }
+            sortShowsView.apply {
+                setInitialSort(initialShowSortOrder)
+                setSortOrderListener(sortOrderListener)
+            }
         }
 
         return binding.root
@@ -125,7 +167,7 @@ class ShowsDistillationFragment : AppCompatDialogFragment() {
             }
 
             // broadcast new sort order
-            ShowsDistillationSettings.sortOrderLiveData.postValue(showSortOrder)
+            ShowsDistillationSettings.sortOrder.value = showSortOrder
 
             if (showSortOrder.changedIgnoreArticles) {
                 // refresh all list widgets