From 0645f3504ef2e6d46a478cc735e6cfca5357e31e Mon Sep 17 00:00:00 2001 From: tapframe <85391825+tapframe@users.noreply.github.com> Date: Thu, 18 Jun 2026 15:39:24 +0530 Subject: [PATCH] Align next up copy with TV app --- .../commonMain/composeResources/values-el/strings.xml | 6 +++--- .../src/commonMain/composeResources/values/strings.xml | 10 +++++----- .../kotlin/com/nuvio/app/core/i18n/LocalizedUiText.kt | 4 ++-- .../app/features/details/SeriesPlaybackResolverTest.kt | 6 +++--- .../com/nuvio/app/features/home/HomeScreenTest.kt | 8 ++++---- .../features/watching/domain/SeriesContinuityTest.kt | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/composeApp/src/commonMain/composeResources/values-el/strings.xml b/composeApp/src/commonMain/composeResources/values-el/strings.xml index 55a061cd..fcb41fc9 100644 --- a/composeApp/src/commonMain/composeResources/values-el/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-el/strings.xml @@ -355,7 +355,7 @@ Προτροπή συνέχισης κατά την εκκίνηση ΣΤΥΛ ΚΑΡΤΑΣ ΚΑΤΑ ΤΗΝ ΕΚΚΙΝΗΣΗ - ΣΥΜΠΕΡΙΦΟΡΑ UP NEXT + ΣΥΜΠΕΡΙΦΟΡΑ ΕΠΟΜΕΝΟΥ ΟΡΑΤΟΤΗΤΑ Εμφάνιση της ενότητας Συνέχεια παρακολούθησης στην Αρχική οθόνη. Εμφάνιση συνέχειας παρακολούθησης @@ -363,8 +363,8 @@ Κάρτα αφίσας με προτεραιότητα στο artwork Πλατύ Οριζόντια κάρτα με πλούσιες πληροφορίες - Όταν είναι ενεργοποιημένο, το Up Next συνεχίζει πάντα από το πιο απομακρυσμένο παρακολουθημένο επεισόδιο. Όταν είναι απενεργοποιημένο, ακολουθεί το πιο πρόσφατα παρακολουθηθέν επεισόδιο. Χρήσιμο αν ξαναβλέπετε παλαιότερα επεισόδια. - Up Next από το πιο απομακρυσμένο επεισόδιο + Εμφάνιση επόμενου επεισοδίου με βάση το πιο προχωρημένο προβληθέν επεισόδιο. Απενεργοποιήστε το για επαναπροβολές ώστε να χρησιμοποιείται το πιο πρόσφατα προβληθέν επεισόδιο. + Επόμενο από το πιο προχωρημένο επεισόδιο ΑΡΧΙΚΗ ΠΗΓΕΣ Εγκατάσταση, αφαίρεση, ανανέωση και ταξινόμηση των πηγών περιεχομένου σας. diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index be123bdf..134801bd 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -613,7 +613,7 @@ Released items first, upcoming at the end Poster Card Style ON LAUNCH - UP NEXT BEHAVIOR + NEXT UP BEHAVIOR VISIBILITY Display the Continue Watching shelf on the Home screen. Show Continue Watching @@ -624,7 +624,7 @@ Wide Info-dense horizontal card Show next episode based on the furthest watched episode. Disable for rewatches to use the most recently watched episode instead. - Up Next From Furthest Episode + Next Up From Furthest Episode Prefer episode thumbnails when available. Prefer Episode Thumbnails in Continue Watching HOME @@ -1189,7 +1189,7 @@ Mark previous seasons as watched Mark as unwatched Mark as watched - Up next + Next Up %1$s watched %1$dh %2$dm left %1$dm left @@ -1336,8 +1336,8 @@ Sign-out failed Sign-up failed Unable to load catalog items. - Up Next - Up Next • S%1$dE%2$d + Next Up + Next Up • S%1$dE%2$d %1$s logo Failed to load comments Could not load details from any addon. diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/i18n/LocalizedUiText.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/i18n/LocalizedUiText.kt index 3c96e28c..10356040 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/i18n/LocalizedUiText.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/i18n/LocalizedUiText.kt @@ -100,11 +100,11 @@ fun localizedResumeLabel(seasonNumber: Int?, episodeNumber: Int?): String { fun localizedUpNextLabel(seasonNumber: Int?, episodeNumber: Int?): String = if (seasonNumber != null && episodeNumber != null) { - resourceString("Up Next • S${seasonNumber}E${episodeNumber}") { + resourceString("Next Up • S${seasonNumber}E${episodeNumber}") { getString(Res.string.continue_watching_up_next_episode, seasonNumber, episodeNumber) } } else { - resourceString("Up Next") { getString(Res.string.continue_watching_up_next) } + resourceString("Next Up") { getString(Res.string.continue_watching_up_next) } } fun localizedMonthName(month: Int): String = diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/details/SeriesPlaybackResolverTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/details/SeriesPlaybackResolverTest.kt index a70a2627..faff7f84 100644 --- a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/details/SeriesPlaybackResolverTest.kt +++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/details/SeriesPlaybackResolverTest.kt @@ -37,7 +37,7 @@ class SeriesPlaybackResolverTest { ) assertNotNull(action) - assertEquals("Up Next • S1E3", action.label) + assertEquals("Next Up • S1E3", action.label) assertEquals("show:1:3", action.videoId) assertEquals(1, action.seasonNumber) assertEquals(3, action.episodeNumber) @@ -86,7 +86,7 @@ class SeriesPlaybackResolverTest { ) assertNotNull(action) - assertEquals("Up Next • S1E3", action.label) + assertEquals("Next Up • S1E3", action.label) assertEquals("show:1:3", action.videoId) } @@ -124,7 +124,7 @@ class SeriesPlaybackResolverTest { ) assertNotNull(action) - assertEquals("Up Next • S4E15", action.label) + assertEquals("Next Up • S4E15", action.label) assertEquals("tmdb:98765:4:15", action.videoId) assertEquals(4, action.seasonNumber) assertEquals(15, action.episodeNumber) diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/HomeScreenTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/HomeScreenTest.kt index 2ebf8447..98c2ff52 100644 --- a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/HomeScreenTest.kt +++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/HomeScreenTest.kt @@ -33,7 +33,7 @@ class HomeScreenTest { ) val nextUp = continueWatchingItem( videoId = "tt0944947:1:4", - subtitle = "Up Next • S1E4 • Cripples, Bastards, and Broken Things", + subtitle = "Next Up • S1E4 • Cripples, Bastards, and Broken Things", ) val movie = progressEntry( videoId = "movie-1", @@ -64,7 +64,7 @@ class HomeScreenTest { ) val nextUp = continueWatchingItem( videoId = "show:1:5", - subtitle = "Up Next • S1E5 • The Wolf and the Lion", + subtitle = "Next Up • S1E5 • The Wolf and the Lion", ) val result = buildHomeContinueWatchingItems( @@ -87,7 +87,7 @@ class HomeScreenTest { ) val nextUp = continueWatchingItem( videoId = "show:1:5", - subtitle = "Up Next • S1E5 • Next", + subtitle = "Next Up • S1E5 • Next", ) val result = buildHomeContinueWatchingItems( @@ -264,7 +264,7 @@ class HomeScreenTest { fun `stale live next up item is dropped when current seed advances`() { val staleNextUp = continueWatchingItem( videoId = "show:4:11", - subtitle = "Up Next • S4E11", + subtitle = "Next Up • S4E11", seedSeasonNumber = 4, seedEpisodeNumber = 10, ) diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watching/domain/SeriesContinuityTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watching/domain/SeriesContinuityTest.kt index 5aab3131..eda075e4 100644 --- a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watching/domain/SeriesContinuityTest.kt +++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/watching/domain/SeriesContinuityTest.kt @@ -39,7 +39,7 @@ class SeriesContinuityTest { ) assertNotNull(action) - assertEquals("Up Next • S1E3", action.label) + assertEquals("Next Up • S1E3", action.label) assertEquals("show:1:3", action.videoId) assertEquals(3, action.episodeNumber) } @@ -166,7 +166,7 @@ class SeriesContinuityTest { ) assertNotNull(action) - assertEquals("Up Next • S2E2", action.label) + assertEquals("Next Up • S2E2", action.label) assertEquals("show:2:2", action.videoId) } }