Also create comicinfo file inside chapter folder instead of manga folder since it also contains some chapter specific data
(cherry picked from commit 51c964de3aa370545899c7c3b38b3287cea13d1c)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
Requires extensions to be updated to lib 1.4 to have proper URLs for some of them, which will
happen soon in the future.
(cherry picked from commit 262f8449b4369fde42cbd15d2a768e54461e84af)
* generate ComicInfo files at the chapter root and inside CBZ archives on chapter download.
* Update app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
Co-authored-by: Andreas <andreas.everos@gmail.com>
* Improvements suggested by @ghostbear
* now creates ComicInfo files in normal chapter folders as well
use manga directly instead of converting it to SManga
truncate old files before overwriting them
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
* remove empty line after resolving merge conflict
* fixes Serializer for class 'ComicInfo' is not found error
* some changes to comments and variable names
* Revert leftover changes to archiveChapter() function
* minor cleanup
* Changed Chapter to SChapter
Co-authored-by: Andreas <andreas.everos@gmail.com>
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
(cherry picked from commit 4e628fe6de7a691fbab7960c5f9b750e563eb8a1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
I guess it's simpler to just have 1 entry in the list (other than the last used duplicate).
This helps ensure that the list is as short as it can be.
(cherry picked from commit a8eebd824a50d4676cc31aec51ede94009b82851)
# Conflicts:
# app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
# app/src/main/java/eu/kanade/domain/source/model/Source.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
It wasn't really consistent with other notifications considering there's no
action to be taken in this state.
(cherry picked from commit a0f49b16c5b76d493857840c1012b9df7086f35c)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
* Add back haptic feedback long tap to fav
- add back haptic when long tap on manga to add to library
* simplify
* Revert "simplify"
This reverts commit f4bd57315a3dbf35f5975233980304fa66807718.
* Revert "Add back haptic feedback long tap to fav"
This reverts commit 81486e30e9adf6a7e983b5e3f12bd5bc34083db1.
* cleanup
(cherry picked from commit 34aa4eb291747ccb268c28f5060481706d6c4915)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
* Use `selectedBackground` for other list items to match with others
* Remove unused imports
(cherry picked from commit ebb96a6ff46230686fa260e96917bdb7de3ec288)
* Disable `ChapterHeader` click when in selection mode
* Disable `ChapterDownloadIndicator` click when in selection mode
* Review changes
* Merge remote-tracking branch 'origin/master' into patch-7
* Merge remote-tracking branch 'origin/master' into patch-7
* Revert back to old implementation
(cherry picked from commit 8dce7b3e9eee1ea3d4a279e2d2e4ea9d600279a8)
We can probably clean up the same logic in the manga controller at some point too, but that stuff's messy.
Also fixes the spacing issue that the new icon introduced.
(cherry picked from commit 33e90d64497f920be825b803e1342a2e6c937111)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
- Delay the initial emission of updates/sources/extensions lists instead of using a state flow. This hopefully avoids rapid initial recompositions that cause the LazyColumn key duplication crashes. (Closes#8371)
- Fix a NPE in BrowseSourcePresenter
(cherry picked from commit 5d1f79012e63403ac37309dd958244108e28a1a5)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
- Remove redundant chapter sorting logic when fetching next chapter(s)
- Remove redundant download queue checks (it'll handle already queued or downloaded items)
- Trigger download ahead when read >= 25% of chapter rather than 20%
- Rely on download cache when checking if next chapter is downloaded to avoid jank (fixes#8328)
(cherry picked from commit fc184f1cfa929328c41b0ec374503afe204d6c15)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
The container already provides color option for both states
(cherry picked from commit 156191af4454d756e51e331f67cba7e19efbbb38)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/components/Tabs.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
* Add ability to open random manga
* Use `getMangaForCategory` instead
* Put it in overflow menu instead of using EFAB
* Partial review changes
* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
* Wording changes
(cherry picked from commit f5451a68812f56d9427a9b771f6bed00f8fbd7e6)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
This adds content window insets supports that will be passed to
all components used except top and bottom bar.
(cherry picked from commit 16f9fb2f40e0569c5c22de4a062cd890b4b64d4e)
Restore "Darken the description colors"
Restores #3858, with new values based on current standards (0.78f rather than 0.62f)
I wanted to accomplish this without having to call a const, but that felt like a logical solution as well
Of course, if you got cleaner methods do tell, thanks
(cherry picked from commit 04d2a3399b4c1e708e8da2a7bf7bfd0ec4ecb77a)
* Clean up strings and icons
* fix incorrect usages of label_more
* restore strings and reduce usage of android.R
* removing icon desc of FABs anyway as app's not for visual impaired users
(cherry picked from commit 4b60138d41ea33e5e4c3defb0dc626b599216f3f)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
Since users seem to be confused now that the library loads before download info is shown...
(cherry picked from commit fde7bfa3d17ce2e02df5625836eb739aeaab7863)
* PreferenceModel: Add subtitle provider to ListPreference
So that it's possible to avoid value formatting when needed
* cleanups
(cherry picked from commit 3e86cb094b90a29d5e4ddf7a4c72ccf96c66fee3)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt
* Touch up library item touch indicator
Now the touch indicator has the same coverage as the selection indicator.
Experimental Modifier.Node API is used to draw the selection indicator
* Unify library and browse source list item layouts
(cherry picked from commit 87391832bafff1e9f90fdfe064725fe8d1ec0184)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryCoverOnlyGrid.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryGridCover.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt
