From a417ac0638a64c2a817833c5014ed937109637cf Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Mon, 31 Mar 2025 11:09:35 +0600 Subject: [PATCH 1/3] Fix mark existing duplicate read chapters as read option not working in some cases (mihonapp/mihon#1944) (cherry picked from commit 8a21148578af3c1538e9ab2b1fe5bdf05b4e35c9) (cherry picked from commit 09a0b4f862b9a8adec2076d274d9fd0eb79b378c) --- CHANGELOG.md | 28 +++++++++++++++---- .../tachiyomi/ui/reader/ReaderViewModel.kt | 15 ++++++---- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2028f388d..af554e315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,20 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co ## [Unreleased] ### Added - Add option to always decode long strip images with SSIV +- Add more Kaomoji for empty/error screens ([@ianfhunter](https://github.com/ianfhunter/)) ([#1909](https://github.com/mihonapp/mihon/pull/1909)) +- Add user manga notes ([@imkunet](https://github.com/imkunet), [@AntsyLich](https://github.com/AntsyLich)) ([#428](https://github.com/mihonapp/mihon/pull/428)) + - Fix user notes not restoring when manga doesn't exist in DB ([@AntsyLich](https://github.com/AntsyLich)) ([#1945](https://github.com/mihonapp/mihon/pull/1945)) + +### Fixes +- Fix Bangumi search results including novels ([@MajorTanya](https://github.com/MajorTanya)) ([#1885](https://github.com/mihonapp/mihon/pull/1885)) +- Fix next chapter button occasionally jumping to the last page of the current chapter ([@perokhe](https://github.com/perokhe)) ([#1920](https://github.com/mihonapp/mihon/pull/1920)) + - Fix page number not appearing when opening chapter ([@perokhe](https://github.com/perokhe)) ([#1936](https://github.com/mihonapp/mihon/pull/1936)) +- Fix backup sharing from notifications not working when app is in background ([@JaymanR](https://github.com/JaymanR))([#1929](https://github.com/mihonapp/mihon/pull/1929)) +- Fix mark existing duplicate read chapters as read option not working in some cases ([@AntsyLich](https://github.com/AntsyLich)) ([#1944](https://github.com/mihonapp/mihon/pull/1944)) + +## [v0.18.0] - 2025-03-20 +### Added +- Add option to always decode long strip images with SSIV ([@AntsyLich](https://github.com/AntsyLich)) ([`c5655e8`](https://github.com/mihonapp/mihon/commit/c5655e8803bc32d0931657f0b7bc6afeab70feaf)) - Change option label ([@AntsyLich](https://github.com/AntsyLich)) ([#1835](https://github.com/mihonapp/mihon/pull/1835)) - Added option to enable incognito per extension ([@sdaqo](https://github.com/sdaqo), [@AntsyLich](https://github.com/AntsyLich)) ([#157](https://github.com/mihonapp/mihon/pull/157)) - Add button to favorite manga from history screen ([@Animeboynz](https://github.com/Animeboynz)) ([#1733](https://github.com/mihonapp/mihon/pull/1733)) @@ -27,13 +41,13 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co - Add back option to disable unread chapter badge in library ([@AntsyLich](https://github.com/AntsyLich)) ([#1871](https://github.com/mihonapp/mihon/pull/1871)) ### Changed -- Sliders UI +- Sliders UI ([@AntsyLich](https://github.com/AntsyLich)) ([#1840](https://github.com/mihonapp/mihon/pull/1840)) - Apply "Downloaded only" filter to all entries regardless of favourite status ([@NGB-Was-Taken](https://github.com/NGB-Was-Taken)) ([#1603](https://github.com/mihonapp/mihon/pull/1603)) - Ignore hidden files/folders for Local Source chapter list ([@BrutuZ](https://github.com/BrutuZ)) ([#1763](https://github.com/mihonapp/mihon/pull/1763)) - Migrate to newer Bangumi API ([@MajorTanya](https://github.com/MajorTanya)) ([#1748](https://github.com/mihonapp/mihon/pull/1748)) - Now showing manga starting dates in search - Reduced request load by 2-4x in certain situations -- Bump default user agent +- Bump default user agent ([@AntsyLich](https://github.com/AntsyLich)) ([#1833](https://github.com/mihonapp/mihon/pull/1833)) - Changed the label of chapter swipe settings and renamed the group to "Behavior" ([@AntsyLich](https://github.com/AntsyLich)) ([#1870](https://github.com/mihonapp/mihon/pull/1870)) ### Fixed @@ -47,10 +61,11 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co - Attempt to fix crash when migrating or removing entries from library ([@FlaminSarge](https://github.com/FlaminSarge)) ([#1828](https://github.com/mihonapp/mihon/pull/1828)) ### Removed -- Remove alphabetical category sort option +- Remove alphabetical category sort option ([@AntsyLich](https://github.com/AntsyLich)) ([#1781](https://github.com/mihonapp/mihon/pull/1781)) ### Other - Add zoned "Current time" to debug info and include year & timezone in logcat output ([@MajorTanya](https://github.com/MajorTanya)) ([#1672](https://github.com/mihonapp/mihon/pull/1672)) +- Add application package ID to debug info ([@MajorTanya](https://github.com/MajorTanya)) ([#1847](https://github.com/mihonapp/mihon/pull/1847)) ## [v0.17.1] - 2024-12-06 ### Changed @@ -257,7 +272,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co - Fix extra date header introduced by parent PR ([@sirlag](https://github.com/sirlag)) ([#415](https://github.com/mihonapp/mihon/pull/415)) - Fix build time in about screen displayed in UTC ([@AntsyLich](https://github.com/AntsyLich)) ([`aed53d3`](https://github.com/mihonapp/mihon/commit/aed53d3bdc85ce0e899fbb90b9f9cad0f1b86480)) - App infinitely retries tracker update instead of failing after 3 tries ([@MajorTanya](https://github.com/MajorTanya)) ([#411](https://github.com/mihonapp/mihon/pull/411)) -- Crash on Pixel devices (was introduced due to compose update) ([`ab06720`](https://github.com/mihonapp/mihon/commit/ab067209661eceefc04c65f6bdbfcaa8a1264651)) +- Crash on Pixel devices (was introduced due to compose update) ([@AntsyLich](https://github.com/AntsyLich)) ([`ab06720`](https://github.com/mihonapp/mihon/commit/ab067209661eceefc04c65f6bdbfcaa8a1264651)) - Crash when opening some heif/heic images ([@az4521](https://github.com/az4521)) ([#466](https://github.com/mihonapp/mihon/pull/466)) - Crash when putting app in background while track date selection dialog is open ([@ivaniskandar](https://github.com/ivaniskandar)) ([`c348fac`](https://github.com/mihonapp/mihon/commit/c348fac78fac479fb123bd617c01c78b9ca851d5)) - Dates for saved images not following the specification (fixes date issue mainly on Samsung devices) ([@MajorTanya](https://github.com/MajorTanya)) ([#552](https://github.com/mihonapp/mihon/pull/552)) @@ -295,7 +310,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co ### Fixed - "Flash screen on page change" making the screen full black ([@AntsyLich](https://github.com/AntsyLich)) ([`38d6ab8`](https://github.com/mihonapp/mihon/commit/38d6ab80ce868707829dbc81de4170afe3c2f2a5)) -- Faulty MangaUpdates score in database ([@AntsyLich](https://github.com/AntsyLich) ([`a024218`](https://github.com/mihonapp/mihon/commit/a024218410953a389b8af4880fa7ae6cc30124a2) +- Faulty MangaUpdates score in database ([@AntsyLich](https://github.com/AntsyLich)) ([`a024218`](https://github.com/mihonapp/mihon/commit/a024218410953a389b8af4880fa7ae6cc30124a2)) - Updating extension not reflecting correctly ([@AntsyLich](https://github.com/AntsyLich)) ([`cb06898`](https://github.com/mihonapp/mihon/commit/cb068984303f811692531bf6f14902ae118d8ac7)) - Inconsistent button height in "Data and storage" for some languages ([@theolm](https://github.com/theolm)) ([#202](https://github.com/mihonapp/mihon/pull/202)) - Chapter not being marked as read locally when refreshing Enhanced Trackers ([@Secozzi](https://github.com/Secozzi)) ([#219](https://github.com/mihonapp/mihon/pull/219)) @@ -320,7 +335,8 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co - Branding to Mihon ([@AntsyLich](https://github.com/AntsyLich)) - Minimum supported Android version to 8 ([@AntsyLich](https://github.com/AntsyLich)) ([`dfb3091`](https://github.com/mihonapp/mihon/commit/dfb3091e380dda3e9bfb64bf5c9a685cf3a03d0e)) -[unreleased]: https://github.com/mihonapp/mihon/compare/v0.17.1...main +[unreleased]: https://github.com/mihonapp/mihon/compare/v0.18.0...main +[v0.18.0]: https://github.com/mihonapp/mihon/compare/v0.17.1...v0.18.0 [v0.17.1]: https://github.com/mihonapp/mihon/compare/v0.17.0...v0.17.1 [v0.17.0]: https://github.com/mihonapp/mihon/compare/v0.16.5...v0.17.0 [v0.16.5]: https://github.com/mihonapp/mihon/compare/v0.16.4...v0.16.5 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 0e2641527..d53e5828d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -18,7 +18,6 @@ import eu.kanade.domain.sync.SyncPreferences import eu.kanade.domain.track.interactor.TrackChapter import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences -import eu.kanade.tachiyomi.data.database.models.isRecognizedNumber import eu.kanade.tachiyomi.data.database.models.toDomainChapter import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadProvider @@ -182,6 +181,11 @@ class ReaderViewModel @JvmOverloads constructor( private var chapterToDownload: Download? = null + private val unfilteredChapterList by lazy { + val manga = manga!! + runBlocking { getChaptersByMangaId.await(manga.id, applyScanlatorFilter = false) } + } + /** * Chapter list for the active manga. It's retrieved lazily and should be accessed for the first * time in a background thread to avoid blocking the UI. @@ -759,15 +763,14 @@ class ReaderViewModel @JvmOverloads constructor( .contains(LibraryPreferences.MARK_DUPLICATE_CHAPTER_READ_EXISTING) if (!markDuplicateAsRead) return - val duplicateUnreadChapters = chapterList - .mapNotNull { - val chapter = it.chapter + val duplicateUnreadChapters = unfilteredChapterList + .mapNotNull { chapter -> if ( !chapter.read && chapter.isRecognizedNumber && - chapter.chapter_number == readerChapter.chapter.chapter_number + chapter.chapterNumber.toFloat() == readerChapter.chapter.chapter_number ) { - ChapterUpdate(id = chapter.id!!, read = true) + ChapterUpdate(id = chapter.id, read = true) // SY --> .also { deleteChapterIfNeeded(ReaderChapter(chapter)) } // SY <-- From 6135547c5a67609cfd67817b7170f1256409df0b Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Sun, 6 Apr 2025 17:48:50 +0700 Subject: [PATCH 2/3] Fix: NaN when dragging `Start/Resume` reading button in MangaScreen (cherry picked from commit ea418b9517a05b0dcc68bfbbba4315ff1067c832) --- .../java/eu/kanade/presentation/manga/MangaScreen.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index bb872a301..23f9edb3c 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -539,7 +539,10 @@ private fun MangaScreenSmallImpl( }, ) { change, dragAmount -> change.consume() - offsetX += dragAmount + val newOffsetX = offsetX + dragAmount + if (!newOffsetX.isNaN()) { + offsetX = newOffsetX + } } }, // KMK <-- @@ -988,7 +991,10 @@ private fun MangaScreenLargeImpl( }, ) { change, dragAmount -> change.consume() - offsetX += dragAmount + val newOffsetX = offsetX + dragAmount + if (!newOffsetX.isNaN()) { + offsetX = newOffsetX + } } }, // KMK <-- From c10f27150f8fa495750a82ab3030d68dc98f4d17 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Thu, 10 Apr 2025 00:21:32 +0700 Subject: [PATCH 3/3] Update version & changelog --- app/build.gradle.kts | 2 +- app/src/main/res/raw/changelog_release.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 12250b93a..e2a12a53a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,7 +31,7 @@ android { applicationId = "app.komikku" versionCode = 73 - versionName = "1.13.0" + versionName = "1.13.1" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"") diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml index 88e5c9780..176949c48 100644 --- a/app/src/main/res/raw/changelog_release.xml +++ b/app/src/main/res/raw/changelog_release.xml @@ -1,5 +1,9 @@ + + [b]Fix:[/b] Mark existing duplicate read chapters as read option not working in some cases + [b]Fix:[/b] NaN crash when dragging `Start/Resume` reading button in MangaScreen + [b]New:[/b] feat: unify recommendation screens combine MAL, AniList, MangaUpdates, MangaDex, Comick [b]New:[/b] Support for private tracking with AniList, Bangumi, Kitsu @@ -16,6 +20,7 @@ [b]New:[/b] Add option to export minimal library information to a CSV file [b]New:[/b] Add "Monochrome" theme [b]New:[/b] Add prefix search to search by internal DB ID + [b]Improve:[/b] Update view's UI & order (always show latest unread chapter first) (cuong-tran) [b]Improve:[/b] (EditMergedSettings): Allow open merge children manga [b]Improve:[/b] Apply "Downloaded only" filter to all entries regardless of favourite status [b]Improve:[/b] Remove alphabetical category/feed sort option