Causing too many theming issues/complexity. This will make the Material 3 transition easier.
(cherry picked from commit f85dfa90b867c80b7a456c07ee03f99c9b71a987)
* Prepare for edge-to-edge MangaController
* Fix derpy liftToScroll with our own implementation
* Edge-to-edge MangaController
Except when legacy blue theme is used.
* Save app bar lift state for controller backstack
* Fix expanded cover position after the view recycled
* Handle overlap changes when incognito mode disabled
* Tablet fixes
* Revert "Handle overlap changes when incognito mode disabled"
This reverts commit 1f492449
Breaks on rotation changes.
* Fix MangaController's swipe refresh position
* All controllers are now doing lift app bar on scroll by default
They are already doing that before so this pretty much just a cleanups.
* TachiyomiCoordinatorLayout: Support ViewPager for app bar lift state check
I'm willing to revert this if this minute detail solution is deemed too hacky xD
* Fix app bar not lifted when scrolled without fling
* Save app bar lift state across configuration changes
* Fix MangaController's swipe refresh position after configuration change
* TachiyomiCoordinatorLayout: Update ViewPager reference when controller is changed
(cherry picked from commit da16110e1c571526baea34275db41937f68c7e8c)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
* add Theme "Teal & Turquoise"
* re sorting & change tertiary dark
* use alpha on ripple color & capitalize
(cherry picked from commit 83436c9550fb46f6322959b01959542e967ec84e)
* Added "Ninomae" theme
Based on the lovely Ninomae Ina'nis, for Arkon and Flat
* Use updated colors from Ghostbear
Adapted after feedback
Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>
* Tweak the Ninomae theme further
* Sort themes alphabetically
- Sorts themes alphabetically.
- Use the same capital word system in colors.xml for themes.xml as well.
- Rename AMOLED theme to AMOLED mode in theme.xml and color.xml references.
* More tweaks
* Style incognito bar
Uses a dark purple which looks super clean instead of a washed out gray
This sets the groundwork for other themes too
* Tweak final onPrimary color
* Rename Ninomae to Tako
RIP
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit 0d62aedfbb183fbe7c1a4886ed7505c5ce6c8518)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
* 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 ae97bb04458c6a754c6e0ca05a2a3b96ce16894f)
# 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
* add Yin Yang Theme
* change download badge color to yin yang as well
* update string
* fix &
(cherry picked from commit d9ea621e544981062c2a67b8f4bb196cb0da904f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
* 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 0eadc028b6f9daf38cae083cfdc2ff44a1836623)
# 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
* 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
* 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
* Add better library item selectors
Inspired by the J2K method of library item selection.
* Tweak theme selection colors
It was missing for Hot Pink and Midnight Dusk.
The selector color is 75% alpha of the color accent, this looked fitting for all themes.
(cherry picked from commit 88d9ffe92e41ab8a4d24655a32aa87a20ee8bd01)
* 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 11a232a2dfd42094ebabba1a1c02997931fcdd10)
* Added "Green Apple" theme
Totally not stolen from other forks.
Although to cover all my bases I co-author all people who adapted the theme in any form.
Neko, J2K and Tako
Co-Authored-By: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-Authored-By: Jays2Kings <jays@outlook.com>
Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
* Add black as the OnSecondary color
Co-authored-by: Carlos <2092019+CarlosEsco@users.noreply.github.com>
Co-authored-by: Jays2Kings <jays@outlook.com>
Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
(cherry picked from commit 4af13e3536493db7de3ff5e24ae5794c1efe3661)
* 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 176e984b56d66d1e47bd367d7dde03e4a024152c)
# 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
* 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 fed6f44995b7931816d86f599734e81e3c764a80)
# Conflicts:
# app/src/main/res/values/styles.xml
# app/src/main/res/values/themes.xml
* 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 33dcdc159949e76933f07130fd43d0537c7ea46f)
# Conflicts:
# app/src/main/res/values/themes.xml
* 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
