mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-12-27 11:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,533 Commits 1 Branch 88 Tags 84 MiB
b49280e347
Commit Graph

5071 Commits

Author SHA1 Message Date
arkon
3a8b5e1b5e Fix default category name being shown with empty library 2022-12-01 23:00:34 -05:00
Ivan Iskandar
94d1b68598
Use Voyager on BrowseSource and SourceSearch screen (#8650) 
Some navigation janks will be dealt with when the migration is complete
 2022-11-30 23:05:11 -05:00
arkon
8eda4df71f Fix refreshing state for extensions tab 
Fixes #8644
Also add an extra delay in case it's super fast.
 2022-11-29 09:25:22 -05:00
AntsyLich
8ad9337863
Fix Stub Source migration screen broken (#8643) 
* Fix Stub Source migration screen broken

* Lint
 2022-11-29 09:06:52 -05:00
Ivan Iskandar
cd13e187cf
Use Voyager on Downloads screen (#8640) 2022-11-28 09:23:11 -05:00
Ivan Iskandar
bcc21e55bd
Complete Settings migration to Voyager (#8639) 
Now the Controller wrapper can be yeeted anytime
 2022-11-28 09:21:18 -05:00
arkon
5fbecfd7b7 Don't remove queued downloads when deleting manga after chapter deletion 2022-11-27 17:12:45 -05:00
arkon
3480b45098 Minor cleanup 2022-11-27 17:12:45 -05:00
arkon
44366ac058 Minor global search UI tweaks 2022-11-27 15:16:08 -05:00
arkon
4f2a794fba Remove dead code 2022-11-27 15:09:37 -05:00
Dexroneum
fe6aa4358f
Show toolbarTitle depending of size (#8633) 2022-11-27 14:57:52 -05:00
Andreas
f99b62a069
Use Compose on Global/Migrate Search screen (#8631) 
* Use Compose on Global/Migrate Search screen

- Refactor to use Voyager and Compose
- Use sealed class for state
- Somethings are broken/missing due to screens using different navigation libraries

* Review changes
 2022-11-27 14:56:21 -05:00
arkon
ac1bed38f9 Show empty library message properly 
Fixes #8632
The `library` map still contains the default category even when "empty".
 2022-11-27 10:43:38 -05:00
Ivan Iskandar
217b03a292
Fix library not loading when not logged in to any tracker (#8629) 2022-11-26 21:37:22 -05:00
AntsyLich
3d7591feca
Implement simple stats screen (#8068) 
* Implement simple stats screen

* Review Changes

* Some other changes

* Remove unused

* Small changes

* Review Changes 2 + Cleanup

* Review Changes 3

* Cleanup leftovers

* Optimize imports
 2022-11-26 15:50:26 -05:00
Ivan Iskandar
e14909fff4
Use Voyager on Library tab (#8620) 2022-11-26 15:48:57 -05:00
arkon
37118088d4 Remove usage of PublishRelay in DownloadQueue 2022-11-26 10:07:51 -05:00
arkon
5c9e9bd2c4 Use Voyager between more screens 2022-11-26 09:34:06 -05:00
Andreas
db35ba53b1
Use Voyager between supported screens in Extension package (#8616) 
- Minor state behavior changes
 2022-11-26 09:14:11 -05:00
AntsyLich
758d223776
Disable generating ComicInfo.xml on download (#8619) 
* Disable generating ComicInfo.xml on download

* Remove unused import
 2022-11-26 09:13:08 -05:00
arkon
a54d9912d0 Fix Kavita interceptor crashing app + minor cleanup 2022-11-25 23:03:42 -05:00
arkon
7e74949d38 Explicitly add READ_APP_SPECIFIC_LOCALES permission 
Some devices are throwing a SecurityException (calling getApplicationLocales) for some reason.
 2022-11-25 23:03:42 -05:00
Andreas
a8c5780963
Use Voyager on Migrate Manga screen (#8611) 2022-11-24 22:25:36 -05:00
Ivan Iskandar
f4ac754d02
Use Voyager on Browse tab (#8605) 2022-11-23 22:28:25 -05:00
AntsyLich
0347d3970a
Cleanup [Downloader.ensureSuccessfulDownload] (#8602) 2022-11-23 09:23:29 -05:00
Ivan Iskandar
acc2312384
Use Voyager on Updates tab (#8603) 
* Use Voyager on Updates tab

* Fix back press

* Fix selection
 2022-11-23 09:22:20 -05:00
Ivan Iskandar
7d34ff214c
Change settings screen to object (#8604) 2022-11-23 09:14:55 -05:00
arkon
e2179a6669 Avoid concurrency issues when reordering categories 
Maybe fixes #8372
 2022-11-22 23:12:23 -05:00
arkon
5c37347cec Delete empty source folder when deleting all downloads for a manga 
It previously only attempted this after deleting a list of chapters, so it wasn't applicable
when deleting from Library or after unfavoriting an entry.

Closes #8594
 2022-11-22 09:25:00 -05:00
Joseph Olugbohunmi
ef3a6c80a7
Implement copying of Manga URL to Clipboard (#8587) 
feat: Implement copying of Manga URL to Clipboard
 2022-11-21 23:09:23 -05:00
arkon
2a2c6cee5f Allow zooming in WebView 
Note that this does not force-enable zooming on pages with set viewports (which typically implies proper mobile scaling).
Closes #8588
 2022-11-21 18:39:16 -05:00
Andreas
7dff3cc6cb
Remove unused resources (#8578) 2022-11-20 15:29:08 -05:00
arkon
8c1171a722 Don't attempt to check chapter download status for local chapters 
Fixes #8541
 2022-11-20 15:28:51 -05:00
arkon
2c850d0e33 Fix invert tapping dropdown not updating checked state in reader 
Fixes #8566
Should ideally just Compose-ify it all some day.
 2022-11-20 15:12:51 -05:00
Andreas
f1b85ff39d
Use Voyager on Extension Details screen (#8576) 2022-11-20 14:36:03 -05:00
arkon
2d86f69caa Add reindex downloads description 
Closes #8546
Also disable sound for the notification and cancel running indexing job if invalidating.
 2022-11-20 14:29:56 -05:00
arkon
e22896a956 Use current timezone when setting tracker dates 
Fixes #8553
 2022-11-19 22:40:17 -05:00
arkon
be5802e473 Add back track icon onClick and title onLongClick actions 
Closes #8565
Closes #8536
 2022-11-19 22:37:48 -05:00
arkon
eb6ba96b57 Limit parallelism for Coil image loading 
Reference: https://www.reddit.com/r/androiddev/comments/xbeizp/comment/io4ytdv/

Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
 2022-11-18 22:57:54 -05:00
arkon
5325e590ec Fix url sharing 
Maybe fixes #8539
Based on f52785cbbd

Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
 2022-11-18 22:49:54 -05:00
AntsyLich
3f34fa1f58
Tweak library selection (#8513) 
* Tweak library selection

Also use the new `fast*` extensions functions in other places of library presenter

* Cleanup
 2022-11-18 22:33:38 -05:00
arkon
d12ea86b55 Add shecan DoH provider 
Closes #8557
 2022-11-18 22:28:08 -05:00
AntsyLich
ba2a528886
Fix related to cancelling queued chapters (#8528) 
Tachi removes the downloaded chapter (if it exists) when you just cancelled a download from queue.

PR fixes that

Also removes redundant return
 2022-11-18 22:27:39 -05:00
Ivan Iskandar
d60367768b
Fix monochrome launcher icon not applied when non-round shape is used (#8552) 2022-11-17 12:23:48 -05:00
arkon
db6528d3fa Show toast when no next chapter found in library 
Closes #8522
Will probably become a snackbar at some point.
 2022-11-14 22:47:07 -05:00
arkon
f5873d70c6 Don't rely on cache when deleting empty manga folders 
In case the cache hasn't actually been indexed yet. Maybe fixes #8438.
 2022-11-14 22:42:36 -05:00
arkon
10e349f76e Retain previous selected state when updating list states 
Fixes #8417
 2022-11-13 22:35:52 -05:00
arkon
b1ccebf329 Minor cleanup 
Mostly just addressing comments from #8452
 2022-11-13 12:24:59 -05:00
Andreas
3407eb84c5
Make padding names neutral (#8531) 2022-11-13 12:11:51 -05:00
arkon
6017229d1b Clean up ComicInfo stuff a bit more 2022-11-13 12:01:19 -05:00
arkon
4f00af3173 Change long press on downloaded chapter icon to open menu 
Seems like silently deleting things is confusing to some people.
 2022-11-13 11:55:34 -05:00
arkon
9da232dcd8 Adjust download cache to ignore irrelevant files 
Fixes #8530
 2022-11-13 11:52:11 -05:00
Ivan Iskandar
acd43005df
SearchToolbar: Better physical keyboard support (#8529) 
Make enter keys behave like search key of on-screen keyboard
 2022-11-13 10:59:23 -05:00
AntsyLich
51c964de3a
Fix download not working on sd card (#8527) 
Also create comicinfo file inside chapter folder instead of manga folder since it also contains some chapter specific data
 2022-11-13 10:40:33 -05:00
arkon
262f8449b4 Resolve proper chapter URL for ComicInfo "Web" field 
Requires extensions to be updated to lib 1.4 to have proper URLs for some of them, which will
happen soon in the future.
 2022-11-12 09:54:32 -05:00
Andreas
bdf035d60a
Use Voyager on Source Filter screen (#8511) 2022-11-12 09:47:19 -05:00
Andreas
0270878748
Use Voyager on Extension Filter screen (#8503) 
- Use sealed class for state
- Minor changes
 2022-11-11 16:57:31 -05:00
arkon
6ada3c90ff Clean up ComicInfo stuff a bit 2022-11-11 16:34:18 -05:00
Shamicen
4e628fe6de
Create ComicInfo Metadata files on chapter download (#8033) 
* generate ComicInfo files at the chapter root and inside CBZ archives on chapter download.

* Update app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt

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

* Improvements suggested by @ghostbear

* now creates ComicInfo files in normal chapter folders as well
use manga directly instead of converting it to SManga
truncate old files before overwriting them

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>

* remove empty line after resolving merge conflict

* fixes Serializer for class 'ComicInfo' is not found error

* some changes to comments and variable names

* Revert leftover changes to archiveChapter() function

* minor cleanup

* Changed Chapter to SChapter

Co-authored-by: Andreas <andreas.everos@gmail.com>
Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
 2022-11-11 16:16:37 -05:00
arkon
a8eebd824a Remove duplicate pinned sources setting 
I guess it's simpler to just have 1 entry in the list (other than the last used duplicate).
This helps ensure that the list is as short as it can be.
 2022-11-11 15:35:10 -05:00
ThePromidius
92b039fac7
Add Kavita tracker (#7488) 
* Added kavita tracker

* Changed api endpoint since tachiyomi has it's own. Moved some processing to backend

* Bugfix. Parsing to int instead of float

* Ignore DOH, update migration and cleanup

* Fix Unexpected JSON token
	modified:   app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
	modified:   app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/KavitaApi.kt
	modified:   app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/KavitaModels.kt

* Apply code format suggestions from code review

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

* Apply simplified code suggestions from code review

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

* Removed unused dtos

* Use setter instead of function to get apiurl

* Added Interceptor

* Handle not configured/not accesible sources

* Unused import

* Added kavita to new tracking settings screen

* Delete SettingsTrackingController.kt to solve conflict

* Review comments
* Removed break lines from log messages
* Fixed jwt typo

* Merged enhanced services compatibility warning message to be more generic.
* Updated Komga String res to use new formatted one
* Added Kavita String res to use formatted one

* Apply suggestions from code review - hardcoded strings to track name

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

Co-authored-by: Andreas <andreas.everos@gmail.com>
 2022-11-11 15:19:41 -05:00
Ivan Iskandar
acc65529a0
Replace numberpicker with wheelpicker (#8501) 
* Replace numberpicker with wheelpicker

* cleanups
 2022-11-11 15:02:45 -05:00
Quang Kieu
3061f198e9
Temporally Fix #8287 (#8493) 2022-11-11 15:01:48 -05:00
arkon
6fc1f4fc21 Reword download cache/indexing strings for consistency 2022-11-11 15:01:06 -05:00
arkon
a0f49b16c5 Remove "Download complete" notification 
It wasn't really consistent with other notifications considering there's no
action to be taken in this state.
 2022-11-10 23:08:19 -05:00
arkon
c6c4c1c393 Migrate to more domain model usages 2022-11-10 22:42:44 -05:00
arkon
811931ccc0 Minor cleanup 2022-11-10 22:23:34 -05:00
AntsyLich
08d5633d81
Add option to invalidate download cache (#8491) 
* Add option to invalidate download cache

* Review changes + lint
 2022-11-10 22:15:35 -05:00
arkon
c76d5dd30c Tweak library continue reading button 2022-11-10 22:08:23 -05:00
Ivan Iskandar
340357d158
Voyager on More tab (#8498) 2022-11-10 22:08:18 -05:00
Ivan Iskandar
11ed47397d
Remove top bar workaround (#8497) 
Fixed upstream and we currently using small top bar which doesn't affected
 2022-11-10 21:26:56 -05:00
AntsyLich
6ce54eb845
Fix clearing database freezes the app (#8492) 2022-11-10 07:59:31 -05:00
arkon
e45f6d0c92 Use toShareIntent in WebViewActivity 2022-11-09 22:38:28 -05:00
Ivan Iskandar
18ccde082d
Full Compose MangaController (#8452) 
* Full Compose MangaController

* unique key

* Use StateScreenModel

* dismiss

* rebase fix

* toShareIntent
 2022-11-09 22:31:56 -05:00
Ivan Iskandar
bc3bb82651
Voyager on History tab (#8481) 2022-11-09 09:26:29 -05:00
d-najd
ba00d9e5d2
Add "Play" button on manga in library (#8218) 
* resume manga button in libarary

* work on resume button

* Backup

* work on opening the last read chapter

* backup

* renaming

* fab instead of image

* done with logic

* cleanup

* cleanup

* import cleanup

* cleanup...

* refactoring

* fixing logic

* fixing scopes

* Reworking design

* adding ability to turn on/off the feature

* cleanup

* refactoring, fixing logic, adding filter logic (partial)

* backup

* backup

* logic done

* backup before merge fix

* merge conflict....

* merge conflict...

* reworking ui logic

* removing unnecessary file

* refactoring

* refactoring

* review changes + minor parameter position movement

* commiting suggestion

Co-authored-by: arkon <arkon@users.noreply.github.com>

* fixing minor mistake

* moving ChapterFilter.kt

Co-authored-by: arkon <arkon@users.noreply.github.com>
 2022-11-07 22:32:23 -05:00
Andreas
bf9edda04c
Use Voyager on Category screen (#8472) 2022-11-07 22:13:14 -05:00
arkon
3733871d2f Don't show copied to clipboard toast on A13+ when copying backup restore error 2022-11-05 11:56:31 -04:00
arkon
54471a014f Get index of selected update list item based on chapterId 
Fixes #8442
 2022-11-05 11:56:08 -04:00
arkon
8749be518f Adjust read next history logic 
Closes #8454
 2022-11-05 10:37:32 -04:00
Alessandro Jean
6d880c938a
Retry the MAL request if the token is expired (#8437) 
Retry the MAL request if the token expired.
 2022-11-04 22:54:52 -04:00
Luqman
34aa4eb291
Add back haptic feedback long tap to fav (#8418) 
* Add back haptic feedback long tap to fav

- add back haptic when long tap on manga to add to library

* simplify

* Revert "simplify"

This reverts commit f4bd57315a3dbf35f5975233980304fa66807718.

* Revert "Add back haptic feedback long tap to fav"

This reverts commit 81486e30e9adf6a7e983b5e3f12bd5bc34083db1.

* cleanup
 2022-11-04 22:52:28 -04:00
arkon
280b0f42db Toggle enabled source in bulk 
Maybe fixes #8439
 2022-11-04 09:39:23 -04:00
arkon
d41c103a72 Increase visibility of selected item background in dark themes 
Closes #8419
 2022-11-04 09:38:38 -04:00
arkon
0b93b9e059 Add pseudolocales to dev builds 2022-11-03 09:47:27 -04:00
Brett McGinnis
ea3f933e95
#8264: Enabled isPseudoLocalesEnabled for debug (#8367) 
Enabled isPseudoLocalesEnabled for debug
 2022-11-03 09:46:53 -04:00
AntsyLich
1e93d785e5
Remove redundant compiler args (#8405) 2022-11-01 20:13:30 -04:00
AntsyLich
999bd4efee
Center extension name in ExtensionDetailsScreen (#8407) 2022-11-01 12:03:31 -04:00
arkon
3222247969 Release v0.14.2 2022-10-31 17:38:56 -04:00
arkon
dd6c9ce2fe Avoid crashing if multiple entries exist for same URL/source 
Related to #8331. We'll need to revisit some of the get/insert logic to make sure this doesn't actually happen,
but at least it'll stop crashing for now.
 2022-10-31 17:38:56 -04:00
zbue
38c6702b8f
Perform haptic feedback where appropriate (#8378) 2022-10-31 17:23:00 -04:00
AntsyLich
afcf4b2988
Fix resetting filter resets browse pager (#8394) 
Fix resetinf filter resets browse pager
 2022-10-31 17:22:53 -04:00
zbue
ebb96a6ff4
Use selectedBackground for other list items to match with others (#8379) 
* Use `selectedBackground` for other list items to match with others

* Remove unused imports
 2022-10-31 17:20:31 -04:00
AntsyLich
8b0affe9bd
Set softWrap to true again for Pill text (#8391) 2022-10-31 17:20:24 -04:00
arkon
642b392d44 Fix crash in ReaderReadingModeSettings when reverse portrait orientation is set 2022-10-30 23:10:59 -04:00
zbue
8dce7b3e9e
Disable ChapterHeader & ChapterDownloadIndicator click when in selection mode (#8350) 
* Disable `ChapterHeader` click when in selection mode

* Disable `ChapterDownloadIndicator` click when in selection mode

* Review changes

* Merge remote-tracking branch 'origin/master' into patch-7

* Merge remote-tracking branch 'origin/master' into patch-7

* Revert back to old implementation
 2022-10-30 22:57:56 -04:00
arkon
33e90d6449 Clean up library download chapters logic 
We can probably clean up the same logic in the manga controller at some point too, but that stuff's messy.
Also fixes the spacing issue that the new icon introduced.
 2022-10-30 22:56:07 -04:00
Swords
50b17d5d34
Add different download options within the Library (#8267) 
* feat: add download options to library

* feat: use max instead of min

* feat: remove download all option

* feat: applied requested changes + rename some functions

* feat: merge downloadAllUnreadChapters and downloadUnreadChapters into one function

* Apply suggestions from code review

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

* feat: apply lint suggestions + fix code

feat: apply lint suggestions + fix code

* feat: revert onClickDownload back to onDownloadClicked

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
 2022-10-30 22:27:48 -04:00
arkon
7818885406 Use proper content color for filter icon in library toolbar 2022-10-30 22:19:02 -04:00
arkon
26af7ccc77 Use BOM for kotlinx.coroutines dependencies 2022-10-30 19:38:18 -04:00
arkon
5d1f79012e Fix some crashes 
- Delay the initial emission of updates/sources/extensions lists instead of using a state flow. This hopefully avoids rapid initial recompositions that cause the LazyColumn key duplication crashes. (Closes #8371)
- Fix a NPE in BrowseSourcePresenter
 2022-10-30 18:43:16 -04:00
arkon
cac80daa71 Set source properly when creating manga entries 
Fixes #8333
 2022-10-30 17:40:17 -04:00
arkon
fc184f1cfa Clean up download ahead logic 
- Remove redundant chapter sorting logic when fetching next chapter(s)
- Remove redundant download queue checks (it'll handle already queued or downloaded items)
- Trigger download ahead when read >= 25% of chapter rather than 20%
- Rely on download cache when checking if next chapter is downloaded to avoid jank (fixes #8328)
 2022-10-30 16:59:33 -04:00
arkon
725fcbba0e Add warning about F-Droid build support in More screen 2022-10-30 16:00:19 -04:00
stevenyomi
a078f1ab1b
Refactor search toolbar and fix browse source (#8360) 2022-10-30 13:34:47 -04:00
arkon
86c3d8c064 Use Compose fast* functions in more places 2022-10-30 12:27:12 -04:00
Ivan Iskandar
156191af44
Tabs: Don't explicitly set text color in the text (#8365) 
The container already provides color option for both states
 2022-10-30 12:04:46 -04:00
stevenyomi
57bba9e5ab
Fix Layout Inspector's Compose tree for dev flavor (#8363) 2022-10-30 11:42:06 -04:00
arkon
dd1923fe88 Remove redundant preference composables 2022-10-30 11:37:02 -04:00
arkon
df773ee15c Refactor overflow menus into a composable 2022-10-30 11:06:41 -04:00
zbue
f5451a6881
Add ability to open random manga (#8232) 
* Add ability to open random manga

* Use `getMangaForCategory` instead

* Put it in overflow menu instead of using EFAB

* Partial review changes

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Merge remote-tracking branch 'refs/remotes/origin/patch-6' into patch-6

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt

* Wording changes
 2022-10-30 10:57:33 -04:00
arkon
fcec1581b7 Fix share menu item not appearing for entries not in library 2022-10-30 10:48:25 -04:00
arkon
11cc789e36 Center global search prompt properly in library list mode 2022-10-30 10:48:25 -04:00
Ivan Iskandar
16f9fb2f40
Rebase Scaffold fork (#8353) 
This adds content window insets supports that will be passed to
all components used except top and bottom bar.
 2022-10-30 09:59:50 -04:00
Ivan Iskandar
6bfaa85e84
MoreScreen: Add navbar padding (#8349) 2022-10-29 23:10:18 -04:00
Soitora
04d2a3399b
Restore chapter description alpha (#8345) 
Restore "Darken the description colors"

Restores #3858, with new values based on current standards (0.78f rather than 0.62f)

I wanted to accomplish this without having to call a const, but that felt like a logical solution as well

Of course, if you got cleaner methods do tell, thanks
 2022-10-29 22:58:18 -04:00
Ivan Iskandar
054bf8ec5d
MangaScreen: Apply bottom content padding to large screen info column (#8347) 2022-10-29 22:57:19 -04:00
arkon
8417f5a63c Add more context to obsolete extension warning 2022-10-29 16:35:32 -04:00
Dexroneum
26b46cace0 Few UI changes (#8299) 
Co-authored-by: arkon <arkon@users.noreply.github.com>
 2022-10-29 16:28:25 -04:00
arkon
0849111247 Use remember var delegates in more places 2022-10-29 16:14:49 -04:00
Ivan Iskandar
f9c25b350e
New Pager implementation (#8323) 
Minimal implementation using new Compose SnapFlingBehavior
 2022-10-29 12:32:55 -04:00
arkon
5b12c144da Release v0.14.1 2022-10-29 11:51:25 -04:00
stevenyomi
4b60138d41
Clean up strings and icons (#8326) 
* Clean up strings and icons

* fix incorrect usages of label_more

* restore strings and reduce usage of android.R

* removing icon desc of FABs anyway as app's not for visual impaired users
 2022-10-29 11:43:51 -04:00
arkon
fde7bfa3d1 Show notification while download cache is renewing 
Since users seem to be confused now that the library loads before download info is shown...
 2022-10-29 11:39:04 -04:00
arkon
69635ee66a Make Compose DropdownMenu overlap the trigger 
Closes #8329
 2022-10-29 10:37:51 -04:00
arkon
224f29077d Sort library items alphabetically in secondary pass 
Fixes #7461
 2022-10-29 10:11:12 -04:00
AntsyLich
e1ab1fdb65 Prompt Extension update if ext-lib is updated 
Co-authored-by: arkon <arkon@users.noreply.github.com>
 2022-10-29 10:05:30 -04:00
Ivan Iskandar
3e86cb094b
PreferenceModel: Add subtitle provider to ListPreference (#8322) 
* PreferenceModel: Add subtitle provider to ListPreference

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

* cleanups
 2022-10-29 09:44:12 -04:00
Ivan Iskandar
9fbd3fe33f
build: Add param to generate Compose compiler metrics (#8330) 
./gradlew assembledevPreview -Ptachiyomi.enableComposeCompilerMetrics=true
 2022-10-29 09:37:48 -04:00
arkon
d0c4463ab3 Avoid concurrency crashes in SourceManager 2022-10-28 21:29:38 -04:00
arkon
ad107860b9 Consider downloaded only mode when getting download counts in library 
Fixes #8318
 2022-10-28 21:29:25 -04:00
arkon
5efb31bd71 Fix some crashes 2022-10-28 21:10:03 -04:00
arkon
e4a2f35907 Fix library download counts not being loaded if downloaded filter is in exclusion state 2022-10-28 19:05:55 -04:00
arkon
37cb4ec0c2 Don't filter out partially read chapters when marking as unread 
Fixes #8313
 2022-10-28 18:29:00 -04:00
arkon
401134fa8e Use MaterialTheme.shapes in more places 2022-10-28 16:18:05 -04:00
Ivan Iskandar
87391832ba
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
 2022-10-28 11:46:10 -04:00
AntsyLich
e36d31bf0f
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>
 2022-10-28 11:44:05 -04:00
d-najd
37b7efbc87
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>
 2022-10-28 11:41:51 -04:00
AntsyLich
6e4a30e593
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>
 2022-10-28 11:40:43 -04:00
arkon
ebddb96373 Release v0.14.0 2022-10-28 11:36:26 -04:00
arkon
0288abb66e Update baseline profile 2022-10-28 11:15:06 -04:00
AntsyLich
37c55abc2a
Center the Text inside Pill (#8304) 2022-10-28 10:28:46 -04:00
arkon
c50b1a5c66 Alternate method of avoiding LazyColumn key conflict crashes 
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
 2022-10-27 23:26:34 -04:00
Ivan Iskandar
187e9f94aa
Set source id when inserting to db (#8300) 2022-10-27 22:34:21 -04:00
arkon
1704dc062d Show file URI when invalid backup file is selected 2022-10-27 18:04:43 -04:00
AntsyLich
0657a52924
Cleanup history repository (#8297) 
* Cleanup history repository

* Lint
 2022-10-27 18:03:52 -04:00
arkon
ccc4144f3c Remove side nav icon alignment preference 
Simplifying it to just always be centered, which is what most Google apps seem to be doing anyway.
 2022-10-27 17:30:12 -04:00
arkon
d5b4bb49b1 Refactor network to local manga logic 
Maybe fixes #8289
 2022-10-26 23:01:21 -04:00
Ivan Iskandar
5b3f9e082e
Use new Compose BOM 2022.10.00 (#8295) 2022-10-26 18:12:32 -04:00
arkon
ca06516900 Avoid some crashes 2022-10-26 18:12:11 -04:00
Ivan Iskandar
3fb42b6ce9
Use Syer's Voyager fork (#8288) 
with fixes needed for further migration
also revert back jvm target to 1.8
 2022-10-26 09:22:38 -04:00
AntsyLich
2cbe946e7e
Rework library selection (#8290) 2022-10-26 09:22:12 -04:00
AntsyLich
3b5b9a1ae5
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>
 2022-10-26 09:21:35 -04:00
AntsyLich
a834ff3a44
Show LibraryScreen toolbar early to match other main screens (#8285) 2022-10-25 09:40:45 -04:00
Ivan Iskandar
82b552ac9a
MangaPresenter: Filter unsupported track service from available service list (#8286) 2022-10-25 09:34:05 -04:00
arkon
15f7e53e4f Don't export CrashActivity 2022-10-23 22:07:06 -04:00
arkon
9792a6cb78 Fetch download counts if library is filtered by downloaded 
Fixes #8277
 2022-10-23 10:15:05 -04:00
Dexroneum
f30150c0f0
Fixed "0 mins ago" in "Library last updated" string (#8279) 
* Fixed "0 mins ago" in "Library last updated" string

* Recommended fixes
 2022-10-22 19:59:07 -04:00
arkon
5c868d7846 Use kotlin.time extensions in some more places 2022-10-22 19:57:55 -04:00
arkon
39e41510d0 Explicitly remove com.google.android.gms.permission.AD_ID permission 2022-10-22 19:53:59 -04:00
arkon
78b76a186c Avoid NPE in browse source screen 
It logically should never be null, yet I see crash logs about it.
 2022-10-22 16:04:12 -04:00
arkon
6e04822f5e Only enable ACRA crash logging in preview and stable release builds 2022-10-22 15:47:09 -04:00
AntsyLich
4ff5c1148e
Cleanup LibraryUpdateService (#8237) 2022-10-22 15:16:44 -04:00
d-najd
42bf91779d
Category name letter casing change not allowed when renaming (#8274) 
* adding the feature

* minor reordering

* Changes from review

* including gradle.properites.swp

* Update app/src/main/java/eu/kanade/domain/category/model/Category.kt

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

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
 2022-10-22 15:09:38 -04:00
stevenyomi
2ab744c525
Fix app lock and make delay not survive app being killed (#8272) 
* Fix app lock

* Always require unlock if app is killed
 2022-10-22 15:07:44 -04:00
AntsyLich
4a244a598b
Cleanup UpdatesPresenter deleteChapters (#8273) 2022-10-22 12:58:14 -04:00
arkon
d0bff298b7 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.
 2022-10-22 12:24:59 -04:00
arkon
152eb5b951 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
 2022-10-22 10:50:44 -04:00
stevenyomi
d558f9e1d6
Tweak tablet UI mode setting (#8262) 2022-10-22 10:15:12 -04:00
AntsyLich
b3557e844c
Fix "Add manga to library" snackbar not showing with ChapterDownloadAction.START_NOW (#8271) 2022-10-22 10:12:06 -04:00
arkon
9c8ccb8e0e Disable Firebase advertising ID collection 
https://firebase.google.com/docs/analytics/configure-data-collection?platform=android#disable_advertising_id_collection
 2022-10-21 23:06:34 -04:00
arkon
4138a17e29 Maybe avoid extensions list rendering crashes 2022-10-21 22:50:33 -04:00
arkon
eb742b29f8 Avoid some IndexOutOfBoundsExceptions 2022-10-21 16:45:26 -04:00
arkon
d2e62ffb19 Prevent invalid user agent header values from being set 2022-10-21 16:27:59 -04:00
arkon
2921be620a Use fade transition in Voyager screens to mimic existing Conductor change handler 2022-10-21 15:29:17 -04:00
arkon
c61a51438d Disable autocomplete on tracker login password field 2022-10-21 15:12:12 -04:00
arkon
7e40680af0 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
 2022-10-21 15:00:41 -04:00
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
renovate[bot]
570fec6ea6 Update voyager to v1.0.0-rc02 2022-10-16 10:28:44 -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