From aba6b6407459579748500faebda636c7bc210df5 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 27 Apr 2024 16:41:10 +0300 Subject: [PATCH] Scrobbling fixes --- .../common/ui/selector/ScrobblingSelectorViewModel.kt | 10 +++++----- app/src/main/res/layout/sheet_scrobbling.xml | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt index 6702b1abc..a984526c3 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt @@ -152,11 +152,11 @@ class ScrobblingSelectorViewModel @Inject constructor( val history = historyRepository.getOne(manga) currentScrobbler.updateScrobblingInfo( mangaId = manga.id, - rating = prevInfo?.rating ?: manga.rating, - status = prevInfo?.status ?: if (history == null) { - ScrobblingStatus.PLANNED - } else { - ScrobblingStatus.READING + rating = prevInfo?.rating ?: 0f, + status = prevInfo?.status ?: when { + history == null -> ScrobblingStatus.PLANNED + history.percent == 1f -> ScrobblingStatus.COMPLETED + else -> ScrobblingStatus.READING }, comment = prevInfo?.comment, ) diff --git a/app/src/main/res/layout/sheet_scrobbling.xml b/app/src/main/res/layout/sheet_scrobbling.xml index b61b10051..41330ffc8 100644 --- a/app/src/main/res/layout/sheet_scrobbling.xml +++ b/app/src/main/res/layout/sheet_scrobbling.xml @@ -79,14 +79,16 @@