Skip to content

fix: normalize genre labels to proper case #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProdigyV21 merged 2 commits into from
May 14, 2026
Merged

fix: normalize genre labels to proper case #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf5cb97
fix: normalize genre labels to proper case
EierKopZA May 12, 2026
ea57810
fix: format details genre metadata
May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/details/DetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ import com.arflix.tv.ui.theme.Purple
import com.arflix.tv.ui.theme.TextPrimary
import com.arflix.tv.ui.theme.TextSecondary
import com.arflix.tv.util.LocalDeviceType
import com.arflix.tv.util.formatGenreName
import com.arflix.tv.util.isInCinema
import com.arflix.tv.util.parseRatingValue
import java.text.SimpleDateFormat
Expand Down Expand Up @@ -1177,7 +1178,7 @@ private fun DetailsContent(
}
}

val genreText = genres.take(2).joinToString(" / ").ifBlank {
val genreText = genres.take(2).map(::formatGenreName).joinToString(" / ").ifBlank {
if (item.mediaType == MediaType.TV) "TV Series" else "Movie"
}
val displayDate = item.year.takeIf { it.isNotBlank() }
Expand Down Expand Up @@ -1805,7 +1806,7 @@ private fun DetailsContent(

Spacer(modifier = Modifier.height(4.dp))

val genreText = genres.take(2).joinToString(" / ").ifEmpty {
val genreText = genres.take(2).map(::formatGenreName).joinToString(" / ").ifEmpty {
if (item.mediaType == MediaType.TV) "TV Series" else "Movie"
}
val isCompactHeight = configuration.screenHeightDp < 720
Expand Down Expand Up @@ -3959,7 +3960,7 @@ private fun GenreBadge(genre: String) {
.padding(horizontal = 10.dp, vertical = 5.dp)
) {
Text(
text = genre.uppercase(),
text = formatGenreName(genre),
style = ArflixTypography.label,
color = Pink
)
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/arflix/tv/ui/screens/tv/live/MiniPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import androidx.tv.material3.ExperimentalTvMaterial3Api
import androidx.tv.material3.Text
import com.arflix.tv.data.model.IptvNowNext
import com.arflix.tv.data.model.IptvProgram
import com.arflix.tv.util.formatGenreName

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -264,7 +265,7 @@ private fun ChannelIdentityRow(channel: EnrichedChannel?) {
style = LiveType.SectionTag.copy(color = LiveColors.FgMute),
)
Text(
text = channel.genre.name.uppercase(),
text = formatGenreName(channel.genre.name),
style = LiveType.SectionTag.copy(color = LiveColors.FgMute),
)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/com/arflix/tv/ui/screens/tv/live/SearchOverlay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.tv.material3.ExperimentalTvMaterial3Api
import androidx.tv.material3.Text
import com.arflix.tv.util.formatGenreName
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -283,7 +284,7 @@ private fun SearchResultRow(
overflow = TextOverflow.Ellipsis,
)
Text(
text = channel.genre.name.uppercase(),
text = formatGenreName(channel.genre.name),
style = LiveType.SectionTag.copy(color = LiveColors.FgMute),
)
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/kotlin/com/arflix/tv/util/MediaBadges.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ import com.arflix.tv.data.model.MediaType
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.time.temporal.ChronoUnit
import java.util.Locale

private val releaseDateFormatter = DateTimeFormatter.ISO_LOCAL_DATE
private val genreWordStartRegex = Regex("(^|[\\s/&-])([\\p{L}])")
private val tvWordRegex = Regex("\\bTv\\b")

fun isInCinema(item: MediaItem, now: LocalDate = LocalDate.now()): Boolean {
if (item.mediaType != MediaType.MOVIE) return false
Expand All @@ -23,3 +26,12 @@ fun parseRatingValue(raw: String): Float {
if (raw.isBlank()) return 0f
return raw.trim().replace(',', '.').toFloatOrNull() ?: 0f
}

fun formatGenreName(raw: String): String {
val trimmed = raw.trim()
if (trimmed.isEmpty()) return trimmed
val titled = trimmed.lowercase(Locale.ROOT).replace(genreWordStartRegex) { match ->
match.groupValues[1] + match.groupValues[2].replaceFirstChar { it.titlecase(Locale.ROOT) }
}
Comment on lines +32 to +35

@EierKopZA EierKopZA May 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot apply changes based on this feedback

return titled.replace(tvWordRegex, "TV")
}
Loading