arkon
38bc8ec6b4
Add global search progress bar ( closes #3727 )
2020-11-22 16:54:19 -05:00
arkon
56c19e57a9
Add help shortcut for source migration ( closes #3951 )
2020-11-22 16:30:20 -05:00
arkon
d548c690d6
Fix transparent navbar when bottom sheets are opened ( fixes #3848 )
2020-11-22 15:49:57 -05:00
arkon
eceac4d6e3
Merge restore entry points, avoid unnecessary new strings
2020-11-21 12:35:04 -05:00
jobobby04
682fae12b6
Make a protobuf based backup system ( #3936 )
...
* Make a protobuf based backup system
* Cleanup
* More cleanup
* Fix restores always loading the full backup restore, even when legacy restore was used
* Make offline the default
(cherry picked from commit f6fd8a8ddb90869f3e28fd8fcd81a2125f8e0527)
* Find chapter based on the url
(cherry picked from commit 326dc2700944a60da381d82cd9782c5f0d335902)
* Dont break after finding one chapter
(cherry picked from commit f91d1af37398619cf371e4920b60f6d309799c74)
* Also apply changes to online restore
(cherry picked from commit e7c16cd0d14ea5d50ce4a9a3dfa8ca768be702f2)
* Rewrite backup categories
(cherry picked from commit f4200e2146a9c540675767206ed4664894aa1216)
* Dedupe some code, move over read and bookmarks properly
(cherry picked from commit d9ce86aca66945c831670a1523d8bc69966312df)
* Move some functions to the abstract backup manager
(cherry picked from commit b0c658741a2f506bc31823f1f0347772bc119d2e)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
* Fix some backup duplication issues
(cherry picked from commit a4a1c2827c4537d2d07a0cb589dc1c3be1d65185)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt
* Fix a missed bundleOf
* So glad this wasnt merged before now, everything should be working with this commit
2020-11-20 22:34:24 -05:00
arkon
2695bdddf8
Fix non-transparent navigation bar
2020-11-20 22:28:06 -05:00
Dominik Chrástecký
c9b1a425a7
add support for S Pen actions ( #4029 )
2020-11-20 22:25:24 -05:00
arkon
122b2b1a8e
Draw under navbar in Android 9+
2020-11-15 13:30:49 -05:00
arkon
c0519e8670
Remove a stray trailing dash
2020-11-11 13:40:07 -05:00
arkon
6991c224b2
Tweak manga info header
2020-11-07 19:22:20 -05:00
Andreas E
b1ce3693ed
Change list view font size back to 16sp ( #3978 )
...
Make list view font size bigger again
2020-10-30 22:21:55 -04:00
Jozef Hollý
0902d7cca9
Weblate translations ( #3895 )
...
Co-authored-by: Adam <bessaa935@gmail.com>
Co-authored-by: Ashraf Is <rediancool@gmail.com>
Co-authored-by: Ashraf Isl <rediancool@gmail.com>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: Credits125Cre <credits125@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eva Godoy <godoytraduccion@gmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Jozef Hollý <j2.00ghz@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Luka Paun <croluxgame@gmail.com>
Co-authored-by: Lyaiya <hipsnafoha@outlook.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Mubarek Seyd Juhar <mubareksej@gmail.com>
Co-authored-by: Nico <nicknicola94@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Pxeexe <johongira192@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Ruud Schouten <ruud.schouten@outlook.com>
Co-authored-by: Salem Almashaikhi <salemnabil1@outlook.com>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: opb <myniceaddress@outlook.com>
Co-authored-by: İlle <derasetad@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/am/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/bn/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uz/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Strings
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Adam <bessaa935@gmail.com>
Co-authored-by: Ashraf Is <rediancool@gmail.com>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: Credits125Cre <credits125@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eva Godoy <godoytraduccion@gmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Luka Paun <croluxgame@gmail.com>
Co-authored-by: Lyaiya <hipsnafoha@outlook.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Mubarek Seyd Juhar <mubareksej@gmail.com>
Co-authored-by: Nico <nicknicola94@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Pxeexe <johongira192@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Ruud Schouten <ruud.schouten@outlook.com>
Co-authored-by: Salem Almashaikhi <salemnabil1@outlook.com>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: opb <myniceaddress@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
2020-10-30 17:52:47 -04:00
Andreas E
9493577de2
Replace language code in Global Search with secondary text ( #3972 )
...
Replace language code in Global Search with secondary text
2020-10-25 15:25:58 -04:00
arkon
837ce62844
Janky workaround for collapsed global search covers
2020-10-24 13:31:29 -04:00
Andreas E
a2b1acd70f
Update Global search layout to match Library and Browse ( #3892 )
...
* Update Global Search card item to be comfortable with rounded corners
* Remove card background
2020-10-24 13:07:06 -04:00
arkon
538c168641
Use default height for extended FAB ( closes #3949 )
2020-10-18 10:21:03 -04:00
arkon
832a4fa68e
Lower minWidth for extended FAB ( fixes #3939 )
2020-10-13 17:38:56 -04:00
arkon
ed41604f56
Show locale in sources list items
2020-10-12 17:35:08 -04:00
arkon
72d114d46a
Use secondary color for manga info header action button default state
2020-10-12 16:59:05 -04:00
arkon
a689e4e041
Trust user-added CAs (closes https://github.com/inorichi/tachiyomi-extensions/issues/4581 )
2020-10-11 16:03:24 -04:00
arkon
6c792d2821
Update dependencies
2020-10-10 16:34:06 -04:00
Jozef Hollý
2992a0f4d8
Translations (Continuous) ( #3886 )
...
* Weblate translations
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Alessandro Zangrandi <alessandro@mzit.it>
Co-authored-by: Alex <linuxrf@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: Félix D <felix.desmaretz@protonmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Josh Ciardi <jbciardi@gmail.com>
Co-authored-by: Juan Aranda <juan50055005@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Mubarek Juhar <mubareksej@gmail.com>
Co-authored-by: Nikita Epifanov <nikgreens@protonmail.com>
Co-authored-by: Nin Gun <luis_noxer@hotmail.es>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Redya Rachmandanu <redyarachmandanu@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Salem Almashaikhi <salemnabil1@outlook.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Simon Mattila <simon.mattila@protonmail.com>
Co-authored-by: Yassin El Aoud <yassinelaoud@gmail.com>
Co-authored-by: abidin toumi <abidin24@disroot.org>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: ssantos <ssantos@web.de>
Co-authored-by: İlle <derasetad@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/am/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/en_US/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kn/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Strings
* Deleted translation using Weblate (Belarusian)
* Deleted translation using Weblate (Bengali (Bangladesh))
* Deleted translation using Weblate (Spanish (Mexico))
* Deleted translation using Weblate (Tigrinya)
* Deleted translation using Weblate (English (United States))
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Alessandro Zangrandi <alessandro@mzit.it>
Co-authored-by: Alex <linuxrf@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: Félix D <felix.desmaretz@protonmail.com>
Co-authored-by: Hara Desu <aqjbgr09@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: Josh Ciardi <jbciardi@gmail.com>
Co-authored-by: Juan Aranda <juan50055005@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Mubarek Juhar <mubareksej@gmail.com>
Co-authored-by: Nikita Epifanov <nikgreens@protonmail.com>
Co-authored-by: Nin Gun <luis_noxer@hotmail.es>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Redya Rachmandanu <redyarachmandanu@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Salem Almashaikhi <salemnabil1@outlook.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Simon Mattila <simon.mattila@protonmail.com>
Co-authored-by: Yassin El Aoud <yassinelaoud@gmail.com>
Co-authored-by: abidin toumi <abidin24@disroot.org>
Co-authored-by: darkbeast13 <nikhil15mps@gmail.com>
Co-authored-by: f0roots <f0rootss@gmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: ssantos <ssantos@web.de>
Co-authored-by: İlle <derasetad@gmail.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
2020-10-04 12:55:18 -04:00
arkon
0904692f15
Set activated states for manga info favorite/tracker buttons
2020-10-03 12:55:51 -04:00
Andreas E
812368e332
Ability to delete reading history ( #3871 )
...
* Added ability to delete history for all manga
* Fix review comments
2020-10-03 10:54:42 -04:00
arkon
cf39ae0000
Add banner for Incognito Mode
2020-10-03 10:53:26 -04:00
arkon
7194f65203
Show downloaded only banner in all views
2020-10-03 10:48:53 -04:00
arkon
4b78ff324d
Minor string cleanup for Incognito Mode
2020-10-03 10:44:34 -04:00
Platiplus
79ccfcd553
[Feature Request] Option to turn off History - #3772 ( #3855 )
...
* Implementing do not save chapter history preference
* Refactor of labels
* Changing incognito mode from Readers section to More
* Fixing imports and removing unused strings
2020-10-03 10:43:01 -04:00
Unlocked
25d1c40cda
Fix visual issue with bottom padding in filters sheet ( #3881 )
2020-10-02 09:02:34 -04:00
Andreas E
bddeb86223
Fix color filter sheet content alignment ( #3862 )
...
Fix color filter sheet content alignment
2020-09-29 12:27:58 -04:00
arkon
b5986b509e
Fix chapter filter icon tinting
2020-09-27 19:16:46 -04:00
jobobby04
9d2adcd512
Add infinite history and search history ( #3827 )
...
* Add infinite history and search history
* Cleanup code
2020-09-27 18:17:14 -04:00
arkon
fb3756420b
Use tristate checkboxes for chapters list filters
2020-09-27 18:13:20 -04:00
arkon
2eab43a669
Fix scrolled content being visible behind navigation view group
2020-09-27 18:06:27 -04:00
arkon
7c69b1b649
Tweak navigation view group header style
2020-09-27 13:41:25 -04:00
scb261
3784d1a8f2
Add option to hide bottom bar when scrolling ( #3758 )
...
* [wip] hardcoded flag for hide on scroll
* add corresponding option in settings
* clean up a little
Co-authored-by: arkon <arkon@users.noreply.github.com>
2020-09-27 13:25:30 -04:00
scb261
458e761b45
Add ability to choose what to remove for selected mangas ( #3796 )
...
* [wip] started to change manga delete options
* Change dialog for deleting selected manga
* Move array to appropriate file
* Make first option enabled by default
* Use radio buttons to reduce amount of clicks
* Revert "Use radio buttons to reduce amount of clicks"
2020-09-27 13:03:04 -04:00
arkon
371b0b2132
Color selected bottom nav item with accent color when theme isn't blue
2020-09-26 19:27:39 -04:00
arkon
5d1ca64768
Use same padding as source icons for extensions
2020-09-26 19:23:13 -04:00
arkon
972a595c74
Color selected tab with accent color when theme isn't blue
2020-09-26 19:18:58 -04:00
arkon
a3c598a3e1
Remove card backgrounds from browse lists
2020-09-26 19:03:46 -04:00
arkon
9ce8c5c160
Use background color for list view
2020-09-26 18:33:39 -04:00
arkon
3bce07e873
Minor settings search code cleanup
2020-09-22 22:33:43 -04:00
arkon
766f9e37b5
#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>
2020-09-22 22:23:38 -04:00
arkon
a9bed90d02
Move manga info summary more/less button toggle
2020-09-22 22:20:29 -04:00
arkon
01ad405dd2
Center reader transition text properly ( fixes #3819 )
2020-09-20 12:56:04 -04:00
mpm11011
528c1b90c2
Merge branch 'dev' into dev-settings-search
2020-09-16 14:56:34 -04:00
Jay
004e1c98ee
Send manga/chapter/page details when sharing a chapter page
2020-09-15 17:59:47 -04:00
arkon
da5f10a2f1
Clean up global chapter settings code
2020-09-14 16:23:42 -04:00
lmj0011
64050e8266
[feature] add ability to set global filter/sort/display for Manga chapters ( #3622 )
...
* - [feature] add ability to set global filter/sort/display for Manga chapters
* - move default chapter settings functionality to overflow menu
- code clean up
* - show confirmation dialog when user selects "Set as Default" option in Chapter Settings
* - hide overflow menu in LibrarySettingsSheet
* - apply default chapter settings if manga is added to Library from a Source's browsing screen
Co-authored-by: arkon <arkon@users.noreply.github.com>
2020-09-14 15:58:34 -04:00