arkon
55a07ae51a
Fix library download counts not being loaded if downloaded filter is in exclusion state
...
(cherry picked from commit e4a2f35907a8f0eefcbd30b6a9bde258dfd89111)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-29 18:24:56 -04:00
arkon
250955a0f1
Don't filter out partially read chapters when marking as unread
...
Fixes #8313
(cherry picked from commit 37cb4ec0c22d9b020afa473e593a074e2b8d5694)
2022-10-29 18:24:17 -04:00
arkon
e1f841e78a
Use MaterialTheme.shapes in more places
...
(cherry picked from commit 401134fa8ed0e0134e166e2c5f78de09d744a553)
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 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
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 e36d31bf0fff9652652319fa8b4fc700edc1442a)
# 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 37b7efbc87c45c421974394ee36f86f5cd6e0492)
# 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
AntsyLich
98a56d581e
Fix "Download split" not working while using SD card ( #8305 )
...
* Fix "Download split" not working while using SD card
* Update app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 6e4a30e59352517346eb0f622424390a52fb95c0)
2022-10-29 17:27:32 -04:00
AntsyLich
d0d689b1df
Center the Text inside Pill ( #8304 )
...
(cherry picked from commit 37c55abc2ac464675c278bb9bc7abeced189b834)
2022-10-29 17:26:53 -04:00
arkon
2217eb9d35
Alternate method of avoiding LazyColumn key conflict crashes
...
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit c50b1a5c66256ab003a224d50caa317c53479397)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
2022-10-29 17:26:42 -04:00
Ivan Iskandar
099fa77149
Set source id when inserting to db ( #8300 )
...
(cherry picked from commit 187e9f94aa0ddeef6ad542b2c231b917071eead4)
2022-10-29 17:25:36 -04:00
arkon
5ec56b66a4
Show file URI when invalid backup file is selected
...
(cherry picked from commit 1704dc062d9f610ff1787260516893e697773108)
2022-10-29 17:25:28 -04:00
AntsyLich
47564449a6
Cleanup history repository ( #8297 )
...
* Cleanup history repository
* Lint
(cherry picked from commit 0657a5292404e9bc79a847faa244d9b2552f5bfa)
# Conflicts:
# app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt
# app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt
2022-10-29 17:25:15 -04:00
arkon
f549730c8f
Remove side nav icon alignment preference
...
Simplifying it to just always be centered, which is what most Google apps seem to be doing anyway.
(cherry picked from commit ccc4144f3cc2264c3ae75d492983e9577f352af1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2022-10-29 17:24:26 -04:00
arkon
b5ae4c0d43
Refactor network to local manga logic
...
Maybe fixes #8289
(cherry picked from commit d5b4bb49b168adc5b7c3934e530571497c85a916)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
2022-10-29 17:22:24 -04:00
arkon
71eefc3c9e
Avoid some crashes
...
(cherry picked from commit ca065169002475cc92b7736d02340127a5e419bd)
# Conflicts:
# app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
2022-10-26 23:38:49 -04:00
AntsyLich
c48dd63019
Rework library selection ( #8290 )
...
(cherry picked from commit 2cbe946e7e9eae14c035001c9e4eb970ede229a4)
2022-10-26 23:37:39 -04:00
AntsyLich
32a2827b0e
Use Channel in Download cache ( #8292 )
...
* Use `Channel` in Download cache
Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>
* Use Unlimited capacity
Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
(cherry picked from commit 3b5b9a1ae5803466e9b18846aae6fcd16bf8a637)
2022-10-26 23:37:16 -04:00
AntsyLich
e0c83b018b
Show LibraryScreen toolbar early to match other main screens ( #8285 )
...
(cherry picked from commit a834ff3a4428497d458399a1ed04b0424f21be64)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
2022-10-26 23:37:01 -04:00
Ivan Iskandar
20ea3d5eac
MangaPresenter: Filter unsupported track service from available service list ( #8286 )
...
(cherry picked from commit 82b552ac9a4a8764f8ccf1d75c628310c020440d)
2022-10-26 23:35:37 -04:00
arkon
8231aa45d7
Fetch download counts if library is filtered by downloaded
...
Fixes #8277
(cherry picked from commit 9792a6cb780d0db3a962fdf2e60ef028b3ceb07f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-23 12:52:58 -04:00
Jobobby04
dc6215dd3b
Fix default category always displaying
2022-10-23 12:52:57 -04:00
Jobobby04
8a1456a48f
Fix center margin summary
2022-10-23 12:52:56 -04:00
Dexroneum
275943ebf6
Seekbar fixes ( #709 )
2022-10-23 12:51:59 -04:00
Dexroneum
e110945d1e
Fixed "0 mins ago" in "Library last updated" string ( #8279 )
...
* Fixed "0 mins ago" in "Library last updated" string
* Recommended fixes
(cherry picked from commit f30150c0f08e89cdd240520f77f0bd547a0de4f6)
2022-10-22 21:46:19 -04:00
arkon
6d46283aee
Use kotlin.time extensions in some more places
...
(cherry picked from commit 5c868d784679b55e413366c5d4bdea75253bf8f4)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
2022-10-22 21:46:13 -04:00
arkon
047227a74a
Avoid NPE in browse source screen
...
It logically should never be null, yet I see crash logs about it.
(cherry picked from commit 78b76a186c306903aaac45626f8a609b3dde59a8)
2022-10-22 21:44:02 -04:00
arkon
3314b46630
Only enable ACRA crash logging in preview and stable release builds
...
(cherry picked from commit 6e04822f5e2f0985a98a86c814099b0cf85cb7f8)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/App.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
# app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt
2022-10-22 21:43:54 -04:00
AntsyLich
d853aa0c1b
Cleanup LibraryUpdateService ( #8237 )
...
(cherry picked from commit 4ff5c1148e1ea89b13e5aefbd6b34d66566fb103)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
2022-10-22 21:34:32 -04:00
d-najd
cad519f71c
Category name letter casing change not allowed when renaming ( #8274 )
...
(cherry picked from commit fb04401460e5a8418737f3f3cdd556e9061c35d4)
2022-10-22 21:23:49 -04:00
stevenyomi
0a0b264e43
Fix app lock and make delay not survive app being killed ( #8272 )
...
* Fix app lock
* Always require unlock if app is killed
(cherry picked from commit 2ab744c525e2c6c94bcac7d4cc3848830a50c991)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
2022-10-22 21:23:02 -04:00
AntsyLich
24115a9ddc
Cleanup UpdatesPresenter deleteChapters ( #8273 )
...
(cherry picked from commit 4a244a598bd8caceaab76ae2c851d8e8ef04ed21)
2022-10-22 20:57:23 -04:00
arkon
bd9125f9fe
Remove fake chapter deletion state updates
...
Now that the updates and manga screen listen to download cache changes, it'll reflect the real states once deleted.
(cherry picked from commit d0bff298b7df3524f76434a3636bc196627cb613)
2022-10-22 20:57:12 -04:00
arkon
1bef917db7
Handle async cache in updates and manga screens
...
- Also fix concurrent accesses to main cache map
- Also debounce sources and updates list updates to maybe avoid crashing due to dupe LazyColumn keys
(cherry picked from commit 152eb5b95196a32ed120f4a57996c1958294bf7f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-10-22 20:56:53 -04:00
stevenyomi
46fe5dfd4f
Tweak tablet UI mode setting ( #8262 )
...
(cherry picked from commit d558f9e1d6bcc8eb8f69359e6e7516f7ea24a408)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
2022-10-22 20:47:54 -04:00
AntsyLich
2774df208e
Fix "Add manga to library" snackbar not showing with ChapterDownloadAction.START_NOW ( #8271 )
...
(cherry picked from commit b3557e844c016f095764e72fca8d01657e1d4028)
2022-10-22 20:33:17 -04:00
arkon
e38b1390e6
Maybe avoid extensions list rendering crashes
...
(cherry picked from commit 4138a17e29348c7057ae885a0b8d9d5c3f29cc07)
2022-10-22 20:32:07 -04:00
arkon
d0f3bd077c
Avoid some IndexOutOfBoundsExceptions
...
(cherry picked from commit eb742b29f8b75eb900cf47f6178053dcf68f74bc)
2022-10-22 20:31:48 -04:00
arkon
08c6876742
Prevent invalid user agent header values from being set
...
(cherry picked from commit d2e62ffb199d515b588b4899f7e53ed00bc47819)
2022-10-22 20:31:34 -04:00
arkon
7f7602f9b7
Use fade transition in Voyager screens to mimic existing Conductor change handler
...
(cherry picked from commit 2921be620a2cc2bd3a7be84aaa6d6136c651367c)
2022-10-22 20:29:40 -04:00
arkon
3cfb5a7f1c
Disable autocomplete on tracker login password field
...
(cherry picked from commit c61a51438d039bbb79c09ca9af8b0d2a67135264)
2022-10-22 20:29:10 -04:00
arkon
5a55c66532
Perform download cache renewal async
...
Don't block on cache renewals, but notify library on updates so that the badges show up when ready.
We skip the cache when checking if a chapter is downloaded for the reader assuming that it's a
relatively low cost to check for a single chapter.
(Probably) fixes #8254 / fixes #7847
(cherry picked from commit 7e40680af02505f82fa3655d2d693092c6bd43a1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
# app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2022-10-22 20:28:57 -04:00
arkon
9fafe15081
Remove redundancy in ExtensionManager
...
(cherry picked from commit 93925a72866892358b7f46645e1f189b2cf3bc1d)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
# app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
2022-10-22 20:24:41 -04:00
arkon
893443222d
Proper DI instantiation for some more download related classes
...
(cherry picked from commit b04807e53a355af210e280d42f705976a478c6e5)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt
# app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
2022-10-22 20:16:12 -04:00
arkon
1c6f09e5c7
Allow disabling automatic backups for whatever reason
...
(cherry picked from commit 2cf1009f709fb725becc2ea82964652b79997268)
2022-10-22 20:11:47 -04:00
arkon
5ff3c39d68
Defer library download counts if not needed
...
(cherry picked from commit 93827aba34e98c6f70397d0e767580f3aaf5136b)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-22 20:11:36 -04:00
AntsyLich
b5f3114cb4
Hide reader "Split tall images" option in release build ( #8235 )
...
(cherry picked from commit 44cabf2f0b9db3ae60d5739676fb8777c474ea6b)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
2022-10-22 20:03:16 -04:00
arkon
d79784f292
Avoid crashing if invalid download and backup location is set
...
Fixes #8252
(cherry picked from commit a8ca7b690fe56f8588d3fff9dbfef95062e6442f)
2022-10-22 19:52:59 -04:00
stevenyomi
6ba4c9b139
Clean up strings and resources ( #8253 )
...
* Clean up strings and resources
* fix pringle's typo
* restore catching file pick errors
* add back file chooser title
* revert #7740 and remove try-catch of chooser-wrapped intent
* swap xmlns lines
* swap xml tools lines
(cherry picked from commit 824d5e22bc35a9b511929be21ffbc85b734e5fcd)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/res/drawable/card_gradient_shape.xml
# app/src/main/res/menu/download_queue.xml
2022-10-22 19:52:46 -04:00
Ivan Iskandar
11205a5aa9
AppThemePreference: Filter dynamic theme if it's not available ( #8250 )
...
(cherry picked from commit 4b5f965ceae62d9a62d3b1f89d7986ec76111cff)
2022-10-22 19:39:03 -04:00
stevenyomi
cc605759d3
Fix language/theme settings dialog and remove delay ( #8244 )
...
* Fix language/theme settings dialog and remove delay
* inline UI preferences
* use `by remember`
* remove unused variable
* remove unused import
(cherry picked from commit d03cbbe0cdc699ad15618a326c91e811f5c2e385)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt
2022-10-22 19:38:52 -04:00
Ivan Iskandar
b29fc922cb
Fix crash when saving a page from certain chapters ( #8242 )
...
(cherry picked from commit 84bcd8d1d228e9687f4542e429407c74e73684bd)
2022-10-22 19:37:57 -04:00
Jobobby04
29790dd362
Limit tab lines
2022-10-22 19:37:15 -04:00
Jobobby04
62446a0737
Add _sy to the backup name
2022-10-22 17:11:03 -04:00
Jobobby04
cf8e339eda
Fix E-Hentai language filtering
2022-10-18 21:46:57 -04:00
Jobobby04
82793b7a41
Minor cleanup
2022-10-18 17:53:45 -04:00
arkon
49d5d797b3
Fix download cache not updating on location change
...
(cherry picked from commit 6756bfab7592bdbc424aa4a478769728cf991a54)
2022-10-18 17:52:13 -04:00
Andreas
fed8ef09af
Tweak library view ( #8240 )
...
- Move category join to improve performance
- Move bookmark calculation into query
- Move unread calculation into domain
(cherry picked from commit 8d97b980e354d50a7682e87677ef336833b760fe)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/sqldelight/migrations/22.sqm
# app/src/main/sqldelight/view/libraryView.sq
2022-10-18 17:51:34 -04:00
stevenyomi
a31e8282cb
Clean up OkHttp methods and parse from Okio directly ( #8238 )
...
(cherry picked from commit 2d19729869d1c88a46c0d1a4582d29a80d7ab9cb)
# Conflicts:
# core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
2022-10-18 17:35:23 -04:00
Ivan Iskandar
a7c45ab61e
More settings stuff ( #8226 )
...
* title size
* move about screen to settings
keeping shortcut inside more screen
* more
* shrink texts
* scrollable create backup dialog choices
* search back button
* cleanups
* delay changes that require activity recreate
* lessen horizontal padding
(cherry picked from commit f5bde3726ad235587da59e484a0c82fbe48790da)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/database/components/ClearDatabaseDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
2022-10-18 17:24:57 -04:00
AntsyLich
de10803c2f
Fix selection in library ( #8233 )
...
(cherry picked from commit ea092fa175e39dc9b868ef865d6fcfef81407157)
# Conflicts:
# 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
2022-10-18 16:53:58 -04:00
Andreas
2f748b025a
Tweak Crash activity ( #8229 )
...
- Scroll entire content body
- Edge2Edge
(cherry picked from commit fed914827a3a84efb0beb12f885a85413fba7b98)
2022-10-18 16:52:20 -04:00
AntsyLich
59866497c6
Move "Share" to end of DropDownMenu ( #8225 )
...
(cherry picked from commit ea33f8dba5d0c6b279f8c0f078139f65cfb04ce6)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
2022-10-18 16:52:16 -04:00
Jobobby04
2961202d05
Re-add debug menu button styling
2022-10-17 15:24:52 -04:00
Jobobby04
856e18d7a2
Show merged manga chapters in updates tab
2022-10-17 12:54:39 -04:00
Andreas
d07ea91c27
Add Crash activity ( #8216 )
...
* Add Crash activity
When the application crashes this sends them to a different activity with the cause message and an option to dump the crash logs
* Review changes
(cherry picked from commit 4178f945c9b6bcae9323c02534d7e620136a4e76)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
2022-10-17 00:10:30 -04:00
arkon
767059e7a3
Always renew download cache if no sources have been loaded yet
...
Fixes #7705 . Somewhat janky solution to handle when loading the sources on app start is slower than
the initial download cache priming.
(cherry picked from commit 558aad1a7170a71c454ce7c056b98f446a6eea95)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
2022-10-17 00:09:36 -04:00
AntsyLich
639eb50dbc
Tweak library query ( #8214 )
...
* Tweak library query
Co-Authored-By: Quang Kieu <kieuq@wit.edu>
* Update app/src/main/sqldelight/migrations/21.sqm
* Update app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt
* Update app/src/main/sqldelight/view/libraryView.sq
* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
* Update app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
* Bump version
Co-authored-by: Quang Kieu <kieuq@wit.edu>
(cherry picked from commit d6cbff2837bdf0de679bdf1cc8b93dbf3eadb487)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
# app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/sqldelight/migrations/21.sqm
2022-10-17 00:05:52 -04:00
Ivan Iskandar
a444cd9eb8
Settings: Tint icon with primary color and separate info item layout ( #8217 )
...
(cherry picked from commit aea0cadbfbf7e30263e88db5d11fadcf3c2dab50)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
# app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
2022-10-16 23:05:39 -04:00
Jobobby04
2657e99030
Fix Backup selection for custom info and read manga
2022-10-16 23:00:43 -04:00
Ivan Iskandar
ef58406aa3
CreateBackupDialog: Select all options by default ( #8215 )
...
(cherry picked from commit e4292719d3b3d3dff6d0f80ca59fa250d33d2180)
2022-10-16 22:58:16 -04:00
arkon
2144221250
Remove dead code
...
Mostly from settings rewrite, but some other things too.
(cherry picked from commit 69cdba71eb842865586309d8549de78480cdbe0e)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/database/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
# app/src/main/res/drawable/ic_done_green_24dp.xml
# app/src/main/res/layout/pref_account_login.xml
# app/src/main/res/layout/pref_library_columns.xml
2022-10-16 22:58:07 -04:00
Ivan Iskandar
a2f6b90547
Settings: M3 and two pane ui ( #8211 )
...
* Settings: M3 and two pane ui
* TrackingLoginDialog: Move close button
* Use small top bar
* Revert "Update voyager to v1.0.0-rc02"
This reverts commit 570fec6ea622a7deae44668f4d9c3317699de2aa.
https://github.com/adrielcafe/voyager/issues/62
(cherry picked from commit 5c5468f9af74be984d0d9cb79da804370ee0e775)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
2022-10-16 22:39:58 -04:00
arkon
0b5b9cb5cc
Control library badge visibility with props instead
...
Fixes #8174
(cherry picked from commit 6635dd2990851d830e83a628b7e62091bd20cb43)
# Conflicts:
# 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/LibraryContent.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/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
2022-10-16 22:20:47 -04:00
arkon
aebfef345b
Center EmptyScreen message
...
Fixes #8212
(cherry picked from commit 27e52563051832ff1f71219df89c8f5e742925ec)
2022-10-16 22:01:11 -04:00
AntsyLich
cc16c45e05
Retain bookmark of readded chapters ( #8205 )
...
* Retain bookmark of readded chapters
* Fix typo
(cherry picked from commit a2b21e5ad6fffea279e096250a0daa8a24a27955)
2022-10-16 22:00:34 -04:00
arkon
fb675a82cc
Tweak source view type menu radio icon to match stable
...
(cherry picked from commit dbd93cf5d1f853988f408f5e45bb7a71e0d2f9ed)
2022-10-16 22:00:01 -04:00
arkon
b13a848121
Minor settings cleanup
...
- Fix dark mode setting title
- Enforce usages of translated strings for screen titles
- Use LocalUriHandler where applicable instead of Android context
(cherry picked from commit c2eaf1c86bff1ab9072f79dc3ee7b80df1480805)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
2022-10-16 21:59:50 -04:00
Ivan Iskandar
57dcd16cb9
Full Compose settings ( #8201 )
...
* Uses Voyager for navigation.
* Replaces every screen inside settings except category editor screen since it's
called from several places.
(cherry picked from commit 890f1a3c7b0f2ceefa86a77cb40c11567e2b5a46)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
2022-10-16 21:53:23 -04:00
Swords
1ac63787bd
Add bookmark filter ( #8198 )
...
* feat: add bookmark filter
* feat: add getBookmarkChaptersByMangaId query + interactor to be used for filtering
(cherry picked from commit 3fdcd636d75e3862e75779077faef3d70365bcf6)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
2022-10-15 12:11:24 -04:00
zbue
2903e0d98e
BrowseSourceToolbar: Match display mode dropdown to stable and change toolbar icon based on display mode ( #8200 )
...
* BrowseSourceToolbar: Match display mode dropdown to stable and change toolbar icon based on display mode
* Review changes
* Review changes 2
(cherry picked from commit 3d7e44726d799294e808ce44fa1f0c8e5ff42e7a)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
2022-10-15 12:10:43 -04:00
Jobobby04
6bcad5b13e
Use dp for tag weight
2022-10-15 12:09:39 -04:00
Jobobby04
80c53adf29
Fix open in webview issue
2022-10-15 12:09:38 -04:00
Jobobby04
d595a5ef82
Minor cleanup
2022-10-15 12:09:37 -04:00
arkon
8b0d626c23
Move manga screen filter sheet to toolbar
...
Closes #6927
This makes it more consistent with the library. Tapping the chapters heading still opens the sheet for convenience.
(cherry picked from commit b25ca7617dea67010b0cb55170ae9dd77aa4dc24)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
# app/src/main/res/values/attrs.xml
2022-10-15 12:09:36 -04:00
arkon
a82b86bec8
Minor cleanup
...
(cherry picked from commit bc1fbfac9d3bd6a13b755acb5ac0a2ed702ba1a2)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
# app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt
# app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
2022-10-15 12:09:35 -04:00
arkon
7da8484d81
Attempt to avoid duplicate update rows
...
Related to #7713
(cherry picked from commit 7e92921f84905fefa46a9514c096593520c52076)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt
2022-10-15 12:09:34 -04:00
d-najd
aef2dab957
Range selection in library ( #8186 )
...
* logic and a bit of cleanup
* cleanup done
* grammar fix
* fixing format
* Auto stash before checking out "HEAD"
* Revert "Auto stash before checking out "HEAD""
This reverts commit 202374a36ff444b7da3fcdb2a9859ca71a7c046e.
* Update app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
Co-authored-by: arkon <arkon@users.noreply.github.com>
* cleanup
Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit e1adb89ff8ed1759fcab08ed70b596b41bf3c88c)
2022-10-15 12:09:33 -04:00
stevenyomi
754df5babb
Fix empty screen font style ( #8197 )
...
(cherry picked from commit 4e544005fed41d7f817bd6903d6cb03ad4df9f0b)
2022-10-15 12:09:33 -04:00
Ivan Iskandar
554ba3779b
Use Compose's existing method to get plural string ( #8194 )
...
(cherry picked from commit 02b3718aa1b998079b5da53fe3535ec02fcfdc2d)
2022-10-15 12:09:31 -04:00
arkon
78d87b866a
Upgrade to Kotlin 1.7.20
...
Also run formatter and address some deprecation warnings.
(cherry picked from commit 26a42ba9c01c670f60bedfca41bd72c99aa2a278)
# Conflicts:
# core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
2022-10-15 12:09:30 -04:00
stevenyomi
1b6c970cc2
Fix download progress indicator ( #8188 )
...
(cherry picked from commit b1e104319f90678bc7ed501797d9d7d5b98902b5)
2022-10-15 12:09:30 -04:00
Platiplus
46b268491a
Overwrite saved images instead of creating new ones ( #8162 )
...
* Implementing overwrite instead of saving duplicated images
* Using filename instead of hardcoding image type
* Refactoring method to accept lambda for default value
* Removing extra parenthesis
(cherry picked from commit a3afb3553990a6a0faac8999c867b3ddefd5b101)
2022-10-15 12:09:29 -04:00
Ivan Iskandar
4e38cdfe80
Fix Scrollbar when the list contains sticky header ( #8181 )
...
* Fix Scrollbar when the list contains sticky header
* Fix VerticalFastScroller when the list contains sticky header
* exposé
(cherry picked from commit fba244423f451ef0b715702454ec242a5b73ec1b)
2022-10-15 12:09:28 -04:00
Jobobby04
861481bf26
Fix some Feed add bugs
2022-10-15 12:09:27 -04:00
Ivan Iskandar
24593da484
EmptyScreen: Compose-ify and apply content padding ( #8177 )
...
* Apply content padding to empty screen
except the empty screens in browse
* compose-ify EmptyScreen
* center face when action show
* fix padding
* apply content padding to browse tabs
* fix duplicate bottom insets
(cherry picked from commit 8500add09f475093e4e861f42508496e0f1fd68c)
# 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/library/LibraryScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
# app/src/main/res/layout/common_view_empty.xml
2022-10-15 12:09:26 -04:00
arkon
37a14cb392
Minor UI fixes
...
- Remove M3 styling from search toolbar
- Use secondary alpha for subtitles for Sources and Migrate items
- Update some content descriptions
(cherry picked from commit 23bfa1f18f615ba39be42f62cd7b337a6c51bc8e)
2022-10-15 12:09:26 -04:00
arkon
f50497290e
Bring back overscroll in SwipeRefresh for A12+
...
It's more consistent with the rest of the overscroll behaviour in the app. We'll wait for the upstream fix.
(cherry picked from commit b4f2da12ea58b2f386f4d49356074c0a38351083)
2022-10-15 12:09:25 -04:00
arkon
da9877f91a
Don't wrap tab pills
...
It may sometimes overlap the text a bit, but it's less awkward than wrapped pills
(cherry picked from commit b84a31ba9259ae1cd903bcec4f6339fc88d44831)
2022-10-15 12:09:24 -04:00
arkon
f71f9dbb93
Document copied M3 component customizations
...
(cherry picked from commit d0950cb02687ad99a1f7947b136419ee27ca5b7d)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/settings/database/components/ClearDatabaseDialogs.kt
2022-10-15 12:09:24 -04:00