diff --git a/Strings HR.xml.txt b/Strings HR.xml.txt index 5b6e7a898..09c5f459c 100644 --- a/Strings HR.xml.txt +++ b/Strings HR.xml.txt @@ -568,8 +568,6 @@ Prikaži glavni vrtuljak na vrhu početnog zaslona. Sakrij neobjavljeni sadržaj Sakrij filmove i serije koji još nisu objavljeni. - Sakrij podcrtavanje u katalogu - Uklonite istaknutu liniju ispod naziva kataloga i zbirki u cijeloj aplikaciji. %1$d od %2$d vidljivih kataloga • Odabrano %3$d izvora za glavni odjeljak Otvorite katalog samo kada ga trebate preimenovati ili promijeniti njegov redoslijed. Vidljivo diff --git a/composeApp/src/commonMain/composeResources/values-bg/strings.xml b/composeApp/src/commonMain/composeResources/values-bg/strings.xml index f75074db8..d68d2cdd0 100644 --- a/composeApp/src/commonMain/composeResources/values-bg/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-bg/strings.xml @@ -570,8 +570,6 @@ Покажи въртележка в горната част на началото. Скрий невипуснатото съдържание Скрий филми и сериали, които все още не са излезли. - Скрий подчертаването на каталога - Премахни акцентната линия под заглавията на каталозите и колекциите в цялото приложение. %1$d от %2$d каталога видими • %3$d основни извора избрани Отворете каталог само когато трябва да го преименувате или пренаредите. Видим diff --git a/composeApp/src/commonMain/composeResources/values-cs/strings.xml b/composeApp/src/commonMain/composeResources/values-cs/strings.xml index 5a460acd4..b8a0769e1 100644 --- a/composeApp/src/commonMain/composeResources/values-cs/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-cs/strings.xml @@ -582,8 +582,6 @@ Zobrazit hlavní karusel v horní části domovské stránky. Skrýt nevydaný obsah Skrýt filmy a pořady, které ještě neměly premiéru. - Skrýt podtržení katalogu - Odstranit barevnou linii pod názvy katalogů a sbírek v celé aplikaci. %1$d z %2$d katalogů viditelných • %3$d zdrojů Hero sekce vybráno Otevřete katalog pouze tehdy, když jej potřebujete přejmenovat nebo změnit jeho pořadí. Viditelné diff --git a/composeApp/src/commonMain/composeResources/values-el/strings.xml b/composeApp/src/commonMain/composeResources/values-el/strings.xml index 980a43e39..6faf80ac3 100644 --- a/composeApp/src/commonMain/composeResources/values-el/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-el/strings.xml @@ -1723,8 +1723,6 @@ Δεν έχουν εισαχθεί URL badge Fusion. %1$d/%2$d URLs, %3$d active Fusion badges Απόκρυψη value - Απόκρυψη Catalog Underline - Αφαίρεση της γραμμής τονισμού κάτω από τους τίτλους καταλόγων και συλλογών σε όλη την εφαρμογή. Συνδέστε λογαριασμούς για συνδέσμους και πρόσβαση στη βιβλιοθήκη Χρησιμοποιείται για αναπαραγωγή σε εκδόσεις Android. Licensed under the Apache License, Έκδοση 2.0. diff --git a/composeApp/src/commonMain/composeResources/values-es/strings.xml b/composeApp/src/commonMain/composeResources/values-es/strings.xml index 549542983..670243b12 100644 --- a/composeApp/src/commonMain/composeResources/values-es/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-es/strings.xml @@ -582,8 +582,6 @@ Mostrar un carrusel destacado en la parte superior del inicio. Elige hasta 2 catálogos de origen abajo. Ocultar contenido inédito Oculta películas y programas que aún no se han estrenado. - Ocultar subrayado del catálogo - Elimine la línea de acento debajo de los títulos de catálogos y colecciones en toda la aplicación. %1$d de %2$d catálogos visibles • %3$d fuentes de Destacado seleccionadas Abre un catálogo solo cuando necesites cambiarle el nombre o reordenarlo. Visible diff --git a/composeApp/src/commonMain/composeResources/values-fr/strings.xml b/composeApp/src/commonMain/composeResources/values-fr/strings.xml index 0638c38b7..24d16d5d2 100644 --- a/composeApp/src/commonMain/composeResources/values-fr/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-fr/strings.xml @@ -592,8 +592,6 @@ Afficher un carrousel Hero en vedette en haut de l’accueil. Choisissez jusqu’à 2 catalogues sources ci-dessous. Masquer le contenu non sorti Masque les films et séries qui ne sont pas encore sortis. - Masquer le soulignement des catalogues - Supprime la ligne d’accent sous les titres de catalogues et de collections dans toute l’app. %1$d sur %2$d catalogues visibles • %3$d sources Hero sélectionnées Ouvrez un catalogue uniquement si vous avez besoin de le renommer ou de le réorganiser. Visible diff --git a/composeApp/src/commonMain/composeResources/values-hu/strings.xml b/composeApp/src/commonMain/composeResources/values-hu/strings.xml index 70272fc88..9e334613e 100644 --- a/composeApp/src/commonMain/composeResources/values-hu/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-hu/strings.xml @@ -525,8 +525,6 @@ Kiemelt galéria (carousel) megjelenítése a kezdőlap tetején. Meg nem jelent tartalmak elrejtése A még meg nem jelent filmek és sorozatok elrejtése. - Katalógus aláhúzás elrejtése - A kiemelő vonal eltávolítása a katalógusok és gyűjtemények címei alól az alkalmazás egészében. %1$d / %2$d katalógus látható • %3$d kiemelt forrás kiválasztva Csak akkor nyiss meg egy katalógust, ha át szeretnéd nevezni vagy át szeretnéd rendezni. Látható diff --git a/composeApp/src/commonMain/composeResources/values-id/strings.xml b/composeApp/src/commonMain/composeResources/values-id/strings.xml index 7aa8c360c..660f670cd 100644 --- a/composeApp/src/commonMain/composeResources/values-id/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-id/strings.xml @@ -547,8 +547,6 @@ Tampilkan karousel hero di bagian atas beranda. Sembunyikan Konten Belum Rilis Sembunyikan film dan serial yang belum dirilis. - Sembunyikan Garis Bawah Katalog - Hapus garis aksen di bawah judul katalog dan koleksi di seluruh aplikasi. %1$d dari %2$d katalog terlihat • %3$d sumber hero dipilih Buka katalog hanya jika perlu mengganti nama atau mengurutkannya. Terlihat diff --git a/composeApp/src/commonMain/composeResources/values-in/strings.xml b/composeApp/src/commonMain/composeResources/values-in/strings.xml index 1ee5d1477..8fe51ffaa 100644 --- a/composeApp/src/commonMain/composeResources/values-in/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-in/strings.xml @@ -547,8 +547,6 @@ Tampilkan karousel hero di bagian atas beranda. Sembunyikan Konten Belum Rilis Sembunyikan film dan serial yang belum dirilis. - Sembunyikan Garis Bawah Katalog - Hapus garis aksen di bawah judul katalog dan koleksi di seluruh aplikasi. %1$d dari %2$d katalog terlihat • %3$d sumber hero dipilih Buka katalog hanya jika perlu mengganti nama atau mengurutkannya. Terlihat diff --git a/composeApp/src/commonMain/composeResources/values-it/strings.xml b/composeApp/src/commonMain/composeResources/values-it/strings.xml index fc0992c67..999a8f8d4 100644 --- a/composeApp/src/commonMain/composeResources/values-it/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-it/strings.xml @@ -1315,8 +1315,6 @@ Usa la barra dei pannelli nativa dell'iPhone su iOS 26 e versioni successive. Nascondi contenuti non rilasciati Nascondi i film e le serie TV che non sono ancora stati rilasciati. - Nascondi sottolineatura catalogo - Rimuove la linea di evidenziazione sotto i titoli dei cataloghi e delle collezioni in tutta l'app. Nascondi valore Mostra valore Sfoca le miniature del prossimo episodio in Inizia a guardare per evitare spoiler. diff --git a/composeApp/src/commonMain/composeResources/values-ja/strings.xml b/composeApp/src/commonMain/composeResources/values-ja/strings.xml index a432e4bb4..349f8c066 100644 --- a/composeApp/src/commonMain/composeResources/values-ja/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-ja/strings.xml @@ -582,8 +582,6 @@ ホーム上部にヒーローカルーセルを表示します。 未公開コンテンツを非表示 まだ公開されていない映画やシリーズを非表示にします。 - カタログの下線を非表示 - アプリ全体のカタログ・コレクションタイトル下のアクセントラインを非表示にします。 %1$d / %2$d カタログ表示中 • %3$d ヒーローソース選択中 カタログは名前の変更や並べ替えが必要なときのみ開いてください。 表示 diff --git a/composeApp/src/commonMain/composeResources/values-nb/strings.xml b/composeApp/src/commonMain/composeResources/values-nb/strings.xml index 78a1c2140..fa0b8468c 100644 --- a/composeApp/src/commonMain/composeResources/values-nb/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-nb/strings.xml @@ -531,8 +531,6 @@ Vis hero-karusell øverst på hjemskjermen. Skjul ikke-utgitt innhold Skjul filmer og serier som ikke er utgitt ennå. - Skjul katalog-understrek - Fjern aksentlinjen under katalog- og samlingstitler. %1$d av %2$d kataloger synlige • %3$d hero-kilder valgt Åpne en katalog kun når du skal gi nytt navn eller endre rekkefølge. Synlig diff --git a/composeApp/src/commonMain/composeResources/values-nl/strings.xml b/composeApp/src/commonMain/composeResources/values-nl/strings.xml index fed9fdde4..30963d88d 100644 --- a/composeApp/src/commonMain/composeResources/values-nl/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-nl/strings.xml @@ -600,8 +600,6 @@ Toon herocarrousel bovenaan de startpagina. Niet-uitgebrachte inhoud verbergen Verberg films en series die nog niet zijn uitgebracht. - Catalogusonderstreping verbergen - Verwijder de accentlijn onder catalogus- en collectietitels in de hele app. %1$d van %2$d catalogi zichtbaar • %3$d herobronnen geselecteerd Open een catalogus alleen als je deze wilt hernoemen of herordenen. Zichtbaar diff --git a/composeApp/src/commonMain/composeResources/values-pl/strings.xml b/composeApp/src/commonMain/composeResources/values-pl/strings.xml index 09aaa5fa5..10adfca3a 100644 --- a/composeApp/src/commonMain/composeResources/values-pl/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-pl/strings.xml @@ -547,8 +547,6 @@ Wyświetl wyróżnioną karuzelę hero na górze ekranu głównego. Wybierz do 2 katalogów źródłowych poniżej. Ukryj niewydane treści Ukryj filmy i seriale, które nie zostały jeszcze wydane. - Ukryj podkreślenie katalogu - Usuń linię akcentu pod tytułami katalogów i kolekcji w całej aplikacji. %1$d z %2$d katalogów widocznych • %3$d źródeł hero wybranych Otwórz katalog tylko wtedy, gdy chcesz zmienić jego nazwę lub kolejność. Widoczne diff --git a/composeApp/src/commonMain/composeResources/values-pt-rBR/strings.xml b/composeApp/src/commonMain/composeResources/values-pt-rBR/strings.xml index ecd2cea82..21c1a2fe8 100644 --- a/composeApp/src/commonMain/composeResources/values-pt-rBR/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-pt-rBR/strings.xml @@ -532,8 +532,6 @@ Exibir carrossel hero no topo da página inicial. Ocultar Conteúdo Não Lançado Ocultar filmes e séries que ainda não foram lançados. - Ocultar Linha Sublinhada do Catálogo - Remover a linha de destaque abaixo dos títulos de catálogo e coleção em todo o app. %1$d de %2$d catálogos visíveis • %3$d fontes de hero selecionadas Abra um catálogo apenas quando precisar renomeá-lo ou reordená-lo. Visível diff --git a/composeApp/src/commonMain/composeResources/values-pt/strings.xml b/composeApp/src/commonMain/composeResources/values-pt/strings.xml index 34f96814a..990d1895d 100644 --- a/composeApp/src/commonMain/composeResources/values-pt/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-pt/strings.xml @@ -576,8 +576,6 @@ Apresenta o carrossel de destaques no topo da página inicial. Ocultar conteúdo não lançado Ocultar filmes e séries que ainda não foram lançados. - Ocultar sublinhado dos catálogos - Remove a linha de destaque sob os títulos de catálogos e coleções em toda a app. %1$d de %2$d catálogos visíveis • %3$d fontes de destaque selecionadas Abre um catálogo apenas quando precisares de o renomear ou reordenar. Visível diff --git a/composeApp/src/commonMain/composeResources/values-ro/strings.xml b/composeApp/src/commonMain/composeResources/values-ro/strings.xml index 2ac1e5108..22b50658c 100644 --- a/composeApp/src/commonMain/composeResources/values-ro/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-ro/strings.xml @@ -600,8 +600,6 @@ Afișează un carusel în partea de sus a ecranului principal. Ascunde conținutul nelansat Ascunde filmele și serialele care nu au fost lansate încă. - Ascunde sublinierea catalogului - Elimină linia de accent de sub titlurile cataloagelor și colecțiilor din întreaga aplicație. %1$d din %2$d cataloage vizibile • %3$d surse hero selectate Deschide un catalog doar când trebuie să îl redenumești sau să îl rearanjezi. Vizibil diff --git a/composeApp/src/commonMain/composeResources/values-sk/strings.xml b/composeApp/src/commonMain/composeResources/values-sk/strings.xml index d25e3f608..b707e5b53 100644 --- a/composeApp/src/commonMain/composeResources/values-sk/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-sk/strings.xml @@ -571,8 +571,6 @@ Zobraziť hero karusel v hornej časti domovskej obrazovky. Skryť nevydaný obsah Skryť filmy a seriály, ktoré ešte neboli vydané. - Skryť podčiarknutie katalógu - Odstrániť zvýrazňovací riadok pod názvami katalógov a kolekcií v celej aplikácii. %1$d z %2$d katalógov viditeľných • %3$d zdrojov hero sekcie vybraných Otvorte katalóg iba vtedy, keď ho potrebujete premenovať alebo zmeniť poradie. Viditeľné diff --git a/composeApp/src/commonMain/composeResources/values-tr/strings.xml b/composeApp/src/commonMain/composeResources/values-tr/strings.xml index 964b49270..2c450f872 100644 --- a/composeApp/src/commonMain/composeResources/values-tr/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-tr/strings.xml @@ -537,8 +537,6 @@ Ana sayfanın üstünde öne çıkan bir kaydırmalı alan göster. Aşağıdan en fazla 2 kaynak katalog seç. Henüz Yayınlanmamış İçerikleri Gizle Henüz yayınlanmamış film ve dizileri gizle. - Katalog Alt Çizgisini Gizle - Uygulama genelinde katalog ve koleksiyon başlıklarının altındaki vurgu çizgisini kaldır. %1$d / %2$d katalog görünür • %3$d öne çıkan kaynak seçili Bir kataloğu yalnızca adını değiştirmek veya sıralamak gerektiğinde aç. Görünür diff --git a/composeApp/src/commonMain/composeResources/values-vi/strings.xml b/composeApp/src/commonMain/composeResources/values-vi/strings.xml index c556ce299..08f3bc693 100644 --- a/composeApp/src/commonMain/composeResources/values-vi/strings.xml +++ b/composeApp/src/commonMain/composeResources/values-vi/strings.xml @@ -579,8 +579,6 @@ Hiển thị Hero ở đầu Trang chủ Ẩn nội dung chưa phát hành Ẩn phim và chương trình chưa phát hành - Ẩn gạch chân danh mục - Ẩn gạch chân dưới tiêu đề danh mục và bộ sưu tập %1$d/%2$d danh mục • %3$d nguồn Hero Chỉ mở danh mục khi cần đổi tên hoặc sắp xếp Hiển thị @@ -1973,4 +1971,4 @@ Diễn viên Chưa có nội dung Các addon hiện tại không cung cấp nội dung cho mục này - \ No newline at end of file + diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index f00ffc65d..24324d07c 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -609,8 +609,6 @@ Hide movies and shows that haven't been released yet. Show Catalog Type Show type suffix next to catalog name (Movie/Series). - Hide Catalog Underline - Remove the accent line under catalog and collection titles throughout the app. %1$d of %2$d catalogs visible • %3$d hero sources selected Open a catalog only when you need to rename or reorder it. Visible diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt index deec50250..7a44b0b9b 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt @@ -68,7 +68,6 @@ fun NuvioShelfSection( rowContentPadding: PaddingValues = PaddingValues(0.dp), rowModifier: Modifier = Modifier, itemSpacing: Dp = 10.dp, - showHeaderAccent: Boolean = true, onViewAllClick: (() -> Unit)? = null, viewAllPillSize: NuvioViewAllPillSize = NuvioViewAllPillSize.Default, key: ((T) -> Any)? = null, @@ -85,7 +84,6 @@ fun NuvioShelfSection( NuvioShelfSectionHeader( title = title, modifier = Modifier.padding(horizontal = headerHorizontalPadding), - showAccent = showHeaderAccent, onViewAllClick = onViewAllClick, viewAllPillSize = viewAllPillSize, ) @@ -244,7 +242,6 @@ fun NuvioPosterCard( private fun NuvioShelfSectionHeader( title: String, modifier: Modifier = Modifier, - showAccent: Boolean = true, onViewAllClick: (() -> Unit)? = null, viewAllPillSize: NuvioViewAllPillSize = NuvioViewAllPillSize.Default, ) { @@ -278,18 +275,6 @@ private fun NuvioShelfSectionHeader( modifier = viewAllPlaceholderModifier, ) } - if (showAccent) { - Box( - modifier = Modifier - .padding(top = NuvioTokens.Space.s6) - .width(NuvioTokens.Space.s64 - NuvioTokens.Space.s4) - .height(NuvioTokens.Space.s4) - .background( - color = tokens.colors.accent, - shape = tokens.shapes.chip, - ), - ) - } } } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailPosterRailSection.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailPosterRailSection.kt index e1b0a6f0f..ba229f7d7 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailPosterRailSection.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/details/components/DetailPosterRailSection.kt @@ -43,7 +43,6 @@ fun DetailPosterRailSection( horizontal = headerHorizontalPadding + horizontalScrollPadding, ), rowModifier = Modifier.nuvioHorizontalScrollBleed(horizontalScrollPadding), - showHeaderAccent = false, key = { item -> item.stableKey() }, ) { item -> HomePosterCard( diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt index 9bd55b72f..1a2197561 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt @@ -34,7 +34,6 @@ data class HomeCatalogSettingsUiState( val heroEnabled: Boolean = true, val showCatalogType: Boolean = true, val hideUnreleasedContent: Boolean = false, - val hideCatalogUnderline: Boolean = false, val items: List = emptyList(), ) { val signature: String @@ -45,8 +44,6 @@ 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}" @@ -66,7 +63,6 @@ internal data class HomeCatalogSettingsSnapshot( val heroEnabled: Boolean, val showCatalogType: Boolean, val hideUnreleasedContent: Boolean, - val hideCatalogUnderline: Boolean, val preferences: Map, ) @@ -84,7 +80,6 @@ private data class StoredHomeCatalogSettingsPayload( val heroEnabled: Boolean = true, val showCatalogType: Boolean = true, val hideUnreleasedContent: Boolean = false, - val hideCatalogUnderline: Boolean = false, val items: List = emptyList(), ) @@ -106,7 +101,6 @@ object HomeCatalogSettingsRepository { private var heroEnabled = true private var showCatalogType = true private var hideUnreleasedContent = false - private var hideCatalogUnderline = false fun onProfileChanged() { hasLoaded = false @@ -114,7 +108,6 @@ object HomeCatalogSettingsRepository { heroEnabled = true showCatalogType = true hideUnreleasedContent = false - hideCatalogUnderline = false definitions = emptyList() collectionDefinitions = emptyList() _uiState.value = HomeCatalogSettingsUiState() @@ -128,7 +121,6 @@ object HomeCatalogSettingsRepository { heroEnabled = true showCatalogType = true hideUnreleasedContent = false - hideCatalogUnderline = false _uiState.value = HomeCatalogSettingsUiState() } @@ -162,7 +154,6 @@ object HomeCatalogSettingsRepository { heroEnabled = heroEnabled, showCatalogType = showCatalogType, hideUnreleasedContent = hideUnreleasedContent, - hideCatalogUnderline = hideCatalogUnderline, preferences = preferences.mapValues { (_, value) -> HomeCatalogPreference( customTitle = value.customTitle, @@ -202,15 +193,6 @@ object HomeCatalogSettingsRepository { HomeCatalogSettingsSyncService.triggerPush() } - fun setHideCatalogUnderline(enabled: Boolean) { - ensureLoaded() - if (hideCatalogUnderline == enabled) return - hideCatalogUnderline = enabled - publish() - persist() - HomeCatalogSettingsSyncService.triggerPush() - } - fun setHeroSourceEnabled(key: String, enabled: Boolean) { updatePreference(key, pushRemote = false) { preference -> if (!enabled) { @@ -240,7 +222,6 @@ object HomeCatalogSettingsRepository { heroEnabled = true showCatalogType = true hideUnreleasedContent = false - hideCatalogUnderline = false preferences.clear() normalizePreferences() publish() @@ -290,7 +271,6 @@ object HomeCatalogSettingsRepository { heroEnabled = parsedPayload.heroEnabled showCatalogType = parsedPayload.showCatalogType hideUnreleasedContent = parsedPayload.hideUnreleasedContent - hideCatalogUnderline = parsedPayload.hideCatalogUnderline preferences = parsedPayload.items.associateBy { it.key }.toMutableMap() publish() return @@ -391,7 +371,6 @@ object HomeCatalogSettingsRepository { heroEnabled = heroEnabled, showCatalogType = showCatalogType, hideUnreleasedContent = hideUnreleasedContent, - hideCatalogUnderline = hideCatalogUnderline, items = items, ) } @@ -403,7 +382,6 @@ object HomeCatalogSettingsRepository { heroEnabled = heroEnabled, showCatalogType = showCatalogType, hideUnreleasedContent = hideUnreleasedContent, - hideCatalogUnderline = hideCatalogUnderline, items = preferences.values.sortedBy { it.order }, ), ), @@ -500,7 +478,6 @@ object HomeCatalogSettingsRepository { return SyncHomeCatalogPayload( showCatalogType = showCatalogType, hideUnreleasedContent = hideUnreleasedContent, - hideCatalogUnderline = hideCatalogUnderline, items = items, ) } @@ -509,7 +486,6 @@ object HomeCatalogSettingsRepository { ensureLoaded() showCatalogType = payload.showCatalogType hideUnreleasedContent = payload.hideUnreleasedContent - hideCatalogUnderline = payload.hideCatalogUnderline if (payload.items.isNotEmpty()) { val existingHeroState = preferences.mapValues { it.value.heroSourceEnabled } val remotePreferences = payload.items.associate { item -> diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsSyncService.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsSyncService.kt index 88c2094d4..150db3562 100644 --- 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,7 +42,6 @@ data class SyncCatalogItem( data class SyncHomeCatalogPayload( @SerialName("show_catalog_type") val showCatalogType: Boolean = true, @SerialName("hide_unreleased_content") val hideUnreleasedContent: Boolean = false, - @SerialName("hide_catalog_underline") val hideCatalogUnderline: Boolean = false, val items: List = emptyList(), ) @@ -59,7 +58,6 @@ private data class RemoteHomeCatalogSettings( val updatedAt: String?, val hasShowCatalogType: Boolean, val hasHideUnreleasedContent: Boolean, - val hasHideCatalogUnderline: Boolean, ) private data class PullToken( @@ -77,7 +75,6 @@ object HomeCatalogSettingsSyncService { private const val HIDE_UNRELEASED_CONTENT_KEY = "hide_unreleased_content" private const val SHOW_CATALOG_TYPE_KEY = "show_catalog_type" - private const val HIDE_CATALOG_UNDERLINE_KEY = "hide_catalog_underline" @Volatile var isSyncingFromRemote: Boolean = false @@ -221,7 +218,6 @@ object HomeCatalogSettingsSyncService { updatedAt = blob.updatedAt, hasShowCatalogType = blob.settingsJson.containsKey(SHOW_CATALOG_TYPE_KEY), hasHideUnreleasedContent = blob.settingsJson.containsKey(HIDE_UNRELEASED_CONTENT_KEY), - hasHideCatalogUnderline = blob.settingsJson.containsKey(HIDE_CATALOG_UNDERLINE_KEY), ) } @@ -234,9 +230,6 @@ object HomeCatalogSettingsSyncService { val showCatalogTypeSource = rows .filter { it.hasShowCatalogType } .maxByOrNull { it.updatedAt.orEmpty() } - val hideUnderlineSource = rows - .filter { it.hasHideCatalogUnderline } - .maxByOrNull { it.updatedAt.orEmpty() } return copy( payload = payload.copy( @@ -244,8 +237,6 @@ object HomeCatalogSettingsSyncService { ?: payload.showCatalogType, hideUnreleasedContent = hideUnreleasedSource?.payload?.hideUnreleasedContent ?: payload.hideUnreleasedContent, - hideCatalogUnderline = hideUnderlineSource?.payload?.hideCatalogUnderline - ?: payload.hideCatalogUnderline, ), ) } @@ -278,11 +269,6 @@ object HomeCatalogSettingsSyncService { } else { localPayload.hideUnreleasedContent }, - hideCatalogUnderline = if (settingsJson.containsKey(HIDE_CATALOG_UNDERLINE_KEY)) { - decoded.hideCatalogUnderline - } else { - localPayload.hideCatalogUnderline - }, ) }.getOrNull() diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt index af37817bd..a0ed2ff2b 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeScreen.kt @@ -861,7 +861,6 @@ fun HomeScreen( hasContinueWatchingRows, continueWatchingLayout, posterCardStyle.widthDp, - homeSettingsUiState.hideCatalogUnderline, nativeBottomNavigationOverlayHeight, ) { if ( @@ -873,7 +872,6 @@ fun HomeScreen( style = continueWatchingPreferences.style, layout = continueWatchingLayout, basePosterWidthDp = posterCardStyle.widthDp, - showHeaderAccent = !homeSettingsUiState.hideCatalogUnderline, ) + nativeBottomNavigationOverlayHeight } else { null @@ -958,7 +956,6 @@ fun HomeScreen( items(3) { HomeSkeletonRow( modifier = Modifier.padding(horizontal = 16.dp), - showHeaderAccent = !homeSettingsUiState.hideCatalogUnderline, ) } } diff --git 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 index 7f671d116..f4c907bbf 100644 --- 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,15 +4,11 @@ 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 @@ -72,10 +68,6 @@ private fun HomeCatalogRowSectionContent( onPosterLongClick: ((MetaPreview) -> Unit)?, ) { val posterCardStyle = rememberPosterCardStyleUiState() - val homeCatalogSettings by remember { - HomeCatalogSettingsRepository.snapshot() - HomeCatalogSettingsRepository.uiState - }.collectAsStateWithLifecycle() NuvioShelfSection( title = section.title, @@ -83,7 +75,6 @@ private fun HomeCatalogRowSectionContent( modifier = modifier, headerHorizontalPadding = sectionPadding, rowContentPadding = PaddingValues(horizontal = sectionPadding), - showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline, onViewAllClick = onViewAllClick, viewAllPillSize = NuvioViewAllPillSize.Compact, key = { item -> item.stableKey() }, diff --git 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 index e174a4923..6fab3af2a 100644 --- 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,8 +15,6 @@ 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 @@ -25,7 +23,6 @@ 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.NuvioCardDepthSurface import com.nuvio.app.core.ui.NuvioShelfSection import com.nuvio.app.core.ui.PosterLandscapeAspectRatio @@ -35,7 +32,6 @@ 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 @@ -77,18 +73,12 @@ 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( diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeContinueWatchingSection.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeContinueWatchingSection.kt index 37a660f3c..fdb46db98 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeContinueWatchingSection.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeContinueWatchingSection.kt @@ -47,7 +47,6 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil3.compose.AsyncImage import com.nuvio.app.core.ui.DisintegratingContainer import com.nuvio.app.core.ui.NuvioCardDepthSurface @@ -62,7 +61,6 @@ import com.nuvio.app.core.ui.posterCardClickable import com.nuvio.app.core.ui.rememberPosterCardStyleUiState import com.nuvio.app.features.cloud.CloudLibraryContentType import com.nuvio.app.features.cloud.cloudLibraryDisplayArtworkUrl -import com.nuvio.app.features.home.HomeCatalogSettingsRepository import com.nuvio.app.features.watchprogress.ContinueWatchingItem import com.nuvio.app.features.watchprogress.ContinueWatchingSectionStyle import com.nuvio.app.features.watchprogress.CurrentDateProvider @@ -87,13 +85,8 @@ internal fun continueWatchingSectionHeightEstimate( style: ContinueWatchingSectionStyle, layout: ContinueWatchingLayout, basePosterWidthDp: Int, - showHeaderAccent: Boolean, ): Dp { - val headerHeight = NuvioTokens.Space.s40 + if (showHeaderAccent) { - NuvioTokens.Space.s6 + NuvioTokens.Space.s4 - } else { - 0.dp - } + val headerHeight = NuvioTokens.Space.s40 val headerToRowGap = NuvioTokens.Space.s8 + NuvioTokens.Space.s2 val rowHeight = when (style) { ContinueWatchingSectionStyle.Card -> continueWatchingLandscapeCardHeight(basePosterWidthDp) @@ -107,7 +100,6 @@ internal fun continueWatchingHeroViewportReserveHeight( style: ContinueWatchingSectionStyle, layout: ContinueWatchingLayout, basePosterWidthDp: Int, - showHeaderAccent: Boolean, ): Dp { val bottomNavigationClearance = when (style) { ContinueWatchingSectionStyle.Card, @@ -118,7 +110,6 @@ internal fun continueWatchingHeroViewportReserveHeight( style = style, layout = layout, basePosterWidthDp = basePosterWidthDp, - showHeaderAccent = showHeaderAccent, ) + bottomNavigationClearance } @@ -291,11 +282,6 @@ private fun HomeContinueWatchingSectionContent( onItemClick: ((ContinueWatchingItem) -> Unit)?, onItemLongPress: ((ContinueWatchingItem) -> Unit)?, ) { - val homeCatalogSettings by remember { - HomeCatalogSettingsRepository.snapshot() - HomeCatalogSettingsRepository.uiState - }.collectAsStateWithLifecycle() - val disintegration = remember { ContinueWatchingDisintegrationHolder() } val displayEntries = disintegration.sync(items) @@ -306,7 +292,6 @@ private fun HomeContinueWatchingSectionContent( headerHorizontalPadding = sectionPadding, rowContentPadding = PaddingValues(horizontal = sectionPadding), itemSpacing = layout.itemGap, - showHeaderAccent = !homeCatalogSettings.hideCatalogUnderline, key = { entry -> entry.videoId }, animatePlacement = true, state = listState, diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeSkeletonLoading.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeSkeletonLoading.kt index d95b26bc6..ab4a0bcfb 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeSkeletonLoading.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/components/HomeSkeletonLoading.kt @@ -183,7 +183,6 @@ fun HomeSkeletonHero( @Composable fun HomeSkeletonRow( modifier: Modifier = Modifier, - showHeaderAccent: Boolean = true, ) { val brush = rememberHomeSkeletonBrush() val posterCardStyle = rememberPosterCardStyleUiState() @@ -210,17 +209,6 @@ fun HomeSkeletonRow( .clip(RoundedCornerShape(6.dp)) .background(brush), ) - if (showHeaderAccent) { - // Accent bar - Box( - modifier = Modifier - .width(60.dp) - .height(4.dp) - .clip(RoundedCornerShape(999.dp)) - .background(brush), - ) - Spacer(modifier = Modifier.height(2.dp)) - } // Poster row Row( horizontalArrangement = Arrangement.spacedBy(10.dp), diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt index ae561f6cb..43447cda6 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/library/LibraryScreen.kt @@ -78,7 +78,6 @@ import com.nuvio.app.features.cloud.CloudLibraryItemType import com.nuvio.app.features.cloud.CloudLibraryRepository import com.nuvio.app.features.cloud.CloudLibraryUiState import com.nuvio.app.features.debrid.DebridSettingsRepository -import com.nuvio.app.features.home.HomeCatalogSettingsRepository import com.nuvio.app.features.home.components.HomeEmptyStateCard import com.nuvio.app.features.home.components.HomePosterCard import com.nuvio.app.features.home.components.HomeSkeletonRow @@ -120,10 +119,6 @@ fun LibraryScreen( LibraryDisplaySettingsRepository.ensureLoaded() LibraryDisplaySettingsRepository.uiState }.collectAsStateWithLifecycle() - val homeCatalogSettingsUiState by remember { - HomeCatalogSettingsRepository.snapshot() - HomeCatalogSettingsRepository.uiState - }.collectAsStateWithLifecycle() val networkStatusUiState by NetworkStatusRepository.uiState.collectAsStateWithLifecycle() var observedOfflineState by remember { mutableStateOf(false) } var sourceModeName by rememberSaveable { mutableStateOf(LibraryViewMode.Saved.name) } @@ -335,7 +330,6 @@ fun LibraryScreen( items(3) { HomeSkeletonRow( modifier = Modifier.padding(horizontal = 16.dp), - showHeaderAccent = !homeCatalogSettingsUiState.hideCatalogUnderline, ) } } @@ -415,7 +409,6 @@ fun LibraryScreen( LibraryLayoutMode.HORIZONTAL -> librarySections( displaySections = librarySectionsDisplay, watchedKeys = watchedUiState.watchedKeys, - showHeaderAccent = !homeCatalogSettingsUiState.hideCatalogUnderline, sortOption = effectiveSortOption, onPosterClick = onPosterClick, onSectionViewAllClick = onSectionViewAllClick, @@ -1113,7 +1106,6 @@ private enum class LibraryViewMode { private fun LazyListScope.librarySections( displaySections: List, watchedKeys: Set, - showHeaderAccent: Boolean, sortOption: LibrarySortOption, onPosterClick: ((LibraryItem) -> Unit)?, onSectionViewAllClick: ((LibrarySection, LibrarySortOption) -> Unit)?, @@ -1130,7 +1122,6 @@ private fun LazyListScope.librarySections( modifier = libraryContentTransitionModifier(), headerHorizontalPadding = 16.dp, rowContentPadding = PaddingValues(horizontal = 16.dp), - showHeaderAccent = showHeaderAccent, onViewAllClick = section.source ?.takeIf { it.items.size > LIBRARY_SECTION_PREVIEW_LIMIT } ?.let { source -> onSectionViewAllClick?.let { { it(source, sortOption) } } }, diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt index 104e63e3d..3e30922fe 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/search/SearchScreen.kt @@ -318,7 +318,6 @@ fun SearchScreen( items(2) { HomeSkeletonRow( modifier = Modifier.padding(horizontal = homeSectionPadding), - showHeaderAccent = !homeCatalogSettingsUiState.hideCatalogUnderline, ) } } @@ -327,7 +326,6 @@ fun SearchScreen( items(2) { HomeSkeletonRow( modifier = Modifier.padding(horizontal = homeSectionPadding), - showHeaderAccent = !homeCatalogSettingsUiState.hideCatalogUnderline, ) } } @@ -371,7 +369,6 @@ fun SearchScreen( item(key = "search_loading_more") { HomeSkeletonRow( modifier = Modifier.padding(horizontal = homeSectionPadding), - showHeaderAccent = !homeCatalogSettingsUiState.hideCatalogUnderline, ) } } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt index e99c79420..90a9fb4f9 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/HomescreenSettingsPage.kt @@ -44,8 +44,6 @@ import nuvio.composeapp.generated.resources.layout_catalog_type import nuvio.composeapp.generated.resources.layout_catalog_type_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 @@ -70,7 +68,6 @@ internal fun LazyListScope.homescreenSettingsContent( heroEnabled: Boolean, showCatalogType: Boolean, hideUnreleasedContent: Boolean, - hideCatalogUnderline: Boolean, items: List, ) { val selectedHeroSourceCount = items.count { it.heroSourceEnabled } @@ -112,14 +109,6 @@ 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, - ) } } } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt index dd6774de9..1c822470a 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsFullScreenPages.kt @@ -81,7 +81,6 @@ fun HomescreenSettingsScreen( heroEnabled = homescreenSettingsUiState.heroEnabled, showCatalogType = homescreenSettingsUiState.showCatalogType, hideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent, - hideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline, items = homescreenSettingsUiState.items, ) } diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt index 00f9316c1..35e003b35 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt @@ -405,7 +405,6 @@ fun SettingsScreen( homescreenHeroEnabled = homescreenSettingsUiState.heroEnabled, homescreenShowCatalogType = homescreenSettingsUiState.showCatalogType, homescreenHideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent, - homescreenHideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline, homescreenItems = homescreenSettingsUiState.items, metaScreenSettingsUiState = metaScreenSettingsUiState, continueWatchingPreferencesUiState = continueWatchingPreferencesUiState, @@ -466,7 +465,6 @@ fun SettingsScreen( homescreenHeroEnabled = homescreenSettingsUiState.heroEnabled, homescreenShowCatalogType = homescreenSettingsUiState.showCatalogType, homescreenHideUnreleasedContent = homescreenSettingsUiState.hideUnreleasedContent, - homescreenHideCatalogUnderline = homescreenSettingsUiState.hideCatalogUnderline, homescreenItems = homescreenSettingsUiState.items, metaScreenSettingsUiState = metaScreenSettingsUiState, continueWatchingPreferencesUiState = continueWatchingPreferencesUiState, @@ -537,7 +535,6 @@ private fun MobileSettingsScreen( homescreenHeroEnabled: Boolean, homescreenShowCatalogType: Boolean, homescreenHideUnreleasedContent: Boolean, - homescreenHideCatalogUnderline: Boolean, homescreenItems: List, metaScreenSettingsUiState: MetaScreenSettingsUiState, continueWatchingPreferencesUiState: ContinueWatchingPreferencesUiState, @@ -768,7 +765,6 @@ private fun MobileSettingsScreen( heroEnabled = homescreenHeroEnabled, showCatalogType = homescreenShowCatalogType, hideUnreleasedContent = homescreenHideUnreleasedContent, - hideCatalogUnderline = homescreenHideCatalogUnderline, items = homescreenItems, ) SettingsPage.MetaScreen -> metaScreenSettingsContent( @@ -895,7 +891,6 @@ private fun TabletSettingsScreen( homescreenHeroEnabled: Boolean, homescreenShowCatalogType: Boolean, homescreenHideUnreleasedContent: Boolean, - homescreenHideCatalogUnderline: Boolean, homescreenItems: List, metaScreenSettingsUiState: MetaScreenSettingsUiState, continueWatchingPreferencesUiState: ContinueWatchingPreferencesUiState, @@ -1182,7 +1177,6 @@ private fun TabletSettingsScreen( heroEnabled = homescreenHeroEnabled, showCatalogType = homescreenShowCatalogType, hideUnreleasedContent = homescreenHideUnreleasedContent, - hideCatalogUnderline = homescreenHideCatalogUnderline, items = homescreenItems, ) SettingsPage.MetaScreen -> metaScreenSettingsContent( diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt index 8f4aefce4..9ed104d75 100644 --- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt +++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsSearch.kt @@ -732,7 +732,6 @@ internal fun settingsSearchEntries( PlaybackSearchRow("home-hero", stringResource(Res.string.settings_homescreen_show_hero), stringResource(Res.string.settings_homescreen_show_hero_description)), PlaybackSearchRow("home-catalog-type", stringResource(Res.string.layout_catalog_type), stringResource(Res.string.layout_catalog_type_sub)), 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 -> diff --git a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/components/HomeHeroSectionTest.kt b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/components/HomeHeroSectionTest.kt index fe3c5028f..4cc693afd 100644 --- a/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/components/HomeHeroSectionTest.kt +++ b/composeApp/src/commonTest/kotlin/com/nuvio/app/features/home/components/HomeHeroSectionTest.kt @@ -36,13 +36,11 @@ class HomeHeroSectionTest { style = ContinueWatchingSectionStyle.Card, layout = continueWatchingLayout, basePosterWidthDp = 110, - showHeaderAccent = true, ) val reserveHeight = continueWatchingHeroViewportReserveHeight( style = ContinueWatchingSectionStyle.Card, layout = continueWatchingLayout, basePosterWidthDp = 110, - showHeaderAccent = true, ) val layout = homeHeroLayout( maxWidthDp = 390f,