mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-23 21:12:34 +01:00
Code Issues Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Syer10
2022-11-13 21:29:03 -05:00
parent 501fc4f698
commit 49bee53a67
6 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt
View File

@@ -55,7 +55,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository:
mangaId: Long, mangaId: Long,
index: Int, index: Int,
bookmarked: Boolean bookmarked: Boolean
) = chapterRepository.updateChapterBookmarked( ) = chapterRepository.updateChapter(
mangaId = mangaId, mangaId = mangaId,
chapterIndex = index, chapterIndex = index,
bookmarked = bookmarked bookmarked = bookmarked
@@ -65,7 +65,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository:
manga: Manga, manga: Manga,
index: Int, index: Int,
bookmarked: Boolean bookmarked: Boolean
) = chapterRepository.updateChapterBookmarked( ) = chapterRepository.updateChapter(
mangaId = manga.id, mangaId = manga.id,
chapterIndex = index, chapterIndex = index,
bookmarked = bookmarked bookmarked = bookmarked
@@ -74,7 +74,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository:
fun asFlow( fun asFlow(
chapter: Chapter, chapter: Chapter,
bookmarked: Boolean bookmarked: Boolean
) = chapterRepository.updateChapterBookmarked( ) = chapterRepository.updateChapter(
mangaId = chapter.mangaId, mangaId = chapter.mangaId,
chapterIndex = chapter.index, chapterIndex = chapter.index,
bookmarked = bookmarked bookmarked = bookmarked

6
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt
View File

@@ -55,7 +55,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor
mangaId: Long, mangaId: Long,
index: Int, index: Int,
lastPageRead: Int lastPageRead: Int
) = chapterRepository.updateChapterLastPageRead( ) = chapterRepository.updateChapter(
mangaId = mangaId, mangaId = mangaId,
chapterIndex = index, chapterIndex = index,
lastPageRead = lastPageRead lastPageRead = lastPageRead
@@ -65,7 +65,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor
manga: Manga, manga: Manga,
index: Int, index: Int,
lastPageRead: Int lastPageRead: Int
) = chapterRepository.updateChapterLastPageRead( ) = chapterRepository.updateChapter(
mangaId = manga.id, mangaId = manga.id,
chapterIndex = index, chapterIndex = index,
lastPageRead = lastPageRead lastPageRead = lastPageRead
@@ -74,7 +74,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor
fun asFlow( fun asFlow(
chapter: Chapter, chapter: Chapter,
lastPageRead: Int lastPageRead: Int
) = chapterRepository.updateChapterLastPageRead( ) = chapterRepository.updateChapter(
mangaId = chapter.mangaId, mangaId = chapter.mangaId,
chapterIndex = chapter.index, chapterIndex = chapter.index,
lastPageRead = lastPageRead lastPageRead = lastPageRead

15
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt
View File

@@ -51,24 +51,27 @@ class UpdateChapterMarkPreviousRead @Inject constructor(private val chapterRepos
fun asFlow( fun asFlow(
mangaId: Long, mangaId: Long,
index: Int index: Int
) = chapterRepository.updateChapterMarkPrevRead( ) = chapterRepository.updateChapter(
mangaId = mangaId, mangaId = mangaId,
chapterIndex = index chapterIndex = index,
markPreviousRead = true
) )
fun asFlow( fun asFlow(
manga: Manga, manga: Manga,
index: Int index: Int
) = chapterRepository.updateChapterMarkPrevRead( ) = chapterRepository.updateChapter(
mangaId = manga.id, mangaId = manga.id,
chapterIndex = index chapterIndex = index,
markPreviousRead = true
) )
fun asFlow( fun asFlow(
chapter: Chapter chapter: Chapter
) = chapterRepository.updateChapterMarkPrevRead( ) = chapterRepository.updateChapter(
mangaId = chapter.mangaId, mangaId = chapter.mangaId,
chapterIndex = chapter.index chapterIndex = chapter.index,
markPreviousRead = true
) )
companion object { companion object {

6
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt
View File

@@ -55,7 +55,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt
mangaId: Long, mangaId: Long,
index: Int, index: Int,
read: Boolean read: Boolean
) = chapterRepository.updateChapterRead( ) = chapterRepository.updateChapter(
mangaId = mangaId, mangaId = mangaId,
chapterIndex = index, chapterIndex = index,
read = read read = read
@@ -65,7 +65,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt
manga: Manga, manga: Manga,
index: Int, index: Int,
read: Boolean read: Boolean
) = chapterRepository.updateChapterRead( ) = chapterRepository.updateChapter(
mangaId = manga.id, mangaId = manga.id,
chapterIndex = index, chapterIndex = index,
read = read read = read
@@ -74,7 +74,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt
fun asFlow( fun asFlow(
chapter: Chapter, chapter: Chapter,
read: Boolean read: Boolean
) = chapterRepository.updateChapterRead( ) = chapterRepository.updateChapter(
mangaId = chapter.mangaId, mangaId = chapter.mangaId,
chapterIndex = chapter.index, chapterIndex = chapter.index,
read = read read = read

34
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt
View File

@@ -33,7 +33,6 @@ interface ChapterRepository {
@Path("chapterIndex") chapterIndex: Int @Path("chapterIndex") chapterIndex: Int
): Flow<Chapter> ): Flow<Chapter>
/* TODO add once ktorfit supports nullable paremters
@FormUrlEncoded @FormUrlEncoded
@PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}") @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapter( fun updateChapter(
@@ -43,39 +42,6 @@ interface ChapterRepository {
@Field("bookmarked") bookmarked: Boolean? = null, @Field("bookmarked") bookmarked: Boolean? = null,
@Field("lastPageRead") lastPageRead: Int? = null, @Field("lastPageRead") lastPageRead: Int? = null,
@Field("markPrevRead") markPreviousRead: Boolean? = null @Field("markPrevRead") markPreviousRead: Boolean? = null
): Flow<HttpResponse>*/
// todo remove following updateChapter functions once ktorfit supports nullable parameters
@FormUrlEncoded
@PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapterRead(
@Path("mangaId") mangaId: Long,
@Path("chapterIndex") chapterIndex: Int,
@Field("read") read: Boolean
): Flow<HttpResponse>
@FormUrlEncoded
@PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapterBookmarked(
@Path("mangaId") mangaId: Long,
@Path("chapterIndex") chapterIndex: Int,
@Field("bookmarked") bookmarked: Boolean
): Flow<HttpResponse>
@FormUrlEncoded
@PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapterLastPageRead(
@Path("mangaId") mangaId: Long,
@Path("chapterIndex") chapterIndex: Int,
@Field("lastPageRead") lastPageRead: Int
): Flow<HttpResponse>
@FormUrlEncoded
@PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}")
fun updateChapterMarkPrevRead(
@Path("mangaId") mangaId: Long,
@Path("chapterIndex") chapterIndex: Int,
@Field("markPrevRead") markPreviousRead: Boolean = true
): Flow<HttpResponse> ): Flow<HttpResponse>
@GET("api/v1/manga/{mangaId}/chapter/{chapterIndex}/page/{pageNum}") @GET("api/v1/manga/{mangaId}/chapter/{chapterIndex}/page/{pageNum}")

4
gradle/libs.versions.toml
View File

@@ -14,7 +14,7 @@ voyager = "1.0.0-rc06"
accompanist = "0.25.2" accompanist = "0.25.2"
googleAccompanist = "0.25.1" googleAccompanist = "0.25.1"
imageloader = "1.2.2.1" imageloader = "1.2.2.1"
materialDialogs = "0.8.0" materialDialogs = "0.9.0"
# Android # Android
androidGradle = "7.3.1" androidGradle = "7.3.1"
@@ -37,7 +37,7 @@ kotlinInject = "0.5.1"
# Network # Network
ktor = "2.1.3" ktor = "2.1.3"
ktorfit = "1.0.0-beta15" ktorfit = "1.0.0-beta16"
# Logging # Logging
slf4j = "2.0.3" slf4j = "2.0.3"