Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,302 Commits 1 Branch 60 Tags
Commit Graph

8033 Commits

Author SHA1 Message Date
AwkwardPeak7
59887eed80 Change Page.State to sealed interface (#1988) 
(cherry picked from commit f1e2efcb37e2c623b769e979fa1c7e9e5ad7117d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ArchivePageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
 2025-05-11 19:35:07 -04:00
Cuong-Tran
8aa3dca95f Fix navigation issue after migrating a duplicated entry from History tab 
(cherry picked from commit d9c4b56336c21db96a835630a48c46ee7a480342)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2025-05-11 19:11:40 -04:00
NarwhalHorns
5e0f730159 Display total chapters on duplicates list items (#1963) 
(cherry picked from commit 12abd9938b7c235d6a1c02391624703476c1f339)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
 2025-05-11 19:03:47 -04:00
NarwhalHorns
615adc567b Display all similarly named duplicates in duplicate manga dialogue (#1861) 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 0d35b6fdafbf5451a2743ea9bcfc735bf49374a7)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2025-05-11 18:14:26 -04:00
AntsyLich
b0f645d906 Deduplicate entries when browsing (#1957) 
(cherry picked from commit f81da3dcce9afba883b6a3accdd3bf4ea21cfa81)

# Conflicts:
#	CHANGELOG.md
#	data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
 2025-05-11 18:05:21 -04:00
AntsyLich
824550175a Remove feature flag from Nord theme (#1951) 
(cherry picked from commit 5d2110f3fb1aa6b15f62af0dcd3378cfbe475b7a)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt
 2025-05-11 17:32:37 -04:00
Secozzi
ad53c0de83 Add markdown support for manga descriptions (#1948) 
(cherry picked from commit 4e68339783b47b0780e1b9aee643404339d35ed1)

# Conflicts:
#	CHANGELOG.md
#	gradle/libs.versions.toml
 2025-05-11 17:31:41 -04:00
AntsyLich
c8039739d5 Significantly improve browsing speed (near instantaneous) (#1946) 
(cherry picked from commit c8ffabc84a096207c1997ab69fc86176f3b53f00)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
#	data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
#	data/src/main/sqldelight/tachiyomi/data/mangas.sq
#	domain/src/main/java/tachiyomi/domain/manga/interactor/NetworkToLocalManga.kt
#	domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt
#	domain/src/main/java/tachiyomi/domain/source/repository/SourceRepository.kt
 2025-05-11 17:24:33 -04:00
Bartu Özen
26674136e6 Fix app bar action tooltips blocking clicks (#1928) 
(cherry picked from commit 77e79233ab054d16bb5dc04a040d0d86a326136f)

# Conflicts:
#	CHANGELOG.md
 2025-05-11 16:50:49 -04:00
AntsyLich
9972fa1053 Fix mark existing duplicate read chapters as read option not working in some cases (#1944) 
(cherry picked from commit 8a21148578af3c1538e9ab2b1fe5bdf05b4e35c9)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
 2025-05-11 16:50:02 -04:00
AntsyLich
ae3f974d8c Fix user notes not restoring when manga doesn't exist in DB (#1945) 
(cherry picked from commit e91db86faef8d6b17961a1b73fbf07f0d2c8975d)

# Conflicts:
#	CHANGELOG.md
 2025-05-11 16:44:09 -04:00
Mend Renovate
027f179a4b Update kotlin monorepo to v2.1.20 (#1883) 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 556290f2d35f739bb4bddc012739acf10b92708d)
 2025-05-11 16:43:30 -04:00
kunet
fb3c996904 Add user manga notes (#428) 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 8fbe630308b962043c7b59422878c94f80156e9f)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	data/src/main/sqldelight/tachiyomi/migrations/5.sqm
#	domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt
 2025-05-11 16:42:33 -04:00
perokhe
70b25825ec Fix page number not appearing when opening chapter (#1936) 
(cherry picked from commit 132d77aa9947f891f90f1afcdcb24e20ce515438)

# Conflicts:
#	CHANGELOG.md
 2025-05-11 16:26:43 -04:00
Cuong-Tran
290e8f5a1e Fix benchmark build (#1938) 
(cherry picked from commit b00bbe91beb942f2ac18765be6c78b6f318cc66d)
 2025-05-11 16:25:36 -04:00
Jayman Rana
f6b1440bf2 Fix backup sharing from notifications not working when app is in background (#1929) 
(cherry picked from commit 3e5d3d099fed5feb6a6807196bea5fed72973fe9)

# Conflicts:
#	CHANGELOG.md
 2025-05-11 16:25:27 -04:00
perokhe
77a4919656 Fix next chapter button occasionally jumping to the last page of the current chapter (#1920) 
(cherry picked from commit 941dde341eb11703eadae543f351c9284617541c)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
 2025-05-11 16:25:14 -04:00
MajorTanya
87ea971be0 Fix Bangumi search including novels (#1885) 
(cherry picked from commit 953c4e7bc056ed8b9eebe1b111677a4616c4d694)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/dto/BGMSearch.kt
 2025-05-11 16:22:01 -04:00
AntsyLich
2e94e152c2 Use current time as build time for preview builds (#1876) 
(cherry picked from commit 935f1fcf3f8e4f9da4774d932b65ae77b44cc773)

# Conflicts:
#	app/build.gradle.kts
 2025-05-11 16:21:22 -04:00
AntsyLich
34736bc26e For release builds use last commit time as build time (#1873) 
(cherry picked from commit dae7d179662ff6d6654e7c10e57f1aeeaf579de8)

# Conflicts:
#	app/build.gradle.kts
 2025-05-11 16:17:52 -04:00
Jobobby04
5742d2e3fe Release 1.12.0 2025-05-11 14:24:22 -04:00
Callum Wong
84c7da5a7d
Add QR code scan button for sync API key (#1430) 
* Add dependency com.journeyapps:zxing-android-embedded:4.3.0

* Add widget parameter to EditTextPreferenceWidget

* Add QR code scanner icon button to sync API key preference which launches a ScanContract

* Remove screenOrientation property from CaptureActivity manifest

* Allow scanning both normal and inverted codes

* store values and make code more concise

Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>

* Import local context

---------

Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
 2025-05-11 14:15:05 -04:00
cfouche
274350c118
Change for t1 for better hit rate (#1425) 2025-05-11 14:12:44 -04:00
Jobobby04
df99e7ee49 SpotlessApply 2025-03-18 18:04:23 -04:00
cfouche
dbd4437474
Update base URL and host for Pururin to pururin.me (#1415) 2025-03-18 17:43:03 -04:00
AntsyLich
9c198d0c33 Seperate mark duplicate read chapters as read behaviors as options (#1870) 
(cherry picked from commit 8a3b6107755c768924a31c2b58d705296133839c)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
 2025-03-18 17:37:58 -04:00
AntsyLich
d62a8a138c Add back option to hide unread chapter badge in library (#1871) 
(cherry picked from commit ac432e2e941f4689caad246bab6aa7d303c83bfa)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
 2025-03-18 17:31:02 -04:00
MajorTanya
226b3f2ff4 Add app ID to debug info (#1847) 
This will avoid the need to know which forks has which version numbers
and avoid confusion in support.

(cherry picked from commit eddf07f9ac31bab57d06515e42df9c854bc50eed)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt
 2025-03-18 17:27:55 -04:00
AntsyLich
ac8dab75fe Make option to mark duplicate chapter as read apply when reading (#1839) 
(cherry picked from commit 22b5fb58ff8e89635d646f8fa29256b53c41ffbf)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
 2025-03-18 17:27:12 -04:00
AntsyLich
aad2bf4645 Make more sliders discrete and ensure they don't look out of place (#1840) 
Also cleanup the underlying code

(cherry picked from commit 4f06c1cc09d15245b26b8a862738cb6a859fedcc)

# Conflicts:
#	CHANGELOG.md
 2025-03-18 17:24:05 -04:00
AntsyLich
7f71296e1c Change label of setting to always use SSIV in long strip reader (#1834) 
(cherry picked from commit 85d168ed5e201134558cc843aba896306617c9ca)

# Conflicts:
#	CHANGELOG.md
 2025-03-18 16:57:58 -04:00
NarwhalHorns
8dc6a95ce6 Display staff information on Anilist tracker search results (#1810) 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit b702603965044cfe3ee852f8d0c970b6eb93b97a)

# Conflicts:
#	CHANGELOG.md
 2025-03-18 16:55:40 -04:00
Roshan Varughese
1eb64d117e Fix an issue where tracker reading progress is changed to a lower value (#1795) 
(cherry picked from commit 2e2f1ed82d63a93ebf87ee8494434c1bad2e268c)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2025-03-18 16:55:21 -04:00
NarwhalHorns
e76dd7fab0 Update track search preview (#1825) 
(cherry picked from commit 0e6d6c087e5a4d889b9153b390d8335d7add1e87)
 2025-03-18 16:54:29 -04:00
AwkwardPeak7
9ff048e683 Fix webview crash caused by 793d7fb (#1819) 
(cherry picked from commit 9957fff2fbb6dad6f9df89bb2c16db34d9e4da96)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2025-03-04 11:33:14 -05:00
Jobobby04
a64fe8121b Guard against NPE in edit info dialog 2025-03-02 14:03:33 -05:00
Jobobby04
4db7a32075 Fix migration delete downloaded not registering properly 2025-03-02 14:01:39 -05:00
Jobobby04
d9200ef006 Build fix 2025-03-02 13:34:37 -05:00
AwkwardPeak7
dfde271f7f Spoof or remove X-Requested-With header from webview (#1812) 
(cherry picked from commit 793d7fbe40c87ed233da8cc99d544d01024ed4f5)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2025-03-02 13:18:06 -05:00
AntsyLich
56433a624e Add option to mark new duplicate read chapters as read (#1785) 
(cherry picked from commit cd0481592c09dc9cfb331805e90e6e5c3752a08c)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
 2025-03-02 13:13:33 -05:00
AntsyLich
f60cb9bb64 Remove alphabetical category sort option (#1781) 
(cherry picked from commit 2b0c28938bfd74577d2ff0736b2cc72f4e4705cf)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
 2025-03-02 13:10:23 -05:00
Cuong-Tran
1d10925829 Add back support for drag-and-drop category reordering (#1427) 
(cherry picked from commit 919607cd06ee45ac667a2fd650d85aaf6ebb9762)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
 2025-03-02 13:09:13 -05:00
Roshan Varughese
02ace23c38 Add option to export minimal library information to a CSV file (#1161) 
(cherry picked from commit fab8b17d99c44a08555b1f584c56d62a47737ca0)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
 2025-03-02 13:01:51 -05:00
Jobobby04
3e16adf961 SpotlessApply 2025-03-02 12:59:36 -05:00
AntsyLich
fb1a3da0ea Use .toUri() extension function 
(cherry picked from commit 0dda64b9d80a47a96fb52d13b5e0ece6d5fca2b1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
 2025-03-02 12:55:41 -05:00
AntsyLich
5f2e979bb5 Remove F-droid warnings 
(cherry picked from commit 181dbbb638686a284fa24c4e43d7c022a4f8e4bb)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
#	domain/src/test/java/tachiyomi/domain/release/interactor/GetApplicationReleaseTest.kt
 2025-03-02 12:54:48 -05:00
MajorTanya
5d4d15aa9c Add private tracking support for Kitsu (#1774) 
(cherry picked from commit 1dd81ef1e1b383f379f4e8e53d27a47cf7f0278f)

# Conflicts:
#	CHANGELOG.md
 2025-03-02 12:45:02 -05:00
NarwhalHorns
59a6bd700b Support for private tracking with AniList and Bangumi (#1736) 
Co-authored-by: MajorTanya <39014446+MajorTanya@users.noreply.github.com>
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 49b2b346b65c2631a8369c8f6643e945720770de)

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/eu/kanade/tachiyomi/data/track/BaseTracker.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt
#	app/src/main/java/eu/kanade/test/DummyTracker.kt
 2025-03-02 12:44:26 -05:00
MajorTanya
278224676b Fix Bangumi login regression (#1770) 
Caused by #1748.

Two different issues actually.

Firstly, the getUsername API call uses the authClient, which uses the
BangumiInterceptor to get the current OAuth data and attach the
Authorization header. However, on login, #1748 did not try to set the
new auth details until after attempting to call getUsername.
This would cause Mihon to think the user was not authenticated with
Bangumi and cancel the process.

This is fixed by having Mihon store the OAuth credentials in the
interceptor first before attempting to call getUsername.

The second issue is a simple trailing dollar sign in the API URL for
the getUsername method. This was removed.

(cherry picked from commit badc229a2312c0c750c34631f303ac4ca970dc71)
 2025-03-02 12:30:27 -05:00
MajorTanya
66f2877a3f Add back explicit update(track) call to Bangumi (#1771) 
Most if not all other trackers do this too. Technically this causes
some request duplication (since things like the BaseTracker's
setRemoteLastChapterRead fire anyway due to the tracker sheet being
open. But considering the reduced number of requests in other places,
I think this is still acceptable.

This change will allow #1736 to proceed, hopefully.

(cherry picked from commit 277d8bad8e8d21cd74dc1681da09a4b980f455e0)
 2025-03-02 12:30:16 -05:00