Cleanup
This commit is contained in:
parent
dbb970d7b5
commit
a7cb182bbe
@ -23,10 +23,8 @@ import cafe.adriel.voyager.navigator.LocalNavigator
|
||||
import cafe.adriel.voyager.navigator.Navigator
|
||||
import cafe.adriel.voyager.navigator.currentOrThrow
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||
import eu.kanade.core.preference.asState
|
||||
import eu.kanade.domain.manga.model.hasCustomCover
|
||||
import eu.kanade.domain.manga.model.toSManga
|
||||
import eu.kanade.domain.ui.UiPreferences
|
||||
import eu.kanade.presentation.category.components.ChangeCategoryDialog
|
||||
import eu.kanade.presentation.components.NavigatorAdaptiveSheet
|
||||
import eu.kanade.presentation.manga.ChapterSettingsDialog
|
||||
@ -117,12 +115,6 @@ class MangaScreen(
|
||||
val successState = state as MangaScreenModel.State.Success
|
||||
val isHttpSource = remember { successState.source is HttpSource }
|
||||
|
||||
// SY -->
|
||||
val previewsRowCount by remember {
|
||||
Injekt.get<UiPreferences>().previewsRowCount().asState(scope)
|
||||
}
|
||||
// SY <--
|
||||
|
||||
LaunchedEffect(successState.manga, screenModel.source) {
|
||||
if (isHttpSource) {
|
||||
try {
|
||||
@ -205,7 +197,7 @@ class MangaScreen(
|
||||
onEditFetchIntervalClicked = screenModel::showSetFetchIntervalDialog.takeIf {
|
||||
successState.manga.favorite
|
||||
},
|
||||
previewsRowCount = previewsRowCount,
|
||||
previewsRowCount = successState.previewsRowCount,
|
||||
// SY -->
|
||||
onMigrateClicked = { migrateManga(navigator, screenModel.manga!!) }.takeIf { successState.manga.favorite },
|
||||
onMetadataViewerClicked = { openMetadataViewer(navigator, successState.manga) },
|
||||
|
@ -418,6 +418,7 @@ class MangaScreenModel(
|
||||
PagePreviewState.Unused
|
||||
},
|
||||
alwaysShowReadingProgress = readerPreferences.preserveReadingPosition().get() && manga.isEhBasedManga(),
|
||||
previewsRowCount = uiPreferences.previewsRowCount().get(),
|
||||
// SY <--
|
||||
)
|
||||
}
|
||||
@ -1634,6 +1635,7 @@ class MangaScreenModel(
|
||||
val showMergeWithAnother: Boolean,
|
||||
val pagePreviewsState: PagePreviewState,
|
||||
val alwaysShowReadingProgress: Boolean,
|
||||
val previewsRowCount: Int,
|
||||
// SY <--
|
||||
) : State {
|
||||
val processedChapters by lazy {
|
||||
|
@ -696,7 +696,8 @@ class ReaderViewModel @JvmOverloads constructor(
|
||||
if (readerPreferences.markReadDupe().get()) {
|
||||
getChaptersByMangaId.await(manga!!.id).sortedByDescending { it.sourceOrder }
|
||||
.filter {
|
||||
!it.read && it.chapterNumber > 0.0 && it.chapterNumber.toFloat() == readerChapter.chapter.chapter_number
|
||||
!it.read && it.chapterNumber > 0.0 &&
|
||||
it.chapterNumber.toFloat() == readerChapter.chapter.chapter_number
|
||||
}
|
||||
.also { setReadStatus.await(true, *it.toTypedArray()) }
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user