185 Commits

Author SHA1 Message Date
arkon
0f70c14879 Remove legacy blue theme
Causing too many theming issues/complexity. This will make the Material 3 transition easier.

(cherry picked from commit f85dfa90b867c80b7a456c07ee03f99c9b71a987)
2021-11-13 17:31:00 -05:00
arkon
e28d72bf9c Minor cleanup
(cherry picked from commit 93e2b88d41143b7485172a29bb40b7ed5478a0ac)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-11-02 19:05:18 -04:00
Ivan Iskandar
14d6e8dd94 Replace Timber with Square Logcat and make logging configurable (#6062)
* Replace Timber with Square Logcat

* Configurable logger

(cherry picked from commit 2e127dff1f0b00f6a92359a07132c6016db6ea36)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
2021-10-23 14:24:42 -04:00
Ivan Iskandar
0feb9d338f Tablet UI override (#5830)
* Tablet UI override

* Tablet UI advanced pref

(cherry picked from commit 0df23ab87870b87190a3942585da834eff5ed97a)

# 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/setting/SettingsAdvancedController.kt
2021-09-06 16:38:53 -04:00
arkon
ae392192f2 Update app theme preference UI
Heavily influenced by TachiyomiJ2K.

(cherry picked from commit 6240fe1dfc9615b0be4bee6e54070e9d21a68b87)
2021-08-27 12:51:00 -04:00
arkon
3cf1ae0aa4 Use custom tabs instead of browser (closes #5754)
(cherry picked from commit 6c527d52fb3ace3c26ac2b1e25a764e2dd99231d)
2021-08-27 12:50:57 -04:00
Ivan Iskandar
acbc4c48fa Edge-to-edge manga details view (#5613)
* 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
2021-08-27 12:50:47 -04:00
Riztard Lanthorn
ac75ad7489 add Theme "Teal & Turquoise" (#5681)
* add Theme "Teal & Turquoise"

* re sorting & change tertiary dark

* use alpha on ripple color & capitalize

(cherry picked from commit 83436c9550fb46f6322959b01959542e967ec84e)
2021-08-27 12:50:43 -04:00
arkon
7b038951b0 Remove ability to set in-app language differently from system's
(cherry picked from commit 03980b2f27bc80bc578808f86a1e114a72a3559e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
2021-08-27 12:50:28 -04:00
Ivan Iskandar
306deb5e6a Fix forced secure screen disabled after disabling incognito
(cherry picked from commit 245132a1d136d41b5c139c09c58711ce224b6494)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
2021-08-27 12:50:24 -04:00
Ivan Iskandar
e02057a066 Fix reader activity not using preferred language (#5630)
(cherry picked from commit a3090e62f5491d1a50bb97206dc5534e086959db)
2021-08-01 23:38:39 -04:00
Ivan Iskandar
673869bd13 Apply default night mode earlier (#5593)
(cherry picked from commit c42d517f6b13652a7fe9edf21b2441bf35ee75b1)
2021-07-25 14:21:17 -04:00
Ivan Iskandar
699490685f Add Dynamic theme for Android 12 (#5569)
* Add Dynamic theme for Android 12

* Also theme text colors

(cherry picked from commit b2d58e04d262ef30e9232c46e917d45e6dc34c8d)
2021-07-18 22:02:54 -04:00
Soitora
a17747e2b4 Added "Tako" theme (#5546)
* 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
2021-07-18 20:20:26 -04:00
Riztard Lanthorn
22fd34088f add Yin Yang Theme (#5508)
* 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
2021-07-08 23:08:47 -04:00
Ivan Iskandar
52b748d935 Simplify locale override (#5509)
(cherry picked from commit 37d30eb887d0580fc98eb6a6fd5d6a08bc585721)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
2021-07-07 20:37:02 -04:00
arkon
183da5cc84 Resource cleanup post-theme removal
(cherry picked from commit 040bac3da2a215802ebad02f8e6a418bb200cb9c)
2021-07-05 18:43:55 -04:00
arkon
988249b177 Remove Hot Pink theme
The old AMOLED Hot Pink theme is pretty close to what Midnight Dusk + AMOLED is now.

(cherry picked from commit e9dce32a9820e829b1caa1957d2ec1ab9cc9f3c6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
2021-07-05 18:42:30 -04:00
arkon
e6a4d1e2b4 Rename "Dark Blue" theme to "Blue"
(cherry picked from commit 535cc0d81e03380d6e0e87d7be751a04c2a12aa4)
2021-07-05 18:41:17 -04:00
arkon
b71694fb54 Update to Conductor 3.0.0
(cherry picked from commit 01a1a9ebab09bb81fcb35412b171be794bfb91bf)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
2021-07-03 19:08:00 -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 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
2021-07-03 18:55:12 -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
Zakhar Timoshenko
56fa39387f Added "Yotsuba" theme (#5290)
(cherry picked from commit 9b967177c51a93c5db3fe2079cc6581e5b065970)
2021-06-13 14:35:40 -04:00
Ivan Iskandar
eafce1ee5d Enable secure screen when incognito mode is enabled (#5339)
* Enable secure screen when incognito mode is enabled

* Fix incognito banner not showing up after configuration changes

(cherry picked from commit fb8aafb69f252efbf9e58bdb80180b3afb59b866)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
2021-06-10 16:41:38 -04:00
arkon
84330af417 Address some build warnings
(cherry picked from commit fb7a458747e8a9fe2abe73d8ef6982f3bc0298e2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
2021-06-03 14:01:05 -04:00
arkon
d5fcded898 Fix toolbar menu being broken on transition (fixes #5135)
(cherry picked from commit 034506f56b96b7f01c2d27021236e55f0542c559)
2021-05-29 18:19:40 -04:00
Jobobby04
9fa278f708 Fix SY themes a bit more 2021-05-28 14:36:53 -04:00
Soitora
ae073f9207 Added "Green Apple" theme (#5184)
* 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)
2021-05-28 14:36:47 -04:00
Soitora
2acc364960 Added "Strawberry Daiquiri" theme (#5176)
(cherry picked from commit 0fb9ca3e8b1e779206c9e4a9f7ac3259bed3911a)
2021-05-28 14:36:42 -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 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
2021-05-28 14:36:40 -04:00
arkon
ba0e353ea1 Revert "Prevent view from being removed if a to is found (#5135) (#5152)"
This reverts commit 974275a42993534b6d63ae6ba34b75c3c21b7627.

(cherry picked from commit 986b709f2ce7f6ccd131b85f27c195bd85114fa6)
2021-05-23 15:36:10 -04:00
Antoine Gaudreau Simard
ac7e2909ba Prevent view from being removed if a to is found (#5135) (#5152)
Introduced in c68e7c8da78309a0b091c11379a8da5c6222572d

(cherry picked from commit 974275a42993534b6d63ae6ba34b75c3c21b7627)
2021-05-23 14:49:55 -04:00
arkon
b4a226157c Drop support for Android 5.x
(cherry picked from commit 89619b7836145130b4bf5d92ebc0f6fe70de7233)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
2021-05-04 14:13:14 -04:00
Eugene
8ac309c4ae
Theme AMOLEDblue (#280) 2021-04-27 17:57:51 -04:00
arkon
aa56698dac Clean up controller viewbinding creation
Based on https://github.com/Jays2Kings/tachiyomiJ2K/blob/master/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt

(cherry picked from commit cab919d74c2a00fd450c915a4d7fddc29c44927e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-04-19 14:56:08 -04:00
Ivan Iskandar
e43777bba7 Themes cleanup (#4894)
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/res/values/themes.xml
2021-04-19 14:35:28 -04:00
Ivan Iskandar
885c251fb4 Add navigation bar scrim (#4845)
* Revert "Add navigation bar scrim (closes #4836)"

This reverts commit 2a69d1b0

* Add navigation bar scrim

(cherry picked from commit 1f729f1cb33e4d9df6471016417eac0fd1782735)
2021-04-19 13:58:32 -04:00
Ivan Iskandar
9e40625c08 Draw edge-to-edge (#4802)
(cherry picked from commit f3660d88ddf21d92a80cc5e73bfa012ddf506e75)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-04-11 18:43:19 -04:00
Antoine Gaudreau Simard
6e9043c633 Add onPause\onResume persistence to searchView. Fixes issue #3627 (#4494)
* Add onPause\onResume persistence to searchView. Fixes issue #3627

* New controller subclass with built-in SearchView support

* Implement new SearchableNucleusController in SourceController

* Add query to BasePresenter (for one field it is not worth create a subclass in my opinion), convert BrowseSourceController to inherit from SearchableNucleusController

* move to flows to fix an issue in GlobalSearch where it would trigger the search multiple times

* Continue conversion to SearchableNucleusController

* Convert LibraryController, convert to flows, Known ISSUE with empty string being posted after setting the query upon creation of UI

* Fix issues with the post being tide to the SearchView queue which is not processed until shown. Add COLLAPSING state capture which should wrap this up.

* refactoring & enforce @StringRes for queryHint

(cherry picked from commit 2911fe7a1aa8b94d8e95e99648e3bce0d23fa0a7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
2021-03-28 18:33:41 -04:00
Jobobby04
04200bb590 Cleanup 2021-03-11 19:10:33 -05:00
OncePunchedMan
f7d52e0372
Added "Hot Pink" theme (#238)
* first test

* added hot pink theme

* moved string to correct place
2021-03-10 19:28:07 -05:00
Jobobby04
079ca1d0b3 Small cleanup 2021-02-24 16:16:47 -05:00
arkon
cd8543d40b Avoid crash when device fails to handle opening a URL
(cherry picked from commit 61e5440b7c9c01dcb4a373d407da4872a4f38de2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
2021-02-12 18:54:09 -05:00
arkon
ede6a54b30 Remove unnecessary LayoutContainer implementations
(cherry picked from commit 291168f4debfc87a62c77c252c77ebeff4b3aafd)
2021-02-11 18:13:41 -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
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
inorichi
c8dd2190ba Minor fixes regarding leaks
(cherry picked from commit 36f81b4a623ede11f10049f5869de5b6efa7803a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-01-07 14:27:22 -05:00
CrepeTF
4b3d92a050
Added "Midnight Dusk" theme (#183)
* Added Midnight Dusk theme + tweaks

* Added Midnight Dusk theme + tweaks

* Colouring mistakes

* Space error
2020-12-26 19:25:34 -05:00
arkon
67e676d4ae Apply theme to OAuth login redirect activities
(cherry picked from commit 6d403851cf81dd596860d80bf44bdd350667be7a)
2020-12-21 14:21:39 -05:00