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

5543 Commits

Author SHA1 Message Date
arkon
827fe98211 Explicitly reword some locale names 
Avoiding some country names in favour of more generic terminology where appropriate.

(cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b)
 2022-10-08 17:34:46 -04:00
AntsyLich
41542517f7 Add methods to get manga and chapter url (#8114) 
* Add methods to get manga and chapter url

Some fork supports directly opening chapters with webview hence `getChapterUrl`

* Review Changes

* Add since to javadoc

(cherry picked from commit de23226591376e998e4ff1ff7b2d4c2a0a805b09)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2022-10-01 19:16:27 -04:00
AntsyLich
71076bd56a Move LibraryManga to domain layer (#8126) 
(cherry picked from commit ea8383978b1783fd60d6057deb6c91cb5a85c505)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-10-01 19:14:58 -04:00
AntsyLich
37fd74f141 Reduce some usages of toDbManga (#8116) 
Co-Authored-By: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
(cherry picked from commit b04d1e5f50b1a3622e8bfde3ddced7e5a7cd8e2e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-10-01 18:39:11 -04:00
AntsyLich
30e3cc46c8 Downloader: Don't trust index provided by source (#8122) 
(cherry picked from commit 98c459a6b69a26338d310afe7f2629fa939d6f89)
 2022-10-01 18:33:18 -04:00
AntsyLich
c1df5adf2c Don't download completely read chapter if it was in queue (#8113) 
(cherry picked from commit 00f442b77ee6b04a486f842bdad83487efb349d5)
 2022-10-01 18:33:12 -04:00
Ivan Iskandar
1eb1763342 HistoryScreen: Remove paging (#8125) 
* HistoryScreen: Remove paging

Per my testing performance-wise there's virtually no
difference in loading time.

* cleanups

* add key and contentType

(cherry picked from commit 42b0e3e4389b78556ccf34b93edc7d454de5881e)
 2022-10-01 18:33:02 -04:00
Andreas
dbeb6c721a Tweak behavior on Browse screen (#8121) 
* Tweak behavior on Browse screen

- Fix system back popping controller
- Add behavior to system back to cancel search toolbar before clearing current search or popping controller

* Review changes

(cherry picked from commit 6ac17363ed68487b2262308ee9d671ad301f2754)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2022-10-01 18:30:01 -04:00
Ivan Iskandar
8e4f038e9a ExtensionScreen: Adjust item visual (#8120) 
* ExtensionScreen: Adjust item visual

* Move install status view and add progress indicator
* Add secondary item modifier to info texts
* Wrap info texts with FlowRow in case of unavailable space
* Remove language text in non-installed items

Extra content:
* Change the list key to be more consistent
* General cleanups

* typo

(cherry picked from commit 58c47c4c50936f061e65434f60af56a92a51dfb2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
 2022-10-01 18:15:27 -04:00
Shamicen
d540d83574 Fix ComicInfo.xml not being read if .noxml file exists too (#8111) 
* gives ComicInfo.xml files priority over noxml files if both are at the chapter root.

* delete the noxml file if both a noXml file and a ComicInfo file exist

(cherry picked from commit 80b2ebc45b5f04bcd832ed2497d3f2f6ea4adf10)
 2022-10-01 18:06:30 -04:00
AntsyLich
5002bafa22 Fix total item count in library app bar (#8117) 
(cherry picked from commit ef2c9460b5dc15bb9af6a430fa0a93765debcef4)
 2022-10-01 18:06:14 -04:00
AntsyLich
54dcb640bb Improve DelayedTrackerStore (#8109) 
* Improve DelayedTrackerStore

* Review changes

(cherry picked from commit ad84a8c3e9bd56025ab59beb5c024a7b7d6e2b35)
 2022-10-01 18:06:05 -04:00
Alessandro Jean
d8e0344624 Improve search toolbar UX a little bit (#8102) 
* Improve search toolbar UX a little.

* Fix wrong stringResource import.

* Revert `FocusRequester` change in favour of #8093.

(cherry picked from commit 5a37f2398a45949bb327a61210ab46d5207d09cb)
 2022-10-01 18:02:18 -04:00
Ivan Iskandar
ca36adca29 manga-refresh-state (#8090) 
(cherry picked from commit 98a4f6cccb85d39fb37c95aa99da71bb7abfd134)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-10-01 18:02:01 -04:00
Ivan Iskandar
1f444185da UpdatesScreen: Fix selection state after deleting download (#8100) 
(cherry picked from commit 633bd6eb462ee187fb3c1d6c3f8f025cb0f9eedc)
 2022-10-01 17:40:08 -04:00
stevenyomi
20a4a3af98 Remove cache control on already cacheless image request (#8085) 
(cherry picked from commit f4c684b4b8729fb91b685f9990b33ba344dfa9c2)

# Conflicts:
#	source-api/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
 2022-10-01 17:38:10 -04:00
Jobobby04
89b30bd8d8 Probably fix random source crashes 2022-09-26 14:00:15 -04:00
arkon
1e9dca95cb Fix date added when adding from browse source 
Fixes #8059

(cherry picked from commit ec272f6c4ee9731dac5f6639c02c07fedd523698)
 2022-09-25 21:13:01 -04:00
Ivan Iskandar
d5fcd3a67e BrowseSourceScreen: Adjust browse mode chips placement (#8076) 
The chips row is now scrollable too and filter fab is removed

(cherry picked from commit 0190c36d20a0ef070fad8a6ab55906c25390144c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-09-25 21:11:29 -04:00
Alessandro Jean
2d2ee54c99 Add support to update strategy on global update (#7902) 
* Add support to update strategy.

* Add JavaDoc and bump the LIB_VERSION_MAX constant.

* Fix a word typo.

* Store update strategy enum as integer in the DB.

(cherry picked from commit ba533f30ce70bdcfbfaaae3e7758dbe38fe6fb1b)

# Conflicts:
#	app/src/main/java/eu/kanade/data/DatabaseAdapter.kt
#	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/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/sqldelight/data/mangas.sq
#	app/src/main/sqldelight/migrations/20.sqm
 2022-09-25 21:04:10 -04:00
Jobobby04
3da5a2a20d Minor cleanup 2022-09-25 20:41:31 -04:00
Andreas
1f4bfc4764 Split the rest of the preferences in PreferencesHelper (#8074) 
* Split the reset of the preferences in PreferencesHelper

* Capitalize ThemeMode

(cherry picked from commit 29fa93e829ca7f9c3a28c58f3de146bc2bd15aad)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
#	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/source/SourcesPresenter.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
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-25 20:41:19 -04:00
Ivan Iskandar
0d0513cff7 GlobalSearchController: Auto focus search view when initial query is empty (#8073) 
(cherry picked from commit 0fabe4bd013a1980b0fa3e70306e851acd1b5bc3)
 2022-09-25 19:19:31 -04:00
Ivan Iskandar
fc8b15916a DownloadController: Fix first active download status not updating (#8069) 
(cherry picked from commit f98b4f4e39514a48aab34ef4afee675bbd5bd6ac)
 2022-09-24 23:26:20 -04:00
Ivan Iskandar
1fe34a35d7 SecureActivityDelegate: Fix cold-start only lock behavior (#8066) 
(cherry picked from commit 467ceacb17770399fd1f276aebe887bafb516f49)
 2022-09-24 23:25:14 -04:00
stevenyomi
5da4353730 Improve chapter recognition (#8050) 
(cherry picked from commit 4b4a138eee71cfe6385085bc6795ea731f7e8c85)
 2022-09-24 23:24:39 -04:00
Andreas
02a154bb85 Move chapter preferences from PreferencesHelper to LibraryPrefrences (#8061) 
(cherry picked from commit b5dca2eb09c008563e6e977fb3379fb7548d1144)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-24 23:24:28 -04:00
Andreas
1d9237d3ee Clear search query before popping controller when navigating up (#8055) 
(cherry picked from commit d3520419d49f4c283b96de23fa12ac68b3f2db60)
 2022-09-24 23:14:06 -04:00
Andreas
e5b99c0147 Recreate reader settings when opening sheet (#8054) 
(cherry picked from commit acb8ab15b2e73ba2f161eb201e93ba3a36df2867)
 2022-09-24 23:13:59 -04:00
Andreas
34735166ec Split backup preferences from PreferencesHelper (#8051) 
(cherry picked from commit 5cdcc1679f2eb8a79586bf407d4d2f6fc60c2c49)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
 2022-09-22 12:58:54 -04:00
arkon
7f29d6fc74 Minor cleanup 
Also add POST_NOTIFICATIONS permissions to make Android Studio stop complaining about it.

(cherry picked from commit b37b3767f3c55a74bede78d11300249ab419a4c7)
 2022-09-22 12:48:23 -04:00
Andreas
416db76218 Split download preferences from PreferencesHelper (#8048) 
(cherry picked from commit e82963c9ef15416f6bf818c4043cf802c3033105)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.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/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-09-22 12:47:25 -04:00
happywillow0
02fe0df8f6 Update BrowseSourcePresenter.kt (#8040) 
Set filters to default when reset is pressed.

(cherry picked from commit ec34977a64ae21c5dfe5533064882554ba964d44)
 2022-09-22 12:36:22 -04:00
Jobobby04
8fb2faca12 Don't uselessly override the search in SearchController 2022-09-22 12:36:02 -04:00
Andreas
bdc45fb8aa Split track preferences from PreferencesHelper (#8046) 
(cherry picked from commit e568951396220b95447a025615a4b57b273f8864)
 2022-09-21 11:47:02 -04:00
Andreas
bcc3a40b36 Split reader preferences from PreferencesHelper (#8042) 
(cherry picked from commit e275897bf9f3def5ccf17978d64b2969c8c85de7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2022-09-20 16:57:00 -04:00
arkon
9a3c4e9d13 Remove redundant preference keys 
(cherry picked from commit 2b089648a34c7b193f307647be67a057ca9196bb)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2022-09-20 16:28:02 -04:00
AntsyLich
7041ce777a Cleanup logic in UpdatesPresenter (#8035) 
(cherry picked from commit c2a831dded39c7ed4fab90647d2056aa557d7e05)
 2022-09-20 16:17:33 -04:00
Andreas
b7363706d7 Split library preferences from PreferencesHelper (#8036) 
(cherry picked from commit c740558327f0f40f1b58d04ca5d5baed9285f048)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.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
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2022-09-20 16:17:17 -04:00
arkon
d73e7aee9d Clean up UpdatesController 
- Move loading state into scaffold (closes #7704)
- Move logic into presenter
- Make some composables private

(cherry picked from commit 0e3176a77c925bb7f9d9f87bf68476563f9b9e9e)
 2022-09-20 15:55:28 -04:00
Jobobby04
b479d5a4f1 Fix crash 2022-09-20 15:50:14 -04:00
arkon
00bb74f330 Clean up base classes 
Should be able to throw away some of the search controller stuff after Global Search is migrated

(cherry picked from commit 0225711f6f91417af0ae41d42f81c70c86a572ab)
 2022-09-20 11:08:23 -04:00
arkon
966bd31d61 Catch error properly when app update check fails (fixes #8019) 
(cherry picked from commit 7ec822503a50700153840d34095ac994415bcac2)
 2022-09-20 11:08:14 -04:00
arkon
6c3183af8d Minor cleanup/fixes 
- Add FAB collapsing in clear database screen (fixes #7935)
- Don't allow multiline category names to be entered
- Consolidate Downloaded Only / Incognito Mode banner components
- Fix see-through migrate screen sticky header

(cherry picked from commit 83871fc013d6ab8b44d64cf8ff3ce2ef27d61946)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
 2022-09-20 11:08:05 -04:00
Andreas
f40477cf6e Split security preferences from PrefrencesHelper (#8030) 
(cherry picked from commit b668364afbfdde9e91fda6621c80c96262c6492a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
 2022-09-18 13:25:51 -04:00
arkon
bffecf3833 Avoid invalid locales in language picker (fixes #7950) 
We should probably prune the translations though.

(cherry picked from commit 877ae041a419be60d2f094130cf58096dc7f0120)
 2022-09-18 13:08:54 -04:00
arkon
42a4d154cc Read metadata from ComicInfo.xml files in Local source (#8025) 
Co-authored-by: Shamicen <84282253+Shamicen@users.noreply.github.com>
Co-authored-by: Andreas <andreas.everos@gmail.com>
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
(cherry picked from commit 1395343f116bfbc9c3ee04eed372299ea36aa22d)
 2022-09-18 13:08:31 -04:00
Andreas
5d1dfb5290 Split source preferences from PreferencesHelper (#8029) 
(cherry picked from commit 30b3b2d3ffd5d90aee293e9ae22b3cb2a4924c2b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
 2022-09-18 13:08:22 -04:00
Andreas
41c9c20e26 Use 1.x preference abstraction (#8020) 
* Use 1.x preference abstraction

- Uses SharedPreferences compared to 1.x impl which uses DataStore but it breaks all settings screens currently
- Move PreferencesHelper to new PreferenceStore
  - PreferencesHelper should be split into smaller preference stores and be in core or domain
- Remove flow preferences as new PreferenceStore handles changes for us

Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>

* Fix PreferenceMutableState not updating

* Fix changes not emitting on first subscription

Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
(cherry picked from commit 0086743a5311c22fb8c07f596ab5de384862a68a)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2022-09-18 12:31:49 -04:00
Ivan Iskandar
853ed03242 ExtensionsPresenter: Use StateFlow for extensions list (#8017) 
(cherry picked from commit f54adb49a1af381798a8d65db3d82cc92e221139)
 2022-09-16 13:59:09 -04:00