rework panorama cover settings

2024-10-27 04:44:26 +07:00 · 2024-10-27 04:44:26 +07:00 · e31a0016fb
commit e31a0016fb
parent cb6566e500
41 changed files with 194 additions and 264 deletions
--- a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
@ -65,7 +65,11 @@ class UiPreferences(

    fun readButtonPosition() = preferenceStore.getString("reading_button_position", FabPosition.End.toString())

-    fun usePanoramaCover() = preferenceStore.getBoolean("use_panorama_cover", false)
+    fun usePanoramaCoverFlow() = preferenceStore.getBoolean("use_panorama_cover_flow", false)
+
+    fun usePanoramaCoverAlways() = preferenceStore.getBoolean("use_panorama_cover_grid", true)
+
+    fun usePanoramaCoverMangaInfo() = preferenceStore.getBoolean("use_panorama_cover_manga_info", false)
    // KMK <--

    fun recommendsInOverflow() = preferenceStore.getBoolean("recommends_in_overflow", false)
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
@ -36,7 +36,7 @@ fun BrowseSourceComfortableGrid(
    onMangaLongClick: (Manga) -> Unit,
    // KMK -->
    selection: List<Manga>,
-    usePanoramaCover: Boolean? = null,
+    usePanoramaCover: Boolean = false,
    // KMK <--
 ) {
    LazyVerticalGrid(
@ -90,7 +90,7 @@ internal fun BrowseSourceComfortableGridItem(
    onLongClick: () -> Unit = onClick,
    // KMK -->
    isSelected: Boolean = false,
-    usePanoramaCover: Boolean?,
+    usePanoramaCover: Boolean,
    // KMK <--
 ) {
    MangaComfortableGridItem(
@ -104,7 +104,7 @@ internal fun BrowseSourceComfortableGridItem(
        ),
        // KMK -->
        isSelected = isSelected,
-        panoramaCover = usePanoramaCover,
+        usePanoramaCover = usePanoramaCover,
        fitToPanoramaCover = true,
        // KMK <--
        coverAlpha = if (manga.favorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
@ -101,7 +101,6 @@ internal fun BrowseSourceCompactGridItem(
        ),
        // KMK -->
        isSelected = isSelected,
-        fitToPanoramaCover = true,
        // KMK <--
        coverAlpha = if (manga.favorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,
        coverBadgeStart = {
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt
@ -10,7 +10,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.DropdownMenu
@ -21,9 +20,6 @@ import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.kmk.KMR
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun BrowseSourceSimpleToolbar(
@ -73,15 +69,12 @@ fun BrowseSourceSimpleToolbar(
                    selectingDisplayMode = false
                    onDisplayModeChange(LibraryDisplayMode.ComfortableGrid)
                }
-                val usePanoramaCover by lazy { Injekt.get<UiPreferences>().usePanoramaCover() }
-                if (!usePanoramaCover.collectAsState().value) {
-                    RadioMenuItem(
-                        text = { Text(text = stringResource(KMR.strings.action_display_comfortable_grid_panorama)) },
-                        isChecked = displayMode == LibraryDisplayMode.ComfortableGridPanorama,
-                    ) {
-                        selectingDisplayMode = false
-                        onDisplayModeChange(LibraryDisplayMode.ComfortableGridPanorama)
-                    }
+                RadioMenuItem(
+                    text = { Text(text = stringResource(KMR.strings.action_display_comfortable_grid_panorama)) },
+                    isChecked = displayMode == LibraryDisplayMode.ComfortableGridPanorama,
+                ) {
+                    selectingDisplayMode = false
+                    onDisplayModeChange(LibraryDisplayMode.ComfortableGridPanorama)
                }
                RadioMenuItem(
                    text = { Text(text = stringResource(MR.strings.action_display_grid)) },
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
@ -12,7 +12,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.AppBarTitle
@ -28,10 +27,7 @@ import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.kmk.KMR
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
 import tachiyomi.source.local.LocalSource
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun BrowseSourceToolbar(
@ -145,15 +141,12 @@ fun BrowseSourceToolbar(
                    onDisplayModeChange(LibraryDisplayMode.ComfortableGrid)
                }
                // KMK -->
-                val usePanoramaCover by lazy { Injekt.get<UiPreferences>().usePanoramaCover() }
-                if (!usePanoramaCover.collectAsState().value) {
-                    RadioMenuItem(
-                        text = { Text(text = stringResource(KMR.strings.action_display_comfortable_grid_panorama)) },
-                        isChecked = displayMode == LibraryDisplayMode.ComfortableGridPanorama,
-                    ) {
-                        selectingDisplayMode = false
-                        onDisplayModeChange(LibraryDisplayMode.ComfortableGridPanorama)
-                    }
+                RadioMenuItem(
+                    text = { Text(text = stringResource(KMR.strings.action_display_comfortable_grid_panorama)) },
+                    isChecked = displayMode == LibraryDisplayMode.ComfortableGridPanorama,
+                ) {
+                    selectingDisplayMode = false
+                    onDisplayModeChange(LibraryDisplayMode.ComfortableGridPanorama)
                }
                // KMK <--
                RadioMenuItem(
--- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCardRow.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCardRow.kt
@ -75,17 +75,17 @@ internal fun MangaItem(
    onLongClick: () -> Unit,
    // KMK -->
    isSelected: Boolean = false,
-    panoramaCover: Boolean = true,
+    usePanoramaCover: Boolean? = null,
    // KMK <--
 ) {
    // KMK -->
-    val usePanoramaCover = panoramaCover ?: Injekt.get<UiPreferences>().usePanoramaCover().collectAsState().value
+    val panoramaCover = usePanoramaCover ?: Injekt.get<UiPreferences>().usePanoramaCoverFlow().collectAsState().value
    val coverRatio = remember { mutableFloatStateOf(1f) }
    // KMK <--
    Box(
        modifier = Modifier.width(
            // KMK -->
-            if (usePanoramaCover && coverRatio.floatValue <= RatioSwitchToPanorama) 205.dp else 96.dp,
+            if (panoramaCover && coverRatio.floatValue <= RatioSwitchToPanorama) 205.dp else 96.dp,
            // KMK <--
        ),
    ) {
@ -99,7 +99,7 @@ internal fun MangaItem(
            // KMK -->
            isSelected = isSelected,
            coverRatio = coverRatio,
-            panoramaCover = usePanoramaCover,
+            usePanoramaCover = panoramaCover,
            fitToPanoramaCover = true,
            // KMK <--
            coverAlpha = if (isFavorite) CommonMangaItemDefaults.BrowseFavoriteCoverAlpha else 1f,
--- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt
@ -13,11 +13,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableFloatState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.produceState
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@ -28,21 +25,14 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import eu.kanade.domain.ui.UiPreferences
-import eu.kanade.presentation.manga.components.CoverPlaceholderColor
 import eu.kanade.presentation.manga.components.MangaCover
-import eu.kanade.presentation.manga.components.RatioSwitchToPanorama
 import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga
 import tachiyomi.core.common.util.lang.withIOContext
 import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.manga.model.asMangaCover
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.Badge
 import tachiyomi.presentation.core.components.BadgeGroup
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun MigrationItem(
@ -51,15 +41,7 @@ fun MigrationItem(
    sourcesString: String,
    chapterInfo: MigratingManga.ChapterInfo,
    onClick: () -> Unit,
-    // KMK -->
-    coverRatio: MutableFloatState = remember { mutableFloatStateOf(1f) },
-    // KMK <--
 ) {
-    // KMK -->
-    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
-    val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama
-    val bgColor = manga.asMangaCover().dominantCoverColors?.first?.let { Color(it) }
-    // KMK <--
    Column(
        modifier
            .widthIn(max = 150.dp)
@ -71,41 +53,13 @@ fun MigrationItem(
        val context = LocalContext.current
        Box(
            Modifier.fillMaxWidth()
-                // KMK -->
-                .background(bgColor ?: CoverPlaceholderColor)
-                // KMK <--
                .aspectRatio(MangaCover.Book.ratio),
        ) {
-            // KMK -->
-            if (usePanoramaCover && coverIsWide) {
-                MangaCover.Panorama(
-                    modifier = Modifier
-                        // KMK -->
-                        .align(Alignment.Center)
-                        // KMK <--
-                        .fillMaxWidth(),
-                    data = manga,
-                    // KMK -->
-                    onCoverLoaded = { _, result ->
-                        val image = result.result.image
-                        coverRatio.floatValue = image.height.toFloat() / image.width
-                    },
-                    // KMK <--
-                )
-            } else {
-                // KMK <--
-                MangaCover.Book(
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    data = manga,
-                    // KMK -->
-                    onCoverLoaded = { _, result ->
-                        val image = result.result.image
-                        coverRatio.floatValue = image.height.toFloat() / image.width
-                    },
-                    // KMK <--
-                )
-            }
+            MangaCover.Book(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                data = manga,
+            )
            Box(
                modifier = Modifier
                    .clip(RoundedCornerShape(bottomStart = 4.dp, bottomEnd = 4.dp))
--- a/app/src/main/java/eu/kanade/presentation/browse/components/RelatedMangasComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/RelatedMangasComfortableGrid.kt
@ -35,7 +35,7 @@ fun RelatedMangasComfortableGrid(
    onKeywordClick: (String) -> Unit,
    onKeywordLongClick: (String) -> Unit,
    selection: List<Manga>,
-    usePanoramaCover: Boolean? = null,
+    usePanoramaCover: Boolean = false,
 ) {
    FastScrollLazyVerticalGrid(
        columns = columns,
--- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
@ -5,9 +5,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.icons.outlined.Panorama
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.tooling.preview.PreviewParameter
@ -24,6 +28,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.domain.history.model.HistoryWithRelations
 import tachiyomi.i18n.MR
+import tachiyomi.i18n.kmk.KMR
 import tachiyomi.presentation.core.components.FastScrollLazyColumn
 import tachiyomi.presentation.core.components.ListGroupHeader
 import tachiyomi.presentation.core.components.material.Scaffold
@ -41,6 +46,9 @@ fun HistoryScreen(
    onClickResume: (mangaId: Long, chapterId: Long) -> Unit,
    onDialogChange: (HistoryScreenModel.Dialog?) -> Unit,
 ) {
+    // KMK -->
+    val usePanoramaCover = remember { mutableStateOf(false) }
+    // KMK <--
    Scaffold(
        topBar = { scrollBehavior ->
            SearchToolbar(
@ -49,15 +57,35 @@ fun HistoryScreen(
                onChangeSearchQuery = onSearchQueryChange,
                actions = {
                    AppBarActions(
-                        persistentListOf(
-                            AppBar.Action(
-                                title = stringResource(MR.strings.pref_clear_history),
-                                icon = Icons.Outlined.DeleteSweep,
-                                onClick = {
-                                    onDialogChange(HistoryScreenModel.Dialog.DeleteAll)
-                                },
-                            ),
-                        ),
+                        // KMK -->
+                        persistentListOf<AppBar.AppBarAction>().builder()
+                            .apply {
+                                if (!state.list.isNullOrEmpty()) {
+                                    add(
+                                        AppBar.Action(
+                                            title = stringResource(KMR.strings.action_panorama_cover),
+                                            icon = Icons.Outlined.Panorama,
+                                            iconTint = MaterialTheme.colorScheme.primary.takeIf { usePanoramaCover.value },
+                                            onClick = {
+                                                usePanoramaCover.value = !usePanoramaCover.value
+                                            },
+                                        ),
+                                    )
+                                }
+                                add(
+                                    // KMK <--
+                                    AppBar.Action(
+                                        title = stringResource(MR.strings.pref_clear_history),
+                                        icon = Icons.Outlined.DeleteSweep,
+                                        onClick = {
+                                            onDialogChange(HistoryScreenModel.Dialog.DeleteAll)
+                                        },
+                                    ),
+                                    // KMK -->
+                                )
+                            }
+                            .build(),
+                        // KMK <--
                    )
                },
                scrollBehavior = scrollBehavior,
@ -85,6 +113,9 @@ fun HistoryScreen(
                    onClickCover = { history -> onClickCover(history.mangaId) },
                    onClickResume = { history -> onClickResume(history.mangaId, history.chapterId) },
                    onClickDelete = { item -> onDialogChange(HistoryScreenModel.Dialog.Delete(item)) },
+                    // KMK -->
+                    usePanoramaCover = usePanoramaCover.value,
+                    // KMK <--
                )
            }
        }
@ -98,6 +129,9 @@ private fun HistoryScreenContent(
    onClickCover: (HistoryWithRelations) -> Unit,
    onClickResume: (HistoryWithRelations) -> Unit,
    onClickDelete: (HistoryWithRelations) -> Unit,
+    // KMK -->
+    usePanoramaCover: Boolean,
+    // KMK <--
 ) {
    FastScrollLazyColumn(
        contentPadding = contentPadding,
@ -127,6 +161,9 @@ private fun HistoryScreenContent(
                        onClickCover = { onClickCover(value) },
                        onClickResume = { onClickResume(value) },
                        onClickDelete = { onClickDelete(value) },
+                        // KMK -->
+                        usePanoramaCover = usePanoramaCover,
+                        // KMK <--
                    )
                }
            }
--- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt
@ -15,7 +15,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableFloatState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@ -26,7 +25,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.manga.components.RatioSwitchToPanorama
 import eu.kanade.presentation.theme.TachiyomiPreviewTheme
@ -36,9 +34,6 @@ import tachiyomi.domain.history.model.HistoryWithRelations
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

 private val HistoryItemHeight = 96.dp

@ -50,6 +45,7 @@ fun HistoryItem(
    onClickDelete: () -> Unit,
    modifier: Modifier = Modifier,
    // KMK -->
+    usePanoramaCover: Boolean,
    coverRatio: MutableFloatState = remember { mutableFloatStateOf(1f) },
    // KMK <--
 ) {
@ -62,7 +58,6 @@ fun HistoryItem(
    ) {
        // KMK -->
        val mangaCover = history.coverData
-        val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
        val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama
        val bgColor = mangaCover.dominantCoverColors?.first?.let { Color(it) }
        val onBgColor = mangaCover.dominantCoverColors?.second
@ -150,6 +145,7 @@ private fun HistoryItemPreviews(
                onClickCover = {},
                onClickResume = {},
                onClickDelete = {},
+                usePanoramaCover = false,
            )
        }
    }
--- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
@ -19,7 +19,6 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.util.fastForEach
 import dev.icerock.moko.resources.StringResource
-import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.TabbedDialog
 import eu.kanade.presentation.components.TabbedDialogPaddings
 import eu.kanade.tachiyomi.R
@ -49,8 +48,6 @@ import tachiyomi.presentation.core.components.SortItem
 import tachiyomi.presentation.core.components.TriStateItem
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get

@Composable
 fun LibrarySettingsDialog(
@ -297,22 +294,14 @@ private fun ColumnScope.DisplayPage(
    screenModel: LibrarySettingsScreenModel,
 ) {
    val displayMode by screenModel.libraryPreferences.displayMode().collectAsState()
-    // KMK -->
-    val usePanoramaCover by lazy { Injekt.get<UiPreferences>().usePanoramaCover() }
-    // KMK <--
    SettingsChipRow(MR.strings.action_display_mode) {
-        displayModes
-            .filterNot {
-                it.second == LibraryDisplayMode.ComfortableGridPanorama &&
-                    usePanoramaCover.collectAsState().value
-            }
-            .map { (titleRes, mode) ->
-                FilterChip(
-                    selected = displayMode == mode,
-                    onClick = { screenModel.setDisplayMode(mode) },
-                    label = { Text(stringResource(titleRes)) },
-                )
-            }
+        displayModes.map { (titleRes, mode) ->
+            FilterChip(
+                selected = displayMode == mode,
+                onClick = { screenModel.setDisplayMode(mode) },
+                label = { Text(stringResource(titleRes)) },
+            )
+        }
    }

    if (displayMode != LibraryDisplayMode.List) {
--- a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
@ -26,7 +26,6 @@ import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.MutableFloatState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@ -42,7 +41,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 eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.manga.components.MangaCoverHide
 import eu.kanade.presentation.manga.components.RatioSwitchToPanorama
@ -50,10 +48,7 @@ import exh.debug.DebugToggles
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.BadgeGroup
 import tachiyomi.presentation.core.i18n.stringResource
-import tachiyomi.presentation.core.util.collectAsState
 import tachiyomi.presentation.core.util.selectedBackground
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import tachiyomi.domain.manga.model.MangaCover as MangaCoverModel

 object CommonMangaItemDefaults {
@ -92,13 +87,9 @@ fun MangaCompactGridItem(
    coverBadgeEnd: @Composable (RowScope.() -> Unit)? = null,
    // KMK -->
    libraryColored: Boolean = true,
-    coverRatio: MutableFloatState = remember { mutableFloatStateOf(1f) },
-    fitToPanoramaCover: Boolean = false,
    // KMK <--
 ) {
    // KMK -->
-    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
-    val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama
    val bgColor = coverData.dominantCoverColors?.first?.let { Color(it) }.takeIf { libraryColored }
    val onBgColor = coverData.dominantCoverColors?.second.takeIf { libraryColored }
    // KMK <--
@ -118,58 +109,22 @@ fun MangaCompactGridItem(
                        tint = onBgColor,
                    )
                } else {
-                    if (fitToPanoramaCover && usePanoramaCover && coverIsWide) {
-                        MangaCover.Panorama(
-                            modifier = Modifier
-                                // KMK -->
-                                // .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha)
-                                // KMK <--
-                                .fillMaxWidth(),
-                            data = coverData,
+                    // KMK <--
+                    MangaCover.Book(
+                        modifier = Modifier
                            // KMK -->
-                            alpha = if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha,
-                            bgColor = bgColor ?: (MaterialTheme.colorScheme.surface.takeIf { isSelected }),
-                            tint = onBgColor,
-                            onCoverLoaded = { _, result ->
-                                val image = result.result.image
-                                coverRatio.floatValue = image.height.toFloat() / image.width
-                            },
+                            // .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha)
                            // KMK <--
-                        )
-                    } else {
+                            .fillMaxWidth(),
+                        data = coverData,
+                        // KMK -->
+                        alpha = if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha,
+                        bgColor = bgColor ?: (MaterialTheme.colorScheme.surface.takeIf { isSelected }),
+                        tint = onBgColor,
                        // KMK <--
-                        MangaCover.Book(
-                            modifier = Modifier
-                                // KMK -->
-                                // .alpha(if (isSelected) GridSelectedCoverAlpha else coverAlpha)
-                                // KMK <--
-                                .fillMaxWidth(),
-                            data = coverData,
-                            // KMK -->
-                            alpha = if (isSelected) GRID_SELECTED_COVER_ALPHA else coverAlpha,
-                            bgColor = bgColor ?: (MaterialTheme.colorScheme.surface.takeIf { isSelected }),
-                            tint = onBgColor,
-                            onCoverLoaded = { _, result ->
-                                val image = result.result.image
-                                coverRatio.floatValue = image.height.toFloat() / image.width
-                            },
-                            scale = if (usePanoramaCover && coverIsWide) {
-                                ContentScale.Fit
-                            } else {
-                                ContentScale.Crop
-                            },
-                            // KMK <--
-                        )
-                    }
+                    )
                }
            },
-            // KMK -->
-            ratio = if (fitToPanoramaCover && usePanoramaCover && coverIsWide) {
-                MangaCover.Panorama.ratio
-            } else {
-                MangaCover.Book.ratio
-            },
-            // KMK <--
            badgesStart = coverBadgeStart,
            badgesEnd = coverBadgeEnd,
            content = {
@ -264,12 +219,11 @@ fun MangaComfortableGridItem(
    // KMK -->
    libraryColored: Boolean = true,
    coverRatio: MutableFloatState = remember { mutableFloatStateOf(1f) },
-    panoramaCover: Boolean?,
+    usePanoramaCover: Boolean,
    fitToPanoramaCover: Boolean = false,
    // KMK <--
 ) {
    // KMK -->
-    val usePanoramaCover = panoramaCover ?: Injekt.get<UiPreferences>().usePanoramaCover().collectAsState().value
    val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama
    val bgColor = coverData.dominantCoverColors?.first?.let { Color(it) }.takeIf { libraryColored }
    val onBgColor = coverData.dominantCoverColors?.second.takeIf { libraryColored }
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
@ -22,7 +22,7 @@ internal fun LibraryComfortableGrid(
    searchQuery: String?,
    onGlobalSearchClicked: () -> Unit,
    // KMK -->
-    usePanoramaCover: Boolean? = null,
+    usePanoramaCover: Boolean = false,
    // KMK <--
 ) {
    LazyLibraryGrid(
@ -71,7 +71,7 @@ internal fun LibraryComfortableGrid(
                    null
                },
                // KMK -->
-                panoramaCover = usePanoramaCover,
+                usePanoramaCover = usePanoramaCover,
                // KMK <--
            )
        }
--- a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt
@ -62,7 +62,7 @@ fun DuplicateMangaDialog(
    val minHeight = LocalPreferenceMinHeight.current

    // KMK -->
-    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
+    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCoverAlways().collectAsState()
    val coverRatio = remember { mutableFloatStateOf(1f) }
    val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama
    // KMK <--
@ -196,7 +196,7 @@ fun DuplicateMangasDialog(
    mangaName: String,
    duplicate: Manga,
 ) {
-    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
+    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCoverAlways().collectAsState()
    val coverRatio = remember { mutableFloatStateOf(1f) }
    val coverIsWide = coverRatio.floatValue <= RatioSwitchToPanorama

--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
@ -126,7 +126,7 @@ fun MangaInfoBox(
    // KMK <--
 ) {
    // KMK -->
-    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCover().collectAsState()
+    val usePanoramaCover by Injekt.get<UiPreferences>().usePanoramaCoverMangaInfo().collectAsState()
    // KMK <--
    Box(modifier = modifier) {
        // Backdrop
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
@ -51,7 +51,7 @@ object SettingsAppearanceScreen : SearchableSettings {
        return listOf(
            getThemeGroup(uiPreferences = uiPreferences),
            // KMK -->
-            getDetailsPageThemeGroup(uiPreferences = uiPreferences),
+            getMangaInfoThemeGroup(uiPreferences = uiPreferences),
            // KMK <--
            getDisplayGroup(uiPreferences = uiPreferences),
            // SY -->
@ -156,15 +156,15 @@ object SettingsAppearanceScreen : SearchableSettings {

    // KMK -->
    @Composable
-    private fun getDetailsPageThemeGroup(
+    private fun getMangaInfoThemeGroup(
        uiPreferences: UiPreferences,
    ): Preference.PreferenceGroup {
        val scope = rememberCoroutineScope()
-        val detailsPageThemeCoverBased by remember {
+        val mangaInfoThemeCoverBased by remember {
            Injekt.get<UiPreferences>().themeCoverBased().asState(scope)
        }
        return Preference.PreferenceGroup(
-            title = stringResource(KMR.strings.pref_details_page_theme),
+            title = stringResource(KMR.strings.pref_manga_info_theme),
            preferenceItems = persistentListOf(
                Preference.PreferenceItem.SwitchPreference(
                    pref = uiPreferences.themeCoverBased(),
@ -173,7 +173,7 @@ object SettingsAppearanceScreen : SearchableSettings {
                Preference.PreferenceItem.ListPreference(
                    pref = uiPreferences.themeCoverBasedStyle(),
                    title = stringResource(KMR.strings.pref_theme_cover_based_style),
-                    enabled = detailsPageThemeCoverBased,
+                    enabled = mangaInfoThemeCoverBased,
                    entries = PaletteStyle.entries
                        .associateWith {
                            when (it) {
@ -200,6 +200,11 @@ object SettingsAppearanceScreen : SearchableSettings {
                        }
                        .toImmutableMap(),
                ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = uiPreferences.usePanoramaCoverMangaInfo(),
+                    title = stringResource(KMR.strings.pref_panorama_cover),
+                    subtitle = stringResource(KMR.strings.pref_panorama_cover_summary),
+                ),
            ),
        )
    }
@ -274,9 +279,9 @@ object SettingsAppearanceScreen : SearchableSettings {
            preferenceItems = persistentListOf(
                // KMK -->
                Preference.PreferenceItem.SwitchPreference(
-                    pref = uiPreferences.usePanoramaCover(),
-                    title = stringResource(KMR.strings.pref_use_panorama_cover),
-                    subtitle = stringResource(KMR.strings.pref_use_panorama_cover_summary),
+                    pref = uiPreferences.usePanoramaCoverFlow(),
+                    title = stringResource(KMR.strings.pref_panorama_cover_flow),
+                    subtitle = stringResource(KMR.strings.pref_panorama_cover_flow_summary),
                ),
                // KMK <--
                Preference.PreferenceItem.SwitchPreference(
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@ -38,6 +38,7 @@ import coil3.transform.RoundedCornersTransformation
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.manga.components.RatioSwitchToPanorama
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.EditMangaDialogBinding
@ -61,6 +62,8 @@ import tachiyomi.i18n.MR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.source.local.isLocal
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get

@Composable
 fun EditMangaDialog(
@ -366,7 +369,7 @@ private fun loadCover(
    // KMK <--
 ) {
    // KMK -->
-    if (coverRatio.floatValue <= RatioSwitchToPanorama) {
+    if (Injekt.get<UiPreferences>().usePanoramaCoverAlways().get() && coverRatio.floatValue <= RatioSwitchToPanorama) {
        binding.mangaCover.visibility = View.GONE
        binding.mangaCoverPanorama.visibility = View.VISIBLE
        binding.mangaCoverPanorama.load(manga) {
--- a/i18n-kmk/src/commonMain/moko-resources/ar/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/ar/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">تبديل NSFW فقط</string>
  <string name="action_bulk_select">وضع التحديد بالجملة</string>
  <string name="action_faq_and_guides">الأسئلة الشائعة والأدلة</string>
-  <string name="pref_details_page_theme">صفحة التفاصيل</string>
+  <string name="pref_manga_info_theme">صفحة التفاصيل</string>
  <string name="download_cache_renew_interval">الفاصل الزمني لتجديد التحميل</string>
  <string name="download_cache_renew_interval_manual">دليل</string>
  <string name="download_cache_renew_interval_1hour">ساعة واحدة</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">إظهار الفئات المخفية</string>
-  <string name="pref_use_panorama_cover">غلاف بانوراما</string>
-  <string name="pref_use_panorama_cover_summary">إظهار الغلاف في الوضع الأفقي إذا كان صورة واسعة</string>
+  <string name="pref_panorama_cover">غلاف بانوراما</string>
+  <string name="pref_panorama_cover_summary">إظهار الغلاف في الوضع الأفقي إذا كان صورة واسعة</string>
  <string name="action_display_comfortable_grid_panorama">شبكة بانوراما المريحة</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml
@ -13,12 +13,13 @@
    <string name="action_remove_merged">Remove merged entries?</string>
    <string name="action_hide">Hide</string>
    <string name="action_show_hidden_categories">Show hidden categories</string>
+    <string name="action_panorama_cover">Panorama cover</string>


    <!-- Preferences -->
      <!-- Appearance section -->
    <string name="pref_custom_theme_style">Custom theme style</string>
-    <string name="pref_details_page_theme">Manga details page</string>
+    <string name="pref_manga_info_theme">Manga Info</string>
    <string name="pref_theme_cover_based">Theme based on cover</string>
    <string name="pref_theme_cover_based_style">Cover based theme style</string>
    <string name="pref_theme_cover_based_style_tonalspot">Tonal Spot</string>
@ -30,8 +31,10 @@
    <string name="pref_theme_cover_based_style_monochrome">Monochrome</string>
    <string name="pref_theme_cover_based_style_fidelity">Fidelity</string>
    <string name="pref_theme_cover_based_style_content">Content</string>
-    <string name="pref_use_panorama_cover">Panorama Cover</string>
-    <string name="pref_use_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
+    <string name="pref_panorama_cover">Panorama Cover</string>
+    <string name="pref_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
+    <string name="pref_panorama_cover_flow">Panorama Cover Flow</string>
+    <string name="pref_panorama_cover_flow_summary">Show panorama cover in Global Search &amp; Suggestions</string>
    <string name="action_display_comfortable_grid_panorama">Panorama comfortable grid</string>
    <string name="pref_expand_related_mangas">Expand Suggestions</string>
    <string name="pref_expand_related_mangas_summary">If turned off, Suggestions won\'t automatically load &amp; show expanded</string>
--- a/i18n-kmk/src/commonMain/moko-resources/cs/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/cs/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Přepnout pouze NSFW</string>
  <string name="action_bulk_select">Režim hromadného výběru</string>
  <string name="action_faq_and_guides">FAQ a návody</string>
-  <string name="pref_details_page_theme">Stránka s podrobnostmi</string>
+  <string name="pref_manga_info_theme">Stránka s podrobnostmi</string>
  <string name="download_cache_renew_interval">Interval obnovení mezipaměti</string>
  <string name="download_cache_renew_interval_manual">Ruční</string>
  <string name="download_cache_renew_interval_1hour">1 hodina</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Zobrazit skryté kategorie</string>
-  <string name="pref_use_panorama_cover">Kryt Panoramy</string>
-  <string name="pref_use_panorama_cover_summary">Zobrazit obal v režimu na šířku, pokud je to široký obrázek</string>
+  <string name="pref_panorama_cover">Kryt Panoramy</string>
+  <string name="pref_panorama_cover_summary">Zobrazit obal v režimu na šířku, pokud je to široký obrázek</string>
  <string name="action_display_comfortable_grid_panorama">Panorama pohodlná mřížka</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/da/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/da/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Slå kun NSFW til/fra</string>
  <string name="action_bulk_select">Masse valg tilstand</string>
  <string name="action_faq_and_guides">Ofte stillede spørgsmål og vejledninger</string>
-  <string name="pref_details_page_theme">Detaljer side</string>
+  <string name="pref_manga_info_theme">Detaljer side</string>
  <string name="download_cache_renew_interval">Download cache forny interval</string>
  <string name="download_cache_renew_interval_manual">Manuelt</string>
  <string name="download_cache_renew_interval_1hour">1 time</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Vis skjulte kategorier</string>
-  <string name="pref_use_panorama_cover">Panoramaomslag</string>
-  <string name="pref_use_panorama_cover_summary">Vis omslag i liggende tilstand, hvis det er et bredt billede</string>
+  <string name="pref_panorama_cover">Panoramaomslag</string>
+  <string name="pref_panorama_cover_summary">Vis omslag i liggende tilstand, hvis det er et bredt billede</string>
  <string name="action_display_comfortable_grid_panorama">Panorama komfortabelt gitter</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/de/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/de/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Nur NSFW umschalten</string>
  <string name="action_bulk_select">Massenauswahlmodus</string>
  <string name="action_faq_and_guides">FAQ und Anleitungen</string>
-  <string name="pref_details_page_theme">Detailseite</string>
+  <string name="pref_manga_info_theme">Detailseite</string>
  <string name="download_cache_renew_interval">Download-Cache Erneuerungsintervall</string>
  <string name="download_cache_renew_interval_manual">Manuell</string>
  <string name="download_cache_renew_interval_1hour">1 Stunde</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Versteckte Kategorien anzeigen</string>
-  <string name="pref_use_panorama_cover">Panorama-Cover</string>
-  <string name="pref_use_panorama_cover_summary">Cover im Querformat anzeigen, wenn es ein breites Bild ist</string>
+  <string name="pref_panorama_cover">Panorama-Cover</string>
+  <string name="pref_panorama_cover_summary">Cover im Querformat anzeigen, wenn es ein breites Bild ist</string>
  <string name="action_display_comfortable_grid_panorama">Panorama-bequemes Raster</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/el/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/el/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Εναλλαγή μόνο NSFW</string>
  <string name="action_bulk_select">Λειτουργία μαζικής επιλογής</string>
  <string name="action_faq_and_guides">Συχνές ερωτήσεις και οδηγοί</string>
-  <string name="pref_details_page_theme">Σελίδα λεπτομερειών</string>
+  <string name="pref_manga_info_theme">Σελίδα λεπτομερειών</string>
  <string name="download_cache_renew_interval">Χρονικό διάστημα ανανέωσης προσωρινής μνήμης</string>
  <string name="download_cache_renew_interval_manual">Χειροκίνητα</string>
  <string name="download_cache_renew_interval_1hour">1 ώρα</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Εμφάνιση κρυφών κατηγοριών</string>
-  <string name="pref_use_panorama_cover">Κάλυψη Πανοράματος</string>
-  <string name="pref_use_panorama_cover_summary">Εμφάνιση εξωφύλλου σε λειτουργία τοπίου αν είναι μια ευρεία εικόνα</string>
+  <string name="pref_panorama_cover">Κάλυψη Πανοράματος</string>
+  <string name="pref_panorama_cover_summary">Εμφάνιση εξωφύλλου σε λειτουργία τοπίου αν είναι μια ευρεία εικόνα</string>
  <string name="action_display_comfortable_grid_panorama">Πανόραμα άνετο πλέγμα</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/es/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/es/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Alternar sólo NSFW</string>
  <string name="action_bulk_select">Modo de selección masiva</string>
  <string name="action_faq_and_guides">Preguntas frecuentes y guías</string>
-  <string name="pref_details_page_theme">Página de detalles</string>
+  <string name="pref_manga_info_theme">Página de detalles</string>
  <string name="download_cache_renew_interval">Descargar el intervalo de renovación de caché</string>
  <string name="download_cache_renew_interval_manual">Manual</string>
  <string name="download_cache_renew_interval_1hour">1 hora</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Mostrar categorías ocultas</string>
-  <string name="pref_use_panorama_cover">Portada Panorama</string>
-  <string name="pref_use_panorama_cover_summary">Mostrar la portada en modo apaisado si es una imagen ancha</string>
+  <string name="pref_panorama_cover">Portada Panorama</string>
+  <string name="pref_panorama_cover_summary">Mostrar la portada en modo apaisado si es una imagen ancha</string>
  <string name="action_display_comfortable_grid_panorama">Cuadrícula panorámica cómoda</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/fi/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/fi/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Vaihda vain NSFW</string>
  <string name="action_bulk_select">Bulk valintatila</string>
  <string name="action_faq_and_guides">UKK ja oppaat</string>
-  <string name="pref_details_page_theme">Yksityiskohdat sivu</string>
+  <string name="pref_manga_info_theme">Yksityiskohdat sivu</string>
  <string name="download_cache_renew_interval">Lataa välimuistin uusimisväli</string>
  <string name="download_cache_renew_interval_manual">Manuaalinen</string>
  <string name="download_cache_renew_interval_1hour">1 tunti</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Näytä piilotetut kategoriat</string>
-  <string name="pref_use_panorama_cover">Panoraama Kansi</string>
-  <string name="pref_use_panorama_cover_summary">Näytä kansi vaakatilassa, jos se on leveä kuva</string>
+  <string name="pref_panorama_cover">Panoraama Kansi</string>
+  <string name="pref_panorama_cover_summary">Näytä kansi vaakatilassa, jos se on leveä kuva</string>
  <string name="action_display_comfortable_grid_panorama">Panorama mukava ruudukko</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/fil/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/fil/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">I-toggle ang NSFW lamang</string>
  <string name="action_bulk_select">Pumili ng maramihan</string>
  <string name="action_faq_and_guides">FAQ at mga Guide</string>
-  <string name="pref_details_page_theme">Pahina ng mga detalye</string>
+  <string name="pref_manga_info_theme">Pahina ng mga detalye</string>
  <string name="download_cache_renew_interval">Tagal ng pagbago ng download cache</string>
  <string name="download_cache_renew_interval_manual">Mano-mano</string>
  <string name="download_cache_renew_interval_1hour">1 oras</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Show hidden categories</string>
-  <string name="pref_use_panorama_cover">Panorama Cover</string>
-  <string name="pref_use_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
+  <string name="pref_panorama_cover">Panorama Cover</string>
+  <string name="pref_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
  <string name="action_display_comfortable_grid_panorama">Panorama comfortable grid</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/fr/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/fr/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Activer/désactiver uniquement NSFW</string>
  <string name="action_bulk_select">Mode de sélection en bloc</string>
  <string name="action_faq_and_guides">FAQ et tutoriels</string>
-  <string name="pref_details_page_theme">Page de détails</string>
+  <string name="pref_manga_info_theme">Page de détails</string>
  <string name="download_cache_renew_interval">Intervalle de renouvellement du cache de téléchargement</string>
  <string name="download_cache_renew_interval_manual">Manuelle</string>
  <string name="download_cache_renew_interval_1hour">1 heure</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">Ecran LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Afficher les catégories masquées</string>
-  <string name="pref_use_panorama_cover">Couverture Panorama</string>
-  <string name="pref_use_panorama_cover_summary">Afficher la couverture en mode paysage s\'il s\'agit d\'une image large</string>
+  <string name="pref_panorama_cover">Couverture Panorama</string>
+  <string name="pref_panorama_cover_summary">Afficher la couverture en mode paysage s\'il s\'agit d\'une image large</string>
  <string name="action_display_comfortable_grid_panorama">Grille confortable Panorama</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/it/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/it/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Attiva/disattiva solo NSFW</string>
  <string name="action_bulk_select">Modalità selezione Bulk</string>
  <string name="action_faq_and_guides">FAQ e guide</string>
-  <string name="pref_details_page_theme">Pagina dettagli</string>
+  <string name="pref_manga_info_theme">Pagina dettagli</string>
  <string name="download_cache_renew_interval">Intervallo di rinnovo download cache</string>
  <string name="download_cache_renew_interval_manual">Manuale</string>
  <string name="download_cache_renew_interval_1hour">1 ora</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Mostra categorie nascoste</string>
-  <string name="pref_use_panorama_cover">Copertina Panorama</string>
-  <string name="pref_use_panorama_cover_summary">Mostra la copertina in modalità orizzontale se è un\'immagine larga</string>
+  <string name="pref_panorama_cover">Copertina Panorama</string>
+  <string name="pref_panorama_cover_summary">Mostra la copertina in modalità orizzontale se è un\'immagine larga</string>
  <string name="action_display_comfortable_grid_panorama">Griglia confortevole Panorama</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/ja/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/ja/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">NSFWのみ切り替え</string>
  <string name="action_bulk_select">一括選択モード</string>
  <string name="action_faq_and_guides">FAQ とガイド</string>
-  <string name="pref_details_page_theme">詳細ページ</string>
+  <string name="pref_manga_info_theme">詳細ページ</string>
  <string name="download_cache_renew_interval">キャッシュの更新間隔をダウンロード</string>
  <string name="download_cache_renew_interval_manual">マニュアル</string>
  <string name="download_cache_renew_interval_1hour">1 時間</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">非表示のカテゴリを表示</string>
-  <string name="pref_use_panorama_cover">パノラマカバー</string>
-  <string name="pref_use_panorama_cover_summary">横向き時にカバーを表示する</string>
+  <string name="pref_panorama_cover">パノラマカバー</string>
+  <string name="pref_panorama_cover_summary">横向き時にカバーを表示する</string>
  <string name="action_display_comfortable_grid_panorama">パノラマ快適なグリッド</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/nl/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/nl/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Alleen NSFW in-/uitschakelen</string>
  <string name="action_bulk_select">Bulk selectiemodus</string>
  <string name="action_faq_and_guides">FAQ en handleidingen</string>
-  <string name="pref_details_page_theme">Details pagina</string>
+  <string name="pref_manga_info_theme">Details pagina</string>
  <string name="download_cache_renew_interval">Download de cache vernieuwingsinterval</string>
  <string name="download_cache_renew_interval_manual">Handleiding</string>
  <string name="download_cache_renew_interval_1hour">1 uur</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Toon verborgen categorieën</string>
-  <string name="pref_use_panorama_cover">Panorama Omslag</string>
-  <string name="pref_use_panorama_cover_summary">Toon omslag in liggende modus als het breed beeld is</string>
+  <string name="pref_panorama_cover">Panorama Omslag</string>
+  <string name="pref_panorama_cover_summary">Toon omslag in liggende modus als het breed beeld is</string>
  <string name="action_display_comfortable_grid_panorama">Panorama comfortabel raster</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/pl/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/pl/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Przełącz tylko NSFW</string>
  <string name="action_bulk_select">Tryb masowego zaznaczenia</string>
  <string name="action_faq_and_guides">FAQ i przewodniki</string>
-  <string name="pref_details_page_theme">Strona szczegółów</string>
+  <string name="pref_manga_info_theme">Strona szczegółów</string>
  <string name="download_cache_renew_interval">Częstotliwość odnawiania pamięci podręcznej pobierania</string>
  <string name="download_cache_renew_interval_manual">Ręcznie</string>
  <string name="download_cache_renew_interval_1hour">1 godzina</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Pokaż ukryte kategorie</string>
-  <string name="pref_use_panorama_cover">Pokładka panorama</string>
-  <string name="pref_use_panorama_cover_summary">Pokaż okładkę w trybie poziomym, jeśli jest szerokim obrazem</string>
+  <string name="pref_panorama_cover">Pokładka panorama</string>
+  <string name="pref_panorama_cover_summary">Pokaż okładkę w trybie poziomym, jeśli jest szerokim obrazem</string>
  <string name="action_display_comfortable_grid_panorama">Siatka wygodna panorama</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/pt-rBR/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/pt-rBR/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Ativar/desativar somente NSFW</string>
  <string name="action_bulk_select">Modo de seleção em massa</string>
  <string name="action_faq_and_guides">FAQ e Guias</string>
-  <string name="pref_details_page_theme">Página de detalhes</string>
+  <string name="pref_manga_info_theme">Página de detalhes</string>
  <string name="download_cache_renew_interval">Baixar intervalo de renovação do cache</string>
  <string name="download_cache_renew_interval_manual">Manualmente</string>
  <string name="download_cache_renew_interval_1hour">number@@0 horas</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Mostrar categorias ocultas</string>
-  <string name="pref_use_panorama_cover">Capa do Panorama</string>
-  <string name="pref_use_panorama_cover_summary">Mostrar capa no modo paisagem se for uma imagem larga</string>
+  <string name="pref_panorama_cover">Capa do Panorama</string>
+  <string name="pref_panorama_cover_summary">Mostrar capa no modo paisagem se for uma imagem larga</string>
  <string name="action_display_comfortable_grid_panorama">Grade de panorama confortável</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/pt/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/pt/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Ativar/desativar somente NSFW</string>
  <string name="action_bulk_select">Modo de seleção em massa</string>
  <string name="action_faq_and_guides">FAQ e Guias</string>
-  <string name="pref_details_page_theme">Página de detalhes</string>
+  <string name="pref_manga_info_theme">Página de detalhes</string>
  <string name="download_cache_renew_interval">Baixar intervalo de renovação do cache</string>
  <string name="download_cache_renew_interval_manual">Manualmente</string>
  <string name="download_cache_renew_interval_1hour">number@@0 horas</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Mostrar categorias ocultas</string>
-  <string name="pref_use_panorama_cover">Capa do Panorama</string>
-  <string name="pref_use_panorama_cover_summary">Mostrar capa no modo paisagem se for uma imagem larga</string>
+  <string name="pref_panorama_cover">Capa do Panorama</string>
+  <string name="pref_panorama_cover_summary">Mostrar capa no modo paisagem se for uma imagem larga</string>
  <string name="action_display_comfortable_grid_panorama">Grade de panorama confortável</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/ro/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/ro/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Comută numai NSFW</string>
  <string name="action_bulk_select">Mod selecţie în masă</string>
  <string name="action_faq_and_guides">Întrebări frecvente și ghiduri</string>
-  <string name="pref_details_page_theme">Pagina de detalii</string>
+  <string name="pref_manga_info_theme">Pagina de detalii</string>
  <string name="download_cache_renew_interval">Interval reînnoire descărcare geocutie</string>
  <string name="download_cache_renew_interval_manual">Manual</string>
  <string name="download_cache_renew_interval_1hour">1 oră</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Arată categoriile ascunse</string>
-  <string name="pref_use_panorama_cover">Copertă panoramă</string>
-  <string name="pref_use_panorama_cover_summary">Arată coperta în modul peisaj dacă este o imagine largă</string>
+  <string name="pref_panorama_cover">Copertă panoramă</string>
+  <string name="pref_panorama_cover_summary">Arată coperta în modul peisaj dacă este o imagine largă</string>
  <string name="action_display_comfortable_grid_panorama">Rețea confortabilă a panoramei</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/ru/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/ru/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Переключить только NSFW</string>
  <string name="action_bulk_select">Режим массового выбора</string>
  <string name="action_faq_and_guides">FAQ и руководства</string>
-  <string name="pref_details_page_theme">Детали</string>
+  <string name="pref_manga_info_theme">Детали</string>
  <string name="download_cache_renew_interval">Загрузить интервал обновления кэша</string>
  <string name="download_cache_renew_interval_manual">Ручной</string>
  <string name="download_cache_renew_interval_1hour">1 час</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Показать скрытые категории</string>
-  <string name="pref_use_panorama_cover">Покрытие Панорамы</string>
-  <string name="pref_use_panorama_cover_summary">Показывать обложку в альбомном режиме, если это широкое изображение</string>
+  <string name="pref_panorama_cover">Покрытие Панорамы</string>
+  <string name="pref_panorama_cover_summary">Показывать обложку в альбомном режиме, если это широкое изображение</string>
  <string name="action_display_comfortable_grid_panorama">Удобная сетка для панорамы</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/sv/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/sv/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Växla endast NSFW</string>
  <string name="action_bulk_select">Bulk markeringsläge</string>
  <string name="action_faq_and_guides">Vanliga frågor och guider</string>
-  <string name="pref_details_page_theme">Detaljer sida</string>
+  <string name="pref_manga_info_theme">Detaljer sida</string>
  <string name="download_cache_renew_interval">Hämta cache förnyelseintervall</string>
  <string name="download_cache_renew_interval_manual">Manuell</string>
  <string name="download_cache_renew_interval_1hour">1 timme</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Visa dolda kategorier</string>
-  <string name="pref_use_panorama_cover">Panorama omslag</string>
-  <string name="pref_use_panorama_cover_summary">Visa omslaget i liggande läge om det är en bred bild</string>
+  <string name="pref_panorama_cover">Panorama omslag</string>
+  <string name="pref_panorama_cover_summary">Visa omslaget i liggande läge om det är en bred bild</string>
  <string name="action_display_comfortable_grid_panorama">Panorama bekvämt rutnät</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/tr/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/tr/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Yalnız yetişkin içerikler</string>
  <string name="action_bulk_select">Toplu seçim modu</string>
  <string name="action_faq_and_guides">SSS ve Yönergeler</string>
-  <string name="pref_details_page_theme">Detaylar sayfası</string>
+  <string name="pref_manga_info_theme">Detaylar sayfası</string>
  <string name="download_cache_renew_interval">İndirme önbelleği yenileme aralığı</string>
  <string name="download_cache_renew_interval_manual">Manuel</string>
  <string name="download_cache_renew_interval_1hour">1 saat</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Gizli kategorileri göster</string>
-  <string name="pref_use_panorama_cover">Panorama Cover</string>
-  <string name="pref_use_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
+  <string name="pref_panorama_cover">Panorama Cover</string>
+  <string name="pref_panorama_cover_summary">Show cover in landscape mode if it\'s a wide image</string>
  <string name="action_display_comfortable_grid_panorama">Panorama comfortable grid</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/uk/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/uk/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Лише NSFW</string>
  <string name="action_bulk_select">Масовий режим вибору</string>
  <string name="action_faq_and_guides">ЧаПи та керівництва</string>
-  <string name="pref_details_page_theme">Сторінка подробиць</string>
+  <string name="pref_manga_info_theme">Сторінка подробиць</string>
  <string name="download_cache_renew_interval">Завантажити інтервал оновлення кешу</string>
  <string name="download_cache_renew_interval_manual">Вручну</string>
  <string name="download_cache_renew_interval_1hour">1 година</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">Піко-8</string>
  <string name="action_show_hidden_categories">Показати приховані категорії</string>
-  <string name="pref_use_panorama_cover">Кришка Панорами</string>
-  <string name="pref_use_panorama_cover_summary">Показувати обкладинку в альбомному режимі якщо це широке зображення</string>
+  <string name="pref_panorama_cover">Кришка Панорами</string>
+  <string name="pref_panorama_cover_summary">Показувати обкладинку в альбомному режимі якщо це широке зображення</string>
  <string name="action_display_comfortable_grid_panorama">Панорама</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/vi/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/vi/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">Chỉ 18+</string>
  <string name="action_bulk_select">Chế độ lựa chọn hàng loạt</string>
  <string name="action_faq_and_guides">Hỏi đáp &amp; Hướng dẫn</string>
-  <string name="pref_details_page_theme">Trang chi tiết</string>
+  <string name="pref_manga_info_theme">Trang chi tiết</string>
  <string name="download_cache_renew_interval">Khoảng thời gian làm bộ nhớ tải xuống</string>
  <string name="download_cache_renew_interval_manual">Thủ công</string>
  <string name="download_cache_renew_interval_1hour">1 tiếng</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">Hiện các danh mục ẩn</string>
-  <string name="pref_use_panorama_cover">Ảnh bìa toàn cảnh</string>
-  <string name="pref_use_panorama_cover_summary">Hiển thị ảnh bìa dạng ngang nếu là hình ảnh rộng</string>
+  <string name="pref_panorama_cover">Ảnh bìa toàn cảnh</string>
+  <string name="pref_panorama_cover_summary">Hiển thị ảnh bìa dạng ngang nếu là hình ảnh rộng</string>
  <string name="action_display_comfortable_grid_panorama">Lưới toàn cảnh</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/zh-rCN/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/zh-rCN/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">切换仅 NSFW</string>
  <string name="action_bulk_select">批量选择模式</string>
  <string name="action_faq_and_guides">常见问题和指南</string>
-  <string name="pref_details_page_theme">详细信息页面</string>
+  <string name="pref_manga_info_theme">详细信息页面</string>
  <string name="download_cache_renew_interval">下载缓存更新间隔</string>
  <string name="download_cache_renew_interval_manual">手动模式</string>
  <string name="download_cache_renew_interval_1hour">1 小时</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">LCD</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">显示隐藏分类</string>
-  <string name="pref_use_panorama_cover">全景封面</string>
-  <string name="pref_use_panorama_cover_summary">横向显示宽屏封面</string>
+  <string name="pref_panorama_cover">全景封面</string>
+  <string name="pref_panorama_cover_summary">横向显示宽屏封面</string>
  <string name="action_display_comfortable_grid_panorama">全景松散网格</string>
 </resources>
--- a/i18n-kmk/src/commonMain/moko-resources/zh-rTW/strings.xml
+++ b/i18n-kmk/src/commonMain/moko-resources/zh-rTW/strings.xml
@ -4,7 +4,7 @@
  <string name="action_toggle_nsfw_only">切換僅 NSFW</string>
  <string name="action_bulk_select">批量選擇模式</string>
  <string name="action_faq_and_guides">常見問題和指南</string>
-  <string name="pref_details_page_theme">詳情頁面</string>
+  <string name="pref_manga_info_theme">詳情頁面</string>
  <string name="download_cache_renew_interval">下載快取更新間隔</string>
  <string name="download_cache_renew_interval_manual">手動</string>
  <string name="download_cache_renew_interval_1hour">每 1 小時</string>
@ -98,7 +98,7 @@
  <string name="custom_theme_palette_lcd">液晶顯示器</string>
  <string name="custom_theme_palette_pico">PICO-8</string>
  <string name="action_show_hidden_categories">顯示隱藏的分類</string>
-  <string name="pref_use_panorama_cover">全景封面</string>
-  <string name="pref_use_panorama_cover_summary">如果是寬影像，則以橫向模式顯示封面</string>
+  <string name="pref_panorama_cover">全景封面</string>
+  <string name="pref_panorama_cover_summary">如果是寬影像，則以橫向模式顯示封面</string>
  <string name="action_display_comfortable_grid_panorama">全景舒適格</string>
 </resources>