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

4730 Commits

Author SHA1 Message Date
arkon
3be06eacaa Remove redundant preference composables 
(cherry picked from commit dd1923fe88bbb1e7f838d560806598a4ba2174f8)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt
 2022-11-01 12:00:14 -04:00
arkon
81d9ac81ce Refactor overflow menus into a composable 
(cherry picked from commit df773ee15c814e03267fdfcd81d4e12d38a3508b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:43:19 -04:00
zbue
621e9dbc41 Add ability to open random manga (#8232) 
* Add ability to open random manga

* Use `getMangaForCategory` instead

* Put it in overflow menu instead of using EFAB

* Partial review changes

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Wording changes

(cherry picked from commit f5451a68812f56d9427a9b771f6bed00f8fbd7e6)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
 2022-11-01 11:38:53 -04:00
arkon
b941c34c3f Use remember var delegates in more places 
(cherry picked from commit 0849111247d28fa5a74abe6759c992097bfa7109)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:20:34 -04:00
stevenyomi
b2c4fc0ec5 Clean up strings and icons (#8326) 
* Clean up strings and icons

* fix incorrect usages of label_more

* restore strings and reduce usage of android.R

* removing icon desc of FABs anyway as app's not for visual impaired users

(cherry picked from commit 4b60138d41ea33e5e4c3defb0dc626b599216f3f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2022-10-29 18:57:56 -04:00
arkon
75e1dfee3f Show notification while download cache is renewing 
Since users seem to be confused now that the library loads before download info is shown...

(cherry picked from commit fde7bfa3d17ce2e02df5625836eb739aeaab7863)
 2022-10-29 18:46:08 -04:00
arkon
f3a2b1d7e4 Sort library items alphabetically in secondary pass 
Fixes #7461

(cherry picked from commit 224f29077d37ca72c5a9f01649998c80d7bafedd)
 2022-10-29 18:45:49 -04:00
AntsyLich
51dd8c2285 Prompt Extension update if ext-lib is updated 
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit e1ab1fdb656bea90bdf6990523c857e0434fbc0c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
 2022-10-29 18:45:42 -04:00
Jobobby04
2306038c74 Minor cleanup 2022-10-29 18:39:25 -04:00
arkon
94c0b0a36e Avoid concurrency crashes in SourceManager 
(cherry picked from commit d0c4463ab372460ce6f16ec09ea975448423ed66)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
 2022-10-29 18:27:13 -04:00
arkon
ef1242d067 Consider downloaded only mode when getting download counts in library 
Fixes #8318

(cherry picked from commit ad107860b91d5b91f3e127904a0bd81c957f87c4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:26:25 -04:00
arkon
38abaa162e Fix some crashes 
(cherry picked from commit 5efb31bd7105975ef531aaebbb70e3f409378663)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-10-29 18:25:50 -04:00
arkon
55a07ae51a Fix library download counts not being loaded if downloaded filter is in exclusion state 
(cherry picked from commit e4a2f35907a8f0eefcbd30b6a9bde258dfd89111)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:24:56 -04:00
Jobobby04
9d84481770 Cherry pick fixes 2022-10-29 18:03:25 -04:00
AntsyLich
37207ed58b Cleanup Library presenter (#8284) 
* yeet observable + minor cleanup

* move [getTracksFlow] to domain

* Lint

* Review changes

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

* Review Changes 2

* Stuff

* Rename + Rebase

* Lint

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit e36d31bf0fff9652652319fa8b4fc700edc1442a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-29 18:03:08 -04:00
d-najd
0d7cff1f43 WebView for chapter link (#8281) 
* backup

* doing logic

* cleanup

* applying suggestion

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* requested changes

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 37b7efbc87c45c421974394ee36f86f5cd6e0492)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2022-10-29 17:31:25 -04:00
AntsyLich
98a56d581e Fix "Download split" not working while using SD card (#8305) 
* Fix "Download split" not working while using SD card

* Update app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 6e4a30e59352517346eb0f622424390a52fb95c0)
 2022-10-29 17:27:32 -04:00
arkon
2217eb9d35 Alternate method of avoiding LazyColumn key conflict crashes 
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit c50b1a5c66256ab003a224d50caa317c53479397)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-10-29 17:26:42 -04:00
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