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

4412 Commits

Author SHA1 Message Date
arkon
f549730c8f Remove side nav icon alignment preference 
Simplifying it to just always be centered, which is what most Google apps seem to be doing anyway.

(cherry picked from commit ccc4144f3cc2264c3ae75d492983e9577f352af1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-10-29 17:24:26 -04:00
arkon
b5ae4c0d43 Refactor network to local manga logic 
Maybe fixes #8289

(cherry picked from commit d5b4bb49b168adc5b7c3934e530571497c85a916)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
 2022-10-29 17:22:24 -04:00
arkon
71eefc3c9e Avoid some crashes 
(cherry picked from commit ca065169002475cc92b7736d02340127a5e419bd)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
 2022-10-26 23:38:49 -04:00
AntsyLich
c48dd63019 Rework library selection (#8290) 
(cherry picked from commit 2cbe946e7e9eae14c035001c9e4eb970ede229a4)
 2022-10-26 23:37:39 -04:00
AntsyLich
32a2827b0e Use Channel in Download cache (#8292) 
* Use `Channel` in Download cache

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Use Unlimited capacity

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
(cherry picked from commit 3b5b9a1ae5803466e9b18846aae6fcd16bf8a637)
 2022-10-26 23:37:16 -04:00
Ivan Iskandar
20ea3d5eac MangaPresenter: Filter unsupported track service from available service list (#8286) 
(cherry picked from commit 82b552ac9a4a8764f8ccf1d75c628310c020440d)
 2022-10-26 23:35:37 -04:00
arkon
8231aa45d7 Fetch download counts if library is filtered by downloaded 
Fixes #8277

(cherry picked from commit 9792a6cb780d0db3a962fdf2e60ef028b3ceb07f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-23 12:52:58 -04:00
Jobobby04
dc6215dd3b Fix default category always displaying 2022-10-23 12:52:57 -04:00
arkon
6d46283aee Use kotlin.time extensions in some more places 
(cherry picked from commit 5c868d784679b55e413366c5d4bdea75253bf8f4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2022-10-22 21:46:13 -04:00
arkon
3314b46630 Only enable ACRA crash logging in preview and stable release builds 
(cherry picked from commit 6e04822f5e2f0985a98a86c814099b0cf85cb7f8)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt
 2022-10-22 21:43:54 -04:00
AntsyLich
d853aa0c1b Cleanup LibraryUpdateService (#8237) 
(cherry picked from commit 4ff5c1148e1ea89b13e5aefbd6b34d66566fb103)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2022-10-22 21:34:32 -04:00
stevenyomi
0a0b264e43 Fix app lock and make delay not survive app being killed (#8272) 
* Fix app lock

* Always require unlock if app is killed

(cherry picked from commit 2ab744c525e2c6c94bcac7d4cc3848830a50c991)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
 2022-10-22 21:23:02 -04:00
AntsyLich
24115a9ddc Cleanup UpdatesPresenter deleteChapters (#8273) 
(cherry picked from commit 4a244a598bd8caceaab76ae2c851d8e8ef04ed21)
 2022-10-22 20:57:23 -04:00
arkon
bd9125f9fe Remove fake chapter deletion state updates 
Now that the updates and manga screen listen to download cache changes, it'll reflect the real states once deleted.

(cherry picked from commit d0bff298b7df3524f76434a3636bc196627cb613)
 2022-10-22 20:57:12 -04:00
arkon
1bef917db7 Handle async cache in updates and manga screens 
- Also fix concurrent accesses to main cache map
- Also debounce sources and updates list updates to maybe avoid crashing due to dupe LazyColumn keys

(cherry picked from commit 152eb5b95196a32ed120f4a57996c1958294bf7f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-10-22 20:56:53 -04:00
stevenyomi
46fe5dfd4f Tweak tablet UI mode setting (#8262) 
(cherry picked from commit d558f9e1d6bcc8eb8f69359e6e7516f7ea24a408)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2022-10-22 20:47:54 -04:00
AntsyLich
2774df208e Fix "Add manga to library" snackbar not showing with ChapterDownloadAction.START_NOW (#8271) 
(cherry picked from commit b3557e844c016f095764e72fca8d01657e1d4028)
 2022-10-22 20:33:17 -04:00
arkon
e38b1390e6 Maybe avoid extensions list rendering crashes 
(cherry picked from commit 4138a17e29348c7057ae885a0b8d9d5c3f29cc07)
 2022-10-22 20:32:07 -04:00
arkon
d0f3bd077c Avoid some IndexOutOfBoundsExceptions 
(cherry picked from commit eb742b29f8b75eb900cf47f6178053dcf68f74bc)
 2022-10-22 20:31:48 -04:00
arkon
7f7602f9b7 Use fade transition in Voyager screens to mimic existing Conductor change handler 
(cherry picked from commit 2921be620a2cc2bd3a7be84aaa6d6136c651367c)
 2022-10-22 20:29:40 -04:00
arkon
5a55c66532 Perform download cache renewal async 
Don't block on cache renewals, but notify library on updates so that the badges show up when ready.

We skip the cache when checking if a chapter is downloaded for the reader assuming that it's a
relatively low cost to check for a single chapter.

(Probably) fixes #8254 / fixes #7847

(cherry picked from commit 7e40680af02505f82fa3655d2d693092c6bd43a1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-10-22 20:28:57 -04:00
arkon
9fafe15081 Remove redundancy in ExtensionManager 
(cherry picked from commit 93925a72866892358b7f46645e1f189b2cf3bc1d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
 2022-10-22 20:24:41 -04:00
arkon
893443222d Proper DI instantiation for some more download related classes 
(cherry picked from commit b04807e53a355af210e280d42f705976a478c6e5)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
 2022-10-22 20:16:12 -04:00
arkon
5ff3c39d68 Defer library download counts if not needed 
(cherry picked from commit 93827aba34e98c6f70397d0e767580f3aaf5136b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-22 20:11:36 -04:00
AntsyLich
b5f3114cb4 Hide reader "Split tall images" option in release build (#8235) 
(cherry picked from commit 44cabf2f0b9db3ae60d5739676fb8777c474ea6b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
 2022-10-22 20:03:16 -04:00
arkon
d79784f292 Avoid crashing if invalid download and backup location is set 
Fixes #8252

(cherry picked from commit a8ca7b690fe56f8588d3fff9dbfef95062e6442f)
 2022-10-22 19:52:59 -04:00
stevenyomi
6ba4c9b139 Clean up strings and resources (#8253) 
* Clean up strings and resources

* fix pringle's typo

* restore catching file pick errors

* add back file chooser title

* revert #7740 and remove try-catch of chooser-wrapped intent

* swap xmlns lines

* swap xml tools lines

(cherry picked from commit 824d5e22bc35a9b511929be21ffbc85b734e5fcd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/res/drawable/card_gradient_shape.xml
#	app/src/main/res/menu/download_queue.xml
 2022-10-22 19:52:46 -04:00
stevenyomi
cc605759d3 Fix language/theme settings dialog and remove delay (#8244) 
* Fix language/theme settings dialog and remove delay

* inline UI preferences

* use `by remember`

* remove unused variable

* remove unused import

(cherry picked from commit d03cbbe0cdc699ad15618a326c91e811f5c2e385)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt
 2022-10-22 19:38:52 -04:00
Ivan Iskandar
b29fc922cb Fix crash when saving a page from certain chapters (#8242) 
(cherry picked from commit 84bcd8d1d228e9687f4542e429407c74e73684bd)
 2022-10-22 19:37:57 -04:00
Jobobby04
62446a0737 Add _sy to the backup name 2022-10-22 17:11:03 -04:00
Jobobby04
82793b7a41 Minor cleanup 2022-10-18 17:53:45 -04:00
arkon
49d5d797b3 Fix download cache not updating on location change 
(cherry picked from commit 6756bfab7592bdbc424aa4a478769728cf991a54)
 2022-10-18 17:52:13 -04:00
Andreas
fed8ef09af Tweak library view (#8240) 
- Move category join to improve performance
- Move bookmark calculation into query
- Move unread calculation into domain

(cherry picked from commit 8d97b980e354d50a7682e87677ef336833b760fe)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/sqldelight/migrations/22.sqm
#	app/src/main/sqldelight/view/libraryView.sq
 2022-10-18 17:51:34 -04:00
stevenyomi
a31e8282cb Clean up OkHttp methods and parse from Okio directly (#8238) 
(cherry picked from commit 2d19729869d1c88a46c0d1a4582d29a80d7ab9cb)

# Conflicts:
#	core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
 2022-10-18 17:35:23 -04:00
Ivan Iskandar
a7c45ab61e More settings stuff (#8226) 
* title size

* move about screen to settings

keeping shortcut inside more screen

* more

* shrink texts

* scrollable create backup dialog choices

* search back button

* cleanups

* delay changes that require activity recreate

* lessen horizontal padding

(cherry picked from commit f5bde3726ad235587da59e484a0c82fbe48790da)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/database/components/ClearDatabaseDialogs.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
 2022-10-18 17:24:57 -04:00
AntsyLich
de10803c2f Fix selection in library (#8233) 
(cherry picked from commit ea092fa175e39dc9b868ef865d6fcfef81407157)

# Conflicts:
#	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/LibraryCoverOnlyGrid.kt
 2022-10-18 16:53:58 -04:00
Andreas
2f748b025a Tweak Crash activity (#8229) 
- Scroll entire content body
- Edge2Edge

(cherry picked from commit fed914827a3a84efb0beb12f885a85413fba7b98)
 2022-10-18 16:52:20 -04:00
Andreas
d07ea91c27 Add Crash activity (#8216) 
* Add Crash activity

When the application crashes this sends them to a different activity with the cause message and an option to dump the crash logs

* Review changes

(cherry picked from commit 4178f945c9b6bcae9323c02534d7e620136a4e76)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
 2022-10-17 00:10:30 -04:00
arkon
767059e7a3 Always renew download cache if no sources have been loaded yet 
Fixes #7705. Somewhat janky solution to handle when loading the sources on app start is slower than
the initial download cache priming.

(cherry picked from commit 558aad1a7170a71c454ce7c056b98f446a6eea95)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
 2022-10-17 00:09:36 -04:00
AntsyLich
639eb50dbc Tweak library query (#8214) 
* Tweak library query

Co-Authored-By: Quang Kieu <kieuq@wit.edu>

* Update app/src/main/sqldelight/migrations/21.sqm

* Update app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt

* Update app/src/main/sqldelight/view/libraryView.sq

* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt

* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt

* Bump version

Co-authored-by: Quang Kieu <kieuq@wit.edu>
(cherry picked from commit d6cbff2837bdf0de679bdf1cc8b93dbf3eadb487)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/sqldelight/migrations/21.sqm
 2022-10-17 00:05:52 -04:00
arkon
2144221250 Remove dead code 
Mostly from settings rewrite, but some other things too.

(cherry picked from commit 69cdba71eb842865586309d8549de78480cdbe0e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/database/ClearDatabaseScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
#	app/src/main/res/drawable/ic_done_green_24dp.xml
#	app/src/main/res/layout/pref_account_login.xml
#	app/src/main/res/layout/pref_library_columns.xml
 2022-10-16 22:58:07 -04:00
Ivan Iskandar
a2f6b90547 Settings: M3 and two pane ui (#8211) 
* Settings: M3 and two pane ui

* TrackingLoginDialog: Move close button

* Use small top bar

* Revert "Update voyager to v1.0.0-rc02"

This reverts commit 570fec6ea622a7deae44668f4d9c3317699de2aa.

https://github.com/adrielcafe/voyager/issues/62
(cherry picked from commit 5c5468f9af74be984d0d9cb79da804370ee0e775)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
 2022-10-16 22:39:58 -04:00
arkon
0b5b9cb5cc Control library badge visibility with props instead 
Fixes #8174

(cherry picked from commit 6635dd2990851d830e83a628b7e62091bd20cb43)

# Conflicts:
#	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/LibraryCoverOnlyGrid.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-16 22:20:47 -04:00
Ivan Iskandar
57dcd16cb9 Full Compose settings (#8201) 
* Uses Voyager for navigation.
* Replaces every screen inside settings except category editor screen since it's
called from several places.

(cherry picked from commit 890f1a3c7b0f2ceefa86a77cb40c11567e2b5a46)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
 2022-10-16 21:53:23 -04:00
Swords
1ac63787bd Add bookmark filter (#8198) 
* feat: add bookmark filter

* feat: add getBookmarkChaptersByMangaId query + interactor to be used for filtering

(cherry picked from commit 3fdcd636d75e3862e75779077faef3d70365bcf6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2022-10-15 12:11:24 -04:00
Jobobby04
80c53adf29 Fix open in webview issue 2022-10-15 12:09:38 -04:00
arkon
a82b86bec8 Minor cleanup 
(cherry picked from commit bc1fbfac9d3bd6a13b755acb5ac0a2ed702ba1a2)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
 2022-10-15 12:09:35 -04:00
arkon
7da8484d81 Attempt to avoid duplicate update rows 
Related to #7713

(cherry picked from commit 7e92921f84905fefa46a9514c096593520c52076)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
 2022-10-15 12:09:34 -04:00
d-najd
aef2dab957 Range selection in library (#8186) 
* logic and a bit of cleanup

* cleanup done

* grammar fix

* fixing format

* Auto stash before checking out "HEAD"

* Revert "Auto stash before checking out "HEAD""

This reverts commit 202374a36ff444b7da3fcdb2a9859ca71a7c046e.

* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt

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

* cleanup

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit e1adb89ff8ed1759fcab08ed70b596b41bf3c88c)
 2022-10-15 12:09:33 -04:00
arkon
78d87b866a Upgrade to Kotlin 1.7.20 
Also run formatter and address some deprecation warnings.

(cherry picked from commit 26a42ba9c01c670f60bedfca41bd72c99aa2a278)

# Conflicts:
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2022-10-15 12:09:30 -04:00