Remove legacy settings sheet

The per-series settings aren't quite functional yet, but they're also
accessible outside of the sheet.

(cherry picked from commit 28131ac1357e1134d75c02e2a3bb5e3161a3ecfe)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/values/attrs.xml
#	app/src/main/res/values/themes.xml
This commit is contained in:
arkon
2023-07-15 11:10:01 -04:00
committed by Jobobby04
parent cd4c217a7f
commit b5681f0051
18 changed files with 57 additions and 408 deletions
@@ -2,13 +2,17 @@ package eu.kanade.presentation.reader.settings
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
import eu.kanade.presentation.util.collectAsState
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
import tachiyomi.presentation.core.components.CheckboxItem
import tachiyomi.presentation.core.components.HeadingItem
@@ -22,20 +26,35 @@ internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel)
HeadingItem(R.string.pref_category_for_this_series)
// TODO: Reading mode
HeadingItem(R.string.pref_category_reading_mode)
ReadingModeType.values().map {
RadioItem(
label = stringResource(it.stringRes),
// TODO: Reading mode
selected = false,
onClick = { screenModel.onChangeReadingMode(it) },
)
}
// TODO: Rotation type
HeadingItem(R.string.rotation_type)
OrientationType.values().map {
RadioItem(
label = stringResource(it.stringRes),
// TODO: Rotation type
selected = false,
onClick = { screenModel.onChangeOrientation(it) },
)
}
// TODO: if (pager)
PagerViewerSettings(screenModel)
WebtoonViewerSettings(screenModel)
// SY -->
WebtoonWithGapsViewerSettings(screenModel)
// SY <--
val viewer by screenModel.viewerFlow.collectAsState()
if (viewer is WebtoonViewer) {
WebtoonViewerSettings(screenModel)
// SY -->
WebtoonWithGapsViewerSettings(screenModel)
// SY <--
} else {
PagerViewerSettings(screenModel)
}
}
@Composable