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

111 Commits

Author SHA1 Message Date
arkon
935b6576d0 Minor settings sheet cleanup 
(cherry picked from commit 07fdb74fbc9ae2afa67e427bb4a94860c7a2d8e6)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
 2023-03-05 16:53:29 -05:00
arkon
586068d720 Move more components 
(cherry picked from commit dd71c76a8f0b760ec806e71be77998bbc2da61a3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
 2023-03-05 16:44:36 -05:00
arkon
4db8fa8f12 Move more components to presentation-core module 
(cherry picked from commit 58a0add4f6bd8a5ab1006755035ff1b102355d4a)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
 2023-03-05 16:37:21 -05:00
arkon
60741e1b3b Move more components to presentation-core module 
(cherry picked from commit bfe143015a810fc42c1284ef03fbf57ff1a02395)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2023-03-05 16:14:29 -05:00
arkon
148268571e Start moving some Compose components to presentation-core module 
(cherry picked from commit e3cf8632305283468a5e8366a257d6d6880ca1a6)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2023-03-05 16:03:12 -05:00
0x7673
57113014ec Add copy tags to clipboard feature (#9063) 
(cherry picked from commit d02b0ca2db744b0eca48dfca86811d653fd3bdaf)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2023-02-26 21:28:58 -05:00
Ivan Iskandar
fccea2d92a Rework on the wheel picker (#8559) 
* Rework the wheel picker

doesn't need for the animation to stop to change the value

* fix

---------

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

# Conflicts:
#	.github/renovate.json
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
 2023-02-26 21:09:14 -05:00
arkon
5d0543d0aa Replace custom download amount with next 25 
Simplifies things and maybe discourages whacky downloading behavior?
Users can still range select in the chapters list to download custom amounts.

(cherry picked from commit f6e6a7ddf1d32a55da81344b1ae360e16e5560e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2023-02-26 20:57:35 -05:00
Ivan Iskandar
2023acf319 MangaCoverDialog: Disable memory cache (#9066) 
(cherry picked from commit 1671a56f42c4bb1de3482c2ff264593531e5d39d)
 2023-02-26 20:55:28 -05:00
arkon
b75a8fc146 Clean up chapter item composables a bit 
Might help with #9043?

(cherry picked from commit bff98ca76830accfe462d011d42040ae6c1876e8)
 2023-02-26 20:54:17 -05:00
arkon
ce67eb9de3 Move more models to domain module 
(cherry picked from commit 345e9c2a9a61f1f3b814db52eddbb42681499854)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
#	app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
#	app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt
 2023-02-09 13:44:38 -05:00
zbue
740b3e4616 Allow partially read chapters to be marked as unread in updates screen (#8884) 
* Allow partially read chapters to be marked as unread in updates screen

* Review changes

* Review changes 2

(cherry picked from commit f301dc64f00c2d8a19cb89610cf6fba7eb78917d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt
#	app/src/main/sqldelight/migrations/23.sqm
 2023-02-07 15:41:58 -05:00
zbue
7f7789792b Enable confirmButton only when needed to respond to user input (#8848) 
* Enable `confirmButton` when appropriate

* Show error in dialog instead

* Follow M3 guidelines

(cherry picked from commit 33a221971692c1662dc883a7bac9fdcc7b843d35)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt
 2023-02-07 15:06:33 -05:00
zbue
9a7296aa3a Fix downloaded filter unmatched state in manga screen (#8897) 
(cherry picked from commit 768bb7b503a478eecac7426da95d8e4cca8d1f4c)
 2023-02-07 13:32:40 -05:00
arkon
50c06de524 Use theme padding values in more places 
(cherry picked from commit 0067d474c86d08011ebf3b1676c4db8c85e68125)
 2023-02-07 13:08:48 -05:00
arkon
c516848843 Adjust bookmarked chapter styling 
No longer tints the title and subtitle text depending on bookmarked state
in favor of only showing a tinted bookmark icon regardless of read state.

Closes #8839

(cherry picked from commit 6d3a3b3f39a6ac4736ff06628335cbd4c1fd9e8e)
 2023-01-07 16:38:01 -05:00
arkon
824713036a Unify layout for new update and crash screens 
(cherry picked from commit 01ec26842d552c8915df379fe7d9ce1d71be373d)
 2022-12-31 17:19:30 -05:00
arkon
f43b60700e Allow 2 lines for tracker status text 
Fixes #8805

(cherry picked from commit bbf58178052ee609cd1538b93cbf09c7a8dae8e8)
 2022-12-31 17:19:21 -05:00
arkon
623f0e2612 Pull out settings sheet items as reusable composables 
(cherry picked from commit 7cbe18d325274de22b2bef30869d2cc658b72cc1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
 2022-12-16 00:23:07 -05:00
Ivan Iskandar
8da293ad91 Move app state banner to the very top (#8706) 
This moves the banners to the root composable and so eliminates the need to
track the app states in every screen.

(cherry picked from commit d97eab03283ea8b686ffa007bfc69224348b24f1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
 2022-12-15 22:36:08 -05:00
arkon
7d871ccfd3 Abstract ChapterSettingsDialog for reuse elsewhere 
(cherry picked from commit a61e2799dbfd60039b577d7fffc8b6494ba74aba)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
 2022-12-15 22:19:09 -05:00
arkon
68b1012c65 Reuse basic theme preview annotation 
(cherry picked from commit 1009e15aa61f3a717d0fec8a6d7c2d57aacdd4e1)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
 2022-12-15 22:06:31 -05:00
stevenyomi
c94505d289 Migrate Accompanist SwipeRefresh to Compose PullRefresh (#8106) 
(cherry picked from commit 2c4ddca38eef8ea3bc7aad290223ebe0e93dbca2)
 2022-12-15 21:21:29 -05:00
arkon
29d9f1245d Tweak manga cover dialog UI 
Closes #8654, although it's just a workaround. The cover itself doesn't appear within the inset areas when zoomed.

(cherry picked from commit d7a21771a5ee01993e48f903316ac0ff699ee66f)
 2022-12-04 15:46:36 -05:00
Ivan Iskandar
270690e513 Track sheet fixes (#8673) 
* Fix Track sheet not being disposed properly

* Change insets handling

(cherry picked from commit 47f079891fe666e2a2c7d91fe1f7fc49981a78f9)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/util/Navigator.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-12-04 15:45:58 -05:00
AntsyLich
7a3847887c Implement simple stats screen (#8068) 
* Implement simple stats screen

* Review Changes

* Some other changes

* Remove unused

* Small changes

* Review Changes 2 + Cleanup

* Review Changes 3

* Cleanup leftovers

* Optimize imports

(cherry picked from commit 3d7591fecae47c75e6e4bc78b53ac02811620d92)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreScreen.kt
 2022-11-28 16:10:04 -05:00
Joseph Olugbohunmi
c07ccf7943 Implement copying of Manga URL to Clipboard (#8587) 
feat: Implement copying of Manga URL to Clipboard
(cherry picked from commit ef3a6c80a7638209a5a41a0923bd9195380429aa)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2022-11-24 16:23:20 -05:00
arkon
37ea7a7d52 Add back track icon onClick and title onLongClick actions 
Closes #8565
Closes #8536

(cherry picked from commit be5802e47335cded38af67979e45f060e3779595)
 2022-11-24 15:47:37 -05:00
Jobobby04
e0ad9f78ac Improve SY specific change declarations 2022-11-24 15:16:58 -05:00
arkon
22c828da76 Minor cleanup 
Mostly just addressing comments from #8452

(cherry picked from commit b1ccebf329e9a9d77894b9d4ff06aeb9d7317acf)
 2022-11-16 13:52:29 -05:00
Andreas
0fc9cf6779 Make padding names neutral (#8531) 
(cherry picked from commit 3407eb84c5d4bbb7e5cf71e43fca58d1f297ac53)
 2022-11-16 13:33:27 -05:00
Ivan Iskandar
33f57f6df7 SearchToolbar: Better physical keyboard support (#8529) 
Make enter keys behave like search key of on-screen keyboard

(cherry picked from commit acd43005dff055564dd6526eaa3f32347408be5c)
 2022-11-16 13:25:21 -05:00
Jobobby04
0a6672a768 Add source to merged chapters without messing with the scanlators 2022-11-15 01:07:43 -05:00
Jobobby04
5afc33becb Round the corners of page previews 2022-11-13 15:43:56 -05:00
Ivan Iskandar
7b1bc790b3 Full Compose MangaController (#8452) 
* Full Compose MangaController

* unique key

* Use StateScreenModel

* dismiss

* rebase fix

* toShareIntent

(cherry picked from commit 18ccde082d5529766ad1297f9850752508805156)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
#	app/src/main/res/layout/track_chapters_dialog.xml
#	app/src/main/res/layout/track_controller.xml
#	app/src/main/res/layout/track_item.xml
#	app/src/main/res/layout/track_score_dialog.xml
#	app/src/main/res/layout/track_search_dialog.xml
#	app/src/main/res/layout/track_search_item.xml
 2022-11-11 13:55:01 -05:00
Jobobby04
c96efe1819 Page preview jump to page in Reader 2022-11-08 23:20:38 -05:00
zbue
36a01d8144 Use selectedBackground for other list items to match with others (#8379) 
* Use `selectedBackground` for other list items to match with others

* Remove unused imports

(cherry picked from commit ebb96a6ff46230686fa260e96917bdb7de3ec288)
 2022-11-01 13:37:22 -04:00
zbue
ffa45ffea1 Disable ChapterHeader & ChapterDownloadIndicator click when in selection mode (#8350) 
* Disable `ChapterHeader` click when in selection mode

* Disable `ChapterDownloadIndicator` click when in selection mode

* Review changes

* Merge remote-tracking branch 'origin/master' into patch-7

* Merge remote-tracking branch 'origin/master' into patch-7

* Revert back to old implementation

(cherry picked from commit 8dce7b3e9eee1ea3d4a279e2d2e4ea9d600279a8)
 2022-11-01 13:36:28 -04:00
Swords
dd08da26e8 Add different download options within the Library (#8267) 
* feat: add download options to library

* feat: use max instead of min

* feat: remove download all option

* feat: applied requested changes + rename some functions

* feat: merge downloadAllUnreadChapters and downloadUnreadChapters into one function

* Apply suggestions from code review

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

* feat: apply lint suggestions + fix code

feat: apply lint suggestions + fix code

* feat: revert onClickDownload back to onDownloadClicked

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

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2022-11-01 12:46:33 -04:00
arkon
ad444ac761 Use Compose fast* functions in more places 
(cherry picked from commit 86c3d8c06469245d061ddaaa86da5793f48e8787)
 2022-11-01 12:07:09 -04:00
arkon
81d9ac81ce Refactor overflow menus into a composable 
(cherry picked from commit df773ee15c814e03267fdfcd81d4e12d38a3508b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:43:19 -04:00
Ivan Iskandar
1256646e91 Rebase Scaffold fork (#8353) 
This adds content window insets supports that will be passed to
all components used except top and bottom bar.

(cherry picked from commit 16f9fb2f40e0569c5c22de4a062cd890b4b64d4e)
 2022-11-01 11:23:54 -04:00
Soitora
10afbcc61a Restore chapter description alpha (#8345) 
Restore "Darken the description colors"

Restores #3858, with new values based on current standards (0.78f rather than 0.62f)

I wanted to accomplish this without having to call a const, but that felt like a logical solution as well

Of course, if you got cleaner methods do tell, thanks

(cherry picked from commit 04d2a3399b4c1e708e8da2a7bf7bfd0ec4ecb77a)
 2022-11-01 11:23:30 -04:00
Ivan Iskandar
82a1d9847d MangaScreen: Apply bottom content padding to large screen info column (#8347) 
(cherry picked from commit 054bf8ec5d358e26dc761ebd4358167ffe99487d)
 2022-11-01 11:23:19 -04:00
arkon
b941c34c3f Use remember var delegates in more places 
(cherry picked from commit 0849111247d28fa5a74abe6759c992097bfa7109)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-11-01 11:20:34 -04:00
stevenyomi
b2c4fc0ec5 Clean up strings and icons (#8326) 
* Clean up strings and icons

* fix incorrect usages of label_more

* restore strings and reduce usage of android.R

* removing icon desc of FABs anyway as app's not for visual impaired users

(cherry picked from commit 4b60138d41ea33e5e4c3defb0dc626b599216f3f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
#	app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2022-10-29 18:57:56 -04:00
stevenyomi
46fe5dfd4f Tweak tablet UI mode setting (#8262) 
(cherry picked from commit d558f9e1d6bcc8eb8f69359e6e7516f7ea24a408)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2022-10-22 20:47:54 -04:00
stevenyomi
6ba4c9b139 Clean up strings and resources (#8253) 
* Clean up strings and resources

* fix pringle's typo

* restore catching file pick errors

* add back file chooser title

* revert #7740 and remove try-catch of chooser-wrapped intent

* swap xmlns lines

* swap xml tools lines

(cherry picked from commit 824d5e22bc35a9b511929be21ffbc85b734e5fcd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/res/drawable/card_gradient_shape.xml
#	app/src/main/res/menu/download_queue.xml
 2022-10-22 19:52:46 -04:00
AntsyLich
59866497c6 Move "Share" to end of DropDownMenu (#8225) 
(cherry picked from commit ea33f8dba5d0c6b279f8c0f078139f65cfb04ce6)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
 2022-10-18 16:52:16 -04:00
Ivan Iskandar
a2f6b90547 Settings: M3 and two pane ui (#8211) 
* Settings: M3 and two pane ui

* TrackingLoginDialog: Move close button

* Use small top bar

* Revert "Update voyager to v1.0.0-rc02"

This reverts commit 570fec6ea622a7deae44668f4d9c3317699de2aa.

https://github.com/adrielcafe/voyager/issues/62
(cherry picked from commit 5c5468f9af74be984d0d9cb79da804370ee0e775)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
 2022-10-16 22:39:58 -04:00