From 05730a513c1c4c6fd5113f96c5422e3a348c58da Mon Sep 17 00:00:00 2001 From: cd16b Date: Tue, 23 Jan 2024 11:51:45 +0100 Subject: [PATCH] change text hasNextMediaItem() false --- .../main/java/dev/jdtech/jellyfin/PlayerActivity.kt | 10 +++++++++- core/src/main/res/values-it/strings.xml | 1 + core/src/main/res/values/strings.xml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt index d0c398bc..6045cb2c 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt @@ -138,7 +138,15 @@ class PlayerActivity : BasePlayerActivity() { // Skip Intro button skipIntroButton.isVisible = !isInPictureInPictureMode && (currentIntro != null || currentCredit != null) - skipIntroButton.text = if (currentCredit != null) getString(CoreR.string.skip_credit_button) else getString(CoreR.string.skip_intro_button) + skipIntroButton.text = if (currentCredit != null) { + if (binding.playerView.player?.hasNextMediaItem() == true) { + getString(CoreR.string.skip_credit_button) + } else { + getString(CoreR.string.skip_credit_button_last) + } + } else { + getString(CoreR.string.skip_intro_button) + } skipIntroButton.setOnClickListener { if (currentIntro != null) { currentIntro?.let { diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml index 28fff6fd..f374fad4 100644 --- a/core/src/main/res/values-it/strings.xml +++ b/core/src/main/res/values-it/strings.xml @@ -187,4 +187,5 @@ Rimuovi dai preferiti Salta intro Prossimo episodio + Chiudi player \ No newline at end of file diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c7224682..19e2df36 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -187,4 +187,5 @@ Remove from favorites Skip Intro Next episode + Close player