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
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
8a322ea28e Extract source api from app module (#8014) 
* Extract source api from app module

* Extract source online api from app module

(cherry picked from commit 86fe85079413f8ed6e1109b46e6131a9b788b988)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
 2022-09-16 13:49:41 -04:00
Ivan Iskandar
897651a75a Fix derivedStateOf errors (#8008) 
(cherry picked from commit 6865c21c75b67708b26cc78d68747945ea206641)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-09-15 23:11:35 -04:00
Jobobby04
3807fb0607 Convert EhLoginActivity to compose 2022-09-13 18:18:48 -04:00
Jobobby04
f28342601b Minor improvements to browse source 2022-09-12 00:10:04 -04:00
Jobobby04
97641e7692 Handle query search in source feed 2022-09-11 23:45:29 -04:00
Jobobby04
01525c30f2 Add database subscriptions for feed and better thumbnail fetching 2022-09-11 22:19:26 -04:00
Jobobby04
33ef1e7b01 Remove extra padding 2022-09-11 21:12:54 -04:00
arkon
81a4f16a34 Add some padding to tab indicators 
(cherry picked from commit 19be0d68b6c560d0969b6c4e069f88ea380c95fd)
 2022-09-11 19:47:31 -04:00
Jobobby04
3562816e89 SY linting 2022-09-11 19:43:45 -04:00
Jobobby04
d58dda10d4 Minor cleanup 2022-09-11 19:33:03 -04:00
arkon
228f2c78d2 Bump dependencies + linting 
(cherry picked from commit cd3cb72b65d2f5f6ec038eb319717e21e3a1731e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
 2022-09-11 19:32:45 -04:00
Jobobby04
2a587ac90c Set maxlines to 1 for manga chips 2022-09-10 16:18:17 -04:00
Jobobby04
eba7d137ee Convert biometric times to compose 2022-09-10 14:06:39 -04:00
Jobobby04
d0518515e9 Control FAB with Compose in SourceFeed 2022-09-10 12:25:30 -04:00
Ivan Iskandar
4a46117ba7 WebViewScreen: Use Scaffold (#7958) 
(cherry picked from commit 032b377de71d4ac4a50fbf30db82b00e13155d03)
 2022-09-10 11:10:45 -04:00
Andreas
138fc03d1b Fix Filter not being applied in Browse Source (#7945) 
(cherry picked from commit 6b2b21edfa63f01b956ec27386b0c729be2e6d18)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-09-10 11:09:16 -04:00
Ivan Iskandar
25ad9c7fab Fix missing downloaded only/incognito banners in Browse Source (#7936) 
(cherry picked from commit 99270e370e1aba37c3ab5d8954363dd335ca0353)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
 2022-09-10 11:05:48 -04:00
Jobobby04
96f24e0600 Rewrite migration, shove all logic into a presenter instead of the UI 2022-09-04 19:42:08 -04:00
arkon
0c1ac913cb Reimplement extensions search 
Not sure if I should abstract this out to per-tab though. Maybe when we need it...

(cherry picked from commit 21804bfc45b05c67fe6198cd0452cd67b05bc3e8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
 2022-09-03 19:50:22 -04:00
arkon
da69f7876d Fix missing downloaded only/incognito banners in Browse 
(cherry picked from commit bbf5c86b4699703048fb95f4c7922a9c147e164d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
 2022-09-03 19:45:38 -04:00
Ivan Iskandar
c7cece3393 Rebase Scaffold fork (#7929) 
This changes content insets handling

(cherry picked from commit 3fa68ed2171ae930f8d5070123483e2e6c4cfb4c)
 2022-09-03 19:44:07 -04:00
Andreas
99d5d8b91f Merge Latest and Browse into one screen (#7921) 
* Merge Latest and Browse into one

* Add back Latest button

* Change context to IO instead of launching a job

* Use loading screen when loading initial page

(cherry picked from commit cc6aef693e1a15f695ffa7eebd968004a6557010)

# Conflicts:
#	app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowsePagingSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesPresenter.kt
 2022-09-03 19:43:55 -04:00
Andreas
e009398c0f Resolve review comments for BrowseSourceScreens (#7912) 
(cherry picked from commit 2f26982e346d65de82d0809d7262a17f737d9eb2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt
 2022-09-03 18:27:33 -04:00
arkon
241517a13a Make top app bar lift behavior more consistent 
(cherry picked from commit 504844a892635fe9554a3eb907ad328b94ffab29)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseLatestScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseLatestToolbar.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-09-03 18:10:38 -04:00
arkon
57b336b2b8 Maybe fix extensions list crash 
Also fix weird animation of last updated text in Updates

(cherry picked from commit 4c1da1bd1daa9ce51778546021de727c17ef65ba)
 2022-09-03 17:55:00 -04:00
arkon
9318b0d803 Minor cleanup 
(cherry picked from commit c39a1b7867976bddc85d3bfbffeeb717b8bf4501)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourcesTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
 2022-09-03 17:53:12 -04:00
Andreas
16ea8aa3b7 Use Compose on BrowseSourceScreens (#7901) 
(cherry picked from commit d4b764fa317ddcb04b8fefb982cd6b9a6dfc1598)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/Pager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt
#	app/src/main/res/layout/source_comfortable_grid_item.xml
#	app/src/main/res/layout/source_compact_grid_item.xml
#	app/src/main/res/menu/source_browse.xml
 2022-09-03 17:41:24 -04:00
arkon
7c6ab4edcf Implement nicer UI for migrate list sorting 
(cherry picked from commit 90c08303fa484ca241d3c87dcc2e55f423328815)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
 2022-08-31 19:00:56 -04:00
arkon
8c182df784 Initial conversion of browse tabs to full Compose 
TODO:
- Global search should launch a controller with the search textfield focused. This is pending a Compose rewrite of that screen.
- Better migrate sort UI
- Extensions search

(cherry picked from commit 92e83f702c775d5ab5a0b4248995308155150811)

# Conflicts:
#	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/presentation/library/components/LibraryTabs.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.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-08-31 18:55:00 -04:00
Jobobby04
9dad9a6551 Use FullComposeController for Source Feed 2022-08-31 17:01:10 -04:00
Jobobby04
a760198981 Convert Source Feed to Jetpack Compose 2022-08-31 16:21:26 -04:00
Jobobby04
493a1ab4a6 Convert Feed to Jetpack Compose 2022-08-31 15:20:29 -04:00
arkon
588d11c14f Convert settings main and search views to full Compose 
(cherry picked from commit f5c7aa1142eec366092722d6301af939f19ae970)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
 2022-08-29 19:01:59 -04:00
arkon
46b369036e Convert extension details to full Compose 
(cherry picked from commit 761635b572f4cffa0c4979df32635bba91c0b6cb)
 2022-08-29 18:50:22 -04:00
arkon
ae64f9fabd Add last update time to Updates Tab (closes #5466) 
Co-authored-by: datreesezcup <datreesezcup@users.noreply.github.com>
(cherry picked from commit 43c195e14a13aff9a3d2552f4f4a08ecee2d0b63)
 2022-08-29 18:46:36 -04:00
Andreas
65f6e14a46 Tweak flag classes for Library (#7829) 
* Tweak flag classes for Library

- Add interface for Flag and Mask
- Merge Sort Type and Direction into one class
- Use custom serializers for preferences
  - Mainly to not break the old

* Review changes

(cherry picked from commit 880407442c598d1b63db8be43f4848550dc17ff1)

# Conflicts:
#	app/build.gradle.kts
#	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/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.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/library/setting/SortDirectionSetting.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/setting/SortModeSetting.kt
 2022-08-29 18:12:37 -04:00
Andreas
d2199b81ec Fix overflow in ChangeCategoryDialog (#7883) 
(cherry picked from commit be7108a2ee341d9f8f16d5489bb6a5a63195264f)
 2022-08-28 13:15:29 -04:00
Jobobby04
a0f2094c51 E-Hentai set gallery id as hidden scanlator 2022-08-28 12:06:20 -04:00
Andreas
4ae581f6c9 Fix issue with removing categories from manga for ChangeCategoryDialog (#7874) 
(cherry picked from commit 9c49a5ed22e9c501cea7d8020b90f9dd11ca4ee5)
 2022-08-27 20:50:44 -04:00
Andreas
436bd3187d Fix issue with input for DownloadCustomChaptersDialog (#7873) 
(cherry picked from commit 0bb20a92af348ae3fea3f6271999b51fd19a2ff1)
 2022-08-27 20:50:36 -04:00
arkon
bda100f574 Fix checkbox selection when tapping text in Compose dialogs 
(cherry picked from commit cd82c88b9aa8f344d8ee9938eeae8a6293d5f231)
 2022-08-27 20:50:25 -04:00
Ivan Iskandar
66cb3c03b8 Bump Compose M3 to 1.0.0-beta01 (#7867) 
(cherry picked from commit 655fa25b511a423bc17f1f88282150e335df0cd9)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
 2022-08-27 20:39:09 -04:00
arkon
655c0d8c90 Minor tweaks to download custom dialog 
- Allow large decrements (just goes to 0)
- Use Material3 text field for proper theming
- Move dialog composable to presentation package

(cherry picked from commit 03b9950fa15974f1a599a96c26177a612bed5c9d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/database/components/ClearDatabaseDialogs.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2022-08-27 20:09:09 -04:00
Andreas
5baf87edd0 Move a few Dialogs to Compose (#7861) 
* Move a few Dialogs to Compose

- Separating dialogs that are not needed in the PR for the move to Compose on the Browse Source screen
- ChangeMangaCategoriesDialog and AddDuplicateMangaDialog will be removed in the Browse Source screen PR

* Review changes

(cherry picked from commit 2453d1a8861d61b03dce398fad169e556551b400)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-08-27 20:03:05 -04:00
Tien Long Lam
ad6ffe4fec
Able to move 'Merge' button to overflow menu (#655) 2022-08-22 12:57:50 -04:00
Andreas
ec210de6c5 Fix emoji going crazy and fix tabs being visible when library is empty (#7811) 
fixes #7792
fixes #7791

(cherry picked from commit 47b56644dee9a097cfce384ca030ddb75ddadfe5)
 2022-08-19 19:51:28 -04:00
stevenyomi
39e0d7f4e8 Remove 1.x source models (#7781) 
(cherry picked from commit e36e9d9d5c1b2a7b55f28f2bf0ef064880cbac8f)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-08-18 15:44:31 -04:00
stevenyomi
128a868ffb Fix notification and add visual cues when triggering a second update (#7783) 
(cherry picked from commit 1f34f5277c9500e6a3a8069738a0eeeaf8c49ef5)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
 2022-08-18 14:25:45 -04:00
Ivan Iskandar
aeea01a68b UpdatesScreen: use custom LazyColumn with animation fix (#7758) 
(cherry picked from commit 9dbc1aa7a3165c420d3aa7826a345ab44d4199e4)
 2022-08-14 16:04:29 -04:00