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

7476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jobobby04
0c7ceb059e Merged source stop ddos 2022-06-03 19:06:29 -04:00
arkon
6e85e69268 Remove logic for restoring legacy JSON backups 
- Protobuf backups have been around for 1.5 years now
- The ability to restore online-dependant data from JSON backups gets harder as time goes on and sources drift
- If users really need a way to restore them, they can use an older version of the app, or a separate tool for translating between the formats could be created

(cherry picked from commit d1be221d7aaa811e50417235021c7e038704d276)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt
 2022-05-29 18:54:44 -04:00
arkon
2ae1b6ac3e Replace history query with actual upsert 
(cherry picked from commit cd0294b1b697b5dedb79374a1007ad81d90781c9)
 2022-05-29 18:44:41 -04:00
renovate[bot]
d5a09b4035 Update coroutines_version to v1.6.2 (#7219) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
(cherry picked from commit 0dbe82c781daf8cd0cae1f7328d9529cde14dfd2)
 2022-05-29 18:43:51 -04:00
renovate[bot]
3bbfd69370 Update aboutlib_version to v10.3.0 (#7220) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
(cherry picked from commit ad9ef81a771b3828a028833a037d0e03ee10eeed)
 2022-05-29 18:43:44 -04:00
Andreas
8f9aefe1b7 Make Storio follow new database table structure (#7217) 
(cherry picked from commit b36ca92dd936af1928e032712632d68a03024b03)
 2022-05-29 18:43:27 -04:00
Andreas
8b1bc71e72 MangaUpdates tweaks (#7205) 
* MangaUpdates tweaks

* Review changes

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

* Use built in functions instead of Jsoup

Co-authored-by: arkon <4098258+arkon@users.noreply.github.com>
(cherry picked from commit c8468c29f1b65ce5e3a3680b3f095cf003d2f89d)
 2022-05-29 18:43:19 -04:00
arkon
2b766863f5 Minor cleanups 
(cherry picked from commit 3c40010afffa807017f0b56634d8c5323154b4e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2022-05-29 18:43:11 -04:00
Chris
dd8dc8fbe9 Fix global update ignoring network constraint (#7188) 
* update library update network constraint logic

* add explicit 'only on unmetered network' update constraint

(cherry picked from commit 63238b388d1af3a0036f1d9a43cb4d2e87aabf5e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2022-05-29 18:42:37 -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
kasperskier
30620091c1 [skip ci] Fix wording in issue template (#7207) 
(cherry picked from commit 6b14f38cfa476be3bfa27c545a5e65f82acda933)
 2022-05-29 18:26:44 -04:00
arkon
3a489da679 Downgrade R8 to avoid extension issues 
(cherry picked from commit e1e1c20dbe3d49ca3175e5f6ed8c5e16a84b16ba)

# Conflicts:
#	.github/renovate.json
#	app/proguard-rules.pro
 2022-05-29 18:26:34 -04:00
arkon
eda16df5c7 Move SQLDelight Gradle plugin to version catalog 
(cherry picked from commit b0360b83d422f9dae811e49ecc448a189efc824a)

# Conflicts:
#	build.gradle.kts
 2022-05-29 18:25:00 -04:00
arkon
a3d7c50246 Mention MangaUpdates in README 
(cherry picked from commit f7881651c57bdadf4237f924d9d462115b353c6e)
 2022-05-29 18:24:33 -04:00
arkon
53a18bf7c2 Update AGP for Android Studio Chipmunk 2021.2.1 Patch 1 
(cherry picked from commit 241c4ad85766338d33e12c43302abf678b23f532)
 2022-05-29 18:23:57 -04:00
arkon
c4dfbd4768 Minor cleanup 
(cherry picked from commit 87661eb85a54fc938defe4f5e1d046b34585f08b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
 2022-05-24 20:01:07 -04:00
FourTOne5
6fd79f4838 Local Source - qol, cleanup and cover related fixes (#7166) 
* Local Source - qol, cleanup and cover related fixes

* Review Changes

(cherry picked from commit ad17eb138609d684fd5929c3cb7dc644e3a3ec95)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
 2022-05-24 20:00:15 -04:00
Andreas
d7a93e254f Add MangaUpdates as a tracker (#7170) 
* Add MangaUpdates as a tracker

- jobobby04 co-authored for suggestion in BackupTracking.kt

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

* Changes from code review

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

Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 0c631a499025aee66354caec690b68cea4dedfdc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
 2022-05-24 19:54:09 -04:00
arkon
1a1bb412c0 Migrate settings search view to Compose 
(cherry picked from commit 9b0d85bf6c9cf1a6b476be477255f52ac07195c4)
 2022-05-24 19:47:10 -04:00
Ivan Iskandar
f1bd5f4c95 Add scrollbar indicator to LazyColumn (#7164) 
(cherry picked from commit 3b2362c784a334161cffb734c46588ee87307950)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
 2022-05-24 19:47:01 -04:00
arkon
8d7d7498db Refactor chapter recognition tests to run in parallel 
(cherry picked from commit aa2370b381894b24a1a84aa8a7819b5e4e6a62c7)
 2022-05-24 19:46:21 -04:00
saud-97
7466dcc48c Fixes: incorrect sorting when chapter name contains hyphens '-' (#7161) 
* Fixes: incorrect sorting when chapter name contains hyphens '-'

* Added a test case for hyphen in ChapterRecognitionTest.kt

* Removed chapter range test case since it will be replaced by chapterContainingHyphensCase

(cherry picked from commit 3e07100dc2725cb2d42050571232dd5d485b4de5)
 2022-05-24 19:46:15 -04:00
arkon
e2ddcdf655 Bump dependencies 
(cherry picked from commit 1949fb1abe276a6e0085c2783bf52ddffd8816e1)
 2022-05-24 19:46:05 -04:00
FourTOne5
52f32d27e8 Fix LogPriority in HistoryRepositoryImpl (#7173) 
(cherry picked from commit 28be423e65e76243012c7825ca2a4fce5270b092)
 2022-05-24 19:45:54 -04:00
arkon
cf980adb8e Minor cleanup 
(cherry picked from commit 9a75232ca40e8f6f3dd6a6f73cc0c2f3912e3ced)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt
 2022-05-24 19:45:39 -04:00
FourTOne5
9c80b20574 Update extension details screen design (#7158) 
* Update extension details screen design

* Review Changes

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

* Review Changes 2

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit 64da16f58fa1a4196d9bb03674b8e9c3ccf4ca46)
 2022-05-24 19:31:56 -04:00
FourTOne5
dc70fdac43 Migrate extensions language filter screen to compose (#7169) 
(cherry picked from commit fd9510e18fe9e9d42631c40bcaf254453604337b)
 2022-05-24 19:31:41 -04:00
Andreas
47c9b3208a Make extension list update when languages changes (#7168) 
(cherry picked from commit 2761d27aaacce1d454955c1391bffc779b58d2f3)
 2022-05-24 19:31:23 -04:00
arkon
22c0b9cf02 Bump dependencies 
(cherry picked from commit f4e344f686fc1dab18aaa08d6986c9e4f04cb309)
 2022-05-24 19:30:43 -04:00
arkon
755b54cb4d Convert ic_untrusted_source icons to WEBP 
(cherry picked from commit 395a840fc40e34652759fd7f7d768e86fdc4f899)
 2022-05-24 19:30:22 -04:00
CVIUS
c0362faaf8 Fix reader menu appearing then disappearing in webtoon viewer when there is no next chapter (#7115) 
(cherry picked from commit 6580f5771f634b0e2c25f8cd42fa1596b2ea4e1c)
 2022-05-24 19:30:13 -04:00
CVIUS
31ac3aece2 Fix webtoon viewer showing transition view when going to next/prev chapter using next/prev button (#7133) 
(cherry picked from commit b21bcc2d45859ea86d6042b5df9d7c6f30d259cc)
 2022-05-24 19:30:04 -04:00
S97
836b66fe83 Fixed Splitting Height for Tall Images (#7148) 
* Fixed Splitting Height for Tall Images #7140

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

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

Co-authored-by: FourTOne5 <59261191+FourTOne5@users.noreply.github.com>
(cherry picked from commit 4481c54376fbdedc26e29a7942cd8752567ef4a3)
 2022-05-24 19:29:56 -04:00
kasperskier
bbdbaa1de6 Change jsDelivr CDN URL to Fastly (#7156) 
(cherry picked from commit 7b242bf11833ebd6dda34df295dfa7cd45cb88d0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
 2022-05-24 19:29:48 -04:00
CVIUS
d8203499e2 Fix close button tint in extension screen (#7154) 
(cherry picked from commit f2a478288ac884ee9229fb17174d1e5db7249437)
 2022-05-24 19:29:04 -04:00
arkon
530f91d774 Theme Compose SwipeRefresh indicator like XML version 
Also rename some screens/controllers to better represent that they're the list views.

(cherry picked from commit 01e04e31bf63a9fed18d214f0d12b4c45c72f948)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
 2022-05-24 19:27:33 -04:00
FourTOne5
5c723398e0 Fix both warning banner appearing for unofficial ext (#7150) 
(cherry picked from commit cbc114608b76a083b4db8f66abde456a32b61638)
 2022-05-24 19:26:39 -04:00
arkon
0462e8bac1 [skip ci] Reword reset viewer flags settings 2022-05-24 19:25:23 -04:00
arkon
1c86a7c94b Minor cleanup 
# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-05-24 19:24:41 -04:00
arkon
4458f74f6c Use jsDelivr as fallback when GitHub can't be reached for extensions (closes #5517) 
Re-implementation of 24bb2f02dce135e0ceb2856618ecfc0e30dce875

(cherry picked from commit d61bfd7cafa09ff6c5f159c945984f2e8d9904b9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
 2022-05-24 19:10:04 -04:00
arkon
6fc99bef25 Migrate extension details page to Compose 
(cherry picked from commit 13943f77f7c06d7978165a1d9ba139e72dfed853)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
 2022-05-15 22:06:54 -04:00
Jim Man
6659a290c4 Fix formatting (#7146) 
(cherry picked from commit 1c94ecdcdf1306950f58dcae1f72940f7d92c515)
 2022-05-15 21:54:39 -04:00
Andreas
0f4923baa9 Add missing top padding for screen that was rewritten in Compose (#7145) 
(cherry picked from commit fb83a07f843e8cec2dc935f1b4eed6351aff672b)
 2022-05-15 21:54:33 -04:00
Andreas
fdcd3aa7eb Convert Extension tab to use Compose (#7107) 
* Convert Extension tab to use Compose

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>

* Review changes

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>
(cherry picked from commit 3e2d7d76b9b0fb1156d4dfaa01f4176d801089ce)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt
 2022-05-15 21:54:12 -04:00
renovate[bot]
a753f97285 Update serialization_version to v1.3.3 (#7128) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
(cherry picked from commit 7a0915964ab85aeabde25a7d87e535ec97478380)
 2022-05-15 21:17:06 -04:00
renovate[bot]
2736ad87bd Update dependency com.fredporciuncula:flow-preferences to v1.7.0 (#7132) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
(cherry picked from commit aef97c5563471fbc33f36e078ea6e51dd657f5ae)
 2022-05-15 21:16:58 -04:00
CVIUS
a506cde219 Settings cleanup (#7126) 
* Settings cleanup

* Oops

* Also hide "Invert tap zones" if tap zones is set to "Disabled" in ReaderReadingModeSettings

(cherry picked from commit 4c9331c4e94d384393708eb6751b918bb31c5d06)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-05-15 21:16:49 -04:00
renovate[bot]
64dcd7ec92 Update aboutlib_version to v10.2.0 (#7129) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
(cherry picked from commit 6fb5552d574fbc505752c57259ada0d270d52d3b)
 2022-05-15 21:15:59 -04:00
arkon
357b4673f8 Update to AGP 7.2.0 again 
- Disable optimizations on eu.kanade.tachiyomi.source.** classes to avoid access modifications causing mismatches between the app and extensions
- Remove Gson and Kotson Proguard rules, since we don't have those dependencies anymore

(cherry picked from commit bdb55ef8817557e1d4bb4eda1120949ef42a8b54)

# Conflicts:
#	app/proguard-rules.pro
 2022-05-14 19:50:09 -04:00
arkon
db2a67644e Temporarily downgrade AGP to fix extension loading issue in non-debug builds 
(cherry picked from commit 628a3bc16c6f059757bc0e1502708f5a2d56732b)
 2022-05-14 19:48:16 -04:00