Commit Graph

161 Commits

Author SHA1 Message Date
CVIUS ea9ea11eaf Use theme primary color for slider track (#7102)
(cherry picked from commit bc053580ad)
2022-05-14 10:36:32 -04:00
arkon 76e3f0e5cb Consistent divider colour
(cherry picked from commit 9120e82517)
2022-02-12 22:31:46 -05:00
Jobobby04 82688f96db Revert "Temporarily revert some things for stable release"
This reverts commit e6f7689149.
2022-02-01 18:06:22 -05:00
arkon e6f7689149 Temporarily revert some things for stable release
(cherry picked from commit b88f8ae9d2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
(cherry picked from commit 2f22f56b32)
(cherry picked from commit 2492803741)
2022-02-01 18:03:04 -05:00
Jobobby04 5466832187 Revert "Temporarily revert some things for stable release"
This reverts commit 2492803741.
2022-02-01 17:57:55 -05:00
arkon 2492803741 Temporarily revert some things for stable release
(cherry picked from commit b88f8ae9d2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
(cherry picked from commit 2f22f56b32)
2022-02-01 17:57:40 -05:00
Jobobby04 4e018828c4 Revert "Temporarily revert some things for stable release"
This reverts commit 2f22f56b32.
2022-02-01 17:13:25 -05:00
arkon 2f22f56b32 Temporarily revert some things for stable release
(cherry picked from commit b88f8ae9d2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
2022-02-01 17:12:34 -05:00
arkon f089991e0b Use default bottom nav height
(cherry picked from commit 836a2649d3)
2022-01-31 18:44:20 -05:00
arkon 4921a66665 Replace custom download dialog buttons with MaterialButtons
(cherry picked from commit 35e0561950)
2022-01-29 20:06:40 -05:00
arkon e2446cd703 Fix solid background behind text selection UI in dialogs
(cherry picked from commit 1a11d4153e)
2022-01-22 18:39:42 -05:00
arkon c95a274ff5 Update dependencies
(cherry picked from commit 0cb4094dd9)
2022-01-22 11:45:21 -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 38d131be37)

# Conflicts:
#	app/src/main/res/menu/library_selection.xml
#	app/src/main/res/menu/reader.xml
2021-12-18 11:29:19 -05:00
Andreas 79a5a4cb80 Fix back button having wrong tint in Toolbar (#6339)
(cherry picked from commit 0de86dfe6f)
2021-12-11 15:01:18 -05:00
arkon a3cea7e6a3 Use default snackbar styles (fixes unreadable text)
Sorry AMOLED users, you'll just have to deal with the brief light snackbars.

(cherry picked from commit dc39669321)
2021-12-02 19:30:18 -05:00
arkon 93a4634995 Clean up ActionMode styles
(cherry picked from commit 25784d1fe5)
2021-12-02 19:01:16 -05:00
arkon 1faeb083e4 Adjust manga genre chip style
(cherry picked from commit f3d85655a0)
2021-12-02 19:01:01 -05:00
arkon cd64b9b6eb Remove custom tab indicator style
M3 TabLayout has the same style built-in.

(cherry picked from commit e985ffc690)
2021-11-14 18:43:48 -05:00
Ivan Iskandar a780ea8dd9 Adapt M3 Typography (#6228)
(cherry picked from commit 6cbb02f02d)
2021-11-14 18:35:32 -05:00
arkon a9dc395e19 Initial pass of Material 3 styling
Adjustments/fixes to follow.

(cherry picked from commit a8a761aa5f)
2021-11-13 17:31:35 -05:00
arkon 0f70c14879 Remove legacy blue theme
Causing too many theming issues/complexity. This will make the Material 3 transition easier.

(cherry picked from commit f85dfa90b8)
2021-11-13 17:31:00 -05:00
arkon 13f1f37a3e Remove unused fast scroll bubble drawable and accidentally committed file
(cherry picked from commit da5942b398)
2021-11-02 19:08:21 -04:00
arkon a9a93e2f8f Use SwitchMaterial for preferences too (closes #5724)
(cherry picked from commit aae011ed83)
2021-10-23 14:24:51 -04:00
arkon 353a3ffe00 Hide slider tooltip label everywhere
(cherry picked from commit a56997e98c)
2021-10-23 14:24:45 -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 6d650518a1)
2021-10-23 14:24:37 -04:00
arkon f3d867f9aa Move extension app info button
Aligns with TachiyomiJ2K.

(cherry picked from commit 33b3be0d0e)
2021-09-24 12:52:16 -04:00
arkon aa144603e2 Use ShapeableImageView for rounded thumbnails instead of Coil transformations
(cherry picked from commit 0e26abf7a6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
2021-09-01 18:41:11 -04:00
arkon 9a4e6bef7f Fix toolbar text color in light blue theme
(cherry picked from commit 5f5fc77877)
2021-08-27 12:51:01 -04:00
arkon 49916667a7 Fix blue background under action mode text selection handlers in blue theme
(cherry picked from commit 909aed4262)
2021-08-27 12:50:57 -04:00
Soitora 6d0f620629 Bold author and artist fields (#5770)
(cherry picked from commit 11926014da)
2021-08-27 12:50:56 -04:00
Soitora 9a5787af29 Add a much more clean design to Chips (#5765)
Based on the default chips and what is seen on J2K/Neko

(cherry picked from commit 3826b307f7)
2021-08-27 12:50:55 -04:00
arkon 1b2e0d1b11 Adjust blue theme
(cherry picked from commit dd008bc13a)
2021-08-27 12:50:53 -04:00
Ivan Iskandar 564c8618cb Enable elevation overlay for MaterialSwitch (#5686)
(cherry picked from commit 24e5a4d7ec)
2021-08-27 12:50:32 -04:00
Jobobby04 1d9c3624a9 Main tachi title style 2021-08-27 12:50:25 -04:00
Ivan Iskandar d4993d1b71 Replace material-dialogs usage with Material Components' (#5423)
* Use Material Components' dialogs

For all dialogs that has direct replacement.

* Convert text input dialogs

* Convert quad-state multi choices dialogs

* Convert date picker dialogs

This also changes the flow to remove selected start/finish tracking date and
the track item itself

* Remove material-dialogs dependencies

(cherry picked from commit ae97bb0445)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
2021-07-18 20:15:30 -04:00
Soitora d34147803c Tweak chip contrast (#5526)
* Set better contrast for chips

* Set custom chip colors for Yin Yang

(cherry picked from commit 13d39fc942)
2021-07-18 13:07:43 -04:00
Ivan Iskandar ad2bbd0e3c Merge light and dark themes (#5470)
* Merge AMOLED and regular dark themes

This allows all variants of dark themes to use black backgrounds as a
separate preference.

* Merge light and dark themes

* Fix ReaderSeekBar color on Dark Blue theme

* Color fixes

* Fix Dark Blue bars ripple

* Simplify night mode check

(cherry picked from commit 0eadc028b6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	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/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
2021-07-03 18:55:12 -04:00
Ivan Iskandar b7b1175207 Tracking sheet and search adjustments (#5427)
* Tracking sheet and search visual adjustments

* Remove track item divider

* Add start margin to "add tracking" button

* Fix track search dialog crash when no item chosen

* Show "remove" action only when track item is previously set

* Remove placeholder for total chapters

* Cleanups

* Add track search error/empty result message

* Make track search dialog fullscreen

* Use AutofitRecyclerView for track search dialog

* Fix text input overlapping

* Run track search from IME action instead

* Remove deprecated method

* Reformat

* Set track search error message on the placeholder

* Use payload to notify track search item change

* Fix track search action icon tint color

(cherry picked from commit cb71d44024)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
#	app/src/main/res/values/styles.xml
2021-06-28 14:38:36 -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 64c95305b9)

# 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 932c92412c)

# 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
Zakhar Timoshenko 56fa39387f Added "Yotsuba" theme (#5290)
(cherry picked from commit 9b967177c5)
2021-06-13 14:35:40 -04:00
Ivan Iskandar 9a97a97aa7 More bottom sheet improvements (#5183)
* Edge-to-edge bottom sheet when possible

* ReaderSettingsSheet: Animate background dim changes

* Adjust modal bottom sheet in-out animation

* Use public method to get bottom sheet behavior

* Set bottom sheet peek size to 50% screen height

The current auto peek height gives too low value on landscape orientation

* Set bottom sheet navigation bar scrim when needed

(cherry picked from commit 9f744bc445)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-05-29 17:58:17 -04:00
Soitora a93129c4f2 Allow themes to style more objects (#5197)
* Add Tertiary color and use it for Badges

* Define ripple color for Material Dialog

Although it doesn't do anything, but it should

* Add tertiary colors for Green Apple theme

* Use the correct theme accent in AlertDialog

* Declare a global colorControlHighlight

Fixes some of the ripples listed on #5154.

* Change md_ripple_color to primary ripple color

(cherry picked from commit 11a232a2df)
2021-05-28 14:36:51 -04:00
Soitora 606101dc8b Add "Midnight Dusk" and "Hot Pink" themes (#5161)
* Organize and clarify themes file

Increases clarification with better commenting, should make it easier to add or modify current themes.

* Make AMOLED its own theme category

* Tweak ripples for AMOLED

* Add "Midnight Dusk" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Add "Hot Pink" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>

* Make AMOLED a base theme

* Final tweaks

Rename "Toolbar.Light" to "Custom.PopupTheme"
Changes placing of backgroundDusk

Removes HotPink and MidnightDusk custom Toolbars, I believe they are unnecessary.

* Rename a Midnight Dusk color

* Make AMOLED independent from Dark as a theme

Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
Co-authored-by: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>
(cherry picked from commit 176e984b56)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/themes.xml
2021-05-28 14:36:40 -04:00
Soitora e5131e1985 Create a toolbar variable for ripples (#5159)
* Rename rippleNavColor to rippleSecondaryColor

It's not just for the navigation anymore

* Add a rippleToolbarColor for toolbar ripples

Fixes so you can use specialized colors in case of using a theme such as Dark Blue or Light Blue

* Add so text buttons are also themed secondary color

Apparently this is also a common Google app thing

* Changes variable name for Navigation Rail

(cherry picked from commit fed6f44995)

# Conflicts:
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/themes.xml
2021-05-23 15:35:59 -04:00
Soitora 9b4aac7ce5 Ripples patch (#5144)
* Combine ripple_dark and ripple_light

Fixes AMOLED theme and doesn't require two seperate items.

* Fix ripple for the new About icons

* Fixes nav/tab ripple in Dark Blue and Light Blue themes

* Theme some ripples using their Style instead

(cherry picked from commit 33dcdc1599)

# Conflicts:
#	app/src/main/res/values/themes.xml
2021-05-22 18:28:04 -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 562dce60ee)

# 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 afd59eabbb)
2021-05-22 17:29:16 -04:00
arkon df950219f5 Use Material dialogs for preferences
Partially addresses #2907

(cherry picked from commit 112e233498)
2021-03-18 15:11:13 -04:00
arkon 23e4b661bc Tweak dialog corner radius
(cherry picked from commit 18b1326f3a)
2021-03-18 15:11:02 -04:00