|
@@ -62,6 +62,7 @@ import eu.kanade.tachiyomi.R
|
|
|
import eu.kanade.tachiyomi.data.download.model.Download
|
|
|
import eu.kanade.tachiyomi.source.getNameForMangaInfo
|
|
|
import eu.kanade.tachiyomi.ui.manga.ChapterItem
|
|
|
+import eu.kanade.tachiyomi.ui.manga.FetchInterval
|
|
|
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel
|
|
|
import eu.kanade.tachiyomi.util.lang.toRelativeString
|
|
|
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
|
@@ -84,7 +85,7 @@ import java.util.Date
|
|
|
fun MangaScreen(
|
|
|
state: MangaScreenModel.State.Success,
|
|
|
snackbarHostState: SnackbarHostState,
|
|
|
- intervalDisplay: () -> Pair<Int, Int>?,
|
|
|
+ fetchInterval: FetchInterval?,
|
|
|
dateFormat: DateFormat,
|
|
|
isTabletUi: Boolean,
|
|
|
chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
|
|
@@ -112,7 +113,7 @@ fun MangaScreen(
|
|
|
onShareClicked: (() -> Unit)?,
|
|
|
onDownloadActionClicked: ((DownloadAction) -> Unit)?,
|
|
|
onEditCategoryClicked: (() -> Unit)?,
|
|
|
- onEditIntervalClicked: (() -> Unit)?,
|
|
|
+ onEditFetchIntervalClicked: (() -> Unit)?,
|
|
|
onMigrateClicked: (() -> Unit)?,
|
|
|
|
|
|
// For bottom action menu
|
|
@@ -141,7 +142,7 @@ fun MangaScreen(
|
|
|
state = state,
|
|
|
snackbarHostState = snackbarHostState,
|
|
|
dateFormat = dateFormat,
|
|
|
- intervalDisplay = intervalDisplay,
|
|
|
+ fetchInterval = fetchInterval,
|
|
|
chapterSwipeStartAction = chapterSwipeStartAction,
|
|
|
chapterSwipeEndAction = chapterSwipeEndAction,
|
|
|
onBackClicked = onBackClicked,
|
|
@@ -161,7 +162,7 @@ fun MangaScreen(
|
|
|
onShareClicked = onShareClicked,
|
|
|
onDownloadActionClicked = onDownloadActionClicked,
|
|
|
onEditCategoryClicked = onEditCategoryClicked,
|
|
|
- onEditIntervalClicked = onEditIntervalClicked,
|
|
|
+ onEditIntervalClicked = onEditFetchIntervalClicked,
|
|
|
onMigrateClicked = onMigrateClicked,
|
|
|
onMultiBookmarkClicked = onMultiBookmarkClicked,
|
|
|
onMultiMarkAsReadClicked = onMultiMarkAsReadClicked,
|
|
@@ -179,7 +180,7 @@ fun MangaScreen(
|
|
|
chapterSwipeStartAction = chapterSwipeStartAction,
|
|
|
chapterSwipeEndAction = chapterSwipeEndAction,
|
|
|
dateFormat = dateFormat,
|
|
|
- intervalDisplay = intervalDisplay,
|
|
|
+ fetchInterval = fetchInterval,
|
|
|
onBackClicked = onBackClicked,
|
|
|
onChapterClicked = onChapterClicked,
|
|
|
onDownloadChapter = onDownloadChapter,
|
|
@@ -197,7 +198,7 @@ fun MangaScreen(
|
|
|
onShareClicked = onShareClicked,
|
|
|
onDownloadActionClicked = onDownloadActionClicked,
|
|
|
onEditCategoryClicked = onEditCategoryClicked,
|
|
|
- onEditIntervalClicked = onEditIntervalClicked,
|
|
|
+ onEditIntervalClicked = onEditFetchIntervalClicked,
|
|
|
onMigrateClicked = onMigrateClicked,
|
|
|
onMultiBookmarkClicked = onMultiBookmarkClicked,
|
|
|
onMultiMarkAsReadClicked = onMultiMarkAsReadClicked,
|
|
@@ -216,7 +217,7 @@ private fun MangaScreenSmallImpl(
|
|
|
state: MangaScreenModel.State.Success,
|
|
|
snackbarHostState: SnackbarHostState,
|
|
|
dateFormat: DateFormat,
|
|
|
- intervalDisplay: () -> Pair<Int, Int>?,
|
|
|
+ fetchInterval: FetchInterval?,
|
|
|
chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
|
|
|
chapterSwipeEndAction: LibraryPreferences.ChapterSwipeAction,
|
|
|
onBackClicked: () -> Unit,
|
|
@@ -389,8 +390,8 @@ private fun MangaScreenSmallImpl(
|
|
|
MangaActionRow(
|
|
|
favorite = state.manga.favorite,
|
|
|
trackingCount = state.trackingCount,
|
|
|
- intervalDisplay = intervalDisplay,
|
|
|
- isUserIntervalMode = state.manga.calculateInterval < 0,
|
|
|
+ fetchInterval = fetchInterval,
|
|
|
+ isUserIntervalMode = state.manga.fetchInterval < 0,
|
|
|
onAddToLibraryClicked = onAddToLibraryClicked,
|
|
|
onWebViewClicked = onWebViewClicked,
|
|
|
onWebViewLongClicked = onWebViewLongClicked,
|
|
@@ -447,7 +448,7 @@ fun MangaScreenLargeImpl(
|
|
|
state: MangaScreenModel.State.Success,
|
|
|
snackbarHostState: SnackbarHostState,
|
|
|
dateFormat: DateFormat,
|
|
|
- intervalDisplay: () -> Pair<Int, Int>?,
|
|
|
+ fetchInterval: FetchInterval?,
|
|
|
chapterSwipeStartAction: LibraryPreferences.ChapterSwipeAction,
|
|
|
chapterSwipeEndAction: LibraryPreferences.ChapterSwipeAction,
|
|
|
onBackClicked: () -> Unit,
|
|
@@ -605,8 +606,8 @@ fun MangaScreenLargeImpl(
|
|
|
MangaActionRow(
|
|
|
favorite = state.manga.favorite,
|
|
|
trackingCount = state.trackingCount,
|
|
|
- intervalDisplay = intervalDisplay,
|
|
|
- isUserIntervalMode = state.manga.calculateInterval < 0,
|
|
|
+ fetchInterval = fetchInterval,
|
|
|
+ isUserIntervalMode = state.manga.fetchInterval < 0,
|
|
|
onAddToLibraryClicked = onAddToLibraryClicked,
|
|
|
onWebViewClicked = onWebViewClicked,
|
|
|
onWebViewLongClicked = onWebViewLongClicked,
|