diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt index 6c7b693c..84dbe6ff 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt @@ -55,7 +55,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository: mangaId: Long, index: Int, bookmarked: Boolean - ) = chapterRepository.updateChapterBookmarked( + ) = chapterRepository.updateChapter( mangaId = mangaId, chapterIndex = index, bookmarked = bookmarked @@ -65,7 +65,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository: manga: Manga, index: Int, bookmarked: Boolean - ) = chapterRepository.updateChapterBookmarked( + ) = chapterRepository.updateChapter( mangaId = manga.id, chapterIndex = index, bookmarked = bookmarked @@ -74,7 +74,7 @@ class UpdateChapterBookmarked @Inject constructor(private val chapterRepository: fun asFlow( chapter: Chapter, bookmarked: Boolean - ) = chapterRepository.updateChapterBookmarked( + ) = chapterRepository.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, bookmarked = bookmarked diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt index 3de3e956..2c2bf8c8 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt @@ -55,7 +55,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor mangaId: Long, index: Int, lastPageRead: Int - ) = chapterRepository.updateChapterLastPageRead( + ) = chapterRepository.updateChapter( mangaId = mangaId, chapterIndex = index, lastPageRead = lastPageRead @@ -65,7 +65,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor manga: Manga, index: Int, lastPageRead: Int - ) = chapterRepository.updateChapterLastPageRead( + ) = chapterRepository.updateChapter( mangaId = manga.id, chapterIndex = index, lastPageRead = lastPageRead @@ -74,7 +74,7 @@ class UpdateChapterLastPageRead @Inject constructor(private val chapterRepositor fun asFlow( chapter: Chapter, lastPageRead: Int - ) = chapterRepository.updateChapterLastPageRead( + ) = chapterRepository.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, lastPageRead = lastPageRead diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt index abc3c6f8..fcdd61d1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt @@ -51,24 +51,27 @@ class UpdateChapterMarkPreviousRead @Inject constructor(private val chapterRepos fun asFlow( mangaId: Long, index: Int - ) = chapterRepository.updateChapterMarkPrevRead( + ) = chapterRepository.updateChapter( mangaId = mangaId, - chapterIndex = index + chapterIndex = index, + markPreviousRead = true ) fun asFlow( manga: Manga, index: Int - ) = chapterRepository.updateChapterMarkPrevRead( + ) = chapterRepository.updateChapter( mangaId = manga.id, - chapterIndex = index + chapterIndex = index, + markPreviousRead = true ) fun asFlow( chapter: Chapter - ) = chapterRepository.updateChapterMarkPrevRead( + ) = chapterRepository.updateChapter( mangaId = chapter.mangaId, - chapterIndex = chapter.index + chapterIndex = chapter.index, + markPreviousRead = true ) companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt index f0d66631..6324798b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt @@ -55,7 +55,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt mangaId: Long, index: Int, read: Boolean - ) = chapterRepository.updateChapterRead( + ) = chapterRepository.updateChapter( mangaId = mangaId, chapterIndex = index, read = read @@ -65,7 +65,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt manga: Manga, index: Int, read: Boolean - ) = chapterRepository.updateChapterRead( + ) = chapterRepository.updateChapter( mangaId = manga.id, chapterIndex = index, read = read @@ -74,7 +74,7 @@ class UpdateChapterRead @Inject constructor(private val chapterRepository: Chapt fun asFlow( chapter: Chapter, read: Boolean - ) = chapterRepository.updateChapterRead( + ) = chapterRepository.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, read = read diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt index cd3b4f64..6ccc639d 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt @@ -33,7 +33,6 @@ interface ChapterRepository { @Path("chapterIndex") chapterIndex: Int ): Flow - /* TODO add once ktorfit supports nullable paremters @FormUrlEncoded @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}") fun updateChapter( @@ -43,39 +42,6 @@ interface ChapterRepository { @Field("bookmarked") bookmarked: Boolean? = null, @Field("lastPageRead") lastPageRead: Int? = null, @Field("markPrevRead") markPreviousRead: Boolean? = null - ): Flow*/ - - // 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 - - @FormUrlEncoded - @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}") - fun updateChapterBookmarked( - @Path("mangaId") mangaId: Long, - @Path("chapterIndex") chapterIndex: Int, - @Field("bookmarked") bookmarked: Boolean - ): Flow - - @FormUrlEncoded - @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}") - fun updateChapterLastPageRead( - @Path("mangaId") mangaId: Long, - @Path("chapterIndex") chapterIndex: Int, - @Field("lastPageRead") lastPageRead: Int - ): Flow - - @FormUrlEncoded - @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}") - fun updateChapterMarkPrevRead( - @Path("mangaId") mangaId: Long, - @Path("chapterIndex") chapterIndex: Int, - @Field("markPrevRead") markPreviousRead: Boolean = true ): Flow @GET("api/v1/manga/{mangaId}/chapter/{chapterIndex}/page/{pageNum}") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a19a688b..abccb602 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ voyager = "1.0.0-rc06" accompanist = "0.25.2" googleAccompanist = "0.25.1" imageloader = "1.2.2.1" -materialDialogs = "0.8.0" +materialDialogs = "0.9.0" # Android androidGradle = "7.3.1" @@ -37,7 +37,7 @@ kotlinInject = "0.5.1" # Network ktor = "2.1.3" -ktorfit = "1.0.0-beta15" +ktorfit = "1.0.0-beta16" # Logging slf4j = "2.0.3"