Commit Graph

6989 Commits

Author SHA1 Message Date
arkon b2565c7f8b Clean up library download chapters logic
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 33e90d6449)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-11-01 13:36:11 -04:00
Jobobby04 35bd6233d9 Cherry pick fix 2022-11-01 12:46:46 -04:00
Swords dd08da26e8 Add different download options within the Library (#8267)
* feat: add download options to library

* feat: use max instead of min

* feat: remove download all option

* feat: applied requested changes + rename some functions

* feat: merge downloadAllUnreadChapters and downloadUnreadChapters into one function

* Apply suggestions from code review

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* feat: apply lint suggestions + fix code

feat: apply lint suggestions + fix code

* feat: revert onClickDownload back to onDownloadClicked

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 50b17d5d34)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-11-01 12:46:33 -04:00
arkon 2f6bd9754d Use proper content color for filter icon in library toolbar
(cherry picked from commit 7818885406)
2022-11-01 12:33:55 -04:00
arkon db890c33f7 Use BOM for kotlinx.coroutines dependencies
(cherry picked from commit 26af7ccc77)
2022-11-01 12:33:47 -04:00
arkon ebfc0f89ed Fix some crashes
- 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 5d1f79012e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
2022-11-01 12:33:30 -04:00
arkon b4ede754b9 Clean up download ahead logic
- 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 fc184f1cfa)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-11-01 12:32:13 -04:00
arkon f9b49aa7f6 Add warning about F-Droid build support in More screen
(cherry picked from commit 725fcbba0e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
2022-11-01 12:24:45 -04:00
arkon 28ba14b976 Downgrade to org.jetbrains.kotlinx:kotlinx-serialization-json 1.4.0
Fixes data class casting issue seen when multiple sources have the same shadowed classes.

(cherry picked from commit bdeb209d43)
2022-11-01 12:17:37 -04:00
stevenyomi e8e7ff55c0 Refactor search toolbar and fix browse source (#8360)
(cherry picked from commit a078f1ab1b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
2022-11-01 12:17:26 -04:00
arkon ad444ac761 Use Compose fast* functions in more places
(cherry picked from commit 86c3d8c064)
2022-11-01 12:07:09 -04:00
Ivan Iskandar c505f31ad3 Tabs: Don't explicitly set text color in the text (#8365)
The container already provides color option for both states

(cherry picked from commit 156191af44)

# 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
2022-11-01 12:06:58 -04:00
stevenyomi 2dc3569eee Fix Layout Inspector's Compose tree for dev flavor (#8363)
(cherry picked from commit 57bba9e5ab)
2022-11-01 12:00:25 -04:00
arkon 3be06eacaa Remove redundant preference composables
(cherry picked from commit dd1923fe88)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/Preferences.kt
2022-11-01 12:00:14 -04:00
arkon 81d9ac81ce Refactor overflow menus into a composable
(cherry picked from commit df773ee15c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
2022-11-01 11:43:19 -04:00
zbue 621e9dbc41 Add ability to open random manga (#8232)
* 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 f5451a6881)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
2022-11-01 11:38:53 -04:00
arkon 6c377f23e9 Center global search prompt properly in library list mode
(cherry picked from commit 11cc789e36)
2022-11-01 11:24:13 -04:00
Ivan Iskandar 1256646e91 Rebase Scaffold fork (#8353)
This adds content window insets supports that will be passed to
all components used except top and bottom bar.

(cherry picked from commit 16f9fb2f40)
2022-11-01 11:23:54 -04:00
Ivan Iskandar 86afa2ee6a MoreScreen: Add navbar padding (#8349)
(cherry picked from commit 6bfaa85e84)
2022-11-01 11:23:44 -04:00
renovate[bot] 756fc83c65 Update voyager to v1.0.0-rc06 (#8346)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 8f43fb9530)
2022-11-01 11:23:38 -04:00
Soitora 10afbcc61a Restore chapter description alpha (#8345)
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 04d2a3399b)
2022-11-01 11:23:30 -04:00
Ivan Iskandar 82a1d9847d MangaScreen: Apply bottom content padding to large screen info column (#8347)
(cherry picked from commit 054bf8ec5d)
2022-11-01 11:23:19 -04:00
arkon 963d09d270 Add more context to obsolete extension warning
(cherry picked from commit 8417f5a63c)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
2022-11-01 11:22:46 -04:00
Dexroneum 1fcf8450b8 Few UI changes (#8299)
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 26b46cace0)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt
2022-11-01 11:21:31 -04:00
arkon b941c34c3f Use remember var delegates in more places
(cherry picked from commit 0849111247)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
2022-11-01 11:20:34 -04:00
Ivan Iskandar 257d45c598 New Pager implementation (#8323)
Minimal implementation using new Compose SnapFlingBehavior

(cherry picked from commit f9c25b350e)
2022-11-01 11:19:07 -04:00
Jobobby04 80b921172f Remove links from Mangadex description 2022-10-30 11:05:32 -04:00
Weblate (bot) 5ab9243273 Translations update from Hosted Weblate (#8316)
Weblate translations

Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Gediminas Murauskas <muziejusinfo@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Karl Stenlund <hikolo.92@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: jinu147 <nesqea20@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Abay Emes <abayemes@gmail.com>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dexroneum <Rozhenkov69@gmail.com>
Co-authored-by: Gediminas Murauskas <muziejusinfo@gmail.com>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Karl Stenlund <hikolo.92@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: jinu147 <nesqea20@gmail.com>
(cherry picked from commit f38130d086)
2022-10-29 18:58:06 -04:00
stevenyomi b2c4fc0ec5 Clean up strings and icons (#8326)
* 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 4b60138d41)

# 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
2022-10-29 18:57:56 -04:00
arkon 75e1dfee3f Show notification while download cache is renewing
Since users seem to be confused now that the library loads before download info is shown...

(cherry picked from commit fde7bfa3d1)
2022-10-29 18:46:08 -04:00
arkon 5e3c9fcf50 Make Compose DropdownMenu overlap the trigger
Closes #8329

(cherry picked from commit 69635ee66a)
2022-10-29 18:45:59 -04:00
arkon f3a2b1d7e4 Sort library items alphabetically in secondary pass
Fixes #7461

(cherry picked from commit 224f29077d)
2022-10-29 18:45:49 -04:00
AntsyLich 51dd8c2285 Prompt Extension update if ext-lib is updated
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit e1ab1fdb65)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
2022-10-29 18:45:42 -04:00
Jobobby04 2306038c74 Minor cleanup 2022-10-29 18:39:25 -04:00
Ivan Iskandar d53ebe5314 PreferenceModel: Add subtitle provider to ListPreference (#8322)
* PreferenceModel: Add subtitle provider to ListPreference

So that it's possible to avoid value formatting when needed

* cleanups

(cherry picked from commit 3e86cb094b)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt
2022-10-29 18:39:13 -04:00
Ivan Iskandar 2fe7fe1a3f build: Add param to generate Compose compiler metrics (#8330)
./gradlew assembledevPreview -Ptachiyomi.enableComposeCompilerMetrics=true

(cherry picked from commit 9fbd3fe33f)
2022-10-29 18:29:18 -04:00
stevenyomi d8b27a4f43 Reorder parameters of JSON parsing method (#8321)
(cherry picked from commit 073e9f94ff)

# Conflicts:
#	core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
2022-10-29 18:29:10 -04:00
renovate[bot] 4e3af63a8e Update dependency androidx.paging:paging-compose to v1.0.0-alpha17 (#8319)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 64c0d9506d)
2022-10-29 18:27:31 -04:00
renovate[bot] 663a65e3ba Update voyager to v1.0.0-rc05 (#8320)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit f638092ab9)
2022-10-29 18:27:22 -04:00
arkon 94c0b0a36e Avoid concurrency crashes in SourceManager
(cherry picked from commit d0c4463ab3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
2022-10-29 18:27:13 -04:00
arkon ef1242d067 Consider downloaded only mode when getting download counts in library
Fixes #8318

(cherry picked from commit ad107860b9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-29 18:26:25 -04:00
arkon 38abaa162e Fix some crashes
(cherry picked from commit 5efb31bd71)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
2022-10-29 18:25:50 -04:00
arkon 55a07ae51a Fix library download counts not being loaded if downloaded filter is in exclusion state
(cherry picked from commit e4a2f35907)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-29 18:24:56 -04:00
arkon 3f644979c4 Reword "manga" to more generic "entry"/"entries"
Closes #8306

(cherry picked from commit e49781de7a)
2022-10-29 18:24:25 -04:00
arkon 250955a0f1 Don't filter out partially read chapters when marking as unread
Fixes #8313

(cherry picked from commit 37cb4ec0c2)
2022-10-29 18:24:17 -04:00
arkon e1f841e78a Use MaterialTheme.shapes in more places
(cherry picked from commit 401134fa8e)
2022-10-29 18:24:09 -04:00
Ivan Iskandar ab7d9006b2 Touch up manga grid/list items (#8307)
* 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 87391832ba)

# 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
2022-10-29 18:24:01 -04:00
Jobobby04 9d84481770 Cherry pick fixes 2022-10-29 18:03:25 -04:00
AntsyLich 37207ed58b Cleanup Library presenter (#8284)
* yeet observable + minor cleanup

* move [getTracksFlow] to domain

* Lint

* Review changes

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

* Review Changes 2

* Stuff

* Rename + Rebase

* Lint

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

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-29 18:03:08 -04:00
d-najd 0d7cff1f43 WebView for chapter link (#8281)
* backup

* doing logic

* cleanup

* applying suggestion

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

* requested changes

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 37b7efbc87)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-10-29 17:31:25 -04:00