copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions
4368 commits 2 branches 67 tags 103 MiB
Commit graph

434 commits

Author SHA1 Message Date
Jobobby04
803ee3d547 Fix mangadex login dialog crash 2020-11-06 18:19:11 -05:00
Jobobby04
acefd33e2e Cleanup 2020-11-06 14:24:28 -05:00
Jobobby04
079dd953bd Replace elvis operators with .orEmpty where possible 2020-11-04 22:10:13 -05:00
Jobobby04
015c610205 Use stable versions of RxUtil functions 2020-11-04 21:44:08 -05:00
Jobobby04
7cbd7bd419 Cleanup 2020-11-01 19:19:57 -05:00
Jobobby04
98bfe34e18 Update lewd manga checker with new sources and tags 2020-10-31 17:33:59 -04:00
Jobobby04
95c331b8b4 Convert all SY specific things to use ViewBindings instead of synthetics 2020-10-29 23:43:24 -04:00
Jobobby04
3b5249c8bc Convert java threads to kotlin coroutines 2020-10-29 15:29:43 -04:00
Jobobby04
46998d81f4 Do a bit of cleanup 2020-10-29 15:28:48 -04:00
Jobobby04
406b5a89c8 Fix smart background for real this time, fix issues with theme not changing 2020-10-29 00:37:07 -04:00
Jobobby04
4881571293 Big refactor for the E-Hentai config builder, I sucked when making my additions, now its better 2020-10-29 00:13:25 -04:00
Jobobby04
9cba544ffd Refactor and cleanup a bunch of code 2020-10-27 23:05:53 -04:00
Jobobby04
114fb723dc Trim Mangadex descriptions, fixes extra blank lines 2020-10-27 17:59:21 -04:00
Jobobby04
079405c17e More tweaks to delegated manga views 2020-10-26 19:23:59 -04:00
Jobobby04
05269c557d Make TF happy, cleanup the more info menu 2020-10-26 14:28:56 -04:00
Jobobby04
eb3a987826 Implement Neko similar manga, Mangadex only recommendations 2020-10-26 02:13:02 -04:00
Jobobby04
e9cef78d19 Filter scanlators on delegated manga 2020-10-25 20:24:30 -04:00
Jobobby04
32232c80aa Extra info updates 2020-10-25 20:19:02 -04:00
Jobobby04
112bbdfcf7 Remove outdated comment 2020-10-25 18:12:36 -04:00
Jobobby04
2a24f659d2 Disable things that dont work how I want them to 2020-10-24 23:56:40 -04:00
Jobobby04
484cb86ca9 Cleanup 2020-10-24 22:53:43 -04:00
Jobobby04
a75cf8ec53 Attempt a new way to move chapters between EH manga versions 2020-10-24 21:59:56 -04:00
Jobobby04
b252a9e060 Fixed EH update helper crashes 2020-10-24 19:41:16 -04:00
Jobobby04
fa7c6716f4 Remove EH legacy code 2020-10-24 19:07:46 -04:00
Jobobby04
c049ce9018 Convert E-Hentai Update helper to Flows 2020-10-24 16:44:20 -04:00
Jobobby04
1a0109df1d Cleanup 2020-10-24 15:44:52 -04:00
Jobobby04
c999229700 Use bundleOf everywhere I can 2020-10-24 14:28:03 -04:00
Jobobby04
01496ab34c Cleanup some merged manga code 2020-10-24 13:38:25 -04:00
Jobobby04
1dfe3890a9 Add intercept activity source choosing 2020-10-19 18:41:41 -04:00
Jobobby04
a8b1e8fdb0 Switch to the Mangadex extension for the low quality covers setting 2020-10-19 15:47:14 -04:00
Jobobby04
9945752667 Support the short title setting in NHentai 2020-10-19 15:46:08 -04:00
Jobobby04
c3a5439d26 Fixes for delete if in category 2020-10-15 11:27:30 -04:00
Jobobby04
c789203ff8 fix some mangadex manga not being marked as complete in status 2020-10-14 17:48:12 -04:00
Carlos
7f73094bb4 follows sort yolo 
(cherry picked from commit 097d44ef35b021ba11e164f45234356fd8395540)

