|
@@ -34,11 +34,10 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
import androidx.compose.ui.unit.sp
|
|
|
import eu.kanade.presentation.theme.TachiyomiTheme
|
|
|
-import eu.kanade.tachiyomi.data.database.models.Chapter
|
|
|
-import eu.kanade.tachiyomi.data.database.models.ChapterImpl
|
|
|
import eu.kanade.tachiyomi.data.database.models.toDomainChapter
|
|
|
import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
|
|
|
import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
|
|
|
+import tachiyomi.domain.chapter.model.Chapter
|
|
|
import tachiyomi.domain.chapter.service.calculateChapterGap
|
|
|
import tachiyomi.i18n.MR
|
|
|
import tachiyomi.presentation.core.i18n.pluralStringResource
|
|
@@ -51,8 +50,8 @@ fun ChapterTransition(
|
|
|
currChapterDownloaded: Boolean,
|
|
|
goingToChapterDownloaded: Boolean,
|
|
|
) {
|
|
|
- val currChapter = transition.from.chapter
|
|
|
- val goingToChapter = transition.to?.chapter
|
|
|
+ val currChapter = transition.from.chapter.toDomainChapter()
|
|
|
+ val goingToChapter = transition.to?.chapter?.toDomainChapter()
|
|
|
|
|
|
ProvideTextStyle(MaterialTheme.typography.bodyMedium) {
|
|
|
when (transition) {
|
|
@@ -65,7 +64,7 @@ fun ChapterTransition(
|
|
|
bottomChapter = currChapter,
|
|
|
bottomChapterDownloaded = currChapterDownloaded,
|
|
|
fallbackLabel = stringResource(MR.strings.transition_no_previous),
|
|
|
- chapterGap = calculateChapterGap(currChapter.toDomainChapter(), goingToChapter?.toDomainChapter()),
|
|
|
+ chapterGap = calculateChapterGap(currChapter, goingToChapter),
|
|
|
)
|
|
|
}
|
|
|
is ChapterTransition.Next -> {
|
|
@@ -77,7 +76,7 @@ fun ChapterTransition(
|
|
|
bottomChapter = goingToChapter,
|
|
|
bottomChapterDownloaded = goingToChapterDownloaded,
|
|
|
fallbackLabel = stringResource(MR.strings.transition_no_next),
|
|
|
- chapterGap = calculateChapterGap(goingToChapter?.toDomainChapter(), currChapter.toDomainChapter()),
|
|
|
+ chapterGap = calculateChapterGap(goingToChapter, currChapter),
|
|
|
)
|
|
|
}
|
|
|
}
|
|
@@ -275,24 +274,23 @@ private val CardColor: CardColors
|
|
|
private val VerticalSpacerSize = 24.dp
|
|
|
private const val DownloadedIconContentId = "downloaded"
|
|
|
|
|
|
-private fun previewChapter(name: String, scanlator: String, chapterNumber: Float) = ChapterImpl().apply {
|
|
|
- this.name = name
|
|
|
- this.scanlator = scanlator
|
|
|
- this.chapter_number = chapterNumber
|
|
|
-
|
|
|
- this.id = 0
|
|
|
- this.manga_id = 0
|
|
|
- this.url = ""
|
|
|
-}
|
|
|
+private fun previewChapter(name: String, scanlator: String, chapterNumber: Double) = Chapter.create().copy(
|
|
|
+ id = 0L,
|
|
|
+ mangaId = 0L,
|
|
|
+ url = "",
|
|
|
+ name = name,
|
|
|
+ scanlator = scanlator,
|
|
|
+ chapterNumber = chapterNumber,
|
|
|
+)
|
|
|
private val FakeChapter = previewChapter(
|
|
|
name = "Vol.1, Ch.1 - Fake Chapter Title",
|
|
|
scanlator = "Scanlator Name",
|
|
|
- chapterNumber = 1f,
|
|
|
+ chapterNumber = 1.0,
|
|
|
)
|
|
|
private val FakeGapChapter = previewChapter(
|
|
|
name = "Vol.5, Ch.44 - Fake Gap Chapter Title",
|
|
|
scanlator = "Scanlator Name",
|
|
|
- chapterNumber = 44f,
|
|
|
+ chapterNumber = 44.0,
|
|
|
)
|
|
|
private val FakeChapterLongTitle = previewChapter(
|
|
|
name = "Vol.1, Ch.0 - The Mundane Musings of a Metafictional Manga: A Chapter About a Chapter, Featuring" +
|
|
@@ -301,7 +299,7 @@ private val FakeChapterLongTitle = previewChapter(
|
|
|
"Fictional Realities and Reality-Bending Fiction, Where the Fourth Wall is Always in Danger of Being Broken " +
|
|
|
"and the Line Between Author and Character is Forever Blurred.",
|
|
|
scanlator = "Long Long Funny Scanlator Sniper Group Name Reborn",
|
|
|
- chapterNumber = 1f,
|
|
|
+ chapterNumber = 1.0,
|
|
|
)
|
|
|
|
|
|
@PreviewLightDark
|