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

225 Commits

Author SHA1 Message Date
Ivan Iskandar
42c8b47f04 Fix chapter number display style (#7383) 
(cherry picked from commit c33e5c8a1704c8c1a66aa90f6dd934cd5d064c88)
 2022-06-26 13:55:13 -04:00
Ivan Iskandar
8adfc4954c MangaInfoHeader tweaks (#7382) 
* Changed cover alignment when title is longer
* Hide artist text if it's equal to author
* Set single line to status and source name

(cherry picked from commit 6129bbc9ab9ac493a40e4b7f928f8271c191ae2d)
 2022-06-26 13:52:57 -04:00
arkon
24252c388a Fix manga info header using wrong text color (fixes #7368) 
(cherry picked from commit 37fe25ac06ff58d9d91f619bfb13cd516b369a90)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2022-06-26 11:26:31 -04:00
arkon
b889a3482e Avoid overflow in extension screen items (fixes #6972) 
(cherry picked from commit 80d2d9d2581df56286b990f167ad34cbe00a8627)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
 2022-06-26 11:09:55 -04:00
arkon
ec0f572a82 Minor cleanup 
- Use outlined icons where appropriate to match previous UI
- Allow tapping entire ChapterHeader to bring up sheet

(cherry picked from commit 8ec91cddab1b77baa631500d6878e60df8c8d13d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaSmallAppBar.kt
 2022-06-25 17:13:34 -04:00
Ivan Iskandar
2b7aca710e MangaController overhaul (#7244) 
(cherry picked from commit 33a778873af0eb52528a29f741fa59b530679c64)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_controller.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/manga_summary.xml
#	app/src/main/res/menu/manga.xml
 2022-06-25 17:11:25 -04:00
Ivan Iskandar
dfe32071e2 ChapterDownloadView: Convert to compose (#7354) 
(cherry picked from commit a77bce7b3735811002be3e80b95dae892029d0f5)
 2022-06-25 11:34:47 -04:00
arkon
e0cfaa707e Minor cleanup 
(cherry picked from commit 254f021903030551d781223089d64a74fe130197)
 2022-06-25 11:23:39 -04:00
Ivan Iskandar
21e03616ba Convert cover dialog view to compose (#7346) 
(cherry picked from commit 8fedd2d5f13e56115bdf46a9a38e0ae750681488)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt
 2022-06-25 11:22:39 -04:00
arkon
a9227a13e1 Minor composable updates 
Extracted from #7244

Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit 68c47a323879a794c9fc87903233fd418fe2edab)
 2022-06-19 21:36:21 -04:00
arkon
bcb0a24a4f Add Composable preview for preferences 
...except Android Studio refuses to actually render them.

(cherry picked from commit 11f1482818d70e6b00bcfd267ab70418e3350e83)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt
 2022-06-19 21:36:06 -04:00
Ivan Iskandar
3f94fd8e6e Add fast scroller to extensions screen (#7340) 
(cherry picked from commit e6a9d0b090e6f89669587cfa7b71b275d7796bff)
 2022-06-19 21:25:09 -04:00
AntsyLich
60e0913cbb Make stub source icon part of SourceIcon (#7337) 
* Make stub source icon part of `SourceIcon`

* Review Changes

(cherry picked from commit 82879a129e12509223a05230ebeb884f103d0745)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
 2022-06-19 21:25:00 -04:00
Andreas
9a28d42b63 Use custom QueryPagingSource (#7321) 
* Use custom QueryPagingSource

- Adds placeholder to make the list jump around less
- Fixes issue where SQLDelight QueryPagingSource would throw IndexOutOfBounds

* Review Changes

(cherry picked from commit 3fd9e021fa84557fc1681685ee1a3e8b6678e7ba)
 2022-06-18 19:37:56 -04:00
Jobobby04
cd4b6a0c27 Build fixes and minor improvements 2022-06-18 19:27:26 -04:00
Ivan Iskandar
a5fe4e1a44 Fix cover fetching in compose views (#7315) 
Make sure it passed thru the custom fetcher

(cherry picked from commit 1b804e61cb2b38d7194b058b4152b14607b5e443)

# Conflicts:
#	app/src/main/java/eu/kanade/data/history/HistoryMapper.kt
#	app/src/main/java/eu/kanade/domain/history/model/HistoryWithRelations.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
 2022-06-18 19:26:33 -04:00
Ivan Iskandar
3c6b22a37e Don't set text colors when creating compose theme (#7316) 
This avoids compose snackbar text color issue

(cherry picked from commit 4ef337f1e92fcdbded2de57c8f248b60d7795649)
 2022-06-16 12:05:48 -04:00
arkon
2ae6d76af7 Fix WebView user-agent (fixes #7306) 
The `source.headers.toMultimap()` call in WebViewActivity makes all the names lowercase.

(cherry picked from commit 284880d096d1a4e4f746cc49de945f3186207285)
 2022-06-16 12:03:32 -04:00
arkon
d7919c531a Make Compose overflow menu feel slightly more like XML version 
(cherry picked from commit a446b37c1f09c5be4c8693895814921c802479c5)
 2022-06-16 12:03:24 -04:00
AntsyLich
8a06bc42d8 Maintain source info in the database. (#6389) 
* Maintain Source Info in database

* Review changes and cleanups

* Review changes 2

* Review Changes 3

(cherry picked from commit 9d5b7de1d89a353d0bf73ce6befd9f5667d94d17)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
 2022-06-16 12:02:38 -04:00
arkon
0888a7cd72 Update compose-theme-adapter 
(cherry picked from commit 5fbf454652a52567d9c4e2d0bb19eb7b08b1721e)
 2022-06-12 11:50:56 -04:00
AntsyLich
75641213ef Tweak extension details screen (#7257) 
(cherry picked from commit 7a661747c58c300433fe631659ad1b11b1edd865)
 2022-06-11 11:58:07 -04:00
arkon
571d1f29ca Minor cleanups 
Pulling out some of the smaller changes that aren't related to the manga controller changes in #7244

(cherry picked from commit 7fdbf40cd23132915bd90cf623e4a69fb560dd26)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
 2022-06-04 20:43:05 -04:00
AntsyLich
a61bf2096d Fix loading progress not showing in webview (#7243) 
* Fix loading progress not showing in webview

* Review Changes

(cherry picked from commit 0e1e57c1c38e6db6b76f16849cdef3eaba66864d)
 2022-06-04 12:55:03 -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
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
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
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
arkon
6d1dcf0deb Update Compose 
Fixes #7004

(cherry picked from commit 393fc146303c3dc6185842e4158c3bd3f006017b)
 2022-05-14 10:47:43 -04:00
arkon
393d7a1174 Address some build warnings 
(cherry picked from commit b950370f12680e4113c1f736e656181fdf306579)
 2022-05-14 10:46:37 -04:00
arkon
24c5563a02 Update linter 
(cherry picked from commit ae7df4fb7fa4fc996ba26a9f6dbbb6b5277a939b)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/domain/source/model/Source.kt
#	app/src/main/java/eu/kanade/presentation/source/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt
#	app/src/main/java/eu/kanade/presentation/source/SourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
 2022-05-14 10:45:26 -04:00
Jobobby04
5fedef2ccb Convert debug menu to Jetpack Compose 2022-05-08 21:09:02 -04:00
FourTOne5
c6c6cb3033 Properly show history state (#7052) 
* Make `HistoryState` similar to `MigrateState`

* Review Changes

* Also cache the transformation

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

* Fix States

Co-authored-by: Andreas <andreas.everos@gmail.com>
(cherry picked from commit 5bd5b215430c6d19c1e4314bdaf4264eb43e9d29)
 2022-05-02 17:23:04 -04:00
arkon
631781ee8c Extract migrate list number badges for later use in library items 
(cherry picked from commit aec980662f0159f1341392c62b8b7dba3466d835)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/source/MigrateSourceScreen.kt
 2022-05-02 17:22:56 -04:00
FourTOne5
bb5732055e Make MigrateSourceState similar to MigrateState (#7054) 
(cherry picked from commit aef1dc6eaffd96a5ea14cf897f78b9f26db48167)
 2022-05-02 17:19:50 -04:00
FourTOne5
222f8a7d7a Make SourceState similar to MigrateState (#7053) 
* make `SourceState` similar to `MigrateState`

* Review Changes

(cherry picked from commit bd45bf7407716bceec5cc226d3680676bb211fea)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/source/SourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
 2022-05-02 17:19:38 -04:00
arkon
03b03ba342 Update navigation bar padding in Compose screens 
(cherry picked from commit dee783079363acef241e574bc9c5600bc8f27bf3)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt
#	app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
 2022-05-01 16:54:50 -04:00
FourTOne5
ef55134c74 Migrate Source Filter Screen to Compose (#7031) 
* Migrate Source Filter Screen to Compose

* Changes from Review and some more fixes

* Rename some variable and classes

* Review Change

* Ewbase and Review changes

(cherry picked from commit 23f8f35354b30aded0749222234f76a4f9eaab5c)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
 2022-05-01 16:52:11 -04:00
arkon
3f81dfdf99 Allow passing modifier to preference composables 
(cherry picked from commit cccd09fb5cb88a2b5f44dd104929431afa96d2a5)
 2022-05-01 16:00:35 -04:00
Andreas
6eaeec3a48 Migrate Migrate Manga screen to Compose (#7045) 
* Migrate Migrate Manga screen to Compose

* Changes from review comments

(cherry picked from commit bf6d59cd21e6c2436ceefa3de5343e56640f9073)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
 2022-05-01 16:00:18 -04:00