Commit graph

4159 commits

Author SHA1 Message Date
arkon
b279c9115f Fix default category showing up in edit manga categories list
Also remove some usages of runBlocking

(cherry picked from commit 3bc6b1e202f8344356720467c60da19239e22ebc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
2022-08-07 12:17:48 -04:00
Jobobby04
46fc6d44bc Fix group by settings with only default category 2022-08-07 11:37:41 -04:00
arkon
c0db682476 Minor fixes
- Fix categories modal showing when adding from source with no categories
- Use old categories icon in library bottom action menu

(cherry picked from commit 688cc64dffa8cdf1241d3b4e2467b5e8c8529800)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
2022-08-06 18:25:28 -04:00
arkon
8b777e1e5a More backup/restore code cleanup
(cherry picked from commit 9f0052eceb8bdbe9ca1ea18a2aac18a4718387bf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
2022-08-06 18:19:05 -04:00
arkon
6f6a9b677c Start cleaning up backup/restore code
The abstraction was useful for handling 2 systems, but it's no longer needed. Cleaning it up will make migrating to domain models easier down the line.

(cherry picked from commit a2bb81b7db457c3927eaa1f03416a9b07985842b)

# 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/Backup.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupFlatMetadata.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchMetadata.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTag.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTitle.kt
2022-08-06 18:06:31 -04:00
arkon
b0fc4dd6d4 Make screen loading indicators more consistent
(cherry picked from commit 5e68fe4fe92dfe281662fce84195288c743f5cb7)
2022-08-06 17:49:22 -04:00
Jobobby04
05f2f79e0d Update EHTags list 2022-08-05 16:34:00 -04:00
Andreas
394e9b3fe6 Move default category into database (#7676)
(cherry picked from commit 914831d51fbb915aea5cbb409b1da552862c380c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/CategoryImpl.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/sqldelight/migrations/19.sqm
2022-08-05 14:48:37 -04:00
Alessandro Jean
af1ee662ed Add missing Authorization header on MAL refresh token request (#7686)
* Add missing Authorization header on MAL refresh token request.

* Make sure to also close the response when it have failed.

(cherry picked from commit 531546790853dd9adb91777de8d9560a610c4838)
2022-08-05 13:08:12 -04:00
Ivan Iskandar
4da028af6a ExtensionPresenter: Fix crash on first launch (#7685)
* Revert "Use SharedFlow for available extensions to always emit the value (#7609)"

This reverts commit 73901f50c0aee1cb82695642af72ff6ac7bc232d.

* ExtensionPresenter: Explicitly set refreshing status

* Scope coroutines job to presenter

* cleanup

* fix toast

(cherry picked from commit b3426f37e7d36be653363338288f74e2ae252a78)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
2022-08-05 13:07:50 -04:00
nzoba
374d2d8a97 Save read duration to backup (#7672)
* Save read duration to backup

* Add default value

Co-authored-by: Andreas <andreas.everos@gmail.com>

Co-authored-by: Andreas <andreas.everos@gmail.com>
(cherry picked from commit 3d4e56948d86d10ecd227fb59b92da069f37a89f)
2022-08-05 13:04:27 -04:00
Ivan Iskandar
8aa313378f Reimplement appbar color overlay on scroll (#7663)
only on updates and history screen for now, but the required changes on app bar
is there.

also fix missing incognito-downloaded mode indicator on history screen

(cherry picked from commit 737cf9898db0f3e89752b82753c7fe2a88d7fef9)
2022-08-05 13:04:08 -04:00
Jobobby04
ee2fbedefb Fix resume manga fab not working properly for E-H manga 2022-08-05 13:03:36 -04:00
arkon
72ab3abc2f Remove some unneeded TODOs
(cherry picked from commit 322f3a07e8b49d76bbbcf5178be6aa7a1f91e25b)
2022-07-31 18:20:49 -04:00
Andreas
970e3e3880 Fix null pointer exception on Extension Detail screen (#7666)
(cherry picked from commit 6c7b3d78118c9c01aa51fc3c663c5a12c8f986dd)
2022-07-31 18:20:28 -04:00
arkon
26da2504df Remove unused viewstatepageradapter dependency
(cherry picked from commit 2ca62c4edaaa121dc674ab8a5e5d5f1516d84faa)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/widget/RecyclerViewPagerAdapter.kt
2022-07-31 11:57:20 -04:00
Ivan Iskandar
46cbcfc82e Glance widget for Updates (#7581)
* glance

* glance2

(cherry picked from commit 29e1976b90c5dfdc7cd649740d475d86c321f573)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
2022-07-31 11:51:51 -04:00
stevenyomi
702fdb054a Filter out empty genres before saving manga to database (#7655)
(cherry picked from commit 4efb736e56dd1e9f6438502dac915467f5b64f03)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
2022-07-31 11:36:37 -04:00
Andreas
4b87831bdd Remove deprecated LibrarySort (#7659)
* Remove deprecated LibrarySort

* Apply suggestions from code review

(cherry picked from commit 58acf0a8aa3aa37b5d9c63d99987a05ee2f8790f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
2022-07-31 11:35:29 -04:00
MatchaSoba
b729b7f0aa Fix logic for searchWithGenre (#7559)
(cherry picked from commit b563e85c3b744595272718f7e82e3272e2a7c57b)
2022-07-30 12:40:15 -04:00
Andreas
153730447d Use Compose on Clear Database screen (#7639)
(cherry picked from commit 99ac30e59f191bbe3b2e570b4c2e6ec389d64cf2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
2022-07-30 12:40:03 -04:00
AntsyLich
c22a40bd70 Use Stable interface for Updates screen + Cleanup (#7627)
* Use Stable interface for Updates screen + Cleanup

Co-Authored-By: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>

* Disable swipe refresh in selection mode

* Review Changes

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

* Review Changes 2

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit 4774deb1efe023ecff4fd41708dd224edc216c0b)
2022-07-30 12:12:56 -04:00
Andreas
c6e0abb07a Fix library bugs (#7648)
- Fix mixup in Action Menu
- Fix back action not clearing search

(cherry picked from commit db93d1da76ba453e5b499bab0d2482728014786f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
2022-07-30 09:12:44 -04:00
Jobobby04
5dccae234d Fix group by library updates 2022-07-29 22:16:41 -04:00
Andreas
9b19afb7b4 Merge GetExtensions and GetExtensionUpdates (#7646)
(cherry picked from commit 7d74b174e024f2dee84debec1a9826b942e093e4)
2022-07-29 19:40:58 -04:00
Andreas
e21badf48c Fix number of items not updating when Show category tabs is off (#7644)
(cherry picked from commit e513487caac5ef8d7e1b5a60db60291ee8ec5cba)
2022-07-29 19:40:46 -04:00
Ivan Iskandar
b368a53670 MangaPresenter: Add distinctUntilChanged to db flow (#7629)
* MangaScreen: Disable swipe refresh on action mode

* MangaPresenter: Add distinctUntilChanged to db flow

Now will only emit update when the related entry is changed

(cherry picked from commit 483b204fb5b6790fb6fe59ffd80345cd484ca241)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-07-29 09:11:02 -04:00
Andreas
b592709630 Fix category exclude not working in DownloadManager (#7641)
(cherry picked from commit 56028aff5546222da2f03af2f84d8660917b828e)
2022-07-29 09:02:15 -04:00
Jobobby04
b9956e3123 Lint 2022-07-28 21:53:10 -04:00
Jobobby04
cb62926edf Fix group by status 2022-07-28 21:52:58 -04:00
Jobobby04
bba4b991e8 Fix group by, filtering, sorting, and a few others 2022-07-28 21:44:30 -04:00
bucketmouse
89600fc7aa
Center padding option for Surface Duos/other foldables (#634)
* Add center margin option for horizontal dual page view

* Update readme to make the point of the fork obvious

* Center margins now added to large single images that would display in place of two smaller pages

* Cleanup; reworked preference into an int selector to specify which margins to add

* Suggested fixes and and readme reversion which somehow got skipped last commit

* Missed the build block in readme. Oops.
2022-07-28 19:03:09 -04:00
Ivan Iskandar
9db6d65957 Retain backstack views by default (#7621)
(cherry picked from commit dcafdac036155df76d1f8b013ca1d08634fd57c2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
2022-07-28 09:09:36 -04:00
Jobobby04
1d593de654 Minor improvements for delegated source id lists 2022-07-26 16:46:06 -04:00
Jobobby04
a44f7db3c6 Improve library search, fix a few edge cases 2022-07-26 16:25:44 -04:00
Ivan Iskandar
1e07cb0682 BrowseSourceController: Fix broken page after opening manga (#7608)
Probably related to 788583e66f6ad355f65f5bd2db303faa85163c5c

(cherry picked from commit 1c8da5fa974b4cfd0fd762b0b1c2a07622ac7662)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
2022-07-25 11:08:07 -04:00
Andreas
7edf8dd555 Use SharedFlow for available extensions to always emit the value (#7609)
- Fixes Extension screen being stuck refreshing due to StateFlow not emitting due to the value being the same

(cherry picked from commit 73901f50c0aee1cb82695642af72ff6ac7bc232d)
2022-07-25 11:06:45 -04:00
Andreas
87d7a47b8e Fix wrong query being used when opening Global Search (#7604)
(cherry picked from commit 76057b84b2d9ae01ad553a720aadb8114732dfab)
2022-07-24 15:28:23 -04:00
Andreas
4b03d3559f Fix infinite loading when user library is empty (#7602)
- If no manga in library add default category this to remove loading state

(cherry picked from commit 164de67a56095335119b63b3b17abab5007703f8)
2022-07-24 15:28:15 -04:00
Andreas
dcf152b5c2 Tweaks on Library screen (#7597)
- Toolbar not having padding in landscape
- Fix library always refreshing everything even though user is refreshing category
- Tab text using primary color
- Fix Grid having to big of a top padding
- Fix Pager crashing when initial page is greater than the number of categories

(cherry picked from commit bc1f6ba5177735e76b2b42f7884edfbe8f30006e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
2022-07-24 10:38:24 -04:00
Ivan Iskandar
1839eb13d9 MangaPresenter: Don't update fav state when changing categories (#7594)
(cherry picked from commit 59f8c1a2880b1d35e870ea0bca2bc7a9cfc48592)
2022-07-24 10:02:08 -04:00
arkon
22b627ea8d Set splash screen ready state for history and updates pages
(cherry picked from commit cd9487f94cac610cdeb31dcd9139f6cc9dc7026c)
2022-07-24 00:20:51 -04:00
Andreas
5888ca8e7a Fix crash in Extension Detail and set ready to true on Library screen (#7591)
(cherry picked from commit 978489fadef98a05da6dbab49e6cb5b19cdb123d)
2022-07-24 00:20:43 -04:00
arkon
cfe78ff907 Avoid catastrophic failure when cover can't be created in local source (fixes #7577)
(cherry picked from commit d6977e5676377f6090c0e0b4eb15fd043fa01e11)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2022-07-24 00:20:29 -04:00
arkon
53a381ce28 Show better error when trying to open RARv5 file
(cherry picked from commit a84305438853cafa9aff194b89fa221603f2f743)
2022-07-24 00:19:04 -04:00
Andreas
9520494ac5 Use Stable interface for History screen (#7586)
- Adds Stable interface
- Move last Dialog into Compose
- Make History screen be full Compose screen

(cherry picked from commit c751851941796ae7fa10f9dfba9b75396bbbf692)
2022-07-24 00:18:39 -04:00
Andreas
bc1eb0cb30 Cleanup Library after Compose changes (#7584)
(cherry picked from commit 9f2ddaadde0326fb0fcf1ce91a2affc7f4af42c2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
2022-07-24 00:18:26 -04:00
Andreas
dd0e12999d Remove unused dependencies (#7585)
(cherry picked from commit fc328e141c4d131633f0c308b488d10ddaa7d618)
2022-07-24 00:09:10 -04:00
arkon
30fcd30da8 Remove unused legacy ActionModeWithToolbar
(cherry picked from commit 27bac4fffb782119dc7964f43dbd13dc1c7d3f82)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2022-07-23 23:55:52 -04:00
arkon
958fe527e4 Remove bottom nav behavior and add bottom padding to root controller contents
(cherry picked from commit 4bf4b167a54791d0f5a7710ebe15473b8de9dd5c)
2022-07-23 23:55:27 -04:00