Simplify

aniyomiorg · Jul 9, 2024 · 0d0eb6b · 0d0eb6b
1 parent 2764e0e
commit 0d0eb6b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
@@ -1831,20 +1831,21 @@ class PlayerActivity : BaseActivity() {
     }
 
     private fun setMpvMediaTitle() {
-        val title = viewModel.currentAnime?.let { anime ->
-            val episode = viewModel.currentEpisode?.let { ep ->
-                val epNumber = if (ceil(ep.episode_number) == floor(ep.episode_number)) {
-                    ep.episode_number.toInt()
-                } else {
-                    ep.episode_number
-                }.toString().padStart(2, '0')
-                stringResource(MR.strings.media_title_episode, epNumber, ep.name)
-            }.orEmpty()
-            stringResource(MR.strings.media_title_anime, anime.title, episode)
-        }
-        title?.also {
-            MPVLib.setPropertyString("force-media-title", it)
-        }
+        val anime = viewModel.currentAnime ?: return
+        val episode = viewModel.currentEpisode ?: return
+
+        val epNumber = episode.episode_number.let { number ->
+            if (ceil(number) == floor(number)) number.toInt() else number
+        }.toString().padStart(2, '0')
+
+        val title = stringResource(
+            MR.strings.mpv_media_title,
+            anime.title,
+            epNumber,
+            episode.name,
+        )
+
+        MPVLib.setPropertyString("force-media-title", title)
     }
 
     private var aniskipStamps: List<Stamp> = emptyList()

diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml
@@ -903,8 +903,7 @@
     <string name="go_to_next_chapter">Next chapter</string>
     <string name="go_to_previous_chapter">Previous chapter</string>
     <string name="go_to_after_opening">Skipped opening</string>
-    <string name="media_title_anime">%1$s%2$s</string>
-    <string name="media_title_episode"> - E%1$s - %2$s</string>
+    <string name="mpv_media_title">%1$s - E%2$s - %3$s</string>
     <string name="pref_player_smooth_seek">Enable precise seeking</string>
     <string name="pref_player_smooth_seek_summary">When enabled, seeking will not focus on keyframes, leading to slower but precise seeking</string>
     <string name="pref_player_fullscreen">Show content in display cutout</string>