Cuong-Tran
4c08f61f68
Fix: ktlint config for SY code ( #712 )
...
* Add more editor configs and move ktlint config to it (mihonapp/mihon#1731 )
(cherry picked from commit 34d1e6fa278846dd8eb6ea82c936818d4610d3c2)
* more ktlint config
* fix compile
* restore comment-wrapping
* restore all of them
* disable in gradle.kts
* cleanup
* remove filenamktlint_standard_filename
* fix filename
* remove unused EhAssets
* ktlint_standard_multiline-expression-wrapping
* property-naming & function-naming
* ktlint_standard_argument-list-wrapping
* fix argument-list-wrapping
* Improve in case source is null
related to commit 343cd372
2025-02-18 13:44:57 +07:00
KaiserBh
d7ed145c82
feat: add cross device sync ( #1005 )
...
* feat: add cross device sync.
* chore: add google api.
* chore: add SY specifics.
* feat: add backupSource, backupPref, and "SY" backupSavedSearches.
I forgot to add the data into the merging logic, So remote always have empty value :(. Better late than never.
* feat(sync): Allow to choose what to sync.
Various improvement and added the option to choose what they want to sync. Added sync library button to LibraryTab as well.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* oops.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* refactor: fix up the sync triggers, and update imports.
* refactor
* chore: review pointers.
* refactor: update imports
* refactor: add more error guard for gdrive.
Also changed it to be app specific, we don't want them to use sync data from SY or other forks as some of the model and backup is different. So if people using other forks they should use the same data and not mismatch.
* fix: conflict and refactor.
* refactor: update imports.
* chore: fix some of detekt error.
* refactor: add breaks and max retries.
I think we were reaching deadlock or infinite loop causing the sync to go forever.
* feat: db changes to accommodate new syncing logic.
Using timestamp to sync is a bit skewed due to system clock etc and therefore there was a lot of issues with it such as removing a manga that shouldn't have been removed. Marking chapters as unread even though it was marked as a read. Hopefully by using versioning system it should eliminate those issues.
* chore: add migrations
* chore: version and is_syncing fields.
* chore: add SY only stuff.
* fix: oops wrong index.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* chore: review pointers.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* chore: remove the option to reset timestamp
We don't need this anymore since we are utilizing versioning system.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* refactor: Forgot to use the new versioning system.
I forgot to cherry pick this from mihon branch.
* chore: remove isSyncing from Chapter/Manga model.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* chore: remove unused import.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* chore: remove isSyncing leftover.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* chore: remove isSyncing.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
* refactor: make sure the manga version is bumped.
When there is changes in the chapters table such as reading or updating last read page we should bump the manga version. This way the manga is synced properly as in the History and last_read history is synced properly. This should fix the sorting issue.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
---------
Signed-off-by: KaiserBh <kaiserbh@proton.me>
2024-03-29 12:00:26 +07:00
Jobobby04
19746904e1
Some linting
2023-12-23 18:23:58 -05:00
AntsyLich
e368116a30
Trim Chapter scanlator value ( #10108 )
...
(cherry picked from commit d0bcd30909adaaf086e0bd5b0e8231561c4b9e0e)
2023-12-23 17:39:29 -05:00
AntsyLich
c8909961c0
Implement scanlator filter ( #8803 )
...
* Implement scanlator filter
* Visual improvement to scanlator filter dialog
* Review changes + Bug fixes
Backup not containing filtered chapters and similar issue fix
* Review Changes + Fix SQL query
* Lint mamma mia
(cherry picked from commit b97aa235480e35b5514b7b1489b9d4413cea66d9)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt
# data/src/main/sqldelight/tachiyomi/migrations/23.sqm
# data/src/main/sqldelight/tachiyomi/migrations/26.sqm
# domain/src/main/java/tachiyomi/domain/history/interactor/GetNextChapters.kt
2023-12-23 17:38:22 -05:00
arkon
d9a6a7be50
Restrict line length with ktlint
...
(cherry picked from commit 1d144e67678a99ec7198e5efcb1410b5da4bc42e)
# Conflicts:
# .editorconfig
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
2023-11-05 17:28:46 -05:00
AntsyLich
35d8c75aa0
Show missing chapter count between two chapters in chapter list ( #10096 )
...
* Show missing chapter count between two chapters in chapter list
Closes #8460
* Fix crash
* Lint
* Review changes
* Lint
(cherry picked from commit 6d538db5f2afc45976a65ae5d202a490d2e08352)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt
2023-11-05 16:38:06 -05:00
arkon
dfb3e2da8e
Clean up chapter restoring logic a bit
...
(cherry picked from commit ce5e10be955d8166f53de8118f8f12e76546b5ea)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# domain/src/main/java/tachiyomi/domain/history/interactor/GetNextChapters.kt
2023-10-29 13:52:28 -04:00
arkon
873742f6f4
Remove need for SQLDelight primitive adapters
...
(cherry picked from commit cd91ea9b7723eec378bbbefd916d3da6407d685e)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
# data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
# domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt
2023-08-12 15:48:39 -04:00
Jobobby04
9c34323c9d
Merged manga play button fix
2023-07-21 22:18:00 -04:00
arkon
42146b6d1e
Misc cleanup
...
(cherry picked from commit 3cca4602829fd706c5b850bcf45d472ee95b2a38)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
2023-03-20 18:57:43 -04:00
Andreas
0f3bb9f7d7
Migrate things to use newer data models ( #9239 )
...
* Remove old database models from Coil
* Remove old database models from TrackInfoDialogHome
* Remove old database models from Backup Manager
(cherry picked from commit dfdb688b437c38954b1072b7a1df15921a437868)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SMangaExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
2023-03-20 18:27:59 -04:00
Andreas
b5b5dd0e81
Move Local Source to separate module ( #9152 )
...
* Move Local Source to separate module
* Review changes
(cherry picked from commit f27dc19b378f2f38ed2885f40d93f6d8817ef584)
# Conflicts:
# app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
# app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
# core/src/main/java/tachiyomi/core/util/system/ImageUtil.kt
# source-local/src/main/java/tachiyomi/source/local/LocalSource.kt
2023-03-14 22:10:00 -04:00
Two-Ai
b6afd8df46
Simplify filter logic ( #9141 )
...
* Remove unnecessary else branch
* Add TriStateFilter applyFilter
* Simplify filterFnTracking filter logic
(cherry picked from commit ed6809fa2835831b8d5739d195eff1dbf74df801)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
2023-03-14 21:26:12 -04:00
arkon
efca899165
Move chapter utils to domain module
...
(cherry picked from commit ee818bc7c543e8f4b799f18b989817906ac195ab)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt
2023-03-05 15:12:20 -05:00
arkon
ce67eb9de3
Move more models to domain module
...
(cherry picked from commit 345e9c2a9a61f1f3b814db52eddbb42681499854)
# Conflicts:
# app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
# app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt
# app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.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/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt
2023-02-09 13:44:38 -05:00
Jobobby04
c8de918e46
Cherry pick fixes
2022-11-16 14:17:26 -05:00
Jobobby04
3b55bc25dd
Fix downloaded chapter filter
2022-11-16 14:03:04 -05:00
d-najd
1903453ce7
Add "Play" button on manga in library ( #8218 )
...
* resume manga button in libarary
* work on resume button
* Backup
* work on opening the last read chapter
* backup
* renaming
* fab instead of image
* done with logic
* cleanup
* cleanup
* import cleanup
* cleanup...
* refactoring
* fixing logic
* fixing scopes
* Reworking design
* adding ability to turn on/off the feature
* cleanup
* refactoring, fixing logic, adding filter logic (partial)
* backup
* backup
* logic done
* backup before merge fix
* merge conflict....
* merge conflict...
* reworking ui logic
* removing unnecessary file
* refactoring
* refactoring
* review changes + minor parameter position movement
* commiting suggestion
Co-authored-by: arkon <arkon@users.noreply.github.com>
* fixing minor mistake
* moving ChapterFilter.kt
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit ba00d9e5d2c00b9cf415932bb2821bf9914fe248)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-11-11 11:07:42 -05:00
stevenyomi
66ee19daaf
Fix download chapter dir when scanlator is empty or changed ( #7780 )
...
(cherry picked from commit 1f9f9662bc5abe75f24dae30d48e843005d86394)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
2022-08-17 15:35:26 -04:00
arkon
485e6719c3
More domain model usage
...
(cherry picked from commit a3378e6080418e6ba9bab4d027d7f06373556217)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-07-03 17:18:20 -04:00
arkon
f1a31e4560
More domain model usage
...
(cherry picked from commit 3791d8254034ffcab94ddd65ec290c28384e6526)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-07-03 17:05:44 -04:00
AntsyLich
240d5a7c52
Add date_upload to toDbChapter() ( #7297 )
...
(cherry picked from commit 693cc103ea5e9fed3045d3d20778866a0041d944)
2022-06-12 12:47:38 -04:00
AntsyLich
d1d9c53af3
Make syncChaptersWithSource use sqldelight ( #7263 )
...
* Make `syncChaptersWithSource` use sqldelight
Will break chapter list live update on current ui
Co-Authored-By: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
* Review Changes
Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
(cherry picked from commit 120943a8b37eaf847ca1073676a8293288c28e12)
# Conflicts:
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
# app/src/main/sqldelight/data/mangas.sq
2022-06-11 12:51:49 -04:00
AntsyLich
f0fb91b84b
Reader: Save reading progress with SQLDelight ( #7185 )
...
* Use SQLDelight in reader to update history
* Move chapter progress to sqldelight
* Review Changes
Co-Authored-By: inorichi <len@kanade.eu>
* Review Changes 2
Co-authored-by: FourTOne5 <59261191+FourTOne5@users.noreply.github.com>
Co-authored-by: inorichi <len@kanade.eu>
(cherry picked from commit 809da49301cceacd433f38354fb04fc616efcc5f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-05-29 18:38:40 -04:00
arkon
24c5563a02
Update linter
...
(cherry picked from commit ae7df4fb7fa4fc996ba26a9f6dbbb6b5277a939b)
# Conflicts:
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/domain/source/model/Source.kt
# app/src/main/java/eu/kanade/presentation/source/MigrateSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt
# app/src/main/java/eu/kanade/presentation/source/SourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
2022-05-14 10:45:26 -04:00
Jobobby04
c9ec7921a5
Revert "Revert history Compose/SQLDelight changes"
...
This reverts commit 6a0b523e86
2022-04-22 19:40:09 -04:00
Jobobby04
6a0b523e86
Revert history Compose/SQLDelight changes
2022-04-22 19:27:15 -04:00
Andreas
a8cb77cc7e
Migrate History screen database calls to SQLDelight ( #6933 )
...
* Migrate History screen database call to SQLDelight
- Move all migrations to SQLDelight
- Move all tables to SQLDelight
Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
* Changes from review comments
* Add adapters to database
* Remove logging of database version in App
* Change query name for paging source queries
* Update migrations
* Make SQLite Callback handle migration
- To ensure it updates the database
* Use SQLDelight Schema version for Callback database version
Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
(cherry picked from commit b1f46ed8302411fbd884bbc3c26fe28a378fd91a)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
# build.gradle.kts
2022-04-22 10:08:31 -04:00
