Commit Graph

4629 Commits

Author SHA1 Message Date
Gauthier 4ac2873a57 handle maxNumberSort from API (#5917)
(cherry picked from commit d45fefd6f0)
2021-09-24 12:50:06 -04:00
Ivan Iskandar 240b485a65 Change how the bottom navigation is hidden (#5823)
* Change how the bottom navigation is hidden

Modifies the translationY instead of the height.

* Cleanups

(cherry picked from commit f125ab01ee)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-09-24 12:49:59 -04:00
Soitora 57b9376b83 Allow preferences to multi-line (#5905)
(cherry picked from commit 971d8a7e40)
2021-09-24 12:47:36 -04:00
arkon 6618f848ea Unify NSFW flagging for sources/extensions
Since multisource extensions are no longer a thing, we now simply rely on the flag at the extension level, i.e. the per-Source/SourceFactory `@Nsfw` annotation is no longer checked.
We'll have to remove all of the annotation usages from the existing sources, which will also effectively break the setting for older versions of the app.

(cherry picked from commit a2cf210a52)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt
2021-09-24 12:47:29 -04:00
FourTOne5 e7803d305f Don't count "other" as a language. (#5901)
(cherry picked from commit 2c495c4119)
2021-09-24 12:45:33 -04:00
Jobobby04 23928d3c89 Fix Merged Manga not refreshing 2021-09-17 16:16:59 -04:00
Jobobby04 7ffe1794d9 Fix more info crash 2021-09-17 15:40:39 -04:00
Jobobby04 3b0523268a Fix build errors 2021-09-12 14:49:52 -04:00
arkon 5c3326e47d Fix scroller getting dragged incorrectly in RTL (fixes #5496)
(cherry picked from commit 7c72d6cb7c)
2021-09-12 14:44:27 -04:00
arkon f269483072 Don't show option to delete chapters for local manga (closes #5243)
(cherry picked from commit 8362bf0886)
2021-09-12 14:44:19 -04:00
arkon 8717c30498 Add link to help translate in about
(cherry picked from commit 1a8155c45b)

# Conflicts:
#	app/src/main/res/values/strings.xml
2021-09-12 14:44:10 -04:00
FourTOne5 a4dd13f491 Update ExtensionPresenter.kt (#5895)
(cherry picked from commit 3f2f946019)
2021-09-12 14:43:13 -04:00
arkon 823bd024b7 Minor cleanup for download delete exclusion
(cherry picked from commit 2c14a8dee1)
2021-09-12 14:43:05 -04:00
Ivan Iskandar 4a93a93839 Reuse reader's image view in MangaFullCoverDialog (#5824)
* MangaFullCoverDialog: Support animated drawable

* Scaled zoom duration

* Wrap reader's image view to be reused in MangaFullCoverDialog

* Cleanups

* Forgot animated stuff for webtoon view

* Cleanups

* Oopsie

* Cleanups

* Consistent max scale for SubsamplingScaleImageView

The max scale will be obtained from the default scale times 3 for
consistent 3x zoom scale.

(cherry picked from commit 746d35b52b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
2021-09-12 14:42:13 -04:00
Jace f77ac8cb36 Change ProtoNumber of Backup Models for History and Source to a non-zero digit (#5849)
* Change ProtoNumber of Backup Models for History and Source to non-zero

Changed BackupHistory url and BackupSource name properties

* Provide backwards compatibility to current proto backups

- Added data class for zero-based protoNumber
- Restore both 'new' proto and old ones by mapping old to 'new' proto format
- Thanks to @jobobby04  for providing the initial solution.

* Fix on createBackup missing parameter for brokenSource

* Fix issues on build

* Fix missing import on FullBackupRestore

(cherry picked from commit 9a7a03e327)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
2021-09-12 13:34:54 -04:00
tobinstultiens d9d94ed321 Allow exclusion on Delete After Read per category (#5857)
* Added the exclude category from delete after being read

* Stopped it from adding a wildcard to the import

* Placed the remove after read to the download manager

(cherry picked from commit a051079c6a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
2021-09-12 13:33:36 -04:00
Ivan Iskandar 035a1518ad Less hacky way to make sure bottom action toolbar doesn't scroll down (#5871)
* Less hacky way to make sure bottom action toolbar doesn't scroll down

* Fix action toolbar overlapping on landscape

* Disable app bar transparency when ActionMode is present

(cherry picked from commit 7b3c18bb97)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2021-09-12 13:10:33 -04:00
Ivan Iskandar 889a61704f MangaController: Fix listeners cancelled when pushing new controller within (#5883)
(cherry picked from commit f41bde5ee1)
2021-09-12 13:10:04 -04:00
Gauthier b7c0c7a094 use chapter_number instead of ordinal index for syncChaptersWithTrackServiceTwoWay (#5846)
use v2 api for Komga tracker for series

(cherry picked from commit 6151318ac1)
2021-09-12 13:09:56 -04:00
Ivan Iskandar 3d71e643e1 MangaController: Title fixes (#5879)
* MangaController: Move toolbar's TextView reference to ElevationAppBarLayout

* MangaController: Update title alpha earlier when exiting

(cherry picked from commit b45c322729)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-09-12 13:09:49 -04:00
Jobobby04 e38255e895 Migrate to the new mangadex list response 2021-09-12 13:07:18 -04:00
Jobobby04 98f285f777 Cleanup 2021-09-11 11:48:32 -04:00
Jobobby04 982f4d6a97 Debug function to clear watched sources 2021-09-11 11:48:17 -04:00
Jobobby04 972716d884 Only use site specific handlers if data is empty 2021-09-11 11:43:16 -04:00
Jobobby04 6f93fdd089 Cover includes on user follows 2021-09-11 11:42:51 -04:00
Jobobby04 f0329cfafa Improve mangadex title selection 2021-09-11 11:42:19 -04:00
Jobobby04 95e14a9ef9 Cleanup 2021-09-06 16:41:09 -04:00
FourTOne5 c66b57a3b4 Use "isOnline" utils in DownloadService (#5863)
* Use isOnline

* when -> if/else

(cherry picked from commit 156feb6e8e)
2021-09-06 16:40:36 -04:00
arkon 71533fb2bc Read from streams for local source manga details and legacy backups
(cherry picked from commit e942b8a402)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2021-09-06 16:40:36 -04:00
Andreas cf742c65aa Remove the remaining MotionLayout (#5854)
* Remove the remaining MotionLayout

* Use ImageButton instead of Blank View to handle taps in dead area

And some tweaks

(cherry picked from commit abdb67a123)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/res/layout-sw720dp/manga_info_header.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/xml/manga_summary_section_scene.xml
2021-09-06 16:40:35 -04:00
arkon 2f5718c92f Retain GLUtil.maxTextureSize
(cherry picked from commit ee20787c5e)
2021-09-06 16:39:05 -04:00
arkon 97ddafe539 Clean up some companion object usages
(cherry picked from commit ec4e631760)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
2021-09-06 16:39:04 -04:00
Aran Leite 0f0937adf5 Skip bookmark check when cancelling downloads (#5853)
* Skip bookmark check when cancelling downloads

* DownloadManager: simplified filteredChapters declaration

* Completed documentation of DownloadManager's deleteChapters()

(cherry picked from commit 02b430a5bf)
2021-09-06 16:39:03 -04:00
arkon 6eac0f6f98 Fix crash in settings search (fixes #5855)
(cherry picked from commit 7878053df2)
2021-09-06 16:39:03 -04:00
arkon 66d4966463 Queue tracking updates when offline (closes #1497)
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 5ae4621da1)
2021-09-06 16:39:01 -04:00
arkon e734f7d13d Fix chapters getting deleted when marking as unread from library (fixes #5755)
(cherry picked from commit 5ea8d0546e)
2021-09-06 16:39:00 -04:00
arkon f29717272d Minor cleanup
(cherry picked from commit 8a064c118f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
2021-09-06 16:39:00 -04:00
arkon 50a9a907de Don't allow focus on reader containers (closes #5727)
(cherry picked from commit 2f91c27df2)
2021-09-06 16:38:59 -04:00
Soitora 3cb05b1442 Hide language tag when only one language is used (#5834)
* Hide lang tag when only one lang used

* Comment the code

Can't be too useless and do nothing, Ghostbear practically wrote the entire PR for me

* Exclude 'all' from counting as a language

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Use existing Preferences directly from Presenter

* Replace regex with an existing value

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit 763bd54707)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
2021-09-06 16:38:58 -04:00
arkon f51f9eb371 Retain scroll position when selecting app theme preference
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit 0de3558ab3)
2021-09-06 16:38:57 -04:00
arkon eda451a2e4 Rearrange themes, rename "Blue" to "Legacy Blue"
(cherry picked from commit 069f4e12d8)
2021-09-06 16:38:56 -04:00
Quang Kieu 98da48ad73 Edit mangas' Categories in Library using TriState list (#5422)
* Use QuadState Categories to edit mangas in Library

Add updateMangasToCategories to build build correct Categories list for
  each manga using Common and Mix list
Update QuadState Multi-Choice to either Action or Display List
  Display list would have different state sequece from Action
  Uncheck-> Indeterminate (only if initial so)-> Check

fixup manga categories logic as Windows and push request comments

* fixup: Use QuadStateTextView.State enum

Update function to use  QuadStateTextView.State enum that missed in last change

* fixup: missing closing bracket and type cast

Co-authored-by: quangkieu <quangkieu1993@gmail.com>
(cherry picked from commit ee711dc0fb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2021-09-06 16:38:55 -04:00
arkon ca1699aabb Migrate to flow version of ReactiveNetwork
(cherry picked from commit c316e7faab)
2021-09-06 16:38:55 -04:00
arkon c45019e19c Don't show update progress notifications if job isn't active anymore (closes #5844)
(cherry picked from commit 7083b3d912)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
2021-09-06 16:38:54 -04:00
Ivan Iskandar 0feb9d338f Tablet UI override (#5830)
* Tablet UI override

* Tablet UI advanced pref

(cherry picked from commit 0df23ab878)

# 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
Jobobby04 9dc5aedba4 Hide the option to change cover on expand 2021-09-06 16:38:52 -04:00
Jobobby04 cc38579fca Cleanup 2021-09-06 16:38:51 -04:00
Jobobby04 52cdb636c9 MangaDex, add support for Bilibili chapters 2021-09-06 16:38:50 -04:00
Soitora 7e162c99ce Add SY-specific status icons (#412)
For MangaDex
2021-09-03 16:47:10 -04:00
Soitora d294bc0b2a Add status icons to manga info (#5832)
* Add icons to manga status

* Slightly better formatting

Mixed in with a dose of syntactic sugar

* Remove unnecessary lines

I think they are, at least

* Change according to review comments

- Fix forgotten Tablet code removal
- Change 'android:background' to 'app:srcCompat'

* Adjust size of icon

Smaller and more fitting to the environment

(cherry picked from commit d935e22f0d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
2021-09-03 15:28:00 -04:00