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

255 Commits

Author SHA1 Message Date
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
FourTOne5
d6313d092f Remove source lang on migrate screen also seperate removed source on alphabetical sort (#7041) 
* Remove source lang on migrate screen also seperate removed source on alphabetical sort

* Review changes

* Rename Variable

(cherry picked from commit 6ef6eab994b33770234f488b4060c197bb260a8b)
 2022-05-01 15:36:36 -04:00
arkon
55351fa208 Fix about icons sizing 
(cherry picked from commit 8798c295e6e9c531c3fa7bb4c72c065dd013d630)
 2022-05-01 14:59:58 -04:00
FourTOne5
45fcab5b48 Center CurcularProgressIndicator in LoadingScreen (#7032) 
* Center `CurcularProgressIndicator` in `LoadingScreen`

* Fix Import and move modifier to top

(cherry picked from commit 78207d48ba8032103925cc13ed0f180b0a554ede)
 2022-05-01 14:59:42 -04:00
Andreas
55fad3d055 Add error state to MangaCover composable (#7022) 
* Add error state to MangaCover

- Add error drawable when thumbnailUrl isn't able to be loaded
- Tweak usage of MangaCover

* Change `contentDescription` to be nullable

As the invoke function makes default nulls

(cherry picked from commit adf02e53fd2da2c889a409a144cf1c81bde7f6f3)
 2022-05-01 14:59:20 -04:00
Andreas
ca3574690b Use Compose in Migrate tab (#7008) 
* Use Compose in Migrate tab

* Add missing header

* Remove unused files

* Fix build after rebase

* Changes from review comments

(cherry picked from commit 7261fcccda0c0e044ec1cef61ac317574c695768)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/DomainModule.kt
#	app/src/main/java/eu/kanade/presentation/source/SourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
#	app/src/main/res/layout/source_main_controller_item.xml
 2022-05-01 14:58:53 -04:00
arkon
51ba85cca9 Migrate SettingsMainController to Compose 
(cherry picked from commit a4a4503311baacdef03c9bc3fc95c7ba1b0aea37)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
 2022-05-01 14:40:29 -04:00
arkon
e2056982eb Minor cleanup 2: Electric Boogaloo 
- Reword pins on top setting
- Make "Latest" button style match old UI
- Sort sources by name

(cherry picked from commit 08e63e5fab93154ca85d16e459226f01aeab5a2d)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
#	app/src/main/java/eu/kanade/domain/source/model/Source.kt
 2022-05-01 14:07:08 -04:00
arkon
7e0c1308bd Minor cleanup 
(cherry picked from commit 0ec9496d26e2904a46c744c8a979a0947d38518e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/AboutScreen.kt
 2022-05-01 13:51:15 -04:00
Andreas
c1659ad908 Convert Source tab to use Compose (#6987) 
* Use Compose in Source tab

* Replace hashCode with key function

* Add ability to turn off pins moving on top of source list

* Changes from review comments

(cherry picked from commit 29a0989f2889d3361f583285091878c9b4570a52)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2022-05-01 13:49:53 -04:00
arkon
41b2c948e1 Migrate WebViewActivity to Compose 
(cherry picked from commit 558b18899cca41992d6077484ed430972cda35fc)
 2022-05-01 11:02:00 -04:00
Jobobby04
050bdbe531 Change github location to SY 2022-05-01 11:01:42 -04:00
Jobobby04
8f847eb76e Move updates and history back down 2022-04-24 11:26:43 -04:00
arkon
ec689889f3 Migrate More screen to Compose (#6990) 
(cherry picked from commit c25cffafc60d206329dfcc9a30141b15d874cb3a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
 2022-04-23 20:12:59 -04:00
arkon
1da1380985 Tweak about preferences styles 
(cherry picked from commit 8933b41937940d53274839695c8cb04f881a8e95)
 2022-04-23 14:28:25 -04:00
arkon
f537d8396c Basic initial port of About screen to Compose 
(cherry picked from commit d6c87ec10e7d1bec8c43423c3d7d591ce9fdb798)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2022-04-23 14:16:13 -04:00
Jobobby04
2640ae8dd4 Expand imports 2022-04-23 11:09:18 -04:00
CrepeTF
1b29217d00 Resume when history item is tapped (#6982) 
* Remove resume button

* Rename onClickItem to onClickCover

* Optimize imports

* Rename reference to onClickItem in HistoryController.kt

Co-authored-by: CrepeTF <trungnguyen02@outlookcom>
(cherry picked from commit 070abd79ce4e6004b5484a3f91a9c4527bd42bcd)
 2022-04-23 11:07:21 -04:00
arkon
6c0a61e47c Lifted NestedScrollConnection to abstract Compose classes 
Since it'll likely be used in every controller.

(cherry picked from commit 2d01933c288f30e596a76763cc7bf93dd0c5c5c6)
 2022-04-23 11:07:13 -04:00
Jobobby04
c9ec7921a5 Revert "Revert history Compose/SQLDelight changes" 
This reverts commit 6a0b523e86d0c6f4c517236d4b18b7d0d6e9fcbe.
 2022-04-22 19:40:09 -04:00
Jobobby04
6a0b523e86 Revert history Compose/SQLDelight changes 2022-04-22 19:27:15 -04:00