Migrate reader shortcut menus to Compose

Contents' UIs should probably be improved, but that can happen separately.
2025-11-09 18:48:55 +01:00 · 2023-08-04 17:34:08 -04:00
parent 400ca48456
commit 7308090288
10 changed files with 161 additions and 117 deletions
--- a/app/src/main/java/eu/kanade/presentation/reader/OrientationModeSelectDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/OrientationModeSelectDialog.kt
@@ -0,0 +1,56 @@
+package eu.kanade.presentation.reader
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.manga.model.orientationType
+import eu.kanade.presentation.components.AdaptiveSheet
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
+import tachiyomi.presentation.core.components.SettingsChipRow
+import tachiyomi.presentation.core.components.material.padding
+
+private val orientationTypeOptions = OrientationType.entries.map { it.stringRes to it }
+
+@Composable
+fun OrientationModeSelectDialog(
+    onDismissRequest: () -> Unit,
+    screenModel: ReaderSettingsScreenModel,
+    onChange: (Int) -> Unit,
+) {
+    val manga by screenModel.mangaFlow.collectAsState()
+    val orientationType = remember(manga) { OrientationType.fromPreference(manga?.orientationType?.toInt()) }
+
+    AdaptiveSheet(
+        onDismissRequest = onDismissRequest,
+    ) {
+        Row(
+            modifier = Modifier.padding(vertical = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
+        ) {
+            SettingsChipRow(R.string.rotation_type) {
+                orientationTypeOptions.map { (stringRes, it) ->
+                    FilterChip(
+                        selected = it == orientationType,
+                        onClick = {
+                            screenModel.onChangeOrientation(it)
+                            onChange(stringRes)
+                        },
+                        label = { Text(stringResource(stringRes)) },
+                    )
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
@@ -0,0 +1,102 @@
+package eu.kanade.presentation.reader
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Photo
+import androidx.compose.material.icons.outlined.Save
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import eu.kanade.presentation.components.AdaptiveSheet
+import eu.kanade.tachiyomi.R
+import tachiyomi.presentation.core.components.ActionButton
+import tachiyomi.presentation.core.components.material.padding
+
+@Composable
+fun ReaderPageActionsDialog(
+    onDismissRequest: () -> Unit,
+    onSetAsCover: () -> Unit,
+    onShare: () -> Unit,
+    onSave: () -> Unit,
+) {
+    var showSetCoverDialog by remember { mutableStateOf(false) }
+
+    AdaptiveSheet(
+        onDismissRequest = onDismissRequest,
+    ) {
+        Row(
+            modifier = Modifier.padding(vertical = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
+        ) {
+            ActionButton(
+                modifier = Modifier.weight(1f),
+                title = stringResource(R.string.set_as_cover),
+                icon = Icons.Outlined.Photo,
+                onClick = { showSetCoverDialog = true },
+            )
+            ActionButton(
+                modifier = Modifier.weight(1f),
+                title = stringResource(R.string.action_share),
+                icon = Icons.Outlined.Share,
+                onClick = {
+                    onShare()
+                    onDismissRequest()
+                },
+            )
+            ActionButton(
+                modifier = Modifier.weight(1f),
+                title = stringResource(R.string.action_save),
+                icon = Icons.Outlined.Save,
+                onClick = {
+                    onSave()
+                    onDismissRequest()
+                },
+            )
+        }
+    }
+
+    if (showSetCoverDialog) {
+        SetCoverDialog(
+            onConfirm = {
+                onSetAsCover()
+                showSetCoverDialog = false
+            },
+            onDismiss = { showSetCoverDialog = false },
+        )
+    }
+}
+
+@Composable
+private fun SetCoverDialog(
+    onConfirm: () -> Unit,
+    onDismiss: () -> Unit,
+) {
+    AlertDialog(
+        text = {
+            Text(stringResource(R.string.confirm_set_image_as_cover))
+        },
+        confirmButton = {
+            TextButton(onClick = onConfirm) {
+                Text(stringResource(R.string.action_ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.action_cancel))
+            }
+        },
+        onDismissRequest = onDismiss,
+    )
+}
--- a/app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt
@@ -0,0 +1,56 @@
+package eu.kanade.presentation.reader
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.manga.model.readingModeType
+import eu.kanade.presentation.components.AdaptiveSheet
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
+import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
+import tachiyomi.presentation.core.components.SettingsChipRow
+import tachiyomi.presentation.core.components.material.padding
+
+private val readingModeOptions = ReadingModeType.entries.map { it.stringRes to it }
+
+@Composable
+fun ReadingModeSelectDialog(
+    onDismissRequest: () -> Unit,
+    screenModel: ReaderSettingsScreenModel,
+    onChange: (Int) -> Unit,
+) {
+    val manga by screenModel.mangaFlow.collectAsState()
+    val readingMode = remember(manga) { ReadingModeType.fromPreference(manga?.readingModeType?.toInt()) }
+
+    AdaptiveSheet(
+        onDismissRequest = onDismissRequest,
+    ) {
+        Row(
+            modifier = Modifier.padding(vertical = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
+        ) {
+            SettingsChipRow(R.string.pref_category_reading_mode) {
+                readingModeOptions.map { (stringRes, it) ->
+                    FilterChip(
+                        selected = it == readingMode,
+                        onClick = {
+                            screenModel.onChangeReadingMode(it)
+                            onChange(stringRes)
+                        },
+                        label = { Text(stringResource(stringRes)) },
+                    )
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
@@ -42,11 +42,12 @@ internal fun ColumnScope.GeneralPage(screenModel: ReaderSettingsScreenModel) {
        pref = screenModel.preferences.fullscreen(),
    )

-    // TODO: hide if there's no cutout
-    CheckboxItem(
-        label = stringResource(R.string.pref_cutout_short),
-        pref = screenModel.preferences.cutoutShort(),
-    )
+    if (screenModel.hasDisplayCutout) {
+        CheckboxItem(
+            label = stringResource(R.string.pref_cutout_short),
+            pref = screenModel.preferences.cutoutShort(),
+        )
+    }

    CheckboxItem(
        label = stringResource(R.string.pref_keep_screen_on),