618 Commits

Author SHA1 Message Date
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
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
Jobobby04
7d09c4da0d Use the Main Executor to schedule the EH Updater 2021-07-03 19:29:46 -04:00
arkon
aa23de77bc Remove en-GB option since we don't actually localize different English locales
(cherry picked from commit 0cb042cd93d5bd2ad249a71af7d7bf87da5a6a89)

# Conflicts:
#	app/build.gradle.kts
2021-07-03 18:56:53 -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
stinky-lizard
0e636d68c4 Imported implementation for updating library by next expected update from Neko (#5436)
* Imported implementation for updating library by next expected update from Neko. This sort uses the last 4 updates for a manga to compute an average time between updates and then extrapolates when the next update should occur.

Currently seems to work perfectly. However, I may have silently messed something up along the way.

All code and algorithms are credited to kyjibo on GitHub. The original commit adding this functionality is here: 681003926a

* Imported implementation for updating library by next expected update from Neko. This sort uses the last 4 updates for a manga to compute an average time between updates and then extrapolates when the next update should occur.

Currently seems to work perfectly. However, I may have silently messed something up along the way.

All code and algorithms are credited to kyjibo on GitHub. The original commit adding this functionality is here: 681003926a

* Remove commented-out line from LibraryUpdateRanker

I missed removing this when first committing. The removed line is a holdover from Neko, which requires 7+, but I removed the function that requires this.

(cherry picked from commit 70ed49e4782579d6ce2e91ace75ef44f8460a64a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/tables/MangaTable.kt
2021-07-03 18:22:38 -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
arkon
65afc99ead Show global update error notifications by default
(cherry picked from commit ec5e6958ef4f12f6cdf6694a37637770ca1e67da)
2021-06-10 16:40:26 -04:00
arkon
708c4b6905 Add shortcut to tracking guide on website
(cherry picked from commit a1e31549a223f2a0d2006814db443702c9fc0138)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
2021-06-10 16:17:48 -04:00
arkon
3536c359f3 Address some build warnings
(cherry picked from commit 71d225c56286d4b868c1634316a4748a494037ea)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
2021-06-10 16:16:12 -04:00
Andreas
89249c9895 Added category-wise display setting (#5232)
* Added category-wise display setting

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>

* Use flag instead of preference

* Remove database call in LibraryItem

* Remove unnecessary code

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>
(cherry picked from commit a906e9b302f4aa4ce0d5c30b2a52d266b44eaaf5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
2021-06-05 16:07:57 -04:00
arkon
330b7990fe Allow center aligned side nav icons (closes #5177)
(cherry picked from commit 6c53bb4d515d15c39bb4ba8e0eae46341fd58c45)
2021-06-03 14:01:13 -04:00
Jobobby04
359ccdd052 Fix refactor for show history and updates button 2021-06-03 01:06:55 -04:00
Jobobby04
57dde4c922 Refactor show history and updates buttons 2021-06-02 14:12:57 -04:00
Jobobby04
8387492a9b Add biometric lock days, fix biometric time range 2021-06-02 13:39:04 -04:00
Jobobby04
aeaf52cb58 Handle more deprecated items 2021-06-02 00:10:36 -04:00
Jobobby04
d30c9f7120 Address some deprecation warnings 2021-06-01 21:09:03 -04:00
arkon
d5b72c3d3a Only show automatically refresh trackers setting if logged in to some trackers
(cherry picked from commit 36e14b951a2e36c42fa49fcadd503a4f01952c49)
2021-06-01 20:51:36 -04:00
Jobobby04
d057b61158 Revert "Temporarily hide Komga tracker"
This reverts commit 3fb4b565fa74320ec9a580c19da6a359dcfa23e1.
2021-06-01 20:49:21 -04:00
arkon
3fb4b565fa Temporarily hide Komga tracker
(cherry picked from commit 31997fe50af7fb8a5308682a246ceece710deb0d)
2021-06-01 18:22:12 -04:00
arkon
b2e33ab950 Update some icons
(cherry picked from commit 5e5ceef122856a1a6ff2f06e97fcfece917b33b5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
2021-06-01 18:22:00 -04:00
Soitora
84076c2582 Add animations for Bottom Navigation items (#5181)
* Animated icon for the Library tab

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

* Animated icon for the More tab

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

* Rename more_vert to overflow

Should maybe help any confusion together with the other more_horiz changes.

* Animated icon for the History tab

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

* Clarify names and clean files

* Animated icon for the Updates tab

* Animated icon for the Browse tab

* Recreate the animated icon for the History tab

History icons look better when the internal clock is not moving.

Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
(cherry picked from commit aed6e12119b1b71710a4dd4139e776ca63b4636c)
2021-05-29 17:57:44 -04:00
Jobobby04
56ea025e20 Update coroutines, fix E-Hentai gallery update restrictions 2021-05-28 14:36:52 -04:00
Gauthier
e50f04ec54 Display the currently active restrictions in the library update preference (#5187)
* display the currently active restrictions in the library update preference

* removed first line

* use constant instead of literal string

* remove spanned string builder

(cherry picked from commit d9c27e7109fb01db4a103a2d55b5573c2cfe2185)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
2021-05-28 14:36:50 -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
Gauthier
1c084d42df Background tracker update during Library update (#5166)
* add preference to auto update trackers during library update

* also update trackers when updating chapters and preference is set

* remove unnecessary launch/join

* perform tracking update within the same chapter update loop to avoid double notifications

(cherry picked from commit e76e903060658530909455664c954cc4a639527d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
2021-05-28 14:36:47 -04:00
arkon
834e3d78ab Put shortcut to backup menu in More
(cherry picked from commit a498f940c6169a486f61be546759c59045be414e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
2021-05-28 14:36:45 -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
Jobobby04
143d0d2518 Fix reader settings crash 2021-05-23 18:23:44 -04:00
arkon
9adbb1b115 Option to move nav rail buttons to bottom of screen (closes #5158)
Based on 90be3e3494

Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit a462ce3626720ba770b6d1e991be9490a551e83c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/res/values/strings.xml
2021-05-23 15:40:27 -04:00
arkon
43555b3b1a Hide irrelevant settings on tablets
(cherry picked from commit 1b52acdad7771dcd4de0d4f8fe4985db8b1d9182)
2021-05-23 15:34:50 -04:00
Jobobby04
3053bf9d5d Double page spread
(cherry picked from commit 7832d1abe1fdcdb962f388e5a86dd3fcecad6712)
2021-05-23 14:49:09 -04:00
arkon
d8ee654a65 Rename some biometrics things since it's no longer specifically for biometric auth
(cherry picked from commit c741920ec0e698da28469f96b2c5ecc6cbf36f5e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
2021-05-22 17:56:36 -04:00
Gauthier
e085855ec6 Add Komga as an unattended track service (#5049)
* 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
2021-05-22 17:49:45 -04:00
arkon
eaa2bb22ed Remove 1 or 2 hour library updates to avoid DDoSing sources
(cherry picked from commit 569df39fb88e534fa0deb5b9a412f84936006859)

# Conflicts:
#	app/build.gradle.kts
2021-05-22 17:33:29 -04:00
arkon
584f7b516f Restore original preference background after highlight animation (fixes #5094)
(cherry picked from commit ab021c1302dddedac8bfda5beb2402d7eb74ed0a)
2021-05-22 16:52:20 -04:00
arkon
970e6e2560 Remove legacy backup creation
(cherry picked from commit 5e37f72d74ddc84eab1a50ba2f837af7787f8ff4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
2021-05-22 16:51:59 -04:00
Andreas
6238f06d39 Automatic background color for PagerViewer (#4996)
* Add J2K implementation of automatic background

Co-authored-by: Jays2Kings <8617760+Jays2Kings@users.noreply.github.com>

* Tweak the monstrosity called automatic background

* Add ability to choose Automatic as a background

* More tweaks

Co-authored-by: Jays2Kings <8617760+Jays2Kings@users.noreply.github.com>
(cherry picked from commit 122cdae5bcbb0421c98e271521d32fadc7c95beb)

# 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
#	app/src/main/res/values/arrays.xml
2021-05-22 16:28:40 -04:00
simakover
63139a5c08
hide update and history buttons option (#324)
* hide update and history buttons option

* Move updates and history button in More then hiding

Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
2021-05-22 15:17:35 -04:00
Jobobby04
65f66630cf Make backing up read manga optional 2021-05-14 13:47:36 -04:00
Jobobby04
08f1eff450 Update Mangadex Similar to GoldBattles latest version 2021-05-12 23:29:14 -04:00
Jobobby04
93d317629f Disable the mangadex cover setting for now 2021-05-10 22:03:16 -04:00
OncePunchedMan
27f2e8ecbc
[IDEA] Changing to labels not always visible (#296)
* 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>
2021-05-10 22:02:55 -04:00
Jobobby04
a4933388aa Add reader bottom button menu customization 2021-05-06 15:33:28 -04:00
Jobobby04
9095c98159 Organize reader settings a bit 2021-05-04 16:47:17 -04:00
arkon
635dd0cda5 Fix settings search crash (fixes #5002)
Can't lateinit since the controllers are instantiated via reflection.

(cherry picked from commit b453be081e6dda23067201d2507a3b9c4a2ef025)
2021-05-04 15:40:28 -04:00
arkon
86d67b9bf7 Cancel scope in SettingsControllers properly
(cherry picked from commit 284c019b32d9f755442d0c17ebcc272e2660934e)
2021-05-04 14:49:01 -04:00
Andreas
5c352cb3c0 Add manga-wised rotation mode settings (#4841)
* 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
2021-05-04 14:48:06 -04:00