From ab660d0ae70f12c7a065c3721591161bc46e2021 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sat, 19 Mar 2022 13:10:36 +0100 Subject: [PATCH] Show season number in MediaFragment --- .../main/fragments/MediaFragmentEpisodes.kt | 20 ++++++++++++++++--- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentEpisodes.kt b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentEpisodes.kt index 4ca840e..5956745 100644 --- a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentEpisodes.kt +++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/MediaFragmentEpisodes.kt @@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.launch +import org.mosad.teapod.R import org.mosad.teapod.databinding.FragmentMediaEpisodesBinding import org.mosad.teapod.ui.activity.main.MainActivity import org.mosad.teapod.ui.activity.main.viewmodel.MediaFragmentViewModel @@ -47,7 +48,11 @@ class MediaFragmentEpisodes : Fragment() { if (model.seasonsCrunchy.total < 2) { binding.buttonSeasonSelection.visibility = View.GONE } else { - binding.buttonSeasonSelection.text = model.currentSeasonCrunchy.title + binding.buttonSeasonSelection.text = getString( + R.string.season_number_title, + model.currentSeasonCrunchy.seasonNumber, + model.currentSeasonCrunchy.title + ) binding.buttonSeasonSelection.setOnClickListener { v -> showSeasonSelection(v) } @@ -64,7 +69,12 @@ class MediaFragmentEpisodes : Fragment() { // TODO replace with Exposed dropdown menu: https://material.io/components/menus/android#exposed-dropdown-menus val popup = PopupMenu(requireContext(), v) model.seasonsCrunchy.items.forEach { season -> - popup.menu.add(season.title).also { + popup.menu.add(getString( + R.string.season_number_title, + season.seasonNumber, + season.title + ) + ).also { it.setOnMenuItemClickListener { onSeasonSelected(season.id) false @@ -86,7 +96,11 @@ class MediaFragmentEpisodes : Fragment() { // load the new season lifecycleScope.launch { model.setCurrentSeason(seasonId) - binding.buttonSeasonSelection.text = model.currentSeasonCrunchy.title + binding.buttonSeasonSelection.text = getString( + R.string.season_number_title, + model.currentSeasonCrunchy.seasonNumber, + model.currentSeasonCrunchy.title + ) adapterRecEpisodes.notifyDataSetChanged() } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a52fdb..796017e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ %d Minute %d Minutes + S%1$d - %2$s Similar titles Ep. %1$s %2$s Ep. %1$s %2$s (Sub) @@ -67,7 +68,6 @@ Teapod by @Seil0 Version %1$s (%2$s) - Version %1$s (%2$s)