# Conflicts:
#	app/src/main/java/exh/md/handlers/FollowsHandler.kt
 2020-10-14 17:43:40 -04:00
Jobobby04
f3fc479020 Revert temp fixes, add serialization progurd rules 
This reverts commit 543e089982.
 2020-10-13 13:49:28 -04:00
Jobobby04
b67db6a25e Manually deserialize saved searches, fix NHentai 2020-10-13 11:34:29 -04:00
Jobobby04
405b0580fc Implement exclude categories from deletion 2020-10-12 22:11:16 -04:00
jobobby04
445878794c
Make a protobuf based backup system (#112) 
* Make a protobuf based backup system, restore not tested

* Fix a number

* Remove uneeded change

* Remove more uneeded changes

* Use 1.x style models, backup should be 100% compatible with the 1.x backups

* Fix restore service not running

* Fix offline chapter restore
Cleanup saved searches restore(untested)

* Implement onlione/offline option, fix merged manga restore online, fix restore total

* Allow setting auto backup to use a full backup

* Fix for saved searches restore

* Edit some comments

* Convert flows back to observables

* Fix a model

* Fixes and comment only the SY specific things

* Move SY values range to 600 from 60

* Combine legacy and full backup services into one
Deduplicate a lot of code
Simplify a lot of stuff
Modify comments

* Cleanup

* Remove unneeded protobuf config edit because its now the default

* Migrate to kotlinx.serialization for backup saved searches

* Cleanup saved searches more, move gson type adapters to the legacy package
 2020-10-12 14:41:56 -04:00
Jobobby04
f3365cef67 Convert SY specific usages of Gson to Kotlin Serialization 
Cleanup saved searches a bit
Cleanup json parsing
 2020-10-12 14:20:54 -04:00
Jobobby04
4f864152ea Cleanup some code 2020-09-30 19:48:26 -04:00
Jobobby04
c501c9ecc3 Modify the looks of the extra info for a few sources 2020-09-30 19:29:44 -04:00
arkon
26557b3257 #3520 Searchable Settings (#3683) 
* Adding class stubs for settings search, UI elements.

* -  implement searchable settings
- `SettingsController.setupPreferenceScreen` must return a PreferenceScreen

* Remove unneeded SettingsControllerFactory.

* Set query hint, clean up code smell.

* Add search button to MoreController, stop infinite recursion.

* - initialize SearchResultCollection once in Activity.onCreate

* - implement prefernce highlighting after settings search

* - Ensure all Preferences have a key set or else the highlighting effect will have no effect on it.
- remove ExtensionFilterController and SourceFilterController from settingControllersList in SettingsSearchHelper, since those are related to Extensions and not Settings

* Limiting search to settings menu only, localized breadcrumb string, and code cleanup after code review.

* - moved call to SettingsSearchHelper.initPreferenceSearchResultCollection() into SettingsSearchController

* Code review cleanup and refactoring.

* Inlined non-reused key strings.

* Adding more UI polish, add comments for future enhancements.

* - retain search query when navigating *away* from SettingsSearchController
- keep `searchItem` in `expandActionView` state until user goes back (fixes the empty view in `SettingsSearchSearchController` issue)

Co-authored-by: mpm11011 <markuscicero5@gmail.com>
Co-authored-by: lmj0011 <9396189+lmj0011@users.noreply.github.com>
(cherry picked from commit 766f9e37b52873080c58d73dfaff42c5add24dc0)

# Conflicts:
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2020-09-24 09:09:45 -04:00
Jobobby04
9ee712aea4 Fix some mangadex login imports 2020-09-17 10:41:41 -04:00
Jobobby04
11fbc1faf9 Use XLog in more places 2020-09-17 09:05:19 -04:00
Jobobby04
de05f88d5f Fix Mangadex 2 factor auth 
Fix Backups with merge manga breaking(I think)
Tweak preload settings, make the max 20, defaults to 10
Add tag based sorting
 2020-09-15 13:00:40 -04:00
arkon
8d5b2f40b3 Use Kolinter Gradle plugin for linting instead of ktlint directly 
(cherry picked from commit 76f6fe46010b235ee59962c94c790428870fc23e)
 2020-09-13 23:08:52 -04:00
Jobobby04
02e6eaae12 Cleanup and fix a few compiler warnings 2020-09-13 22:24:03 -04:00
Jobobby04
bb6932ff80 Mangadex follows, tell browse there are no more pages 2020-09-12 13:51:54 -04:00
Jobobby04
b93298c411 Add MangaDex only implementation of Mangadex Follows list 
Add login dialog that pops up whenever you are not logged in when trying to browse MangaDex
Remove attempts at porting over chapter read history from older galleries to new ones
Disable latest for ExHentai, it was browse without buttons anyway
 2020-09-11 23:12:13 -04:00
Jobobby04
f62d277894 Opps, forgot to push these changes 2020-09-08 12:04:53 -04:00
Jobobby04
f20e5d864d Move from kizitonwose time to kotlin duration 2020-09-06 16:24:43 -04:00
Jobobby04
1fdbae5bf8 Cleanup 2020-09-05 18:17:48 -04:00
Jobobby04
a1d54880c3 Merged manga implementation, man this took forever to make and bugfix, its not even done 2020-09-05 18:17:33 -04:00
Jobobby04
d21a652944 Remake the merged database, has support for future features 2020-09-04 17:31:35 -04:00
Jobobby04
41b8786415 Cleanup some mangatype logs 2020-08-25 02:07:40 -04:00
Jobobby04
0a502fcf31 Cleanup merged source code so I can modify it easier later on 2020-08-24 17:28:14 -04:00
Jobobby04
80960d87f2 Cleanup 2020-08-24 17:25:10 -04:00
Jobobby04
b8836b9b6f Update firebase 2020-08-23 21:57:06 -04:00
Jobobby04
79e4e3d2a0 Add chapters bottom sheet for reader 2020-08-22 17:37:42 -04:00
Fahad1998
fae290cf22
data saver fix (#85) 
Co-authored-by: Fahad1998 <f1998>
 2020-08-22 17:35:50 -04:00
Jobobby04
9ecf83f842 Delegate mangaplus so that it doesnt crash the app, it is literally just a copy of the extension with no extra features, but at least the app doesnt crash when you use it now 2020-08-21 16:27:01 -04:00
Jobobby04
f594962731 Cleanup 2020-08-21 15:32:42 -04:00
Jobobby04
048eecf655 Optimize and cleanup data saver 2020-08-21 15:32:29 -04:00
Jobobby04
0deb6f6b8d Finish some more advanced mangadex delegation features, more to come later 2020-08-20 20:50:37 -04:00
Jobobby04
294ade035e Rename LewdSource to MetadataSource to account for that Metadata will not always be for lewd sources 2020-08-19 18:45:56 -04:00
Jobobby04
64bb34b50d Delegate Mangadex (Part 1) 2020-08-19 18:20:05 -04:00
Jobobby04
9efb1482f9 Updated delegation system to account for custom headers 2020-08-19 18:19:22 -04:00
Jobobby04
a6b98e24dc Undo linting 2020-08-15 15:57:07 -04:00
Jobobby04
eeb0f76cce Cleanup 2020-08-14 18:41:21 -04:00
Jobobby04
84b9b4db55 Cleanup 2020-08-14 18:41:21 -04:00
Jobobby04
d3603a664c Un-break XLog network logging, code contributed from Neko 2020-08-14 18:41:21 -04:00
Jobobby04
7ccaea0d72 Remove unused hitomi class 2020-08-14 18:41:20 -04:00
Jobobby04
bc549c56d6 Automatic linting fixes 2020-08-14 18:41:20 -04:00
Jobobby04
7d82be964c Add long click to copy on the special manga views 2020-08-12 22:34:20 -04:00
Jobobby04
525c3f84e4 Enable click to copy to clipboard in the more info 2020-08-12 22:32:13 -04:00
Jobobby04
0d033c7080 Cleanup some delegation code 2020-08-12 18:46:05 -04:00
Jobobby04
3e1804da8a Lazily instantiate some variables in EHSourceHelpers 2020-08-12 14:20:32 -04:00
Jobobby04
3fa5322133 Delegate NHentai, to continue using NHentai download the extension, SY requires NHentai version 1.2.28 2020-08-12 00:23:18 -04:00
Jobobby04
5a1bc6e25b Delegate Perv Eden, to continue using it download the extensions(there is a English extension and a Italian extension) 2020-08-12 00:21:29 -04:00
Jobobby04
51d0a67908 Account for custom delegated image requests, fixes Hitomi pages 2020-08-11 15:20:11 -04:00
Jobobby04
8b53568fc8 Cleanup some hitomi leftovers 2020-08-10 23:47:26 -04:00
Jobobby04
9a3fdc23e6 Delegate hitomi, it is now the first fully delegated factory source. To continue using hitomi please download the extension. This comes with a lot of fixes for future delegated factory sources 2020-08-10 23:29:10 -04:00
Jobobby04
f8efe5d189 Make a new debug function to help delegation 2020-08-10 21:15:48 -04:00
Jobobby04
aae23f5ef3 Delegate 8Muses, please manually migrate over your comics to the extension, as the old version of the 8Muses comics cannot support the new comics format 2020-08-10 21:15:08 -04:00
Jobobby04
c2adf2fe0a Copy smart background from J2k 2020-08-06 16:11:00 -04:00
Jobobby04
2de87f8d29 Cleanup 2020-08-06 14:57:54 -04:00
Jobobby04
61094edeed Cleanup some code 2020-08-05 22:46:04 -04:00
Jobobby04
bb87392eef Code cleanup 2020-08-04 22:51:56 -04:00
Jobobby04
4f803494ff Update the EH search engine to fix issues with the current search features 2020-08-03 17:21:10 -04:00
Jobobby04
cce1b135c9 Tweak HBrowse migration 2020-08-02 15:08:47 -04:00
Jobobby04
b344a3944e Fix certain HBrowse manga 2020-08-02 15:06:49 -04:00
Jobobby04
e346d95b0e Delegate HBrowse 2020-08-02 00:50:52 -04:00
Jobobby04
06e57b790e Blacklist the nHentai extension non-english sources, and a few debug function edits 2020-07-30 16:15:38 -04:00
Jobobby04
ff48e89161 Now really fix internal sources download badges not showing up, plus some refactoring and testing debug functions 2020-07-30 15:56:18 -04:00
Jobobby04
a6cba5c87d Add special view for browsing E/Exhentai! All the important info is now in front of your face when browsing, it is on by default and can be toggled off in the E-Hentai settings. Let me know if you find any errors 2020-07-28 16:55:33 -04:00
Jobobby04
f5b6fc5b54 Cleanup 2020-07-27 13:33:42 -04:00
Jobobby04
23b0c3305d Parse more info when browsing E/ExHentai 2020-07-26 17:29:16 -04:00
arkon
72f3ebb70d Replace custom visibility extension functions 
(cherry picked from commit 9e51d82154c3b72b710e1efcee5d4bde73a000e3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2020-07-25 22:11:44 -04:00
Jobobby04
3e9c8dbfd2 Add a special view to replace descriptions for integrated and delegated sources! 
As the integrated and delegated websites don't actually have descriptions, just info, I decided to make a special view for them! with all the info you need available to you in front of your face, there is now no need to go searching through the description! This is likely the most work I have put into 1 feature in the whole time I have been developing TachiyomiSY!
 2020-07-25 21:04:13 -04:00
Jobobby04
a311a3b497 Fix auto captcha opening when you dont have the option enabled (temp fix) 2020-07-24 12:36:20 -04:00
Jobobby04
a8f2f03562 Tsumino is now supported by the new tag display, you may have to refresh your Tsumino manga for them to work properly. Also Set the groundwork for more special features 2020-07-16 22:37:33 -04:00
Jobobby04
8b95d93a96 Add custom tag view for namespaced sources (E-Hentai, nHentai, Hitomi.la, and Pururin) 2020-07-16 17:27:36 -04:00
Jobobby04
362f0a6671 Made almost all the strings SY uses translatable! If people would like to help translate, feel free to join the Tachiyomi discord server (https://discord.gg/tachiyomi), and jump in the tachiyomi-az-sy channel and I can give you a rundown on how to do it 2020-07-15 19:16:21 -04:00
Jobobby04
0ca87a3763 Use androidx preferenceManager for EHLogLevel 2020-07-14 01:50:17 -04:00
Jobobby04
923f5213cd Add author and artist wrapping if a EH based source 2020-07-12 23:27:35 -04:00
Jobobby04
372e570fac Use Tachi previews info + chapters manga page, plus of course SY features integrated into it 
Add missed invert tap settings
Add missed extension open in settings overflow menu option
Cleanup
 2020-07-12 19:21:29 -04:00
arkon
c0a4f4e93a Add ability to sort library by date added (closes #1287) 
(cherry picked from commit 1813dbbf590447861591f41c225007a451bb3e83)

# Conflicts:
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.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/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
 2020-07-12 16:08:15 -04:00
Rani Sargees
a839372d9f fix batch add log 
(cherry picked from commit 629bca4100243d61cf07bbb0f47f6a1ed84031cb)
 2020-07-12 15:16:52 -04:00
Jobobby04
2e033356aa Manga info edit will now not break everything 2020-07-11 15:22:11 -04:00
Jobobby04
044c638079 Very basic manga info edit, currently will break everything if used, tags and cover edit not working 2020-07-11 14:53:59 -04:00
az4521
16933df164 fix nhentai not loading galleries with gifs 
(cherry picked from commit a8ddd91343fd11f7d90adf6282298b04adf67e4f)
 2020-07-09 15:56:07 -04:00
Jobobby04
b225baf64e Lewd manga filter update(more source filtering) 2020-07-06 22:17:42 -04:00
Jobobby04
ea8d251e24 Pururin fix url error 2020-07-05 21:42:22 -04:00
Jobobby04
b4e39448fc Cleanup saved search copy debug function 2020-07-01 15:13:48 -04:00
Jobobby04
3e5d0b7d1b Use automatically generated EHTags file (wow, already 1 new tag since I added the file) 
Scraper located here: https://github.com/jobobby04/Scraper
 2020-06-30 21:48:46 -04:00
Jobobby04
50eef307f4 Add autocomplete tag search in filters for E/Exhentai 2020-06-30 13:36:14 -04:00
Jobobby04
bf209896ed Fix a typo that likely goes back all the way to EH 2020-06-27 19:21:21 -04:00
Jobobby04
ad82dc1c90 Delegate Mangadex 
Features that are now usable because of this:
- Batch add mangadex manga
- Open mangadex manga into TachiyomiSY(skipping the extension)
 2020-06-25 19:35:44 -04:00
Jobobby04
9a2af8ac42 Add saved search copying between E-Hentai and ExHentai in the debug menu 2020-06-22 18:09:30 -04:00
Jobobby04
7581c8e519 Fix e-Hentai misc category default state configuration 2020-06-22 15:15:31 -04:00
Jobobby04
0d6cfb88a7 Remove uselss log in batch add 2020-06-21 00:44:24 -04:00
Jobobby04
70c98e9c2b Fix batch add delegated sources 2020-06-21 00:44:04 -04:00
Jobobby04
6bd564823a More comments and simple tweaks 2020-06-20 16:55:05 -04:00
Jobobby04
4ef72194bb Cleanup resources and put comments where SY code is different from preview code 2020-06-19 20:50:16 -04:00
Jobobby04
bb6d3780c0 Rename Smartsearch layout 2020-06-19 15:44:41 -04:00
Rani Sargees
b90a2ab22d add hcaptcha to captcha detection 
(cherry picked from commit 7c01082270aa98a4840af3b0c1bfd6534570682d)
 2020-06-11 22:12:21 -04:00
Jobobby04
f0f39325dd Simplify wrap tag assignment 2020-06-09 16:12:46 -04:00
Jobobby04
9cddb85ec9 fix nHentai tag click search 2020-06-09 15:16:44 -04:00
Jobobby04
bf4988ddc3 Fix H@H setting so that its in line with the new version of E-Hentai 2020-06-05 15:19:08 -04:00
Jobobby04
5d1dafd89f Close a lot of EHentai config builder classes 2020-06-04 20:49:16 -04:00
Jobobby04
5e7ffa3285 Add default category list 
Fix default language list
 2020-06-01 23:11:57 -04:00
Jobobby04
e3d7900cb7 Added first beta of the E-Hentai Language filtering option 2020-06-01 00:38:19 -04:00
Jobobby04
ae812e9c40 Small intercept tweaks 2020-05-30 14:12:24 -04:00
Jobobby04
a03e668c8f Fix intercept activity theme 2020-05-29 18:17:40 -04:00
Jobobby04
b66f97f0b4 Fix tag filtering threshhold 2020-05-27 13:45:25 -04:00
Jobobby04
0316cf47ed Fix merge with another crash(because of the kotlin dependency update) 2020-05-24 13:37:43 -04:00
Jobobby04
e4c8de1145 Lint 2020-05-24 13:34:35 -04:00
she11sh0cked
de593f458f
Remove language from manga type detection and ignore casing for tags (#26) 
* Remove language detection

* Ignore casing for tag detection

Co-authored-by: she11sh0cked <she11sh0cked@users.noreply.github.com>
 2020-05-24 19:09:06 +02:00
Jobobby04
43098aa61b Added Auto Webtoon Mode 2020-05-19 22:00:58 -04:00
Jobobby04
e4d8fea138 Lewd Filter upgrade, almost finished 2020-05-19 18:51:42 -04:00
Jobobby04
7e65e0de0e fix tag detection 2020-05-19 00:19:43 -04:00
Jobobby04
07a70d8c92 Add a crapton of detection for sources with only a certain type of manga 2020-05-18 21:39:31 -04:00
Jobobby04
68b13c6425 Add modified J2k manga type detection 2020-05-18 20:11:09 -04:00
Jobobby04
b0251b8177 Add support for EH Visited exported data in batch add 2020-05-18 13:00:13 -04:00
Jobobby04
5271abbd1f Migrate the rest of the EH prefreches to Flow Prefrences 2020-05-17 17:11:46 -04:00
Jobobby04
d2b0319d63 Added last debug features, should fix galleries that dont restore properly for the updater 2020-05-16 20:56:45 -04:00
Jobobby04
c15f4c7fd0 Update debug functions 2020-05-16 19:44:12 -04:00
Jobobby04
3a79f8fb50 Updated E hentai notifications to new system 2020-05-11 17:11:47 -04:00
Jobobby04
a006bc7d93 Rename EH update notifier 2020-05-11 16:03:32 -04:00
Jobobby04
b09f1fff51 New All In One Manga interface, its optional and can be disabled 2020-05-11 15:33:38 -04:00