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

495 Commits

Author SHA1 Message Date
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
CrepeTF
1165c57ffa Apply vertical seekbar hide logic to ReaderSettingsSheet 
(cherry picked from commit 4e8006f329cc87438de9202cf0ac1d0d8ceb203f)
 2021-03-22 21:10:23 -04:00
Jobobby04
12962b3486 Minor cleanup 2021-03-22 20:25:46 -04:00
arkon
fae2bd7ab7 Minor code cleanup 
(cherry picked from commit 78285bdf3734bab9712756e0853778f831444b39)
 2021-03-21 00:06:54 -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
7b01f0c608 Add icons for reading mode toggle 
(cherry picked from commit 609d8c9685a54734138b39cc25c261794a21ec99)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-03-18 15:40:12 -04:00
arkon
781f4e393e Less janky enum iteration 
(cherry picked from commit 2f08515455c0c9634b98e3fc24d91f4bf2a4ba90)
 2021-03-18 15:36:26 -04:00
arkon
1399042efb Flip order of previous chapter reader transition text (closes #4608) 
(cherry picked from commit cdc5de3f1be7f75c1b85d019f45156a979774edc)
 2021-03-18 15:35:50 -04:00
arkon
7164f686d4 Add reading mode toggle 
(cherry picked from commit 1e58b05ead62e68373775afb309fcad8b28df957)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-03-18 15:10:53 -04:00
arkon
3122f783a9 Move reader setting related classes 
(cherry picked from commit 938919bd9be821e1e24bdd583aaeb1ab430868a0)
 2021-03-18 14:55:52 -04:00
arkon
142fc0e4a6 Disable sensor when using force orientation (closes #4618) 
(cherry picked from commit fde6b7af4f9c7184ae1c55e1b7953619bd8e26b9)
 2021-03-18 14:53:41 -04:00
Andreas
1fdb03f7db Dual page split allow to have different setting for Paged and Webtoon (#4527) 
(cherry picked from commit 7a64bf55cb8255000da7aaa0030f845b94d985b0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2021-03-07 13:38:17 -05:00
Jobobby04
7e91ae02f1 Upgrade logging, now maps timber to XLog, new logging functions 2021-03-07 00:23:23 -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
48a63e26f3 Add orientation toggle to bottom reader menu (not really) 
(cherry picked from commit 33992d80bfc67bb664c0edf48c48c7882c1ff641)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-02-24 17:12:14 -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
arkon
2845d8cc98 Allow clicking the toolbar to go to the manga 
Co-authored-by: Jobobby04 <jobobby04@users.noreply.github.com>
(cherry picked from commit 8bb69c455b3af3c90340c8969f2c0f474daedbcb)
 2021-02-24 16:44:20 -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
ede6a54b30 Remove unnecessary LayoutContainer implementations 
(cherry picked from commit 291168f4debfc87a62c77c252c77ebeff4b3aafd)
 2021-02-11 18:13:41 -05:00
Andreas
d4de925ec7 Add Right and Left navigation (#4392) 
and remove default navigation classes in favor of the navigation classes

(cherry picked from commit b63d24ac1ab1253a62b6a2886f11953539f13340)
 2021-02-11 18:10:37 -05:00
Jobobby04
0ab28fd6d6 Remove useless var shadow 2021-02-11 18:08:30 -05:00
Jobobby04
86c228243d Fix merged manga chapterlist not updating, fix merge chapter downloads 2021-02-10 16:39:11 -05:00
arkon
bc9602a0f2 Set clip data when sharing content URIs (closes #4198) 
(cherry picked from commit 1607658c30a5d0a2767c5fe39561e9b28cfacfb4)
 2021-02-06 19:11:26 -05:00
arkon
4cbb2ae082 Apply bottom sheet dialog with restriction consistently 
(cherry picked from commit 7eef4f7fbf271ba05450551141929cb8142147ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
 2021-01-28 14:19:04 -05:00
Jobobby04
dbadec2c67 Revert "Fix reader bug with new suspend getFlatMetadata" 
This reverts commit 96031869271b3c5ed43d3c7d227dcdcd584d9618.
 2021-01-26 23:36:40 -05:00
Jobobby04
9603186927 Fix reader bug with new suspend getFlatMetadata 2021-01-26 20:31:04 -05:00
Taco
ec1fe205ad Update Okio, use more KTX stuff (#4353) 
* Update Okio to 2.10.0

* Use some more KTX extensions

(cherry picked from commit 5f7e34b6a1cbda755db6f943a87da16cfc51e6e4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt
 2021-01-26 16:11:02 -05:00
Jobobby04
b0981a00bd Fix Reder PR build errors 2021-01-26 13:37:31 -05:00
Jobobby04
295af5306b Handle delegated source id lists better using a LisenterMutableMap 
Better source id comparisons
 2021-01-26 13:31:22 -05:00
jobobby04
2a211c68a9
Merge pull request #186 from CrepeTF/Reader_PR 
Reader PR + stuff
 2021-01-26 13:30:25 -05:00
CrepeTF
653ae10caf Reader PR 2021-01-26 13:11:42 -05:00
arkon
9ec67db8cb Use proper method to clear notification actions 
(cherry picked from commit cf7ec6aa7628b23ddbb22938f1b587e7bd613d74)
 2021-01-21 19:06:57 -05:00
Jobobby04
0a4fcb480d Small cleanup and optimizations, add a coroutine version of insertFlatMetadata 2021-01-20 21:00:23 -05:00
Jobobby04
3b364c91f1 Do quite a bit of code cleanup 2021-01-17 22:17:15 -05:00
arkon
25caba6905 More consistent injectLazy style 
(cherry picked from commit f667f85fa5857bee1f55217d28d1e751cbb8a66b)
 2021-01-17 18:04:25 -05:00
Jobobby04
a0ac2daad1 Deal with SY for the coroutine function changes 2021-01-10 19:36:24 -05:00
arkon
0edff11353 More coroutine tweaks 
(cherry picked from commit c9cf9cfff006bc8d87e1d7a7245e213d579bb6d9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
 2021-01-10 18:43:47 -05:00
Jobobby04
73e861ec9e Mangadex replace list of langs with just the source lang 2021-01-10 17:28:20 -05:00
Jobobby04
7006341fab Cleanup 2021-01-09 15:16:23 -05:00
Jobobby04
fca7dad7b0 Address coroutine scope leaks for SY 2021-01-07 23:14:08 -05:00
arkon
a68f18d180 Use lifecycleScope directly 
(cherry picked from commit b18a794eca05f4c4befb8606b9af8913d7520215)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2021-01-07 22:22:27 -05:00
Andreas E
d41c619c8a Fix navigation from feedback (#4238) 
* Fix navigation from feedback (fixes #4237)

* Add additional enum values to NavigationRegion mainly for PagerViewer

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 9db81a5a49ff6679cbc5d20c6a0c523a11691ee5)
 2021-01-07 22:11:24 -05:00
arkon
7330be555d Address more coroutine scope leaks 
(cherry picked from commit 6fb7a85e8a77aa379a8138e1f2fe1b5f65b45ed7)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
 2021-01-07 22:11:14 -05:00
arkon
a0981c4944 Minor cleanup 
(cherry picked from commit 135cf9960fbbb479cdabae02602a3c55b2d211c3)
 2021-01-04 01:14:45 -05:00
Andreas E
aab3ba5b48 Navigation settings and split invert tapping for webtoon and pager (#4233) 
(cherry picked from commit 3bf7c74f9343542be74495d4cb48d1fe615839cb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/res/layout/reader_settings_sheet.xml
 2021-01-04 01:08:35 -05:00
Andreas E
651f4659a5 Viewer navigation (#3869) 
* Viewer navigation

Co-authored-by: Harsh Parekh <h.x.dev@outlook.com>

* Match current reader behavior and add ability to invert it

* A bit of clean up

* Clean up inversion

* Only create navigator when changed

and change tap zone when invertTapping is changed

* Clean up PagerConfig

* Change how Viewer navigation works

* Add Edge Navigation

Co-authored-by: Harsh Parekh <h.x.dev@outlook.com>
(cherry picked from commit d69e9034ab5b1b23250b2f529d957f60b9084865)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/res/layout/reader_settings_sheet.xml
 2021-01-01 23:49:25 -05:00
arkon
1f3c805a0f Handle last read page being above total page count (fixes #4010) 
(cherry picked from commit 141f9b7730dc63c123cbe2fca455f70edba9eb39)
 2020-12-31 17:33:20 -05:00