arkon
93925a7286
Remove redundancy in ExtensionManager
2022-10-21 14:42:21 -04:00
arkon
b04807e53a
Proper DI instantiation for some more download related classes
2022-10-21 14:29:44 -04:00
arkon
2cf1009f70
Allow disabling automatic backups for whatever reason
2022-10-20 23:20:38 -04:00
arkon
93827aba34
Defer library download counts if not needed
2022-10-20 23:20:32 -04:00
AntsyLich
44cabf2f0b
Hide reader "Split tall images" option in release build ( #8235 )
2022-10-20 22:41:42 -04:00
arkon
a8ca7b690f
Avoid crashing if invalid download and backup location is set
...
Fixes #8252
2022-10-20 22:34:27 -04:00
stevenyomi
824d5e22bc
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
2022-10-20 17:48:13 -04:00
Ivan Iskandar
4b5f965cea
AppThemePreference: Filter dynamic theme if it's not available ( #8250 )
2022-10-19 22:43:41 -04:00
stevenyomi
d03cbbe0cd
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
2022-10-19 12:57:05 -04:00
Ivan Iskandar
84bcd8d1d2
Fix crash when saving a page from certain chapters ( #8242 )
2022-10-19 07:59:05 -04:00
arkon
6756bfab75
Fix download cache not updating on location change
2022-10-18 17:35:38 -04:00
Andreas
8d97b980e3
Tweak library view ( #8240 )
...
- Move category join to improve performance
- Move bookmark calculation into query
- Move unread calculation into domain
2022-10-18 16:33:26 -04:00
stevenyomi
2d19729869
Clean up OkHttp methods and parse from Okio directly ( #8238 )
2022-10-18 12:09:23 -04:00
Ivan Iskandar
f5bde3726a
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
2022-10-18 09:35:10 -04:00
AntsyLich
ea092fa175
Fix selection in library ( #8233 )
2022-10-18 09:32:34 -04:00
Andreas
fed914827a
Tweak Crash activity ( #8229 )
...
- Scroll entire content body
- Edge2Edge
2022-10-17 20:38:05 -04:00
AntsyLich
ea33f8dba5
Move "Share" to end of DropDownMenu ( #8225 )
2022-10-17 09:42:47 -04:00
Ivan Iskandar
4f91d80765
Update Baseline Profiles ( #8220 )
2022-10-16 22:36:25 -04:00
Andreas
4178f945c9
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
2022-10-16 16:35:20 -04:00
arkon
558aad1a71
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.
2022-10-16 16:30:51 -04:00
AntsyLich
d6cbff2837
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>
2022-10-16 15:33:12 -04:00
Ivan Iskandar
aea0cadbfb
Settings: Tint icon with primary color and separate info item layout ( #8217 )
2022-10-16 15:32:48 -04:00
Ivan Iskandar
e4292719d3
CreateBackupDialog: Select all options by default ( #8215 )
2022-10-16 12:52:34 -04:00
arkon
69cdba71eb
Remove dead code
...
Mostly from settings rewrite, but some other things too.
2022-10-16 12:48:43 -04:00
Ivan Iskandar
5c5468f9af
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 570fec6ea6
.
https://github.com/adrielcafe/voyager/issues/62
2022-10-16 12:15:01 -04:00
arkon
6635dd2990
Control library badge visibility with props instead
...
Fixes #8174
2022-10-16 11:30:54 -04:00
arkon
27e5256305
Center EmptyScreen message
...
Fixes #8212
2022-10-16 10:36:10 -04:00
AntsyLich
a2b21e5ad6
Retain bookmark of readded chapters ( #8205 )
...
* Retain bookmark of readded chapters
* Fix typo
2022-10-15 14:22:58 -04:00
arkon
dbd93cf5d1
Tweak source view type menu radio icon to match stable
2022-10-15 12:05:52 -04:00
arkon
c2eaf1c86b
Minor settings cleanup
...
- Fix dark mode setting title
- Enforce usages of translated strings for screen titles
- Use LocalUriHandler where applicable instead of Android context
2022-10-15 11:58:24 -04:00
Ivan Iskandar
890f1a3c7b
Full Compose settings ( #8201 )
...
* Uses Voyager for navigation.
* Replaces every screen inside settings except category editor screen since it's
called from several places.
2022-10-15 11:38:01 -04:00
Swords
3fdcd636d7
Add bookmark filter ( #8198 )
...
* feat: add bookmark filter
* feat: add getBookmarkChaptersByMangaId query + interactor to be used for filtering
2022-10-15 11:33:09 -04:00
zbue
3d7e44726d
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
2022-10-15 11:16:01 -04:00
arkon
147455f99c
Add padding to track search dialog error message
...
Fixes #8142
2022-10-14 16:37:43 -04:00
arkon
b25ca7617d
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.
2022-10-14 16:30:14 -04:00
arkon
bc1fbfac9d
Minor cleanup
2022-10-14 16:13:50 -04:00
arkon
7e92921f84
Attempt to avoid duplicate update rows
...
Related to #7713
2022-10-14 15:43:27 -04:00
d-najd
e1adb89ff8
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>
2022-10-14 15:30:19 -04:00
stevenyomi
4e544005fe
Fix empty screen font style ( #8197 )
2022-10-14 12:27:52 -04:00
Ivan Iskandar
02b3718aa1
Use Compose's existing method to get plural string ( #8194 )
2022-10-13 22:21:19 -04:00
arkon
26a42ba9c0
Upgrade to Kotlin 1.7.20
...
Also run formatter and address some deprecation warnings.
2022-10-11 22:40:08 -04:00
stevenyomi
b1e104319f
Fix download progress indicator ( #8188 )
2022-10-11 22:17:45 -04:00
Platiplus
a3afb35539
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
2022-10-11 08:20:30 -04:00
Ivan Iskandar
fba244423f
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é
2022-10-10 11:59:01 -04:00
Ivan Iskandar
8500add09f
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
2022-10-09 15:52:56 -04:00
arkon
23bfa1f18f
Minor UI fixes
...
- Remove M3 styling from search toolbar
- Use secondary alpha for subtitles for Sources and Migrate items
- Update some content descriptions
2022-10-09 15:49:32 -04:00
arkon
b4f2da12ea
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.
2022-10-09 15:37:48 -04:00
arkon
b84a31ba92
Don't wrap tab pills
...
It may sometimes overlap the text a bit, but it's less awkward than wrapped pills
2022-10-09 11:51:32 -04:00
arkon
d0950cb026
Document copied M3 component customizations
2022-10-09 11:48:46 -04:00
stevenyomi
404f53b16b
Refactor SwipeRefresh and fix some issues ( #8169 )
2022-10-09 11:20:43 -04:00
zbue
737d0fb8f3
RemoveMangaDialog: Show manga title in dialog message ( #8163 )
2022-10-09 10:56:31 -04:00
arkon
b95a30e424
Fix linting error
2022-10-09 10:54:54 -04:00
arkon
3bfbd58402
Clean up download state logic in MorePresenter
2022-10-09 10:37:44 -04:00
d-najd
50f959e5f4
Hiding the keyboard ( #8160 )
...
* Hiding the keyboard (#8157 )
* Cleanup
* Adding log
* cleanup
* moving code to ViewExtensions.kt
* TrackDialog keyboard fix?
* moving code to ContextExtensions.kt
* MoreScreen: Remove title (#8158 )
* MoreScreen: Remove title
Also removes the state banners as it's redundant
* Add back banners
* Allow manual selection of manga description instead of copying to clipboard
Closes #6548
Notably missing some "standard" options like "Select all" or "Share": https://issuetracker.google.com/issues/226648919
* Allow marking partially read chapters as unread
Closes #3777
* Tablet UI edge-to-edge tweaks (#8159 )
* LibraryScreen: Tweak content padding application to draw under nav bar
* BrowseScreen: Tweak content padding application to draw under nav bar
Side note the tab content doesn't actually use its
scaffold (bottom) contentPadding so it's definitely will
be a headache in the future.
* Don't hardcode bottom nav padding
* removed unnecessary import
* refactoring code
* rewriting code
* cleanup?
* cleanup
Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
2022-10-08 17:12:09 -04:00
Ivan Iskandar
4b4be58d0d
Tablet UI edge-to-edge tweaks ( #8159 )
...
* LibraryScreen: Tweak content padding application to draw under nav bar
* BrowseScreen: Tweak content padding application to draw under nav bar
Side note the tab content doesn't actually use its
scaffold (bottom) contentPadding so it's definitely will
be a headache in the future.
* Don't hardcode bottom nav padding
2022-10-08 13:28:09 -04:00
arkon
4bba7a8bab
Allow marking partially read chapters as unread
...
Closes #3777
2022-10-08 13:26:25 -04:00
arkon
60bcebe4d1
Allow manual selection of manga description instead of copying to clipboard
...
Closes #6548
Notably missing some "standard" options like "Select all" or "Share": https://issuetracker.google.com/issues/226648919
2022-10-08 12:57:55 -04:00
Ivan Iskandar
cf6407c4d4
MoreScreen: Remove title ( #8158 )
...
* MoreScreen: Remove title
Also removes the state banners as it's redundant
* Add back banners
2022-10-08 10:24:50 -04:00
Andreas
dcd5541e96
Fix filter search not triggering when clicking genre from Manga details ( #8156 )
2022-10-08 09:48:19 -04:00
arkon
7be6863910
Add JavaScriptEngine abstraction to extensions-lib ( #8155 )
...
This allows us to swap out the implementation in the future and on different platforms
without major changes to the extensions themselves.
2022-10-08 09:45:06 -04:00
arkon
caf9219d99
Reword some reader settings
2022-10-05 09:26:42 -04:00
Ivan Iskandar
3b62396442
Setup Baseline Profile ( #8135 )
...
* Setup Baseline Profile
Adds Baseline Profile generator and startup time test.
Readme included in macrobenchmark module to run the generator.
* changes
2022-10-04 09:22:55 -04:00
AntsyLich
bbe1608006
Show correct language string in browse screens ( #8136 )
2022-10-03 23:05:37 -04:00
Alessandro Tedesco
b8fa326c21
Fix sort by date in LibraryPresenter ( #8137 ) ( #8145 )
...
Co-authored-by: Alessandro Tedesco <alessandro.tedesco@zehus.it>
2022-10-03 23:03:43 -04:00
Ivan Iskandar
1cf1b34e7f
Fix regular scrollbar ( #8139 )
...
At some point the scrollbar stops responding to
scroll changes. Not too confident with this fix
but it works.
2022-10-03 23:03:33 -04:00
stevenyomi
ff4fb83bff
LocaleHelper: use argument for a when
expression ( #8131 )
2022-10-02 10:08:12 -04:00
arkon
0ca14c61c2
Explicitly reword some locale names
...
Avoiding some country names in favour of more generic terminology where appropriate.
2022-10-01 23:54:54 -04:00
arkon
6be9cccc7a
Revert min extension-lib change
...
Some extensions haven't been bumped yet. We should probably try to bump everything at some point.
Also includes some minor cleanup.
2022-10-01 13:24:38 -04:00
arkon
db3cbac310
Stop loading extension-lib <= 1.2
2022-10-01 11:34:46 -04:00
AntsyLich
de23226591
Add methods to get manga and chapter url ( #8114 )
...
* Add methods to get manga and chapter url
Some fork supports directly opening chapters with webview hence `getChapterUrl`
* Review Changes
* Add since to javadoc
2022-10-01 11:31:07 -04:00
AntsyLich
ea8383978b
Move LibraryManga
to domain layer ( #8126 )
2022-10-01 11:30:51 -04:00
AntsyLich
b04d1e5f50
Reduce some usages of toDbManga
( #8116 )
...
Co-Authored-By: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
2022-10-01 11:01:25 -04:00
AntsyLich
98c459a6b6
Downloader: Don't trust index provided by source ( #8122 )
2022-10-01 11:01:05 -04:00
AntsyLich
00f442b77e
Don't download completely read chapter if it was in queue ( #8113 )
2022-10-01 10:58:13 -04:00
Ivan Iskandar
42b0e3e438
HistoryScreen: Remove paging ( #8125 )
...
* HistoryScreen: Remove paging
Per my testing performance-wise there's virtually no
difference in loading time.
* cleanups
* add key and contentType
2022-10-01 10:50:25 -04:00
AntsyLich
5c22cbf28e
Remove mangaChapterMapper ( #8124 )
...
Was used by updates screen previously
2022-10-01 10:33:03 -04:00
Andreas
488276d498
Tweak library search to allow for searching with source language suffix ( #8123 )
2022-10-01 10:32:52 -04:00
Andreas
6ac17363ed
Tweak behavior on Browse screen ( #8121 )
...
* Tweak behavior on Browse screen
- Fix system back popping controller
- Add behavior to system back to cancel search toolbar before clearing current search or popping controller
* Review changes
2022-10-01 10:32:41 -04:00
Ivan Iskandar
58c47c4c50
ExtensionScreen: Adjust item visual ( #8120 )
...
* ExtensionScreen: Adjust item visual
* Move install status view and add progress indicator
* Add secondary item modifier to info texts
* Wrap info texts with FlowRow in case of unavailable space
* Remove language text in non-installed items
Extra content:
* Change the list key to be more consistent
* General cleanups
* typo
2022-10-01 10:32:08 -04:00
Shamicen
80b2ebc45b
Fix ComicInfo.xml not being read if .noxml file exists too ( #8111 )
...
* gives ComicInfo.xml files priority over noxml files if both are at the chapter root.
* delete the noxml file if both a noXml file and a ComicInfo file exist
2022-09-30 23:41:40 -04:00
AntsyLich
ef2c9460b5
Fix total item count in library app bar ( #8117 )
2022-09-30 23:36:23 -04:00
AntsyLich
ad84a8c3e9
Improve DelayedTrackerStore ( #8109 )
...
* Improve DelayedTrackerStore
* Review changes
2022-09-29 09:20:07 -04:00
Ivan Iskandar
6b1d597d34
MangaScreen: Adjust insets ( #8097 )
...
I should have done this when Scaffold was rebased
2022-09-27 22:20:10 -04:00
Alessandro Jean
5a37f2398a
Improve search toolbar UX a little bit ( #8102 )
...
* Improve search toolbar UX a little.
* Fix wrong stringResource import.
* Revert `FocusRequester` change in favour of #8093 .
2022-09-27 18:05:10 -04:00
Ivan Iskandar
98a4f6cccb
manga-refresh-state ( #8090 )
2022-09-27 17:49:21 -04:00
Ivan Iskandar
633bd6eb46
UpdatesScreen: Fix selection state after deleting download ( #8100 )
2022-09-27 17:44:41 -04:00
Ivan Iskandar
f19c288bec
Fix missing focus when single TextField shown ( #8098 )
2022-09-27 17:44:06 -04:00
arkon
e90b39b29d
Use more unique item keys
...
Should make stacktraces more distinguishable.
2022-09-26 17:23:08 -04:00
stevenyomi
f4c684b4b8
Remove cache control on already cacheless image request ( #8085 )
2022-09-26 17:13:03 -04:00
arkon
ec272f6c4e
Fix date added when adding from browse source
...
Fixes #8059
2022-09-25 13:09:25 -04:00
arkon
db91d04e82
Temporarily replace library category tabs divider with our own
...
Fixes #7789
2022-09-25 10:50:02 -04:00
arkon
9859b38f32
Ellipsize long titles
...
Fixes #8075
2022-09-25 10:18:50 -04:00
Ivan Iskandar
0190c36d20
BrowseSourceScreen: Adjust browse mode chips placement ( #8076 )
...
The chips row is now scrollable too and filter fab is removed
2022-09-25 10:15:01 -04:00
Alessandro Jean
ba533f30ce
Add support to update strategy on global update ( #7902 )
...
* Add support to update strategy.
* Add JavaDoc and bump the LIB_VERSION_MAX constant.
* Fix a word typo.
* Store update strategy enum as integer in the DB.
2022-09-25 10:12:36 -04:00
Andreas
29fa93e829
Split the rest of the preferences in PreferencesHelper ( #8074 )
...
* Split the reset of the preferences in PreferencesHelper
* Capitalize ThemeMode
2022-09-25 10:07:06 -04:00
Ivan Iskandar
0fabe4bd01
GlobalSearchController: Auto focus search view when initial query is empty ( #8073 )
2022-09-25 08:53:34 -04:00
Ivan Iskandar
f98b4f4e39
DownloadController: Fix first active download status not updating ( #8069 )
2022-09-24 11:59:11 -04:00
Ivan Iskandar
467ceacb17
SecureActivityDelegate: Fix cold-start only lock behavior ( #8066 )
2022-09-24 10:46:35 -04:00
stevenyomi
4b4a138eee
Improve chapter recognition ( #8050 )
2022-09-24 10:29:55 -04:00
Andreas
b5dca2eb09
Move chapter preferences from PreferencesHelper to LibraryPrefrences ( #8061 )
2022-09-24 10:14:16 -04:00
Andreas
d3520419d4
Clear search query before popping controller when navigating up ( #8055 )
2022-09-22 22:30:28 -04:00
Andreas
acb8ab15b2
Recreate reader settings when opening sheet ( #8054 )
2022-09-22 22:29:15 -04:00
Andreas
5cdcc1679f
Split backup preferences from PreferencesHelper ( #8051 )
2022-09-22 08:57:42 -04:00
arkon
b37b3767f3
Minor cleanup
...
Also add POST_NOTIFICATIONS permissions to make Android Studio stop complaining about it.
2022-09-21 22:39:32 -04:00
arkon
2d56ad1ad9
Replace deprecated SmallTopAppBar
2022-09-21 22:30:06 -04:00
Andreas
e82963c9ef
Split download preferences from PreferencesHelper ( #8048 )
2022-09-21 17:45:07 -04:00
happywillow0
ec34977a64
Update BrowseSourcePresenter.kt ( #8040 )
...
Set filters to default when reset is pressed.
2022-09-21 14:27:38 -04:00
stevenyomi
2ced56e490
Fix error when updating manga details with uninitialized title ( #8045 )
2022-09-21 09:19:45 -04:00
Andreas
e568951396
Split track preferences from PreferencesHelper ( #8046 )
2022-09-21 09:18:53 -04:00
Andreas
e275897bf9
Split reader preferences from PreferencesHelper ( #8042 )
2022-09-20 08:36:57 -04:00
arkon
2b089648a3
Remove redundant preference keys
2022-09-20 00:13:33 -04:00
AntsyLich
c2a831dded
Cleanup logic in UpdatesPresenter ( #8035 )
2022-09-19 23:56:28 -04:00
Andreas
c740558327
Split library preferences from PreferencesHelper ( #8036 )
2022-09-19 23:55:07 -04:00
arkon
0e3176a77c
Clean up UpdatesController
...
- Move loading state into scaffold (closes #7704 )
- Move logic into presenter
- Make some composables private
2022-09-18 22:38:44 -04:00
arkon
f85cbb1582
Replace clear database FAB with button
...
Also remove a bunch of unnecessary inset paddings since Scaffold handles it
2022-09-18 18:38:22 -04:00
arkon
20bbda78e6
Fix library search not being reflected ( fixes #8031 )
2022-09-18 18:09:26 -04:00
arkon
0225711f6f
Clean up base classes
...
Should be able to throw away some of the search controller stuff after Global Search is migrated
2022-09-18 17:22:54 -04:00
arkon
7ec822503a
Catch error properly when app update check fails ( fixes #8019 )
2022-09-18 16:24:26 -04:00
arkon
83871fc013
Minor cleanup/fixes
...
- Add FAB collapsing in clear database screen (fixes #7935 )
- Don't allow multiline category names to be entered
- Consolidate Downloaded Only / Incognito Mode banner components
- Fix see-through migrate screen sticky header
2022-09-18 16:08:58 -04:00
Andreas
b668364afb
Split security preferences from PrefrencesHelper ( #8030 )
2022-09-18 13:07:48 -04:00
arkon
877ae041a4
Avoid invalid locales in language picker ( fixes #7950 )
...
We should probably prune the translations though.
2022-09-18 11:07:10 -04:00
arkon
1395343f11
Read metadata from ComicInfo.xml files in Local source ( #8025 )
...
Co-authored-by: Shamicen <84282253+Shamicen@users.noreply.github.com>
Co-authored-by: Andreas <andreas.everos@gmail.com>
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
2022-09-18 10:55:30 -04:00
Andreas
30b3b2d3ff
Split source preferences from PreferencesHelper ( #8029 )
2022-09-18 10:36:41 -04:00
Andreas
0086743a53
Use 1.x preference abstraction ( #8020 )
...
* Use 1.x preference abstraction
- Uses SharedPreferences compared to 1.x impl which uses DataStore but it breaks all settings screens currently
- Move PreferencesHelper to new PreferenceStore
- PreferencesHelper should be split into smaller preference stores and be in core or domain
- Remove flow preferences as new PreferenceStore handles changes for us
Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
* Fix PreferenceMutableState not updating
* Fix changes not emitting on first subscription
Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
2022-09-17 11:48:24 -04:00
Ivan Iskandar
f54adb49a1
ExtensionsPresenter: Use StateFlow for extensions list ( #8017 )
2022-09-16 08:35:15 -04:00
Ivan Iskandar
ec30026333
Fix always-on app lock on cold start ( #8018 )
2022-09-16 08:34:46 -04:00
arkon
4ea512f6c2
Fix manga being reinitialized in browse
...
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
2022-09-15 22:55:20 -04:00
arkon
829aadd0bd
Always attempt automatic backup creation
...
- Defaults to every 12 hours
- Minimum number of backups is now 2, just to offer some level of redundancy in case something happens
- If it's missing storage permissions, it'll fail but that's the user's loss if they somehow haven't granted that permission yet
2022-09-15 22:53:46 -04:00
arkon
9d28def387
Remove some dead code
2022-09-15 22:51:01 -04:00
Andreas
86fe850794
Extract source api from app module ( #8014 )
...
* Extract source api from app module
* Extract source online api from app module
2022-09-15 18:12:27 -04:00
Ansh
30ac94181b
Fix stacking of Settings menu in the reader on multiple taps ( #8002 )
...
* fix : conditional check added to avoid stacking of dialog
In onClickListener, bottom sheet is being opened depending on status of dialog sheet, if it's showing or not.
* chore : refactored conditional logic
* Update ReaderActivity.kt
2022-09-15 17:41:54 -04:00
AntsyLich
48d3d454c0
Fix missing condition on getLibrary
sql query ( #8006 )
2022-09-14 11:36:23 -04:00
Ivan Iskandar
6865c21c75
Fix derivedStateOf errors ( #8008 )
2022-09-14 11:36:13 -04:00
Ivan Iskandar
7270c48f26
LibraryItem: Fix equality check ( #7999 )
...
Proper equality check is needed by compose for state changes.
2022-09-12 12:29:28 -04:00
AntsyLich
9e5d79aec3
Fix lint error ( #8000 )
2022-09-12 11:59:15 -04:00
AntsyLich
c51e83c048
Flatten available extensions with its source ( #7956 )
...
* Flatten available extensions with it's source
We should also do something similar for installed extensions
Supersedes #7200
* Dedupe sources
2022-09-11 18:05:46 -04:00
stevenyomi
52fa28c16a
Prevent okhttp from caching covers and chapter images ( #7967 )
2022-09-11 18:00:07 -04:00
AntsyLich
935c8e7d82
Change logic in BitmapFactory.Options.splitData
( #7989 )
2022-09-11 17:59:57 -04:00
arkon
19be0d68b6
Add some padding to tab indicators
2022-09-11 17:59:08 -04:00
arkon
f9bbbce466
Check the actual folder when deleting source folder in case of stale cache
2022-09-11 17:58:59 -04:00
arkon
eb5ef72747
Revert "Update Compose Material3"
...
This partially reverts commit 3dea10bcb9
.
See https://issuetracker.google.com/issues/245626686
2022-09-11 17:49:10 -04:00
Andreas
0215b66098
Count the downloads under each header instead of count the number of headers ( #7990 )
2022-09-11 13:11:50 -04:00
arkon
3dea10bcb9
Update Compose Material3
2022-09-11 11:52:29 -04:00
arkon
cd3cb72b65
Bump dependencies + linting
2022-09-10 23:57:03 -04:00
Andreas
9ce1d71a45
Revert moving arrays to i18n ( #7977 )
2022-09-10 12:21:51 -04:00
arkon
28594bba2c
Remove unused resources
2022-09-10 10:19:38 -04:00
Andreas
d5c207d8a3
Extract translation from app module ( #7975 )
...
* Extract translation from app module
- Prep for further extraction to modules in the nearish future
* Subproject .gitignore
2022-09-10 09:58:45 -04:00
AntsyLich
56826fb477
Cleanup logic of onStripSplit
in WebtoonPageHolder 2 ( #7976 )
2022-09-10 09:34:27 -04:00
Weblate (bot)
171d7f2b8c
Weblate translations ( #7953 )
...
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ismail Mhmary <ismailmhmary@gmail.com>
Co-authored-by: Jujutsu <jujutsu2319728282@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: MES-mitutti <nakanakamituhasi3284@gmail.com>
Co-authored-by: Madddog1997 <madddog1997@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: ZiomaleQ <r.partyka30@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Ismail Mhmary <ismailmhmary@gmail.com>
Co-authored-by: Jujutsu <jujutsu2319728282@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: MES-mitutti <nakanakamituhasi3284@gmail.com>
Co-authored-by: Madddog1997 <madddog1997@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: ZiomaleQ <r.partyka30@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
2022-09-10 09:30:36 -04:00
Andreas
5ec5829e77
Revert removing Fullscreen theme ( #7974 )
...
- Is still used by TachiyomiFullscreenDialog
2022-09-10 09:17:06 -04:00
arkon
448978ac8a
Remove unused resources
2022-09-09 22:37:29 -04:00
Ivan Iskandar
fb9791f597
DownloadController: Partial Compose conversion ( #7969 )
...
Item list is not changed as currently there is no fitting Compose component to
replace the drag-drop behavior.
2022-09-09 22:29:40 -04:00
nzoba
07d1b9f3ba
Fix download ahead missing out 1 chapter ( #7927 )
...
* Fix download ahead missing out 1 chapter
* Move toLong() function
* Add check whether the next chapter is queued
2022-09-09 22:29:24 -04:00
AntsyLich
6b91f65457
Cleanup logic of onStripSplit
in WebtoonPageHolder ( #7955 )
...
* Cleanup logic of `onStripSplit` in WebtoonPageHolder
* Update app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
Co-authored-by: arkon <arkon@users.noreply.github.com>
2022-09-07 17:11:44 -04:00
AntsyLich
0c7b1bda7f
LocalSource: Create cover file if it doesn't exist ( #7954 )
2022-09-07 17:02:06 -04:00
Ivan Iskandar
032b377de7
WebViewScreen: Use Scaffold ( #7958 )
2022-09-07 16:59:44 -04:00
arkon
26d8e47bb9
Bump default user agent string
2022-09-04 18:01:02 -04:00
Weblate (bot)
970ff7841e
Translations update from Hosted Weblate ( #7949 )
...
* Weblate translations
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x
* Deleted translation using Weblate (Tagalog)
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
2022-09-04 17:40:19 -04:00
Weblate (bot)
3f62837260
Translations update from Hosted Weblate ( #7919 )
...
* Weblate translations
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: António Ramos <ubercraft06@gmail.com>
Co-authored-by: Christian Elbrianno <crse@protonmail.ch>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@firemail.cc>
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: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Peter Henriksen <f8xct2@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Ricardo Briones <rbrionesu@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: deadlevel13 <dodoanmanhdung@gmail.com>
Co-authored-by: nzoba <enzobatista2@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/da/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
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/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
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/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x
* Deleted translation using Weblate (Tagalog)
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: António Ramos <ubercraft06@gmail.com>
Co-authored-by: Christian Elbrianno <crse@protonmail.ch>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@firemail.cc>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Peter Henriksen <f8xct2@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Ricardo Briones <rbrionesu@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: deadlevel13 <dodoanmanhdung@gmail.com>
Co-authored-by: nzoba <enzobatista2@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
2022-09-04 11:18:54 -04:00
AntsyLich
d55c854ebf
Webtoon Split: Improve performance ( #7947 )
2022-09-04 11:16:20 -04:00
Andreas
6b2b21edfa
Fix Filter not being applied in Browse Source ( #7945 )
2022-09-04 11:15:13 -04:00
Ivan Iskandar
99270e370e
Fix missing downloaded only/incognito banners in Browse Source ( #7936 )
2022-09-04 11:14:37 -04:00
arkon
21804bfc45
Reimplement extensions search
...
Not sure if I should abstract this out to per-tab though. Maybe when we need it...
2022-09-03 10:47:48 -04:00
arkon
38950f7bc8
Address some OkHttp nullability changes
2022-09-03 10:38:56 -04:00
arkon
bbf5c86b46
Fix missing downloaded only/incognito banners in Browse
2022-09-03 10:33:31 -04:00
Ivan Iskandar
3fa68ed217
Rebase Scaffold fork ( #7929 )
...
This changes content insets handling
2022-09-03 10:33:22 -04:00
Andreas
cc6aef693e
Merge Latest and Browse into one screen ( #7921 )
...
* Merge Latest and Browse into one
* Add back Latest button
* Change context to IO instead of launching a job
* Use loading screen when loading initial page
2022-09-03 10:16:30 -04:00
AntsyLich
5a320d87e8
Remove download source folder when empty ( #7928 )
2022-09-03 09:18:19 -04:00
AntsyLich
da95ecb686
Lessen the use of GlobalScope launchIO
( #7916 )
...
* Lessen the use of GlobalScope `launchIO`
* Wrap some calls with `NonCancellable` context
2022-09-02 11:50:44 -04:00
Ivan Iskandar
774a87a42a
Adjust app lock mechanism ( #7924 )
...
Now uses enum to also handle timed lock
2022-09-02 11:48:48 -04:00
AntsyLich
ff4a217730
Cleanup chapter name when syncing chapter with source ( #7910 )
2022-09-02 10:07:50 -04:00
AntsyLich
a43754e1a6
Fix tmp cbzs are counted towards manga download count ( #7909 )
...
* Fix tmp cbzs are counted towards manga download count
* Review Changes
* Review Changes 2
2022-09-02 10:03:37 -04:00
arkon
8ef200861c
Fix webtoon viewer pages not loading
...
Partial revert of fddca15182
2022-09-02 10:02:04 -04:00
Weblate (bot)
ddd180e56a
Weblate translations ( #7914 )
...
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alex Crecan <alex_crecan@yahoo.com>
Co-authored-by: DIAN SABSAB <philiptenibas@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: HuynhDuc <minhduck3359@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Ric <rikku.debec@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: ZiomaleQ <r.partyka30@gmail.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
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/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
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/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alex Crecan <alex_crecan@yahoo.com>
Co-authored-by: DIAN SABSAB <philiptenibas@gmail.com>
Co-authored-by: HuynhDuc <minhduck3359@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Ric <rikku.debec@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: ZiomaleQ <r.partyka30@gmail.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
2022-09-01 10:05:30 -04:00
arkon
30b86e530b
Bump OkHttp and re-enable fast fallback
...
It wasn't very stable last time, but we'll see how it goes in preview builds.
2022-08-31 16:51:33 -04:00
Andreas
2f26982e34
Resolve review comments for BrowseSourceScreens ( #7912 )
2022-08-31 16:47:07 -04:00
arkon
504844a892
Make top app bar lift behavior more consistent
2022-08-31 16:31:08 -04:00
arkon
4c1da1bd1d
Maybe fix extensions list crash
...
Also fix weird animation of last updated text in Updates
2022-08-31 15:56:08 -04:00
arkon
dc62d0ea8b
Clean up interceptors a bit
2022-08-31 15:39:59 -04:00
AntsyLich
fddca15182
Don't update page progress and allow preload when on StencilPage ( #7899 )
...
Also cleanup a little in WebtoonPageHolder
2022-08-31 15:09:21 -04:00
AntsyLich
81f49f34ef
Manually handle HTTP 103 through WebView ( #7907 )
...
* Manually handle HTTP 103 through WebView
* Review Changes
2022-08-31 14:48:25 -04:00
arkon
c39a1b7867
Minor cleanup
2022-08-31 14:43:58 -04:00
Andreas
d4b764fa31
Use Compose on BrowseSourceScreens ( #7901 )
2022-08-31 14:41:35 -04:00
AntsyLich
d85af2fec6
Add "Njalla" dns provider ( #7908 )
...
* Add "Njalla" dns provider
Details ~~Tho there is none~~: https://dns.njal.la/
* Lint
2022-08-31 11:23:02 -04:00
arkon
90c08303fa
Implement nicer UI for migrate list sorting
2022-08-30 16:31:28 -04:00
arkon
92e83f702c
Initial conversion of browse tabs to full Compose
...
TODO:
- Global search should launch a controller with the search textfield focused. This is pending a Compose rewrite of that screen.
- Better migrate sort UI
- Extensions search
2022-08-30 16:05:35 -04:00
Alessandro Jean
084e6a964e
Enable sub-languages on app first run ( #7127 )
...
* Enable sub-languages on app first run.
* Fix wrong language code string parsing.
* Fix some build issues due to rebase.
* Use PreferenceHelper and remove an extra preference.
* Remove a constant.
2022-08-30 15:37:15 -04:00
stevenyomi
532f662b05
Rewrite RateLimitInterceptor ( #7889 )
2022-08-30 13:17:37 -04:00
AntsyLich
53f5ea7fe9
Rename source download folder on source rename ( #7898 )
...
* Rename source download folder on source rename
* Review Changes
* Review Changes 2
2022-08-30 13:15:34 -04:00
AntsyLich
fc6946ed61
Reword "All" source/ext lang to "Multi" ( #7895 )
...
* Add "multi" as a recognized source/ext lang
* Review Changes
2022-08-30 12:43:50 -04:00
arkon
f5c7aa1142
Convert settings main and search views to full Compose
2022-08-29 16:39:35 -04:00
arkon
761635b572
Convert extension details to full Compose
2022-08-29 16:10:55 -04:00
arkon
488d8ab8cf
Update chapter progress upon registering tracker ( closes #7209 )
...
Co-authored-by: Saud-97 <Saud-97@users.noreply.github.com>
2022-08-29 15:36:56 -04:00
arkon
8efb20439a
Remove some usages of global scope
2022-08-29 15:15:18 -04:00
arkon
43c195e14a
Add last update time to Updates Tab ( closes #5466 )
...
Co-authored-by: datreesezcup <datreesezcup@users.noreply.github.com>
2022-08-29 14:57:25 -04:00
arkon
8a3a7418d0
Show number of unique library items ( closes #6522 )
...
- Filters do affect this
- Won't be shown if tabs aren't visible and there's more than 1 category (so it'd always show the per-category count), but a separate stats page should show that info instead
2022-08-29 14:34:11 -04:00
Andreas
880407442c
Tweak flag classes for Library ( #7829 )
...
* Tweak flag classes for Library
- Add interface for Flag and Mask
- Merge Sort Type and Direction into one class
- Use custom serializers for preferences
- Mainly to not break the old
* Review changes
2022-08-29 13:10:30 -04:00
renovate[bot]
3b34a878a7
Update dependency org.jsoup:jsoup to v1.15.3
2022-08-29 13:08:42 -04:00
AntsyLich
b79340989f
Fix IndexOutOfBoundsException when using Split tall images ( #7892 )
...
Also little cleanup
2022-08-29 13:02:34 -04:00
AntsyLich
0e526c36be
Long strip split fixes 2.0 ( #7882 )
...
options was having issues in returning width for some reason
Fixes #7880
Fixes #7881
2022-08-28 09:46:42 -04:00