AntsyLich
085147b15b
Fix detekt issue
2024-02-26 22:19:23 +06:00
AntsyLich
085ad8d446
Don't add custom User Agent for MAL
...
Closes #298
2024-02-26 22:08:11 +06:00
AntsyLich
9254079957
Fix detekt issue
2024-02-26 21:54:24 +06:00
AntsyLich
7974a1fc0c
Don't add custom User Agent for MAL
...
Closes #298
2024-02-26 21:44:01 +06:00
Splintor
c15f3f2fd5
Allow disabling reader's zoom out ( #302 )
...
* Allow disabling reader's zoom out (#62 )
* Renamed disable zoom out pref and string
* Zoom to default rate if the scale is inferior
* Fixed null value check and formatting
* Fixed detekt
2024-02-25 01:40:06 +06:00
Maddie Witman
07f963d5ae
Fix some issues from 7ff95e2 ( #415 )
...
* Fixed extra header introduced in 7ff95e2
2024-02-25 01:33:46 +06:00
beerpsi
ab02568ac6
[ExtensionLoader] Prioritize extension classpath over app classpath ( #433 )
2024-02-24 23:54:30 +06:00
MajorTanya
617bf491ee
Fix DelayedTrackingUpdateJob spam on update errors ( #411 )
...
* Fix DelayedTrackingUpdateJob spam on update errors
DelayedTrackingUpdateJob would start spamming when it encountered an
error (e.g. a tracker has an issue) and never stop.
This seems to stem from a circular dependency between the Job's
`doWork` and TrackChapter's `await`.
TrackChapter sets up a completely new instance of the
DelayedTrackingUpdateJob if any Exception was thrown during the track
update.
This causes the Job to get replaced (as per the WorkManager's set
ExistingWorkPolicy).
Because of this, the guard clause at the start of doWork would never
trigger, as all instances of the Job would report being the 0th try
(because they were completely new instances).
This simple fix introduces a boolean `isRetry` parameter to
TrackChapter's await method, which is set to `false` by default.
DelayedTrackingUpdateJob however sets this parameter to `true`, which
means TrackChapter won't try to set up the Job again.
* Rename isRetry parameter to setupJobOnFailure
This also inverts the logic, so true & false were swapped.
2024-02-19 00:57:50 +06:00
MajorTanya
840b647b4b
Address overridePendingTransition deprecation ( #410 )
...
This function is deprecated starting with API 34 "UpsideDownCake" and
should be replaced with `overrideActivityTransition`.
2024-02-17 21:26:47 +06:00
AntsyLich
95d4df9ca8
Cleanup [BaseColorScheme.getColorScheme]
2024-02-17 04:07:06 +06:00
AntsyLich
5aec8f8018
Small cleanup in WorkerInfoScreen
2024-02-17 03:29:15 +06:00
AntsyLich
e183cbb231
Revert a mishap in 7ff95e21ba
2024-02-17 03:28:48 +06:00
Maddie Witman
7ff95e21ba
Refactor use of Java.util.date to Java.time.*, to fix localized date issues. ( #402 )
...
* Add support for localdate based relative times
* Update History Screen to use new localdate based relative times
* Update Updates Screen to use new localdate based relative times
* Cleaned up date util classes
* Updated build time display
* Code cleanup
* Fixed crash in settings
* Updated Preferences item
* Worker Info works
* Fixed Tracker date display
* Code changes to pass detekt
2024-02-16 17:09:00 +06:00
MajorTanya
96c236e5c3
Minor refactor of theming when expressions ( #396 )
...
* Minor refactor of theming when expressions
Avoids triggering detekt's CyclomaticComplexMethod warning because of
too many when branches, which would happen with one more theme being
added in these two locations.
In TachiyomiTheme, the Monet theme is separated because it requires
the current Compose context to function. The other themes do not and
are delegated to a Map.
* Implement requested changes
- moved themeResources out of the ThemingDelegate interface
- replaced single condition when with if expression
2024-02-15 02:35:16 +06:00
FooIbar
0da7ad6f1a
Don't copy archives to temp files when opening ( #326 )
2024-02-03 23:33:18 +06:00
AntsyLich
139663acfc
Release v0.16.3
2024-01-30 02:31:45 +06:00
AntsyLich
0f4de03d7a
Don't throw MALTokenExpired whenever we fail to refresh MAL token
...
Also cleanup
2024-01-30 02:31:45 +06:00
AntsyLich
b2d22f86c6
Lint
2024-01-29 23:09:09 +06:00
AwkwardPeak7
79f46b25f6
Fix new extension install not registering in app. ( #275 )
...
* Fix extension install not registering
* fix duplicate key compose error on extension update
* fix doubling of extension after update
* not needed
2024-01-29 23:08:28 +06:00
AntsyLich
aa498360db
Move :core to :core:common
2024-01-29 15:20:21 +06:00
AntsyLich
f03f998b21
[skip ci] Delete ic_launcher-web.png
2024-01-29 14:31:48 +06:00
MajorTanya
b71c793fad
Add click-to-copy extension debug info ( #271 )
...
* Add click-to-copy extension debug info
Adds some debug info about an extension to the user's clipboard when
tapping the logo/name/package name area at the top of the details
screen. Modeled after the debug info from the About screen.
Closes #168 .
* Fix linting failure
* Slight cleanup
* Address detekt
---------
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
2024-01-29 13:57:23 +06:00
AntsyLich
47e5421527
Upgrade combose-bom to latest
2024-01-29 13:25:01 +06:00
Theodoro Loureiro mota
cc09230e26
Adding Detekt in the project ( #216 )
...
* Removing ktlint
* Removing compose lint
* Adding initial Detekt config
* Setting up detekt config
* Adding detekt baseline
* Fixing workflows
* Moving to a module based solution
* Adding new line
* Adding new line
* Updating baseline
* Addressing PR suggestions
* Regenerating baseline.xml
* Cleanup
---------
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
2024-01-29 03:29:55 +06:00
Jishnu M
cf33f250cc
Change extension update error file name ( #253 )
2024-01-28 20:32:23 +06:00
Theodoro Loureiro mota
915a967151
Fixing bottom sheet UI bug in non-tablet devices ( #182 )
...
* replace the windowInsetsPadding for navigationBarsPadding + statusBarsPadding
* Setting decorFitsSystemWindows = true to fix ui bug on Android 11
2024-01-28 20:31:59 +06:00
Soitora
9cc0c4e035
Hide display cutout setting if fullscreen is off ( #241 )
...
- make it behave like the one on more -> setting -> reader
Co-authored-by: Riztard <16263232+Riztard@users.noreply.github.com>
2024-01-28 16:13:18 +06:00
AntsyLich
222e111806
Release v0.16.2
2024-01-28 00:28:28 +06:00
AntsyLich
88ed634978
Lint
2024-01-28 00:15:17 +06:00
AntsyLich
32188f9f65
Refactor MAL code to not spam refresh token when it fails
2024-01-28 00:12:31 +06:00
AntsyLich
05efc4ebeb
Update types of legacy tracker model to match to domain one ( #245 )
...
* `score` to Double
* `tracker_id` to Long
* `last_chapter_read` to Double
* `total_chapters` to Long
* `status` to Long
2024-01-27 23:17:09 +06:00
MajorTanya
65bfa083f2
Replace "tachiyomi" with "mihon" in crash log name ( #234 )
...
Closes #223 .
2024-01-26 01:00:23 +06:00
Secozzi
348b23a9fd
Fix refreshing from enhanced tracker ( #219 )
...
fix refreshing from enhanced tracker
2024-01-24 19:16:28 +06:00
Theodoro Loureiro mota
1dd130df9e
Fix #126 : Inconsistent button height with some languages in "Data and storage" ( #202 )
...
* replace the windowInsetsPadding for navigationBarsPadding + statusBarsPadding
* Fixing bug in the MultiChoiceSegmentedButtonRow
* Rollback file
2024-01-23 18:47:05 +06:00
Theodoro Loureiro mota
e17d87f357
Adding Type-safe project accessors ( #194 )
...
* replace the windowInsetsPadding for navigationBarsPadding + statusBarsPadding
* Enabling TYPESAFE_PROJECT_ACCESSORS
* Adding typesafe project accessors in the app module
* Adding typesafe project accessors in the core module
* Adding typesafe project accessors in the core-metadata module
* Adding typesafe project accessors in the data module
* Adding typesafe project accessors in the domain module
* Adding typesafe project accessors in the presentation-core module
* Adding typesafe project accessors in the presentation-widget module
* Adding typesafe project accessors in the source-local module
* Adding typesafe project accessors in the source-api module
* Rolling back
* Changing TYPESAFE_PROJECT_ACCESSORS line
* Removing extra spaces
2024-01-23 18:35:58 +06:00
AntsyLich
58085336a5
Lint
2024-01-22 20:20:11 +06:00
AntsyLich
e3f33e24f5
Use own client for trackers + custom user agents
...
Closes #114
Closes #143
Co-authored-by: Med <45147847+kitsumed@users.noreply.github.com>
2024-01-22 16:18:30 +06:00
AntsyLich
cb06898430
Fix issues when updating extensions
2024-01-22 02:27:45 +06:00
AntsyLich
39407407f2
Remove usage of .not() where possible
2024-01-21 19:40:42 +06:00
AntsyLich
26815c7356
Tweak app icon scaling
2024-01-21 11:55:25 +06:00
jobobby04
e0deeb8008
Backup and Restore Excluded scanlators ( #166 )
...
* Backup and Restore Excluded scanlators
* Improve performance
* This looks better
2024-01-21 11:38:36 +06:00
AntsyLich
38d6ab80ce
Fix "Flash on page change" gives black screen on page change
...
Fixes #108
2024-01-20 16:33:50 +06:00
AntsyLich
6018aa99e2
Release v0.16.1
2024-01-18 01:30:03 +06:00
AntsyLich
99fd2731f5
Fix score issue with MangaUpdates
...
Also add custom user agent
Potentially fix #17
2024-01-18 01:28:54 +06:00
AntsyLich
3c3a1cd448
[skip ci] Refer to the preview build as beta
2024-01-17 16:01:26 +06:00
AntsyLich
1849715418
Fix icons not filled
...
Closes #3
2024-01-17 13:19:49 +06:00
AntsyLich
a605a4ec75
Release v0.16.0
2024-01-16 11:27:18 +06:00
AntsyLich
25c76f5612
Update icon
...
Huge thanks to LinkCable for making it
2024-01-16 05:30:38 +06:00
AntsyLich
62cb12a3f1
Add back "Check for Updates" and "What's new" on about
2024-01-16 03:52:35 +06:00
AntsyLich
f594f1994b
Lint
2024-01-16 03:04:08 +06:00
AntsyLich
96b85962e3
Change application id
2024-01-16 02:55:29 +06:00
AntsyLich
19afd8c9ca
Rename more references
2024-01-16 01:31:22 +06:00
AntsyLich
5067160132
Add a temporary icon
2024-01-16 01:17:18 +06:00
AntsyLich
c9906491fb
Make version code 1
2024-01-16 01:07:32 +06:00
AntsyLich
e51013d2a4
Remove unnecessary migrations
2024-01-16 01:07:32 +06:00
AntsyLich
1aa75f22d0
Replace all Tachi links to Mihon
2024-01-16 01:07:32 +06:00
AntsyLich
8c910f2a2c
Make tracker use Mihon's client
2024-01-16 01:07:32 +06:00
AntsyLich
dfb3091e38
Make the app Android 8+
2024-01-16 01:07:32 +06:00
AntsyLich
98bdef230a
Replace several reference of Tachiyomi to Mihon
2024-01-15 23:53:13 +06:00
AntsyLich
4b594fc11f
Add back update checker
2024-01-15 21:03:10 +06:00
AntsyLich
71931cf697
Add back analytics
2024-01-15 20:55:26 +06:00
AntsyLich
87e3525f88
Add back reference to Discord
...
Partially reverts commit 33c62ab711
2024-01-15 20:44:08 +06:00
arkon
a9c7cbf2c4
Install build-tools 29.0.3
2024-01-13 14:01:49 -05:00
arkon
e63a52b8e3
Use newer build tools
2024-01-13 13:52:50 -05:00
arkon
49991d38d9
Release v0.15.3
2024-01-13 09:33:18 -05:00
arkon
33c62ab711
Clean up some unnecessary bits
...
- Remove analytics/crash reporting
- Remove app update check
- Remove F-Droid warning
- Remove Discord references
2024-01-13 09:27:53 -05:00
arkon
a37f3eb709
Better message for empty extensions list
2024-01-12 09:27:59 -05:00
arkon
c65a9aecf5
Fixed tap controls not working when zoomed in ( #10378 )
...
Co-authored-by: Paloys <Paloys@users.noreply.github.com>
2024-01-11 18:36:40 -05:00
arkon
02e50411de
Minor extension repo enhancements
...
- Shortcut to settings from extensions tab
- Don't show error toast anymore if nothing's loaded
- Ability to copy extension repo URL to clipboard
2024-01-11 18:25:13 -05:00
Caleb Morris
7292dadd5f
[download-cache] Fixed init logic to skip when cache file is missing ( #10362 )
...
There are several possible causes of the cache file to not exist, including user
action. By skipping these couple steps during initialization when the file is
missing, a renew action is allowed to start and the cache will rebuild and
hopefully work as expected.
Simple fix for #10360
2024-01-11 18:23:18 -05:00
KaiserBh
b1067b942e
Use transaction on restore to go brr. ( #10375 )
...
refactor: use transaction to go brr.
This improve the restore speed on fresh db and non fresh db.
Signed-off-by: KaiserBh <kaiserbh@proton.me>
2024-01-11 18:22:46 -05:00
Caleb Morris
cf6f7c521c
Fixed dev UI preview ( #10385 )
...
The TachiyomiTheme introduced a dependency-injection construct that didn't
exist at the time of rendering previews, so I've changed the preview function
to use a preview version of the theme that uses declarative configuration
over dependency injection
2024-01-11 18:22:21 -05:00
arkon
c6601c1f94
Release v0.15.2
2024-01-08 18:17:25 -05:00
arkon
68899aea61
Disable some non-ready stuff for stable build
2024-01-08 18:16:59 -05:00
arkon
3d178737b1
Move extension repos interactors to proper package
...
Also retain ordering of added repos.
2024-01-08 17:15:48 -05:00
arkon
bf737cf95c
Remove built-in official extension repo support
2024-01-07 23:06:17 -05:00
Naputt1
c91ec9a33b
fix Can't scroll down to the bottom of the webtoon on the last chapter ( #10291 )
2024-01-07 22:52:10 -05:00
Caleb Morris
a8040cb21a
[track-search] Added context menu for copy and open-in-web ( #10352 )
2024-01-07 22:49:51 -05:00
arkon
f60782f11f
Avoid floating point precision issues when converting scores
...
Fixes #10343
Maybe we'll finally migrate off of those legacy models some day...
2024-01-07 17:50:14 -05:00
arkon
5854ad97e0
Do proper check for next chapter's download status when downloading ahead
...
Fixes #10151 (I think?)
2024-01-07 17:30:53 -05:00
arkon
4b8fa059d5
Fix external repo info banner in ExtensionDetailsScreen
2024-01-07 16:35:25 -05:00
arkon
3dc2f9a711
Add advanced setting to revoke all trusted unknown extensions
2024-01-07 16:16:26 -05:00
arkon
8033a94ee2
Trusting new extension shouldn't revoke other irrelevant extensions
2024-01-07 16:05:31 -05:00
arkon
028da099dd
Add filter library by customized update frequency
...
Supersedes #9619
Co-authored-by: quangkieu <quangkieu@users.noreply.github.com>
2024-01-07 16:03:12 -05:00
arkon
e6c6c32d81
Fix selecting custom fetch interval not persisting sometimes
2024-01-07 15:40:53 -05:00
Luqman
bce6af62fc
Add Nord Theme ( #10308 )
...
* Add Nord Theme
* update
* update error color
* update comment
2024-01-07 15:20:08 -05:00
arkon
6510a9617a
Allow permanently trusting unofficial extensions by version code + signature
...
Closes #10290
2024-01-07 13:35:44 -05:00
arkon
14510f1d26
Avoid jank in extensions list if install permissions already granted
2024-01-07 12:32:33 -05:00
arkon
f115edf2ea
Allow deep linking to add external repo
2024-01-07 12:27:40 -05:00
arkon
8a8362203f
Release v0.15.1
2024-01-07 09:52:01 -05:00
arkon
727289c8eb
Allow opening .tachibk files directly with app to restore
2024-01-06 19:03:10 -05:00
arkon
9c91ddd4e3
Add link to storage FAQ in settings screen
2024-01-06 18:26:39 -05:00
arkon
3ea026e311
Avoid hard crash if cached image file was already deleted
...
Closes #9720
2024-01-06 18:15:17 -05:00
arkon
36f307e3bb
Normalize some locale names
2024-01-06 18:14:45 -05:00
arkon
89678ebb17
Show non-localized language names too in app language selection
2024-01-06 17:53:31 -05:00
arkon
80b7d14af1
Fix RAR loading
...
Closes #10302
2024-01-06 17:09:38 -05:00
arkon
bbd8098a61
Avoid showing WebView button in reader errors if page isn't actually from web
2024-01-06 16:55:50 -05:00
arkon
f8ef0f143b
Add link to storage guide during onboarding step
2024-01-06 13:33:56 -05:00
arkon
c4ceda59df
Release v0.15.0
2024-01-06 09:50:56 -05:00
arkon
8321ff6000
Bump dependencies
2024-01-05 23:21:19 -05:00
arkon
9c899e97a9
Clean up external repos
...
- Accept full URL as input instead, which allows for non-GitHub
- Remove automatic CDN fallback in favor of adding that as an external repo if needed
2024-01-05 23:13:16 -05:00
arkon
556f5a42a7
Fix lint error
2024-01-05 17:49:19 -05:00
arkon
850813820c
Disable customized fetch intervals for stable builds for now
...
Until some of the issues get ironed out.
2024-01-05 17:39:12 -05:00
arkon
dba5e6fbfd
Revert "Implement predictive back animation ( #10273 )"
...
This reverts commit 9c120e6231
2024-01-05 17:37:04 -05:00
arkon
c17ada2c98
Support external repos
...
Largely taken from SY.
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
2024-01-05 17:28:08 -05:00
arkon
32bed9b041
Change fetch interval action to show days until next expected update
2024-01-05 17:08:39 -05:00
arkon
e0a0942015
Remove custom extension readme/changelog URLs
...
These were barely used/maintained, so just killing them.
Changelog menu item still exists to take you to the relevant git history.
2024-01-05 17:07:49 -05:00
arkon
493da5c3f4
Force users to retrust unknown extensions on cold starts
2024-01-05 08:53:45 -05:00
arkon
4e221397ce
Remove tmp chapter files after exiting reader
2024-01-04 18:02:40 -05:00
arkon
22589a9c30
Fix next expected update being weird number sometimes
...
Occurs if manga.lastUpdate has never been set yet.
2024-01-01 18:32:21 -05:00
arkon
ec478cbb1b
Defer ACRA reporting until device is idle/not low battery/on unmetered network
2024-01-01 09:53:21 -05:00
arkon
b5e3f429fc
Fix extension settings icon trying to install update instead of opening details
2023-12-31 23:46:07 -05:00
arkon
83130f9bf9
Try to show actual path in invalid location downloader notification
...
Instead of the class/hashCode, which doesn't mean much to a user.
2023-12-31 23:33:10 -05:00
arkon
6f34c5e894
Prevent creating backups with no valid options selected
2023-12-31 09:33:19 -05:00
arkon
74931fad86
Use Material3 version of AboutLibraries
2023-12-31 08:57:11 -05:00
arkon
6ab8e1e73d
Don't use reflection for handling backup options as boolean array
...
Wasn't working correctly in release build, _probably_ because of R8 despite kotlin-reflect
shipping with Proguard rules and us already keeping all Tachiyomi classes.
2023-12-30 20:29:12 -05:00
arkon
1cdaa761b7
Dedupe common LazyColumn with action at bottom layout
2023-12-30 20:08:28 -05:00
arkon
54f4711f7b
Show next expected update in interval dialog
...
Related: #9793
2023-12-30 19:15:52 -05:00
arkon
3d0d5c0472
Misc refactoring
...
- Abstract away relative date string building
- Dedupe large update warning logic
2023-12-30 18:33:35 -05:00
arkon
f0a0ecfd4a
Allow creating backups without library entries
...
- In case you want a backup of just settings?
- Also disable backup options if dependent option is disabled (and fix being able to toggle disabled items)
- Also fix crash in RestoreBackupScreen due to attempt to parcelize Uri
- Make restore validation message a bit nicer
2023-12-30 16:02:36 -05:00
arkon
f3b7eaf4a3
Shorten restore warning message a bit
2023-12-30 12:16:53 -05:00
arkon
5bba7af24a
Allow partial restores (library/settings)
...
Closes #3136
2023-12-30 12:09:55 -05:00
arkon
32c3269291
Filter out empty source preferences when creating backups
2023-12-30 10:38:32 -05:00
arkon
a1e84911be
Clean up create backup UI
2023-12-30 10:36:30 -05:00
arkon
6bb77bcf1a
Minor cleanup/address lint warnings
2023-12-30 10:30:32 -05:00
arkon
ccec5c3efe
Add ability to create manual backups with private preferences too
2023-12-28 17:38:37 -05:00
arkon
8735836498
Refactor backup option flags to normal data class of booleans
2023-12-28 16:44:46 -05:00
arkon
8b65fd5751
Minor exception message cleanup
2023-12-28 16:33:54 -05:00
arkon
f0710df356
Don't make install permission required during onboarding
...
Closes #10257
We show a warning banner in the extensions list and also rely on the system
alert popup if someone attempts to install without the permission already
granted.
2023-12-28 15:48:08 -05:00
arkon
3afcee81f4
Hide private installer option for stable builds
2023-12-28 14:55:31 -05:00
Ivan Iskandar
9c120e6231
Implement predictive back animation ( #10273 )
...
For home screen tabs, Navigator screens and most dialogs
2023-12-28 11:01:01 -05:00
arkon
4b208fc7ce
Move backup models back to main app module
...
I didn't realize the package name change would break compatibility with forks
that still have the old package names...
2023-12-27 13:45:44 -05:00
arkon
a9b0ac43c4
Allow deleting downloaded chapters even if source isn't available
...
Fixes #9160
2023-12-26 17:14:24 -05:00
arkon
fca4f25122
Always show chapter download indicators
...
- Local chapters are just always "downloaded", but you can't delete them from the app
- Unavailable sources show proper state so long as it's stubbed with the name still, but
you can't download anything new
2023-12-26 17:11:26 -05:00
arkon
bfb0d31ff6
Remove skipped updates notification
...
Seems to cause more confusion than it's worth.
Will update the UI for the library update skip options to better
explain what they're for later.
2023-12-26 13:13:33 -05:00
arkon
8939274b5c
Simplify storage usage bar UI implementation
2023-12-25 22:58:05 -05:00
arkon
4571dc6b56
Tweak page flashing
...
Closes #10269 , maybe. I don't really have something to test with.
2023-12-25 18:13:52 -05:00
arkon
f31bc47757
Clean up storage usage info
...
- Show bar representation of used/total space
- Handle all mounted storages
- Also included a bunch of unrelated immutables changes, sorry
2023-12-25 18:11:22 -05:00
arkon
950b4a6c90
Fix read duration statistic getting inflated when restoring history
2023-12-25 16:35:13 -05:00
arkon
2d7650537d
Address some build warnings
2023-12-25 16:31:40 -05:00
arkon
80d6d412f3
Avoid crashing if loading non-read-only private extension
...
Fixes #10252
2023-12-24 22:53:35 -05:00
arkon
6887d98f15
Minor tracking cleanups
2023-12-24 22:25:22 -05:00
arkon
6d74a86711
Some domain Track model migrations
2023-12-24 18:30:24 -05:00
arkon
5908bd1930
Move backup models to domain module
2023-12-24 18:01:58 -05:00
arkon
1a559124eb
Split up BackupCreator into smaller classes
2023-12-24 16:56:16 -05:00
arkon
54ba1d719e
Don't include settings as defaults when manually creating backup
2023-12-24 16:45:07 -05:00
arkon
93cbeca5c0
Highlight restore backup setting when navigating from onboarding step
2023-12-24 16:35:18 -05:00
arkon
19f0175a56
Don't use localized numbers for downloaded image filenames
...
Probably fixes #10258
2023-12-22 19:13:06 -05:00
arkon
bf3899d04a
Whoops, accidentally made the create backup button unusable before
2023-12-22 09:23:00 -05:00
arkon
9f90ee358b
Initial move of restore backup into a separate screen
2023-12-21 22:47:23 -05:00
