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

798 Commits

Author SHA1 Message Date
Jobobby04
5df0eb7ed1 Convert EHentai Login controller to a activity 2021-04-11 20:43:21 -04:00
arkon
1ba07466ef Minor cleanup 
(cherry picked from commit ef49fc91d8c40a45efab6661f9dfe78e147bc732)
 2021-04-11 18:40:23 -04:00
arkon
bcc120056c Make reader spinner colors a bit more consistent 
(cherry picked from commit 7504621a24597340f47edb140fee939ac79fb5ec)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
 2021-04-11 18:38:58 -04:00
arkon
0e8aec7929 Align filter spinners (closes #2995) 
(cherry picked from commit 88e49a9b8bebdc226fb9e37a21bc0b42115e802e)
 2021-04-11 18:37:13 -04:00
arkon
b5a109440f Allow excluding categories from library update 
Closes #3467, #4661, #1839

Supersedes #4474

(cherry picked from commit 4f1275ac019c60f60eb503ba17ec3014d36a974b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-04-04 19:10:42 -04:00
arkon
30ed1f11ee Fix label overflow for reader spinner preferences 
(cherry picked from commit 3257cbe21f45ace1554f82bf9e75d014c8e3b534)
 2021-04-04 19:09:07 -04:00
Andreas
38a46825e2 Remove weird cropping from icon when showing missing chapter warning (#4769) 
(cherry picked from commit fba428257b1046b9b7c84fa50e6b31acbf4cb68d)
 2021-04-04 18:56:56 -04:00
Jobobby04
d294db3e4e Continues -> Continuous 2021-03-30 20:00:55 -04:00
arkon
de9ce8f949 Use regular crop icon 
(cherry picked from commit 71aa5921112717c4347a0a4ea1263c7e81dd5cf0)
 2021-03-28 19:10:27 -04:00
arkon
3c3f5cf35d Add crop borders shortcut 
(cherry picked from commit d501c02f8bdc666e5701518da2e0845d7b494e9e)

# Conflicts:
#	app/src/main/res/layout/reader_activity.xml
 2021-03-28 19:10:15 -04:00
arkon
404a6a621a Prevent manga title from jumping (fixes #4709) 
(cherry picked from commit c58e4f4deef79e0a03fd149adbf54b77a6e04369)
 2021-03-28 19:04:38 -04:00
arkon
8b37c27a73 Cleanup reader spinner layouts 
(cherry picked from commit c4b975b77734c8cea843796bae87ee6e236180f4)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
 2021-03-28 19:01:08 -04:00
arkon
2988524fd8 Clean up reader sheet spinner preferences 
Based on fe2543b9d5

Co-Authored-By: Jays2Kings
(cherry picked from commit 14c114756dbcc9d952790918c0a47b2bdc2dbade)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_pager_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
 2021-03-28 18:01:39 -04:00
arkon
5b9d2175e2 Reorganize reader sheet contents a bit 
(cherry picked from commit c255f57d956a6f81d4a1ea6c22e1ca29d81d28ba)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
 2021-03-28 17:49:40 -04:00
arkon
75f0ab2f40 Split general and reading mode sheet settings 
(cherry picked from commit 64c47bbaedeeca6d2bff81cf37baee01e2067306)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_pager_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
 2021-03-28 17:47:31 -04:00
arkon
709f76d53d Merge reader settings and color filter sheets 
Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)

(cherry picked from commit e0b7698d40678ccebfe6b546af9101c11c3a06c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_settings_sheet.xml
 2021-03-28 17:19:57 -04:00
Andreas
03912407d5 Add navigation layout overlay (#4683) 
* Add navigation layout overlay

* Minor clean up

Destroy animator when done not on start
Move and change pref title
Add summary

(cherry picked from commit 5a7f2684b354943758475b9fe329f233b4295a84)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/values/colors.xml
 2021-03-21 00:06:46 -04:00
CrepeTF
d9b3b7b266 Add option to force disable vertical seekbar 
(cherry picked from commit b5df33bf14d4eea8421d2e1e6b488b79e6daa9f5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/exh/log/Logging.kt
 2021-03-20 14:56:51 -04:00
arkon
23e4b661bc Tweak dialog corner radius 
(cherry picked from commit 18b1326f3aad5174d3f3efd65826f553e7231b8c)
 2021-03-18 15:11:02 -04:00
arkon
3122f783a9 Move reader setting related classes 
(cherry picked from commit 938919bd9be821e1e24bdd583aaeb1ab430868a0)
 2021-03-18 14:55:52 -04:00
arkon
300e04e8f6 Allow scrolling within reader color filter sheet (fixes #4612) 
(cherry picked from commit 0657db7dcb8cc523920478b2f0f9ee7e22e2324d)
 2021-03-18 14:53:30 -04:00
Jobobby04
84abe044a3 Remove Hentai Cafe Delegation 2021-03-11 19:10:33 -05:00
Jobobby04
984956ce95 Fix vertical reader scrollbar buttons cutoff 2021-03-11 19:10:31 -05:00
Riztard Lanthorn
6cad8411fe
swap webview and filter (#235) 2021-03-08 22:44:31 -05:00
Jobobby04
e6f288e2c9 Fix some cherry pick issues 2021-03-07 22:33:38 -05:00
CrepeTF
2e1cf49d99
Reader PR (with vertical sidebar) (#216) 
* Reader PR

* Dealt with conflicts + updates

* Adeed missing import
 2021-03-04 19:08:40 -05:00
scb261
a4c10394b6
Split transition animation setting for webtoon and pager (#230) 
* Split transition animation setting for webtoon and pager

* Move variables

* Rename config variables back
 2021-02-26 14:51:51 -05:00
Andreas
cfd2d43f1c Let users invert dual page split (#4470) 
* Let users invert dual page split

* Use Activity lifecycleScope and cleanup invert logic

(cherry picked from commit 776610d0e64d0c4ad02c094336efa18a144632d2)
 2021-02-24 17:15:44 -05:00
arkon
7a115d8080 Adjust reader seekbar design 
- Revert back to old prev/next chapter icons
- Make views taller for easier actions
- Use more consistent spacing
- Add ripples to prev/next chapter buttons

(cherry picked from commit 829a65e51509162cad8be4f7b0ba463ca80fa3c1)
 2021-02-24 17:02:12 -05:00
arkon
9be7c5e6e1 Initial adoption of bottom reader menus from TachiyomiSY 
Co-authored-by: Jobobby04 <jobobby04@users.noreply.github.com>
Co-authored-by: CrepeTF <CrepeTF@users.noreply.github.com>
(cherry picked from commit 89837e4cedca4fa0c7518c32cd13142ec85b5f97)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/menu/reader.xml
 2021-02-24 17:02:03 -05:00
Jobobby04
0185d5f7d6 Fixes for browse + latest page 2021-02-24 16:18:13 -05:00
Jobobby04
5a67d8169d Edit manga status + edit local manga fixes 2021-02-24 16:15:19 -05:00
Jobobby04
50a5ec45b3 Do a bit of optimization and cleanup, remove old EH startup code 2021-02-14 21:24:26 -05:00
arkon
04da26195e Fix invisible overflow icon in chapter filter sheet in light blue theme 
(cherry picked from commit 7b66ece8959959a11a8ca4ece4d6411add15a788)
 2021-02-11 19:26:46 -05:00
vance
37ce2140f3 Added dual page split setting (#4252) 
* Add DualPageSplit option

* remove extra line

* Split double-page into two pages

* Remove !isAnimated check and add (ALPHA) to the label

* Fix missing insert pages

* Pager cleanup

* Add dual split to Webtoon and fix Vertical

* Fix L2R/R2L

* Add comments and refactor code in ImageUtil

* Use a simpler split solution in webtoon mode

Co-authored-by: weng <>
Co-authored-by: Andreas E <andreas.everos@gmail.com>
(cherry picked from commit b5017eebbf0740189f254d5db25df3c54a282e1f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
 2021-02-11 19:25:58 -05:00
arkon
a616193cdf Fix selected tab in sheets not being the accent color 
(cherry picked from commit 3aeac7e7b598825a9914db9f2d112d1ac7394646)
 2021-02-11 18:10:58 -05:00
arkon
72b0fcca9d Don't restrict filter sheet height anymore 
(cherry picked from commit 1557f713f42739f76fd9808d18d4b914132becff)
 2021-02-11 18:10:49 -05:00
arkon
aadfa2aa8c Show help action when source fails to load 
(cherry picked from commit d84b5e8b461bb8c9c0e6c684dc717e27ba40f6c5)
 2021-02-06 19:16:11 -05:00
arkon
e80a4bea18 Avoid crash when changing spinner indeterminate state 
(cherry picked from commit 7191552126b514fee5a882072b4ad445136b4584)
 2021-02-06 19:08:20 -05:00
arkon
9a3faad499 Fix unreadable sheet tab text in light blue theme 
(cherry picked from commit 9f2fe33ce0080f24f642a823119b0d842e63307a)
 2021-02-04 17:13:11 -05:00
arkon
b235521dd1 Rounded bottom sheets 
(cherry picked from commit 6662e2002f63b303079a515e24ce9e092f07d24e)
 2021-02-04 17:07:39 -05:00
arkon
6168dadba3 Pad trackers list a bit 
(cherry picked from commit 62dffb8226bb42a6d64e8a275111621d8cfbb0b2)
 2021-01-31 19:38:45 -05:00
arkon
08bf113dcb Minor cleanup 
(cherry picked from commit d5cfbef42bde2a785b9c3033dc2a769ac1a7c37f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-01-31 19:38:27 -05:00
Andreas
369e075ed9 Move tracking to a bottom sheet (#4364) 
* Move tracking to a bottom sheet

* Give methods better names and remove unnecessary annotation

(cherry picked from commit 535abcbb8b2197faef77a6b0ba56aa4309067d4c)

# Conflicts:
#	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/track/TrackController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
 2021-01-31 19:36:22 -05:00
Taco
f8763c71ff Regenerate drawables (#4352) 
(cherry picked from commit 9bf452856cb40c7d1475eb2c7471c17d7861bac3)
 2021-01-31 18:32:13 -05:00
Jobobby04
0ccfca51e7 Fix weirdly aligned merge button 2021-01-30 01:47:32 -05:00
Andreas
9cb600e9d6 Unify history and update item (#4361) 
* Unify history and update item

* Use card_radius

(cherry picked from commit 0a10f6605324684afcf4d6bc13a765709dec2d94)
 2021-01-28 13:41:01 -05:00
Riztard Lanthorn
355170b8ff add source name in download queue (#4338) 
(cherry picked from commit 628bd5d6b42cedc463f17e4208b1cdaf4ba7869d)
 2021-01-26 13:42:21 -05:00
Andreas
3927c62a32 Match color for download, header, and pin buttons (#4331) 
* Match download button color to pin color

* Match manga header buttons color to pin color

(cherry picked from commit 441fc6e45b3632dcfcf98854282038f8898f395d)
 2021-01-26 13:38:13 -05:00
jobobby04
2a211c68a9
Merge pull request #186 from CrepeTF/Reader_PR 
Reader PR + stuff
 2021-01-26 13:30:25 -05:00