prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1295 from MAPKOBKA135/devel

Browse Source 
fix 100% problem
This commit is contained in:
Koitharu
2025-02-18 15:29:09 +02:00
committed by GitHub
parent 1b8d35d424 52592ba765
commit 47a22064a5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
View File

@@ -484,8 +484,10 @@ class DetailsActivity :
textViewProgress.textAndVisible = if (info.percent <= 0f) { textViewProgress.textAndVisible = if (info.percent <= 0f) {
null null
} else { } else {
getString(R.string.percent_string_pattern, (info.percent * 100f).toInt().toString()) val displayPercent = if (info.percent >= 0.999999f) 100 else (info.percent * 100f).toInt()
getString(R.string.percent_string_pattern, displayPercent.toString())
} }
progress.setProgressCompat( progress.setProgressCompat(
(progress.max * info.percent.coerceIn(0f, 1f)).roundToInt(), (progress.max * info.percent.coerceIn(0f, 1f)).roundToInt(),
true, true,

5
app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt
View File

@@ -154,10 +154,11 @@ class HistoryRepository @Inject constructor(
suspend fun getProgress(mangaId: Long, mode: ProgressIndicatorMode): ReadingProgress? { suspend fun getProgress(mangaId: Long, mode: ProgressIndicatorMode): ReadingProgress? {
val entity = db.getHistoryDao().find(mangaId) ?: return null val entity = db.getHistoryDao().find(mangaId) ?: return null
val fixedPercent = if (entity.percent >= 0.999999f) 1f else entity.percent
return ReadingProgress( return ReadingProgress(
percent = entity.percent, percent = fixedPercent,
totalChapters = entity.chaptersCount, totalChapters = entity.chaptersCount,
mode = mode, mode = mode
).takeIf { it.isValid() } ).takeIf { it.isValid() }
} }