Commit graph

89 commits

Author SHA1 Message Date
arkon
805a88df25 Add share menu item in reader
Closes #9510

(cherry picked from commit 841f80f935225bdb7ee7e400d2b2aa8176c5e4c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/menu/reader.xml
2023-06-24 13:43:29 -04:00
arkon
479ab126c2 Minor cleanup and remove unused dependencies
(cherry picked from commit 152fdec855cccfb479af8f74f1d4099be0ac399c)
2023-06-24 10:39:23 -04:00
arkon
2d013c551d Migrate reader slider and next/prev buttons to Compose
(cherry picked from commit 9a10656bf07a7dd35400fa6e42dd0e4889ddb177)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
#	app/src/main/res/layout/reader_activity.xml
2023-05-06 17:40:42 -04:00
arkon
c320daf832 Migrate PageIndicatorTextView to Compose
Probably closes #7798

(cherry picked from commit 3c79777e66d701958c2a20dfb5ccbdfef6e5c294)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
2023-05-06 14:28:35 -04:00
d-najd
0d7cff1f43 WebView for chapter link (#8281)
* backup

* doing logic

* cleanup

* applying suggestion

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

* requested changes

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

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-10-29 17:31:25 -04:00
Tien Long Lam
0632d3a605 Added tickers in the reader page slider (#7760)
* Added tickers in the reader page slider

Default setting is off, under the reader page

* Revert "Added tickers in the reader page slider"

This reverts commit 51910dc65ae965b92d2cfe6a4d28df4ad27288a2.

* Added reader page slider tickers via xml

(cherry picked from commit 97656935a25c3f4d9f0a870404131d6c135f4207)
2022-08-17 15:34:08 -04:00
arkon
72aba18dab Use Material3 switches in XML layouts
(cherry picked from commit da7a64b40dda3368565b329e519da3283c797131)

# 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
2022-07-09 19:58:02 -04:00
arkon
5edb36ea75 Fix wrapped long page numbers in reader (closes #7300)
(cherry picked from commit 6bc484617ee382b1ac8262e75671e535647d3bc4)
2022-06-16 12:02:48 -04:00
Román
3c598f459a
Adding more size to few things (#495)
* Adding more size to few things

* Fixing margins and paddings

* Reverting categories_item

* Increasing size of innerContainer
2022-01-15 17:58:39 -05:00
Román
7294f0c17e
Fixing few things in ReaderActivity.xml (#491) 2022-01-01 17:15:50 -05:00
Ivan Iskandar
ae9fe06f7d Workaround cleanup (#6350)
* Remove material-components workaround that was fixed upstream

* Remove unused toolbar workaround

* Fix cover dialog navigation icon

(cherry picked from commit 38d131be37c674544b309248271e4e528d51d0f9)

# Conflicts:
#	app/src/main/res/menu/library_selection.xml
#	app/src/main/res/menu/reader.xml
2021-12-18 11:29:19 -05:00
Ivan Iskandar
22a6c8d772 Use elevated overlay on reader menu (#6347)
(cherry picked from commit 6b52fc1e2d0c23ec1224e654ee36de032661f6e2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2021-12-18 11:19:44 -05:00
Jobobby04
0936d4b844 Fix reader buttons 2021-12-12 20:39:00 -05:00
Ivan Iskandar
a780ea8dd9 Adapt M3 Typography (#6228)
(cherry picked from commit 6cbb02f02db5ca8eb8cb3fab7e1e7e4bcdae077f)
2021-11-14 18:35:32 -05:00
Jobobby04
62ee9e6560 Fix vertical slider 2021-10-23 16:14:53 -04:00
arkon
6b0927298a Smaller font size for reader page indicator (closes #6071)
(cherry picked from commit c9be4093e7190289f1a744634fdb3169eb0fa745)
2021-10-23 14:24:48 -04:00
Jobobby04
2f203f7a1d Cleanup and fixes 2021-10-23 14:24:43 -04:00
Ivan Iskandar
6f429cdb9c App-wide typography adjustments (#5931)
* Manga detail

Also adjust chapter item layout to accommodate bigger
display/font size

* Library

* Updates

* History

* Browse

* Preferences

* Button

* Navigation view

* category-download

* Google Sans

* Reader

* Chips

* Revert "Google Sans"

This reverts commit 5dd4c41f

* Misc

* Cleanups

* Section header text appearance

* Increase library manga title size

* Revert "Increase library manga title size"

This reverts commit 474be913

* Increase section header letter spacing

* Derps

(cherry picked from commit 6d650518a14953a1d5e74d1e56de841492929fb6)
2021-10-23 14:24:37 -04:00
arkon
d74e43b6a6 Switch to Material Slider for reader seekbar
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit d149017c60722ba26fe13487437ab542b9bbaebd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2021-10-23 14:24:33 -04:00
Ivan Iskandar
4bb6bf445b ReaderActivity: Block focus on viewer (#5996)
(cherry picked from commit c8f70efdedddef5c41b46245a25c2c68df01ed6c)
2021-10-23 14:24:28 -04:00
Jobobby04
fcf6776fe4 Fix expander color 2021-09-12 12:09:11 -04:00
arkon
a9a8e44ef6 Make nav overlay non-clickable (maybe fixes #5727)
(cherry picked from commit beb7f909089fb43cce519ea8e2b17926030c1555)
2021-08-27 12:50:59 -04:00
arkon
6857f35910 Don't allow focus on ReaderNavigationOverlayView (maybe fixes #5555)
(cherry picked from commit 2256030a2ad0f59bdb335bb1fe7cb18b041337fc)
2021-08-27 12:50:38 -04:00
Ivan Iskandar
374ecde463 Use correct color for reader loading indicator (#5685)
* Revert "Revert "Use correct color for reader loading indicator (#5645)" (fixes #5669)"

This reverts commit a4eba50c

* Fix crash on older APIs

(cherry picked from commit 5e77ae208da1c21eb58f1eb092ac1e9f3151c14a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
2021-08-27 12:50:33 -04:00
Jobobby04
f5645a8382 Revert "Use correct color for reader loading indicator (#5685)"
This reverts commit de698fc2334030faeddc787ac3b224f4bc32d316.
2021-08-27 12:50:28 -04:00
Ivan Iskandar
a90f99c445 Use correct color for reader loading indicator (#5685)
* Revert "Revert "Use correct color for reader loading indicator (#5645)" (fixes #5669)"

This reverts commit a4eba50c

* Fix crash on older APIs

(cherry picked from commit 5e77ae208da1c21eb58f1eb092ac1e9f3151c14a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
2021-08-27 12:50:26 -04:00
Riztard Lanthorn
c613784fc4
fix toolbar btn color (#395)
* fix prev btn color in vert seekbar

* fix migration button color

use colorOnToolbar instead of colorOnPrimary
2021-08-16 23:01:41 -04:00
Ivan Iskandar
641ad196f9 Reader loading progress indicator changes (#5587)
* Use CircularProgressIndicator on PageHolder

Manually rotate the CircularProgressIndicator inside a wrapper view instead of
drawing our own custom indicator.

* Use CircularProgressIndicator on TransitionHolder

(cherry picked from commit 6ba779fb7ae014d1f6e23d46cabf8c633d279d8e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
2021-07-22 15:47:45 -04:00
Jobobby04
74c94b9879 Small reader fixes 2021-07-04 14:49:41 -04:00
Jobobby04
33c48412be Multiple bugfixes for the reader, includes double page and chapter buttons 2021-07-03 22:37:25 -04:00
arkon
3ee68f5127 Fix some views being click-through-able
(cherry picked from commit fe3b36caebda84ab61753f32d5f112f1c7c12654)
2021-07-03 18:59:20 -04:00
Ivan Iskandar
32e7750b7d Match ReaderActivity theme with the rest of the app (#5450)
* Match ReaderActivity theme with the rest of the app

* Fix viewer inset when fullscreen reader is off

* Fix incorrect toolbar color after recreate

* Remove animated inset

* Move isDarkMode to PreferencesHelper

(cherry picked from commit 64c95305b9831762cc0be72f7ab47b006da07fa8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
2021-06-26 22:38:56 -04:00
Ivan Iskandar
f61bbfa77a More themes cleanup (#5410), remove AMOLED Blue
* More themes cleanup

* Tweak some things

* Fix 'Clear History' icon

* Split out ripple colored to its own drawable

* Tidy up things

* Unify background dim amount

* Use primaryColor for Account login button

* More colored ripples

* use colorOnPrimary for selected comfortable library item title

Co-authored-by: Soitora <simon.mattila@protonmail.com>
(cherry picked from commit 932c92412c29fe4a8d1410d29a6e77557ad48707)

# Conflicts:
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/menu/library_selection.xml
#	app/src/main/res/menu/reader.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/dimens.xml
2021-06-26 22:38:53 -04:00
Jobobby04
3053bf9d5d Double page spread
(cherry picked from commit 7832d1abe1fdcdb962f388e5a86dd3fcecad6712)
2021-05-23 14:49:09 -04:00
Soitora
2f9069765e Ripple overhaul (#5109)
* Create drawables for the ripples

Temporary colors in them to aid in unifying the ripples.

The 'ripple_circular' and 'ripple_normal' are probably going to be merge as one in the end.

* Change selectableItems to drawables

Changes 'selectableItemBackgroundBorderless' to 'ripple_circular' drawable.

Changes 'selectableItemBackground' to 'selectable_item_background' drawable.

* Add temporary colors to aid in finding unstyled ripples

* Fix button sizes to not make oval ripples

* Make the chip selectable follow ripple color

* Style using the built in rippleColor when possible

* Ripple away 💸

* Set ripple color for tabs

Main activity tabs as well as sheet tabs

* Set ripple color in seekbar buttons

* Fix ripple color for the toolbar

* Round off and start to finish the ripples

* Set custom colorful ripple for bottom navigation

Makes the app a little more fun than just black and white. Took inspiration from a ton of updated Google apps.

* Revert two layout changes

These were not necessary for the ripple as it is designed now, but it was before.

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

# Conflicts:
#	app/src/main/res/layout/main_activity.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/values/styles.xml
2021-05-22 17:40:53 -04:00
Ivan Iskandar
b3ddc1dfa3 Remove material-design-dimens (#5133)
(cherry picked from commit afd59eabbb5071b358f8dc04752788d73e4cc553)
2021-05-22 17:29:16 -04:00
Jobobby04
a4933388aa Add reader bottom button menu customization 2021-05-06 15:33:28 -04:00
arkon
01ad3dc92b Handle reader toolbar subtitle getting cut off when text is too big (closes #4843)
(cherry picked from commit 544adb9940bce8f42f9241c53785cb85192d533f)

# Conflicts:
#	app/src/main/res/layout/reader_activity.xml
2021-04-14 18:38:09 -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
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
arkon
3122f783a9 Move reader setting related classes
(cherry picked from commit 938919bd9be821e1e24bdd583aaeb1ab430868a0)
2021-03-18 14:55:52 -04: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
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
CrepeTF
653ae10caf Reader PR 2021-01-26 13:11:42 -05:00