github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-10-31 21:20:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5299 commits 1 branch 87 tags 75 MiB
Commit graph

3941 commits

Author SHA1 Message Date
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
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
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
arkon
28594bba2c Remove unused resources 2022-09-10 10:19:38 -04:00
AntsyLich
56826fb477
Cleanup logic of onStripSplit in WebtoonPageHolder 2 (#7976) 2022-09-10 09:34:27 -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
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
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
Andreas
a83d29f058
Add APK output for x86_64 CPU architecture (#7885) 
* Add APK output for x86_64 CPU architecture

* Review changes

* Fix formatting

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

* Use underscore instead of hyphen

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
 2022-08-28 09:45:33 -04:00
Andreas
be7108a2ee
Fix overflow in ChangeCategoryDialog (#7883) 2022-08-28 09:43:01 -04:00
AntsyLich
1948d55d5d
Long strip split fixes (#7875) 
* Fix image width in `splitStrip`

* Fix reader switch isn't in md3
 2022-08-27 18:10:16 -04:00
Andreas
9c49a5ed22
Fix issue with removing categories from manga for ChangeCategoryDialog (#7874) 2022-08-27 18:02:19 -04:00
Andreas
0bb20a92af
Fix issue with input for DownloadCustomChaptersDialog (#7873) 2022-08-27 17:50:00 -04:00
arkon
cd82c88b9a Fix checkbox selection when tapping text in Compose dialogs 2022-08-27 12:48:04 -04:00
AntsyLich
8d40e20b7d
Prevent unofficial exts from getting marked as obsolete or updateable (#7871) 
* Prevent unofficial exts from getting marked as obsolete

* Prevent unofficial ext `hasUpdate` getting marked as true
 2022-08-27 12:12:59 -04:00
arkon
31b62b2779 Minor cleanup 2022-08-27 11:50:51 -04:00
AntsyLich
88b56121a3
Long Strip Split for Webtoon (#5759) 
* Long Strip Split for Webtoon

* Review Changes

* Review Changes 2 + Rebase
 2022-08-27 11:41:18 -04:00
Ivan Iskandar
655fa25b51
Bump Compose M3 to 1.0.0-beta01 (#7867) 2022-08-26 09:19:47 -04:00
Mubashir Haroon
aab5f083db
Trim newlines from user agent (#7858) 
* trim newlines from user agent

* fix indents

* fix indents for real

* actually fix indents
 2022-08-26 09:18:09 -04:00
arkon
03b9950fa1 Minor tweaks to download custom dialog 
- Allow large decrements (just goes to 0)
- Use Material3 text field for proper theming
- Move dialog composable to presentation package
 2022-08-26 09:16:26 -04:00
Andreas
2453d1a886
Move a few Dialogs to Compose (#7861) 
* Move a few Dialogs to Compose

- Separating dialogs that are not needed in the PR for the move to Compose on the Browse Source screen
- ChangeMangaCategoriesDialog and AddDuplicateMangaDialog will be removed in the Browse Source screen PR

* Review changes
 2022-08-26 08:57:28 -04:00
stevenyomi
4b9a6541d1
Fix chapter download with empty scanlator (#7844) 2022-08-24 17:19:01 -04:00
nzoba
a70b848646
Fix stucked downloads when service not started (#7846) 
* Fix stucked downloads when service not started

* Fix chapter download restart even if should be deleted
 2022-08-24 17:18:22 -04:00
Andreas
ce44c0615b
Add DelicateCoroutinesApi to GlobalScope extension functions (#7848) 2022-08-23 10:16:52 -04:00
nzoba
f207e87722
Download ahead (#7226) 2022-08-22 17:37:54 -04:00
arkon
2e81e1b7d8 Reorder themes 2022-08-21 11:27:02 -04:00
Batuhan
4b0f549666
New Theme Tidal Wave (#7825) 
* New Theme Tidal Wave

Added a new strong blue theme appearance to Tachiyomi titled Tidal Wave.

* Better Tertiary Color: Seafoam Green

Updated the tertiary color to be lighter and match the blue more. Also changed the active button color to contrast better.
 2022-08-20 13:23:32 -04:00
stevenyomi
40749dc767
DownloadProvider: Remove duplicate in valid chapter dir name list (#7826) 2022-08-20 13:19:15 -04:00
stevenyomi
3599d53c61
Disable explicit nulls for JSON serializer (#7824) 
* Disable explicit nulls for JSON serializer

* format to multiple lines
 2022-08-20 11:48:50 -04:00
stevenyomi
2156844b87
NetworkHelper: log real requests and responses (#7820) 2022-08-20 10:16:45 -04:00
Ivan Iskandar
763288ab13
LibrarySettingsSheet: Fix race condition when applying sort mode (#7805) 
Also fix sort direction can't be changed for default category
 2022-08-20 10:15:53 -04:00
Andreas
58e6479438
Fix crash when opening library sheet with empty category list (#7822) 2022-08-19 16:02:37 -04:00
Andreas
6d6c38ecaf
Fix nav bar appearing when going from Library's action mode (#7821) 
fixes #7788
 2022-08-19 16:02:12 -04:00
arkon
3760b310df Don't allow setting blank user agent string 2022-08-19 08:24:03 -04:00
Andreas
47b56644de
Fix emoji going crazy and fix tabs being visible when library is empty (#7811) 
fixes #7792
fixes #7791
 2022-08-19 07:22:46 -04:00
arkon
1fe9b7bda7 Update default user agent string 2022-08-18 18:54:55 -04:00
stevenyomi
e36e9d9d5c
Remove 1.x source models (#7781) 2022-08-18 14:07:13 -04:00
Andreas
4228bbb88e
Set initial flag on new categories (#7800) 
- Use the same flag as other categories
- Per-category uses the flag the user used before starting to use per-category
 2022-08-18 14:06:52 -04:00
Andreas
09abfc7843
Lint changes (#7802) 
- Fixes current lint issues
- Changes lint task to lintKotlin on PRs
 2022-08-18 14:06:32 -04:00
stevenyomi
1f34f5277c
Fix notification and add visual cues when triggering a second update (#7783) 2022-08-18 09:01:10 -04:00
Ahmad Azwar Annas
80b4b7bee6
Add Mullvad and Control D as DoH providers (#7785) 2022-08-18 08:59:40 -04:00
stevenyomi
1f9f9662bc
Fix download chapter dir when scanlator is empty or changed (#7780) 2022-08-16 17:26:08 -04:00
Ivan Iskandar
2d690a09b3
Reinstate in-app language picker (#7493) 
Also add required config for android 13 system picker
 2022-08-14 11:52:46 -04:00
arkon
1d6aa9a277 Merge branch 'patch' 
# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/AddDuplicateMangaDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSorter.kt
#	app/src/main/res/layout/pref_settings.xml
#	app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt
#	gradle/androidx.versions.toml
#	gradle/libs.versions.toml
 2022-08-14 11:28:28 -04:00
Ivan Iskandar
9dbc1aa7a3
UpdatesScreen: use custom LazyColumn with animation fix (#7758) 2022-08-14 10:12:31 -04:00
Ivan Iskandar
b0520df1dd
Use application context to create toast (#7756) 2022-08-14 08:44:24 -04:00
arkon
a89651810d Don't allow swiping away app update install notification 
Based on 85ef40d0ff
 2022-08-13 15:15:14 -04:00
CVIUS
431c04e54f Detect identical mangas when long pressing to add to library (#7095) 
* Detect identical mangas when long pressing to add to library

* Use extracted duplicate manga dialog to avoid duplication

* Partially revert previous commit

* Review changes

* Review changes part 2

(cherry picked from commit f1afeac0bc)
 2022-08-13 15:15:01 -04:00
nicki
f461c71625 Fix Links to Changelog/Readme/Commits for multisrc (#7252) 
* Fix Links to Changelog/Readme/Commits for `multisrc`

working basic fix. Needs to be refactored into `createUrl()`

* Refactor back into `createUrl`

hopefully the logic is understandable
there's three cases:
 - when multisrc, if `path` isn't mentioned, then we're trying to open
   commmit history
 - when multisrc, if `path` is mentioned, then its either a changelog or
   a readme to a multisrc extension, the files are stored in the
   `overrides` subfolder
 - when not multisrc, we're looking at a single source where the links
   are constructed in the same way regardless of it being
   changelog/readme/commit history

(cherry picked from commit e7695aef78)
 2022-08-13 15:05:50 -04:00
arkon
b635789740 Actually compare chapter numbers as numbers when sorting (fixes #7247) 
(cherry picked from commit da8669c826)
 2022-08-13 15:05:23 -04:00
Saud-97
f00e03e5ea New: Migrating titles maintains custom covers (#7196) 
* New: Migrating titles maintains custom covers #7189

* Added Custom Covers to MigrationFlags.kt, strings.xml

* Reworded covers --> cover

* Updated logic to show/hide Migration flags titles depending on manga.

(cherry picked from commit 5ea03fad87)
 2022-08-13 15:03:21 -04:00
arkon
6db2becd30 Add auto split tall images setting 
Also includes some fixes for bad merges in earlier commits

Co-authored-by: Saud-97 <Saud-97@users.noreply.github.com>
Co-authored-by: AntsyLich <AntsyLich@users.noreply.github.com>
 2022-08-13 14:56:08 -04:00
Ivan Iskandar
5f378e28b6
UpdatesPresenter: Prevent unnecessary screen recompose (#7742) 2022-08-13 14:34:51 -04:00
Ivan Iskandar
4ebceac07f
UpdatesScreen: Fix inset related issue (#7741) 2022-08-13 14:27:07 -04:00
Ivan Iskandar
aab5a56892
MangaFullCoverDialog: Use the new image picker when available (#7740) 2022-08-13 13:25:48 -04:00
Andreas
e58945a209 Log extension loading errors directly (#7716) 
(cherry picked from commit 7892cc1519)
 2022-08-13 13:17:41 -04:00
Alessandro Jean
03e4eb1061 Add missing Authorization header on MAL refresh token request (#7686) 
* Add missing Authorization header on MAL refresh token request.

* Make sure to also close the response when it have failed.

(cherry picked from commit 5315467908)
 2022-08-13 13:16:55 -04:00
stevenyomi
09a3509d79 Filter out empty genres before saving manga to database (#7655) 
(cherry picked from commit 4efb736e56)
 2022-08-13 13:16:00 -04:00
Andreas
b3a11eca0f Remove deprecated LibrarySort (#7659) 
* Remove deprecated LibrarySort

* Apply suggestions from code review

(cherry picked from commit 58acf0a8aa)
 2022-08-13 13:15:50 -04:00
MatchaSoba
650c2dc6e7 Fix logic for searchWithGenre (#7559) 
(cherry picked from commit b563e85c3b)
 2022-08-13 13:15:36 -04:00
arkon
d4adb664cc Avoid catastrophic failure when cover can't be created in local source (fixes #7577) 
(cherry picked from commit d6977e5676)
 2022-08-13 13:14:33 -04:00
arkon
5194bdb229 Show better error when trying to open RARv5 file 
(cherry picked from commit a843054388)
 2022-08-13 13:14:23 -04:00
nzoba
87ec71142b Add downloaded icon in TransitionView when chapter is downloaded (#7575) 
* Add downloaded icon in TransitionView

* Change icon

(cherry picked from commit e8b7743826)
 2022-08-13 13:13:23 -04:00
AntsyLich
85f2996ae9 Fix logic of app unlock (#7569) 
(cherry picked from commit 8ea05e852e)
 2022-08-13 13:11:12 -04:00
stevenyomi
e296d56e09 Fix image MIME issues that cause download errors (#7562) 
* Downloader: ignore non-image MIME to prevent .bin extensions

* ProgressResponseBody: allow null content type

Co-authored-by: anenasa <84259093+anenasa@users.noreply.github.com>

Co-authored-by: anenasa <84259093+anenasa@users.noreply.github.com>
(cherry picked from commit 3547d0142f)
 2022-08-13 13:11:03 -04:00
f1998f1998
dd676b6d14 fix concurrent download (#7552) 
* Fix concurrent download

* lower Concurrency

* artist Update app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt

Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>

Co-authored-by: Vetle Ledaal <vetle.ledaal@gmail.com>
(cherry picked from commit b635f02d93)
 2022-08-13 13:10:53 -04:00
arkon
7c7bd72c8e Make default user agent string configurable 
(cherry picked from commit 4ee1d72b6f)
 2022-08-13 13:09:55 -04:00
arkon
c7e44aa22f Replace deprecated ACTION_MEDIA_SCANNER_SCAN_FILE intent 
(cherry picked from commit 0b4f3f5532)
 2022-08-13 13:09:19 -04:00
arkon
ac4f98e152 Configure SQLite 
- Turn on `foreign_keys` to cascade on delete properly
- Turn on `journal_mode` and set `synchronous` to NORMAL which may help performance for larger libraries

Based on d977b89af1

Co-authored-by: ghostbear <andreas.everos@gmail.com>
 2022-08-13 13:08:16 -04:00
arkon
3966a917ee Bump dependencies + compile SDK to 33 + linting 2022-08-13 12:52:18 -04:00
arkon
4a71022a60 Update chapter recognition and related tests 
Includes 3e07100dc2

Co-authored-by: Saud-97 <Saud-97@users.noreply.github.com>
 2022-08-13 12:37:02 -04:00
AntsyLich
1474c8ffb3
Some tweaks on Updates screen (#7729) 
Based on #7708, #7709 and #7717

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

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
 2022-08-12 12:21:05 -04:00
Ivan Iskandar
441e7bf8b1
MainActivity: Fix crash on back pressed (#7731) 2022-08-12 12:20:39 -04:00
Andreas
71fc5d6d35
Add back reset action to the Library and History Search toolbars (#7722) 
* Add back reset action to the Library and History Search toolbars

* Localize the descriptions
 2022-08-11 09:23:56 -04:00
Andreas
ff996d282a
Change usage of name to visualName when Default category can be shown (#7725) 2022-08-11 09:07:20 -04:00
AntsyLich
11f640cfee
Change return value of SyncChaptersWithSource.await() (#7715) 
* Change return value of `SyncChaptersWithSource.await()`

`updatedToAdd.subtract(reAdded).toList()` never worked as at this point `updatedToAdd` contained ids from db where `reAdded` had default one. Was the same case before the rewrite.

Removed `toDelete` from return value as it was not being used anywhere

* Add doc string

* Use HashSet

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
 2022-08-11 09:06:46 -04:00
arkon
d6f1534ee8 Address misc. build warnings 2022-08-10 23:26:34 -04:00
arkon
e511f24979 Fix crash when setting cover errors (closes #7714) 2022-08-10 16:11:12 -04:00
Andreas
22e83f408b
Tweak Library screen (#7718) 
* Allow to refresh when there is white space

fixes #7701

* Don't use key on library screen as it retains scroll position on first item

fixes #7631
 2022-08-10 15:56:52 -04:00
Andreas
ec96a81735
Fake library loading (#7717) 2022-08-10 15:54:26 -04:00
Andreas
7892cc1519
Log extension loading errors directly (#7716) 2022-08-10 15:53:47 -04:00
Ivan Iskandar
f7b11f2ce9
MangaPresenter: Fix incorrect range selection (#7709) 2022-08-09 09:11:12 -04:00
Ivan Iskandar
b4e15263db
Fix issues related to Manga screen slow load (#7708) 
* Fix back handling when manga is still loading

* MangaPresenter: Show what we have earlier to reduce percepted slowness
 2022-08-09 09:10:48 -04:00
nzoba
7845f9430e
Set readStartTime when switching chapters in a single reader session (#7702) 2022-08-08 09:22:37 -04:00
Ivan Iskandar
16abfeeff0
Glance widget fixes (#7706) 
* Fix glance failing when there's too much children

* Adjust cover error placeholder
 2022-08-08 09:20:45 -04:00
arkon
3bc6b1e202 Fix default category showing up in edit manga categories list 
Also remove some usages of runBlocking
 2022-08-07 11:00:51 -04:00
arkon
3c2e237d63 Fix appbar action content descriptions 2022-08-07 10:16:08 -04:00
arkon
688cc64dff Minor fixes 
- Fix categories modal showing when adding from source with no categories
- Use old categories icon in library bottom action menu
 2022-08-06 16:23:13 -04:00
arkon
9f0052eceb More backup/restore code cleanup 2022-08-06 15:40:50 -04:00
arkon
a2bb81b7db Start cleaning up backup/restore code 
The abstraction was useful for handling 2 systems, but it's no longer needed. Cleaning it up will make migrating to domain models easier down the line.
 2022-08-05 23:11:06 -04:00
arkon
5e68fe4fe9 Make screen loading indicators more consistent 2022-08-05 22:33:52 -04:00
Andreas
914831d51f
Move default category into database (#7676) 2022-08-05 09:32:10 -04:00
Alessandro Jean
5315467908
Add missing Authorization header on MAL refresh token request (#7686) 
* Add missing Authorization header on MAL refresh token request.

* Make sure to also close the response when it have failed.
 2022-08-04 22:17:43 -04:00
Ivan Iskandar
b3426f37e7
ExtensionPresenter: Fix crash on first launch (#7685) 
* Revert "Use SharedFlow for available extensions to always emit the value (#7609)"

This reverts commit 73901f50c0.

* ExtensionPresenter: Explicitly set refreshing status

* Scope coroutines job to presenter

* cleanup

* fix toast
 2022-08-04 15:44:37 -04:00
Ivan Iskandar
afceac15c8
Add scroll overlay to LibraryToolbar (#7669) 
Works when category tab is not shown
 2022-08-03 17:41:15 -04:00
nzoba
3d4e56948d
Save read duration to backup (#7672) 
* Save read duration to backup

* Add default value

Co-authored-by: Andreas <andreas.everos@gmail.com>

Co-authored-by: Andreas <andreas.everos@gmail.com>
 2022-08-03 17:40:13 -04:00
Ivan Iskandar
737cf9898d
Reimplement appbar color overlay on scroll (#7663) 
only on updates and history screen for now, but the required changes on app bar
is there.

also fix missing incognito-downloaded mode indicator on history screen
 2022-07-31 22:24:19 -04:00
arkon
322f3a07e8 Remove some unneeded TODOs 2022-07-31 17:52:17 -04:00
Andreas
6c7b3d7811
Fix null pointer exception on Extension Detail screen (#7666) 2022-07-31 17:17:36 -04:00
arkon
2ca62c4eda Remove unused viewstatepageradapter dependency 2022-07-31 11:55:07 -04:00
Ivan Iskandar
29e1976b90
Glance widget for Updates (#7581) 
* glance

* glance2
 2022-07-31 11:31:40 -04:00
stevenyomi
4efb736e56
Filter out empty genres before saving manga to database (#7655) 2022-07-31 11:18:12 -04:00
Andreas
58acf0a8aa
Remove deprecated LibrarySort (#7659) 
* Remove deprecated LibrarySort

* Apply suggestions from code review
 2022-07-31 11:17:43 -04:00
stevenyomi
9f5f101858
Dismiss clear database confirm dialog on success (#7657) 2022-07-31 10:59:55 -04:00
AntsyLich
2a875fe9b8
SyncChaptersWithSource: Fix early exit condition for readded chapters (#7661) 2022-07-31 10:58:55 -04:00
Andreas
039fe4a618
Fix Clear Database item trying to display language when empty (#7651) 2022-07-30 13:55:07 -04:00
arkon
0c9c4c0347 Mimic M3 rounded tab indicators 2022-07-30 12:27:32 -04:00
MatchaSoba
b563e85c3b
Fix logic for searchWithGenre (#7559) 2022-07-30 11:53:25 -04:00
Andreas
99ac30e59f
Use Compose on Clear Database screen (#7639) 2022-07-30 11:51:47 -04:00