feat; option to hide catalog underline

2026-05-16 23:12:12 +00:00 · 2026-05-10 13:47:36 +05:30 · 2026-05-10 13:47:36 +05:30 · 5cdda57913
commit 5cdda57913
parent 46a82dce9a
9 changed files with 64 additions and 0 deletions
--- a/composeApp/src/commonMain/composeResources/values/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values/strings.xml
@ -506,6 +506,8 @@
    <string name="settings_homescreen_show_hero_description">Display hero carousel at top of home.</string>
    <string name="layout_hide_unreleased">Hide Unreleased Content</string>
    <string name="layout_hide_unreleased_sub">Hide movies and shows that haven't been released yet.</string>
+    <string name="settings_homescreen_hide_catalog_underline">Hide Catalog Underline</string>
+    <string name="settings_homescreen_hide_catalog_underline_description">Remove the accent line under catalog and collection titles throughout the app.</string>
    <string name="settings_homescreen_summary">%1$d of %2$d catalogs visible • %3$d hero sources selected</string>
    <string name="settings_homescreen_summary_hint">Open a catalog only when you need to rename or reorder it.</string>
    <string name="settings_homescreen_visible">Visible</string>
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
@ -33,6 +33,7 @@ data class HomeCatalogSettingsItem(
 data class HomeCatalogSettingsUiState(
    val heroEnabled: Boolean = true,
    val hideUnreleasedContent: Boolean = false,
+    val hideCatalogUnderline: Boolean = false,
    val items: List<HomeCatalogSettingsItem> = emptyList(),
 ) {
    val signature: String
@ -41,6 +42,8 @@ data class HomeCatalogSettingsUiState(
            append('|')
            append(hideUnreleasedContent)
            append('|')
+            append(hideCatalogUnderline)
+            append('|')
            append(
                items.joinToString(separator = "|") { item ->
                    "${item.key}:${item.order}:${item.enabled}:${item.heroSourceEnabled}:${item.customTitle}"
@ -59,6 +62,7 @@ internal data class HomeCatalogPreference(
 internal data class HomeCatalogSettingsSnapshot(
    val heroEnabled: Boolean,
    val hideUnreleasedContent: Boolean,
+    val hideCatalogUnderline: Boolean,
    val preferences: Map<String, HomeCatalogPreference>,
 )

@ -75,6 +79,7 @@ private data class StoredHomeCatalogPreference(
 private data class StoredHomeCatalogSettingsPayload(
    val heroEnabled: Boolean = true,
    val hideUnreleasedContent: Boolean = false,
+    val hideCatalogUnderline: Boolean = false,
    val items: List<StoredHomeCatalogPreference> = emptyList(),
 )

@ -95,12 +100,14 @@ object HomeCatalogSettingsRepository {
    private var preferences: MutableMap<String, StoredHomeCatalogPreference> = mutableMapOf()
    private var heroEnabled = true
    private var hideUnreleasedContent = false
+    private var hideCatalogUnderline = false

    fun onProfileChanged() {
        hasLoaded = false
        preferences.clear()
        heroEnabled = true
        hideUnreleasedContent = false
+        hideCatalogUnderline = false
        definitions = emptyList()
        collectionDefinitions = emptyList()
        _uiState.value = HomeCatalogSettingsUiState()
@ -113,6 +120,7 @@ object HomeCatalogSettingsRepository {
        preferences.clear()
        heroEnabled = true
        hideUnreleasedContent = false
+        hideCatalogUnderline = false
        _uiState.value = HomeCatalogSettingsUiState()
    }

@ -144,6 +152,7 @@ object HomeCatalogSettingsRepository {
        return HomeCatalogSettingsSnapshot(
            heroEnabled = heroEnabled,
            hideUnreleasedContent = hideUnreleasedContent,
+            hideCatalogUnderline = hideCatalogUnderline,
            preferences = preferences.mapValues { (_, value) ->
                HomeCatalogPreference(
                    customTitle = value.customTitle,
@ -172,6 +181,14 @@ object HomeCatalogSettingsRepository {
        HomeRepository.applyCurrentSettings()
    }

+    fun setHideCatalogUnderline(enabled: Boolean) {
+        ensureLoaded()
+        if (hideCatalogUnderline == enabled) return
+        hideCatalogUnderline = enabled
+        publish()
+        persist()
+    }
+
    fun setHeroSourceEnabled(key: String, enabled: Boolean) {
        updatePreference(key) { preference ->
            if (!enabled) {
@ -200,6 +217,7 @@ object HomeCatalogSettingsRepository {
        ensureLoaded()
        heroEnabled = true
        hideUnreleasedContent = false
+        hideCatalogUnderline = false
        preferences.clear()
        normalizePreferences()
        publish()
@ -246,6 +264,7 @@ object HomeCatalogSettingsRepository {
        if (parsedPayload != null) {
            heroEnabled = parsedPayload.heroEnabled
            hideUnreleasedContent = parsedPayload.hideUnreleasedContent
+            hideCatalogUnderline = parsedPayload.hideCatalogUnderline
            preferences = parsedPayload.items.associateBy { it.key }.toMutableMap()
            publish()
            return
@ -345,6 +364,7 @@ object HomeCatalogSettingsRepository {
        _uiState.value = HomeCatalogSettingsUiState(
            heroEnabled = heroEnabled,
            hideUnreleasedContent = hideUnreleasedContent,
+            hideCatalogUnderline = hideCatalogUnderline,
            items = items,
        )
    }
@ -355,6 +375,7 @@ object HomeCatalogSettingsRepository {
                StoredHomeCatalogSettingsPayload(
                    heroEnabled = heroEnabled,
                    hideUnreleasedContent = hideUnreleasedContent,
+                    hideCatalogUnderline = hideCatalogUnderline,
                    items = preferences.values.sortedBy { it.order },
                ),
            ),
@ -437,6 +458,7 @@ object HomeCatalogSettingsRepository {
        }
        return SyncHomeCatalogPayload(
            hideUnreleasedContent = hideUnreleasedContent,
+            hideCatalogUnderline = hideCatalogUnderline,
            items = items,
        )
    }
@ -444,6 +466,7 @@ object HomeCatalogSettingsRepository {
    fun applyFromRemote(payload: SyncHomeCatalogPayload) {
        ensureLoaded()
        hideUnreleasedContent = payload.hideUnreleasedContent
+        hideCatalogUnderline = payload.hideCatalogUnderline
        if (payload.items.isNotEmpty()) {
            val existingHeroState = preferences.mapValues { it.value.heroSourceEnabled }
            preferences = payload.items.associate { item ->
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsSyncService.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsSyncService.kt
@ -42,6 +42,7 @@ data class SyncCatalogItem(
@Serializable
 data class SyncHomeCatalogPayload(
    @SerialName("hide_unreleased_content") val hideUnreleasedContent: Boolean = false,
+    @SerialName("hide_catalog_underline") val hideCatalogUnderline: Boolean = false,
    val items: List<SyncCatalogItem> = emptyList(),
 )

--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeCatalogSection.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeCatalogSection.kt
@ -4,11 +4,15 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.nuvio.app.core.ui.NuvioShelfSection
 import com.nuvio.app.core.ui.NuvioViewAllPillSize
 import com.nuvio.app.core.ui.rememberPosterCardStyleUiState
+import com.nuvio.app.features.home.HomeCatalogSettingsRepository
 import com.nuvio.app.features.home.HomeCatalogSection
 import com.nuvio.app.features.home.MetaPreview
 import com.nuvio.app.features.home.stableKey
@ -64,6 +68,10 @@ private fun HomeCatalogRowSectionContent(
    onPosterLongClick: ((MetaPreview) -> Unit)?,
 ) {
    val posterCardStyle = rememberPosterCardStyleUiState()
+    val homeCatalogSettings by remember {
+        HomeCatalogSettingsRepository.snapshot()
+        HomeCatalogSettingsRepository.uiState
+    }.collectAsStateWithLifecycle()

    NuvioShelfSection(
        title = section.title,
@ -71,6 +79,7 @@ private fun HomeCatalogRowSectionContent(
        modifier = modifier,
        headerHorizontalPadding = sectionPadding,
        rowContentPadding = PaddingValues(horizontal = sectionPadding),
+        showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline,
        onViewAllClick = onViewAllClick,
        viewAllPillSize = NuvioViewAllPillSize.Compact,
        key = { item -> item.stableKey() },
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeCollectionRowSection.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeCollectionRowSection.kt
@ -15,6 +15,8 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
@ -23,6 +25,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.nuvio.app.core.ui.NuvioShelfSection
 import com.nuvio.app.core.ui.PosterLandscapeAspectRatio
 import com.nuvio.app.core.ui.landscapePosterWidth
@ -30,6 +33,7 @@ import com.nuvio.app.core.ui.posterCardClickable
 import com.nuvio.app.core.ui.rememberPosterCardStyleUiState
 import com.nuvio.app.features.collection.Collection
 import com.nuvio.app.features.collection.CollectionFolder
+import com.nuvio.app.features.home.HomeCatalogSettingsRepository
 import com.nuvio.app.features.home.PosterShape

@Composable
@ -71,12 +75,18 @@ private fun HomeCollectionRowSectionContent(
    animateGifs: Boolean,
    onFolderClick: ((collectionId: String, folderId: String) -> Unit)?,
 ) {
+    val homeCatalogSettings by remember {
+        HomeCatalogSettingsRepository.snapshot()
+        HomeCatalogSettingsRepository.uiState
+    }.collectAsStateWithLifecycle()
+
    NuvioShelfSection(
        title = collection.title,
        entries = collection.folders,
        modifier = modifier,
        headerHorizontalPadding = sectionPadding,
        rowContentPadding = PaddingValues(horizontal = sectionPadding),
+        showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline,
        key = { folder -> "collection_${collection.id}_folder_${folder.id}" },
    ) { folder ->
        CollectionFolderCard(
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt
@ -42,6 +42,8 @@ import nuvio.composeapp.generated.resources.layout_hide_unreleased
 import nuvio.composeapp.generated.resources.layout_hide_unreleased_sub
 import nuvio.composeapp.generated.resources.settings_homescreen_empty_message
 import nuvio.composeapp.generated.resources.settings_homescreen_empty_title
+import nuvio.composeapp.generated.resources.settings_homescreen_hide_catalog_underline
+import nuvio.composeapp.generated.resources.settings_homescreen_hide_catalog_underline_description
 import nuvio.composeapp.generated.resources.settings_homescreen_keep_home_focused
 import nuvio.composeapp.generated.resources.settings_homescreen_limit_reached
 import nuvio.composeapp.generated.resources.settings_homescreen_no_sources_selected
@ -65,6 +67,7 @@ internal fun LazyListScope.homescreenSettingsContent(
    isTablet: Boolean,
    heroEnabled: Boolean,
    hideUnreleasedContent: Boolean,
+    hideCatalogUnderline: Boolean,
    items: List<HomeCatalogSettingsItem>,
 ) {
    val selectedHeroSourceCount = items.count { it.heroSourceEnabled }
@ -98,6 +101,14 @@ internal fun LazyListScope.homescreenSettingsContent(
                    isTablet = isTablet,
                    onCheckedChange = HomeCatalogSettingsRepository::setHideUnreleasedContent,
                )
+                SettingsGroupDivider(isTablet = isTablet)
+                SettingsSwitchRow(
+                    title = stringResource(Res.string.settings_homescreen_hide_catalog_underline),
+                    description = stringResource(Res.string.settings_homescreen_hide_catalog_underline_description),
+                    checked = hideCatalogUnderline,
+                    isTablet = isTablet,
+                    onCheckedChange = HomeCatalogSettingsRepository::setHideCatalogUnderline,
+                )
            }
        }
    }
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt
@ -78,6 +78,7 @@ fun HomescreenSettingsScreen(
            isTablet = false,
            heroEnabled = homescreenSettingsUiState.heroEnabled,
            hideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent,
+            hideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline,
            items = homescreenSettingsUiState.items,
        )
    }
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
@ -237,6 +237,7 @@ fun SettingsScreen(
                traktSettingsUiState = traktSettingsUiState,
                homescreenHeroEnabled = homescreenSettingsUiState.heroEnabled,
                homescreenHideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent,
+                homescreenHideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline,
                homescreenItems = homescreenSettingsUiState.items,
                metaScreenSettingsUiState = metaScreenSettingsUiState,
                continueWatchingPreferencesUiState = continueWatchingPreferencesUiState,
@ -283,6 +284,7 @@ fun SettingsScreen(
                traktSettingsUiState = traktSettingsUiState,
                homescreenHeroEnabled = homescreenSettingsUiState.heroEnabled,
                homescreenHideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent,
+                homescreenHideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline,
                homescreenItems = homescreenSettingsUiState.items,
                metaScreenSettingsUiState = metaScreenSettingsUiState,
                continueWatchingPreferencesUiState = continueWatchingPreferencesUiState,
@ -339,6 +341,7 @@ private fun MobileSettingsScreen(
    traktSettingsUiState: TraktSettingsUiState,
    homescreenHeroEnabled: Boolean,
    homescreenHideUnreleasedContent: Boolean,
+    homescreenHideCatalogUnderline: Boolean,
    homescreenItems: List<HomeCatalogSettingsItem>,
    metaScreenSettingsUiState: MetaScreenSettingsUiState,
    continueWatchingPreferencesUiState: ContinueWatchingPreferencesUiState,
@ -530,6 +533,7 @@ private fun MobileSettingsScreen(
                    isTablet = false,
                    heroEnabled = homescreenHeroEnabled,
                    hideUnreleasedContent = homescreenHideUnreleasedContent,
+                    hideCatalogUnderline = homescreenHideCatalogUnderline,
                    items = homescreenItems,
                )
                SettingsPage.MetaScreen -> metaScreenSettingsContent(
@ -638,6 +642,7 @@ private fun TabletSettingsScreen(
    traktSettingsUiState: TraktSettingsUiState,
    homescreenHeroEnabled: Boolean,
    homescreenHideUnreleasedContent: Boolean,
+    homescreenHideCatalogUnderline: Boolean,
    homescreenItems: List<HomeCatalogSettingsItem>,
    metaScreenSettingsUiState: MetaScreenSettingsUiState,
    continueWatchingPreferencesUiState: ContinueWatchingPreferencesUiState,
@ -888,6 +893,7 @@ private fun TabletSettingsScreen(
                        isTablet = true,
                        heroEnabled = homescreenHeroEnabled,
                        hideUnreleasedContent = homescreenHideUnreleasedContent,
+                        hideCatalogUnderline = homescreenHideCatalogUnderline,
                        items = homescreenItems,
                    )
                    SettingsPage.MetaScreen -> metaScreenSettingsContent(
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt
@ -588,6 +588,7 @@ internal fun settingsSearchEntries(
    listOf(
        PlaybackSearchRow("home-hero", stringResource(Res.string.settings_homescreen_show_hero), stringResource(Res.string.settings_homescreen_show_hero_description)),
        PlaybackSearchRow("home-hide-unreleased", stringResource(Res.string.layout_hide_unreleased), stringResource(Res.string.layout_hide_unreleased_sub)),
+        PlaybackSearchRow("home-hide-catalog-underline", stringResource(Res.string.settings_homescreen_hide_catalog_underline), stringResource(Res.string.settings_homescreen_hide_catalog_underline_description)),
        PlaybackSearchRow("home-hero-sources", stringResource(Res.string.settings_homescreen_section_hero_sources)),
        PlaybackSearchRow("home-catalogs", stringResource(Res.string.settings_homescreen_section_catalogs)),
    ).forEach { row ->