* 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
* fix: prevent crash if TrackService.getScoreList() is empty
* disabled track score button if service doesn't support scoring
* first implementation of the Komga tracking
this doesn't work for read lists
* auto track when adding to library
* handle refresh
* 2-way sync of chapters for unattended tracking services
* Update app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt
Co-authored-by: Andreas <andreas.everos@gmail.com>
* group strings together
* support for read lists
* sync read chapters on bind
* only mark local chapters as read during 2-way sync (incoming)
* local progress from read chapters will be sent to remote tracker on bind/refresh
this enables syncing after reading offline
* remove unused variable
* refactor the 2-way sync in a util function
* handle auto add to track for unattended services from the browse source screen when long clicking
this will also sync chapters, as it is possible to have read or marked as read chapters from there
* 2-way sync when library update for TRACKING
* refactor
* better handling of what has been read server side
* refactor: extract function
* fix: localLastRead could be -1 when all chapters are read
* refactor to rethrow exception so it can be shown in toast
* extract strings
* replace komga logo
Co-authored-by: Andreas <andreas.everos@gmail.com>
(cherry picked from commit d6b3b0baf70b3a6caccffd367b707f26c1e6010d)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
* 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
* hide update and history buttons option
* Move updates and history button in More then hiding
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
* disable always visible labels
* make it a setting
* remove redundant line
* Fix preference keys
* Update keys again
* Fix import
* Remove extra line
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
* Show notification to disable Incognito Mode when it's enabled
* Finish ReaderActivity and BrowseSourceController when incognito is disabled
* CLeanup strings
* Only register DisableIncognitoReceiver when needed
(cherry picked from commit cb203ef02cc3c078d5e5717b98ef1db1cf570586)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
# app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt
* Add manga-wised rotation mode settings
Based on #3522
Co-authored-by: bboyz269 <4453811+bboyz269@users.noreply.github.com>
* Fix small mistakes
* Complete TODOs
* Rename functions
rotation -> orientation
* Fix orientation icon not changing
Bug from video
* Fix bug with force portrait not being force if a default value
Bug from video
* Backup viewer_flag as a seperate field in so legacy/forks doesn't crash
* Make viewer_flags nullable so old backups viewer gets restored
* Add migration for old rotation and viewer to new defaults ones
* Rename variable in enums
* Fix migration after OrientationType was changed
* Remove untrue comment
Co-authored-by: bboyz269 <4453811+bboyz269@users.noreply.github.com>
(cherry picked from commit 0fef546a0d4b2a78089b0880564e80708afbe1da)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
Based on what's in J2K. Also renamed to MaterialSpinnerView to match what's there.
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 3287ca9cf264fb0d28bdd7e43404cef595d953de)
* add sort by date fetched in library
* chapter fetch date to 8
(cherry picked from commit ddd4cc10ff12d2497a001821c678f2c1a90eef34)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
Using 800s from J2k in BackupManga for this(except for status)
(cherry picked from commit c21b91bc026213993a67089ef4bc76c68ade4445)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
# app/src/main/res/values/strings.xml
* 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
* Let users invert dual page split
* Use Activity lifecycleScope and cleanup invert logic
(cherry picked from commit 776610d0e64d0c4ad02c094336efa18a144632d2)
* Add DualPageSplit option
* remove extra line
* Split double-page into two pages
* Remove !isAnimated check and add (ALPHA) to the label
* Fix missing insert pages
* Pager cleanup
* Add dual split to Webtoon and fix Vertical
* Fix L2R/R2L
* Add comments and refactor code in ImageUtil
* Use a simpler split solution in webtoon mode
Co-authored-by: weng <>
Co-authored-by: Andreas E <andreas.everos@gmail.com>
(cherry picked from commit b5017eebbf0740189f254d5db25df3c54a282e1f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
* Add manga count to the library header
* Make showing the number of manga configurable
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit c34b548a3e093a948d3de2dd784077395ea801ab)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
* Allow to filter for each tracker logged in
* Simplify filter logic
* Use variable names instead of it
and rename variables
* Change how trackFilters and items are setup
* Use variable name instead of it and try cleanup filterFnTracking
* Changes from feedback
(cherry picked from commit fea2e0a26557051a375af236086203507230d78d)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
* Hide tracking when not logged in
* Change string name and value
(cherry picked from commit 1a5858e99ba98482a6470c7f70b2e4c43323940f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
* Add filter for tracking or not
* Use .any
* Access database only when needed
(cherry picked from commit 5cddc0c3875fffa205bd7fbc7f881cc60871b5be)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
* Viewer navigation
Co-authored-by: Harsh Parekh <h.x.dev@outlook.com>
* Match current reader behavior and add ability to invert it
* A bit of clean up
* Clean up inversion
* Only create navigator when changed
and change tap zone when invertTapping is changed
* Clean up PagerConfig
* Change how Viewer navigation works
* Add Edge Navigation
Co-authored-by: Harsh Parekh <h.x.dev@outlook.com>
(cherry picked from commit d69e9034ab5b1b23250b2f529d957f60b9084865)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
# app/src/main/res/layout/reader_settings_sheet.xml
Unfortunately MAL was the only one that supported it in the app, but the official API doesn't support it, so now no trackers have it.
(cherry picked from commit 6e7fefb8b22da062eb2eaf4cb20746e258ef4d65)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt
* Make a protobuf based backup system, restore not tested
* Fix a number
* Remove uneeded change
* Remove more uneeded changes
* Use 1.x style models, backup should be 100% compatible with the 1.x backups
* Fix restore service not running
* Fix offline chapter restore
Cleanup saved searches restore(untested)
* Implement onlione/offline option, fix merged manga restore online, fix restore total
* Allow setting auto backup to use a full backup
* Fix for saved searches restore
* Edit some comments
* Convert flows back to observables
* Fix a model
* Fixes and comment only the SY specific things
* Move SY values range to 600 from 60
* Combine legacy and full backup services into one
Deduplicate a lot of code
Simplify a lot of stuff
Modify comments
* Cleanup
* Remove unneeded protobuf config edit because its now the default
* Migrate to kotlinx.serialization for backup saved searches
* Cleanup saved searches more, move gson type adapters to the legacy package
* Implementing do not save chapter history preference
* Refactor of labels
* Changing incognito mode from Readers section to More
* Fixing imports and removing unused strings
(cherry picked from commit 79ccfcd55397f3df7ce91d88e93a7c879a3360ab)
* [wip] hardcoded flag for hide on scroll
* add corresponding option in settings
* clean up a little
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 3784d1a8f2886e1ebc598cd83afa2622f9c44b43)
* [wip] started to change manga delete options
* Change dialog for deleting selected manga
* Move array to appropriate file
* Make first option enabled by default
* Use radio buttons to reduce amount of clicks
* Revert "Use radio buttons to reduce amount of clicks"
(cherry picked from commit 458e761b458bb3cb41924e88643faf2ee7efd4d9)
