From 5b153bfd3bd67d3c7eec21c4ce2d67ddc6a772e2 Mon Sep 17 00:00:00 2001 From: KhooLy <73142442+KhooLy@users.noreply.github.com> Date: Fri, 17 Jul 2026 17:07:59 +0300 Subject: [PATCH] Declutter player settings sheets The sheets opened with an all-caps title, an instruction sentence, a panel spanning almost half the screen, and two-line rows where every speed carried a redundant Slower/Faster label. Titles are now title case (Audio, Subtitles, Playback speed), the instruction line is gone, the landscape sheet narrows from 46% to 38% width capped at 400dp, rows tighten to 46dp with single-line speed entries (only 1x keeps a Normal label), and mono/stereo channel counts render as words instead of 1.0/2.0. --- .../src/commonMain/resources/i18n/english_us.json | 9 +++++---- core/src/commonMain/resources/i18n/tr_tr.json | 9 +++++---- .../com/fluxa/app/player/MediaTrackModels.kt | 4 ++-- .../feature/player/PlayerSettingsSidebars.kt | 15 ++------------- .../shared/feature/player/PlayerSidebarShell.kt | 8 ++++---- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/core/src/commonMain/resources/i18n/english_us.json b/core/src/commonMain/resources/i18n/english_us.json index 02c769c..7ddab38 100644 --- a/core/src/commonMain/resources/i18n/english_us.json +++ b/core/src/commonMain/resources/i18n/english_us.json @@ -208,6 +208,7 @@ "auto.no_episode_information_found": "No episode information found.", "auto.no_source_add_ons_found": "No source add-ons found.", "auto.no_sources_found_3019f12c": "No sources found.", + "auto.waiting_for_addon": "Waiting for {addon}...", "auto.select_season": "Select Season", "auto.guest": "Guest", "auto.no_account": "No account", @@ -751,12 +752,12 @@ "sources.addon_still_loading": "%s still loading...", "player.debug_log": "Debug Log", "player.embedded_source": "embedded", - "player.audio_title": "AUDIO", - "player.subtitles_title": "SUBTITLES", + "player.audio_title": "Audio", + "player.subtitles_title": "Subtitles", "player.adjust": "Adjust", "player.adjust_audio_subtitle": "Fine tune audio delay.", "player.adjust_subtitles_subtitle": "Fine tune subtitle timing and style.", - "player.speed_title": "SPEED", + "player.speed_title": "Playback speed", "player.audio_subtitle": "Choose an audio language.", "player.subtitles_subtitle": "Choose a subtitle track.", "player.speed_subtitle": "Choose playback speed.", @@ -776,7 +777,7 @@ "player.more_options": "More options", "player.hide_subtitles": "Hide subtitles", "player.embedded_subtitle": "Embedded subtitle", - "player.speed_standard": "Standard playback", + "player.speed_standard": "Normal", "player.speed_slower": "Slower pace", "player.speed_faster": "Faster playback", "player.choose_preferred_source": "Choose your preferred source.", diff --git a/core/src/commonMain/resources/i18n/tr_tr.json b/core/src/commonMain/resources/i18n/tr_tr.json index b3cf0fe..d07c7f0 100644 --- a/core/src/commonMain/resources/i18n/tr_tr.json +++ b/core/src/commonMain/resources/i18n/tr_tr.json @@ -208,6 +208,7 @@ "auto.no_episode_information_found": "Bölüm bilgisi bulunamadı.", "auto.no_source_add_ons_found": "Kaynak için addon bulunamadı.", "auto.no_sources_found_3019f12c": "Kaynak bulunamadı.", + "auto.waiting_for_addon": "{addon} bekleniyor...", "auto.select_season": "Sezon Seç", "auto.guest": "Misafir", "auto.no_account": "Hesap yok", @@ -751,12 +752,12 @@ "sources.addon_still_loading": "%s hâlâ yükleniyor...", "player.debug_log": "Hata Ayıklama Günlüğü", "player.embedded_source": "gömülü", - "player.audio_title": "SES", - "player.subtitles_title": "ALTYAZI", + "player.audio_title": "Ses", + "player.subtitles_title": "Altyazı", "player.adjust": "Ayarla", "player.adjust_audio_subtitle": "Ses gecikmesini ince ayarla.", "player.adjust_subtitles_subtitle": "Altyazı zamanlamasını ve stilini ince ayarla.", - "player.speed_title": "HIZ", + "player.speed_title": "Oynatma hızı", "player.audio_subtitle": "Ses dilini seçin.", "player.subtitles_subtitle": "Altyazı seçimini yapın.", "player.speed_subtitle": "Oynatma hızını seçin.", @@ -776,7 +777,7 @@ "player.more_options": "Diğer seçenekler", "player.hide_subtitles": "Altyazıyı gizle", "player.embedded_subtitle": "Gömülü altyazı", - "player.speed_standard": "Standart oynatım", + "player.speed_standard": "Normal", "player.speed_slower": "Daha sakin tempo", "player.speed_faster": "Daha hızlı oynatım", "player.choose_preferred_source": "Tercih ettiğiniz kaynağı seçin.", diff --git a/player/src/commonMain/kotlin/com/fluxa/app/player/MediaTrackModels.kt b/player/src/commonMain/kotlin/com/fluxa/app/player/MediaTrackModels.kt index f90ef3a..e5ff6bb 100644 --- a/player/src/commonMain/kotlin/com/fluxa/app/player/MediaTrackModels.kt +++ b/player/src/commonMain/kotlin/com/fluxa/app/player/MediaTrackModels.kt @@ -16,8 +16,8 @@ data class MediaTrack( get() { if (type != AUDIO_TRACK_TYPE) return "" return when (channelCount) { - 1 -> "1.0" - 2 -> "2.0" + 1 -> "Mono" + 2 -> "Stereo" 3 -> "2.1" 4 -> "4.0" 5 -> "5.0" diff --git a/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSettingsSidebars.kt b/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSettingsSidebars.kt index 8641ac7..c48c2a3 100644 --- a/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSettingsSidebars.kt +++ b/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSettingsSidebars.kt @@ -66,17 +66,10 @@ fun UniversalSettingsSidebar( tab == 1 -> AppStrings.t(lang, "player.subtitles_title") else -> AppStrings.t(lang, "player.speed_title") } - val subtitle = when { - showAdjust && tab == 0 -> AppStrings.t(lang, "player.adjust_audio_subtitle") - showAdjust && tab == 1 -> AppStrings.t(lang, "player.adjust_subtitles_subtitle") - tab == 0 -> AppStrings.t(lang, "player.audio_subtitle") - tab == 1 -> AppStrings.t(lang, "player.subtitles_subtitle") - else -> AppStrings.t(lang, "player.speed_subtitle") - } PlayerSidebarShell( title = title, - subtitle = subtitle, + subtitle = "", deviceType = deviceType, onClose = onClose, onBack = if (showAdjust) { { showAdjust = false } } else null @@ -210,11 +203,7 @@ fun UniversalSettingsSidebar( title = formatSpeedLabel(speed), isSelected = playbackSpeed == speed, onClick = { onSpeedChange(speed) }, - subtitle = when { - speed == 1.0f -> AppStrings.t(lang, "player.speed_standard") - speed < 1.0f -> AppStrings.t(lang, "player.speed_slower") - else -> AppStrings.t(lang, "player.speed_faster") - }, + subtitle = if (speed == 1.0f) AppStrings.t(lang, "player.speed_standard") else null, deviceType = deviceType ) } diff --git a/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSidebarShell.kt b/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSidebarShell.kt index a4e414d..b8768c1 100644 --- a/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSidebarShell.kt +++ b/shared/src/commonMain/kotlin/com/fluxa/app/shared/feature/player/PlayerSidebarShell.kt @@ -123,8 +123,8 @@ fun PlayerSidebarShell( val panelSizeModifier = when { isSideSheet && isMobile -> Modifier .fillMaxHeight() - .fillMaxWidth(0.46f) - .widthIn(min = 300.dp, max = 520.dp) + .fillMaxWidth(0.38f) + .widthIn(min = 300.dp, max = 400.dp) isSideSheet -> Modifier .widthIn(min = 300.dp, max = 420.dp) .wrapContentHeight() @@ -256,11 +256,11 @@ fun TrackItem( Row( modifier = modifier .fillMaxWidth() - .heightIn(min = if (resolvedDeviceType == DeviceType.TV) 56.dp else 52.dp) + .heightIn(min = if (resolvedDeviceType == DeviceType.TV) 52.dp else 46.dp) .clip(RoundedCornerShape(12.dp)) .background(if (isSelected) Color.White.copy(alpha = 0.08f) else Color.Transparent) .clickable { onClick() } - .padding(horizontal = 12.dp, vertical = 8.dp), + .padding(horizontal = 12.dp, vertical = 6.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp) ) {