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

214 Commits

Author SHA1 Message Date
arkon
ac4befdb51 Migrate More screen to full Compose 
(cherry picked from commit 4d9d587366018e6e794322e2a644712f241cda08)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
 2022-07-19 13:09:27 -04:00
arkon
bb11d056b5 Misc cleanup 
- Migrate sources filter screen to full compose
- Use standard "OK"/"Cancel" actions for delete category dialog
- Abstract some AppBar logic
- Remove some dead code
- Group related strings

(cherry picked from commit e2510c144ad3568caf81660d6ab1b4023202aad4)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
 2022-07-19 13:01:04 -04:00
Ivan Iskandar
2e3b172ba8 MangaScreen: Save selection state (#7560) 
(cherry picked from commit 00519e3b933b66bb764f1f58f79fb781b0cb092a)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-19 12:48:04 -04:00
AntsyLich
f1d1f6c466 Migrate Updates screen to compose (#7534) 
* Migrate Updates screen to compose

* Review Changes + Cleanup

Remove more unused stuff and show confirmation dialog when mass deleting chapters

* Review Changes 2 + Rebase

(cherry picked from commit d8fb6b893fd9ae6aab3b4762837ebce496a214b3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
#	app/src/main/sqldelight/migrations/18.sqm
 2022-07-19 12:37:26 -04:00
arkon
37bb6b27ce Migrate more screens to full Compose 
(cherry picked from commit cbfe9c30bb2970ad911ce35cf1d14bc044225e30)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
 2022-07-16 22:11:30 -04:00
arkon
82b16be60f Fix tablet manga screen column ratios 
Matches previous stable design. Related to #7401

(cherry picked from commit 3192d478371bd0c913020cd6262021f12b074827)
 2022-07-16 20:48:44 -04:00
arkon
879999e69e Fix library column setting jumping in 
(cherry picked from commit f6f5b6aeaba6825974f4b05d279fab54a2633d76)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryMangaEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-16 20:48:18 -04:00
arkon
d145239d93 Migrate licenses screen to full Compose 
(cherry picked from commit 1b2c12385feaa8bc7e32b724289323e5d3e9499e)
 2022-07-16 20:39:54 -04:00
arkon
1e3f313ca2 Remove top app bar scroll behavior 
This lets us make it more consistent with the Compose screens for now. Maybe it'll return in the future.

This also includes making the AboutController a full Compose controller with a new abstracted TopAppBar composable.

(cherry picked from commit 80c7a453286f296ae4d5d3531c805e63db9ca424)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryTopAppBar.kt
#	app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt
 2022-07-16 20:39:44 -04:00
arkon
97e9218f75 Consolidate badge components 
(cherry picked from commit 2096df301d55ed446db21d0d2881e9d273674fae)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-16 20:30:16 -04:00
arkon
af83f81034 Tweak categories view 
- Remove Compose top app bar behaviour since it's kind of jank -- we'll probably just remove the scrolling behaviour everywhere
- Tap title to rename
- Focus in textfield when opening dialogs

(cherry picked from commit 0b78028cf660e2f576ee30f8315b657eca1f39cd)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryTopAppBar.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
 2022-07-16 20:28:56 -04:00
arkon
9b47b7f204 Minor library view cleanup 
- Clean up unused code
- Add text shadow in compact mode
- Tweak some paddings to better match stable

(cherry picked from commit fa73e2403b79deca40590d8f4fa15f00a70e316e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-07-16 20:13:04 -04:00
Andreas
b4adab5eb4 Use Compose for Library list and grid (#7520) 
(cherry picked from commit 905c96922bc7059e99c4c7bd89775747d02028a9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySelectionEvent.kt
#	app/src/main/res/layout/library_category.xml
#	app/src/main/res/layout/library_grid_recycler.xml
#	app/src/main/res/layout/library_list_recycler.xml
 2022-07-16 19:11:22 -04:00
Andreas
6df1a0f79e Use Stable interface for Browse screens (#7544) 
(cherry picked from commit 018ca71336c893f64e0d0653b48b3d5f39b88d63)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
 2022-07-16 17:45:36 -04:00
Andreas
41855c34de Add Stable interface for Category state (#7539) 
(cherry picked from commit a21aa8125e63b9e0d4377aa9c97d6614ee4acf7f)
 2022-07-16 17:21:09 -04:00
AntsyLich
8a3c9255e5 Fix extension setting isn't accesiable when it has update (#7537) 
Closes #7516

(cherry picked from commit 83e193f1ab2798936aba59482ecab67600574583)
 2022-07-16 16:48:03 -04:00
Jobobby04
67e190bffd Page previews for Exh/E-H and NH 
- Still needs click image to open chapter
 2022-07-16 16:45:27 -04:00
Jobobby04
4dda69ac40 Bring back merge manga sources string 2022-07-15 11:27:30 -04:00
AntsyLich
e6586dbc73 Use Material Icons for untrusted extension's icon (#7518) 
(cherry picked from commit 386b8945c8380c63a4e8f935dfe6ef1baab4774b)
 2022-07-13 09:57:39 -04:00
Ivan Iskandar
c77b69ed10 Fix scroll animation when system animation is disabled (#7509) 
(cherry picked from commit ba93060e591fccf3c85995b50f496bc937ae8ae4)
 2022-07-12 12:16:43 -04:00
Ivan Iskandar
dfa559d30f Fix MangaScreen app bar title and nav icon action (#7506) 
(cherry picked from commit cbcab5a545369bc06933bdf4c9f2b6289df1f4ca)
 2022-07-11 11:36:49 -04:00
Ivan Iskandar
d3b59768d4 MangaScreen: Improve chapter list scrolling performance (#7491) 
* MangaScreen: Improve chapter list scrolling performance

Process chapter title, date and read progress string ahead of time

* Use enum for contentType and add key

(cherry picked from commit 1551891c15eb5d323cb1d425794876a753316091)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-07-11 11:31:04 -04:00
Ivan Iskandar
721238a858 ChapterDownloadIndicator: Fixes and improvements (#7485) 
* Increased touch target
* Fix downloaded icon smaller than other states
* Deferred state reads to minimize recompose works
* Move things around to eliminate unnecessary elements

(cherry picked from commit e56f6c10177949c88e61d13e95b23545bef06641)
 2022-07-11 11:08:59 -04:00
Ivan Iskandar
d5aecaad21 MangaScreen: Ditch the expanded app bar (#7470) 
Animating the content padding that's used for the lazy list is heavy. A simple
fix to *just* offset the list is blocked by a Compose fling issue (b/179417109).

So I decided to go with the previous layout of this screen by putting everything
in the list. MangaInfoHeader is split into separate composables to avoid jank
when the item is being inflated.

(cherry picked from commit 34906a74253e7463ac23ea96496c59198884e0be)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaTopAppBar.kt
 2022-07-11 11:08:41 -04:00
Andreas
4e29fd5b2a Use Compose for Category screen (#7454) 
* Use Compose for Category screen

* Use correct string for CategoryRenameDialog title

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

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 86bacbe586bfe5567b1d52eb8d7b7f23724a17d5)

# Conflicts:
#	app/src/main/java/eu/kanade/data/category/CategoryRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/InsertCategory.kt
#	app/src/main/java/eu/kanade/domain/category/repository/CategoryRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt
#	app/src/main/res/layout/categories_item.xml
 2022-07-10 21:27:27 -04:00
Ivan Iskandar
2e881758aa VerticalFastScroller: Fix scroller consuming touch when it's invisible (#7484) 
(cherry picked from commit 9385b86ecb92bd91e5ad65d0eed2580b6b4c6973)
 2022-07-09 19:58:23 -04:00
AntsyLich
3cf809870b ChapterDownloadIndicator: Ensure uniform hit area (#7453) 
(cherry picked from commit eef95cef336f805881b124dd2c5f465c3fd73bc6)
 2022-07-08 21:53:08 -04:00
AntsyLich
5f55a0afbb Reimplement chapter download indicator longpress (#7412) 
(cherry picked from commit deaded5af2da6645d7f320471d5f73c0ffed3edf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
 2022-07-02 13:44:14 -04:00
Ivan Iskandar
4854fcfccf MangaScreen: Hide scroller when appbar is expanded (#7426) 
(cherry picked from commit 3072296919089546016de10c274de1a10b0b7234)
 2022-07-02 13:42:48 -04:00
Ivan Iskandar
299ac1ca2d MangaScreen: Reuse components between two layouts (#7397) 
(cherry picked from commit 388dc2f10301c8dd128b493ad876467fca1b38c3)
 2022-07-02 13:03:00 -04:00
arkon
858c3b5a0a Bump dependencies 
(cherry picked from commit 7e4c45858f6fd2309f8ca07e1e4c4798ab87b764)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2022-07-02 13:02:29 -04:00
AntsyLich
b2a7780501 Fix chapter item incorrect colors (#7403) 
* Fix chapter item incorrect colors

* Make it like stable

(cherry picked from commit 08d1ecfba7e8b41b1ea159057314619d91428da2)
 2022-07-02 12:56:48 -04:00
Ivan Iskandar
e36cacee5a MangaInfoHeader: Add description placeholder (#7398) 
To always show summary view for expanding tags

(cherry picked from commit 0c856438fa86296ecc70f8422740d64f18a9b716)
 2022-06-28 10:03:53 -04:00
Ivan Iskandar
d81fc7f1c0 Improve history screen scrolling perf (#7399) 
(cherry picked from commit e44bb309965e63174b89b9e5e527ad9a60d5184f)
 2022-06-28 10:03:38 -04:00
Jobobby04
447829b1b9 Improve handling of tags 2022-06-27 09:16:19 -04:00
Jobobby04
acc8ec6912 Put metadata header below the buttons 2022-06-27 09:07:25 -04:00
Jobobby04
48a62f7c4a Fix metadata not properly updating 2022-06-26 14:44:56 -04:00
Ivan Iskandar
b1be2a8612 MangaScreen: Fix action mode download button not working (#7385) 
(cherry picked from commit 924dfa19cffed109db8d039cecfa430165abc45e)
 2022-06-26 13:55:38 -04:00
Ivan Iskandar
4eb45d0ade VerticalFastScroller: Fix incorrect touch target (#7384) 
(cherry picked from commit 9ff6ae81bdcb7ce8d1a180f86fad8870324bcf1e)
 2022-06-26 13:55:29 -04:00
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