Clean up reading mode / orientation enum classes

Categorizing the reading modes so we can implement a better selection UI. (cherry picked from commit 4502902fb0df21f637c905dc5c4c36625dedc710) # Conflicts: # app/src/main/java/eu/kanade/domain/manga/model/Manga.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt # app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
2023-11-05 10:01:19 -05:00
parent 44bda0a611
commit e7aa8c31f1
18 changed files with 181 additions and 136 deletions
@@ -0,0 +1,78 @@
+package eu.kanade.presentation.reader
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.items
+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.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.manga.model.readerOrientation
+import eu.kanade.presentation.components.AdaptiveSheet
+import eu.kanade.presentation.theme.TachiyomiTheme
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
+import tachiyomi.presentation.core.components.SettingsIconGrid
+import tachiyomi.presentation.core.components.material.IconToggleButton
+import tachiyomi.presentation.core.util.ThemePreviews
+
+@Composable
+fun OrientationSelectDialog(
+    onDismissRequest: () -> Unit,
+    screenModel: ReaderSettingsScreenModel,
+    onChange: (Int) -> Unit,
+) {
+    val manga by screenModel.mangaFlow.collectAsState()
+    val orientation = remember(manga) { ReaderOrientation.fromPreference(manga?.readerOrientation?.toInt()) }
+
+    AdaptiveSheet(onDismissRequest = onDismissRequest) {
+        DialogContent(
+            orientation = orientation,
+            onChangeOrientation = {
+                screenModel.onChangeOrientation(it)
+                onChange(it.stringRes)
+                onDismissRequest()
+            },
+        )
+    }
+}
+
+@Composable
+private fun DialogContent(
+    orientation: ReaderOrientation,
+    onChangeOrientation: (ReaderOrientation) -> Unit,
+) {
+    Box(modifier = Modifier.padding(vertical = 16.dp)) {
+        SettingsIconGrid(R.string.rotation_type) {
+            items(ReaderOrientation.entries) { mode ->
+                IconToggleButton(
+                    checked = mode == orientation,
+                    onCheckedChange = {
+                        onChangeOrientation(mode)
+                    },
+                    modifier = Modifier.fillMaxWidth(),
+                    imageVector = ImageVector.vectorResource(mode.iconRes),
+                    title = stringResource(mode.stringRes),
+                )
+            }
+        }
+    }
+}
+
+@ThemePreviews
+@Composable
+private fun DialogContentPreview() {
+    TachiyomiTheme {
+        DialogContent(
+            orientation = ReaderOrientation.DEFAULT,
+            onChangeOrientation = {},
+        )
+    }
+}