
Also renaming the helper composables so it's a bit easier to find/replace everything in forks. (cherry picked from commit 0d1bced1226878336f8156671ae0c224c02f2604) # Conflicts: # app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt # app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt # app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt # app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt # app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt # app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.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/presentation/reader/components/ChapterNavigator.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
102 lines
3.5 KiB
Kotlin
102 lines
3.5 KiB
Kotlin
package eu.kanade.presentation.reader
|
|
|
|
import androidx.compose.foundation.layout.Column
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
import androidx.compose.foundation.lazy.grid.items
|
|
import androidx.compose.material3.Surface
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.collectAsState
|
|
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.graphics.vector.ImageVector
|
|
import androidx.compose.ui.res.vectorResource
|
|
import androidx.compose.ui.tooling.preview.PreviewLightDark
|
|
import dev.icerock.moko.resources.StringResource
|
|
import eu.kanade.domain.manga.model.readerOrientation
|
|
import eu.kanade.presentation.components.AdaptiveSheet
|
|
import eu.kanade.presentation.reader.components.ModeSelectionDialog
|
|
import eu.kanade.presentation.theme.TachiyomiTheme
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
|
|
import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
|
|
import tachiyomi.i18n.MR
|
|
import tachiyomi.presentation.core.components.SettingsIconGrid
|
|
import tachiyomi.presentation.core.components.material.IconToggleButton
|
|
import tachiyomi.presentation.core.i18n.stringResource
|
|
|
|
private val ReaderOrientationsWithoutDefault = ReaderOrientation.entries - ReaderOrientation.DEFAULT
|
|
|
|
@Composable
|
|
fun OrientationSelectDialog(
|
|
onDismissRequest: () -> Unit,
|
|
screenModel: ReaderSettingsScreenModel,
|
|
onChange: (StringResource) -> 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,
|
|
) {
|
|
var selected by remember { mutableStateOf(orientation) }
|
|
|
|
ModeSelectionDialog(
|
|
onUseDefault = {
|
|
onChangeOrientation(
|
|
ReaderOrientation.DEFAULT,
|
|
)
|
|
}.takeIf { orientation != ReaderOrientation.DEFAULT },
|
|
onApply = { onChangeOrientation(selected) },
|
|
) {
|
|
SettingsIconGrid(MR.strings.rotation_type) {
|
|
items(ReaderOrientationsWithoutDefault) { mode ->
|
|
IconToggleButton(
|
|
checked = mode == selected,
|
|
onCheckedChange = {
|
|
selected = mode
|
|
},
|
|
modifier = Modifier.fillMaxWidth(),
|
|
imageVector = ImageVector.vectorResource(mode.iconRes),
|
|
title = stringResource(mode.stringRes),
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@PreviewLightDark
|
|
@Composable
|
|
private fun DialogContentPreview() {
|
|
TachiyomiTheme {
|
|
Surface {
|
|
Column {
|
|
DialogContent(
|
|
orientation = ReaderOrientation.DEFAULT,
|
|
onChangeOrientation = {},
|
|
)
|
|
|
|
DialogContent(
|
|
orientation = ReaderOrientation.FREE,
|
|
onChangeOrientation = {},
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|