63 Commits

Author SHA1 Message Date
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
arkon
54736ea410 Replace circular ProgressBars with Material component
(cherry picked from commit eaccfdde599e025c0481497902b89a616c24d587)
2020-12-26 16:42:07 -05:00
Andreas E
45ef778e6d Reader snackbar dismissible (#4190)
* Make Reading Mode Snackbar dismissible

* Change reader FrameLayout to CoordinatorLayout

(cherry picked from commit b92b6520cb949b6038fb5939472a00e86358cf17)
2020-12-26 16:41:29 -05:00
Jobobby04
e23b048d53 Fixes to reader ui from @CrepTF 2020-11-29 18:52:01 -05:00
Jobobby04
a48508a98e reader light theme chapters bottom sheet fixes 2020-09-13 22:52:11 -04:00
Jobobby04
eafe3a62e4 Fix the bottom sheet and remove the bookmark button at the top of the reader 2020-08-24 19:25:47 -04:00
Jobobby04
1240cc5232 Reader bottom sheet transparency, as well as a half fix for the fullscreen reader bug 2020-08-22 22:12:59 -04:00
Jobobby04
79e4e3d2a0 Add chapters bottom sheet for reader 2020-08-22 17:37:42 -04:00
arkon
91fc61114d Force proper LTR layout for reader pages/bottom toolbar (fixes #3258)
(cherry picked from commit 744a4f8f479848fb7b90a8fb1af6501104aa3301)
2020-05-31 14:14:11 -04:00
Jobobby04
290e912cf0 Add auto webtoon snackbar 2020-05-24 22:21:54 -04:00
jobobby04
77026d4eeb Pure Light Theme fixes and adding eh stuff to strings.xml 2020-05-03 02:06:04 -04:00
jobobby04
a6909a76ed Fix common toolbar popup menu text color (fixes #2695)
(cherry picked from commit b9ea6e8d9699d734d8fe3b1d5c1e1ac2d7223f24)
2020-05-03 01:52:05 -04:00
Rani Sargees
4d8f44ddae merge double upstream 2020-05-02 23:39:46 -04:00
arkon
ef0b546d4c Replace more icons 2020-03-15 16:46:38 -04:00
arkon
e41edc1fb7 Pure white light theme 2020-03-15 11:36:38 -04:00
arkon
b9ea6e8d96 Fix common toolbar popup menu text color (fixes #2695) 2020-03-12 19:14:43 -04:00
arkon
fbaaed1516 Match status/nav bar to reader toolbar color 2020-03-07 17:08:11 -05:00
onlymash
5fb3b0e0e3
Show page number only when toolbar is hidden (#2601)
* Show pagenumber only when toolbar is hidden

* Fix fullscreen issue

* Remove unneeded dependency

* Fix menubar padding

* Revert ReaderSeekBar height

* Refine code

Co-authored-by: arkon <arkon@users.noreply.github.com>
2020-03-07 16:57:14 -05:00
arkon
beb2d880ea Move color filter behind reader toolbars (fixes #2619) 2020-02-23 00:07:34 -05:00
arkon
aa05458f1d Run formatter on layout files 2020-02-21 18:43:50 -05:00
arkon
81418a7712 Tweak reader seekbar height for Android 5 UI bug (closes #2487) 2020-01-11 22:29:31 -05:00
arkon
885c7bbb10 Add descriptions to reader prev/next buttons for a11y 2020-01-11 22:14:02 -05:00
arkon
d4c25359bd Remove clickable attributes from unclickable text in reader 2020-01-11 22:13:46 -05:00
Rani Sargees
9b883b1a09 androidx migration
I DID THIS ONE MYSELF WITHOUT TAKING IT FROM THE OTHER FORKS
YEEEEEEEEEEET
2020-01-06 03:26:31 -05:00
arkon
78689e7443
Migrate to AndroidX (#2424)
* Migrate to AndroidX (automatic conversion by Android Studio)

* AndroidX dependency code updates

* Fix source preference reparenting

* fixes the androidx prefererences icon spacing issue

(cherry picked from commit b76a15d960ec2cdf771be16377db0348b66b3179)

* Fix source preference screen heading size/list padding

Co-authored-by: Carlos <cargo8005@gmail.com>
2020-01-05 11:29:27 -05:00
NerdNumber9
7fe742e6ed Upstream merge 2019-07-27 17:56:31 -04:00
Deumiankio
021dde66eb Add color filter blend modes (#2013)
* Add color filter blend modes

* Only show modes supported by currently used API level.

* Fix arrays.xml for API level <=27.
2019-04-29 19:32:49 +02:00