Commit Graph

437 Commits

Author SHA1 Message Date
Jay
2ee691bffe Removed insets logic for bottom nav/added option to use side drawer again 2020-02-11 19:48:51 -08:00
Jay
becf936d48 Fixes to insets and snackbars 2020-02-11 19:48:51 -08:00
Jay
a1d0d113b9 More work on the white + md2 2020-02-11 19:48:51 -08:00
Jay
f24fefad59 Added white theme to pref 2020-02-11 19:48:51 -08:00
Jay
25df36c60d Start of MD2 + White theme 2020-02-11 19:48:51 -08:00
Jay
fb2ab7d765 Recent Read Controller is no longer Rx
Unfortunately to fix #72, an rx observer is needed since the reader adds to the db after the recents is back in view
2020-02-10 01:02:09 -08:00
Jay
27fbcf2082 Removed unused resources 2020-02-04 01:16:49 -08:00
Jay
e96fb3c17c Option to hide categories + added back fastscroller
It's still anchored to the edge of the screen, and locks the filter bar when pressing it
2020-02-01 18:41:08 -08:00
Jay
ccd1c7bc1d Using night colors instead of night themes
So I dont have to use get theme (which was causing lag) and fixes some theming bugs
2020-01-29 23:57:17 -08:00
Jay
32c58640a2 Remove pencil from edit manga cover
Move reset tags to the bottom
2020-01-27 21:40:35 -08:00
Jay
332a21ed76 Fixed tracking icon in search activity 2020-01-22 17:37:20 -08:00
Jay
3f0aa0c037 More updates to edit manga dialog
Cleared focus from add tag
edit pencil is more noticable now
setting a local cover disables auto refresh covers
2020-01-21 19:48:26 -08:00
arkon
2b1752de09 Remove reflection to show tracking checkmark 2020-01-21 17:52:46 -08:00
Jay
bf919e7949 Fixes for local manga and others for custom manga info 2020-01-20 12:34:20 -08:00
Jay
c92b2bb203 UI/Functionality for custom info done
Local Manga is up next
2020-01-20 01:04:36 -08:00
Jay
afe69fa2ed Tracking updates
Tracked no longer shows manga tracking for services you've logged out of
Added logout button to tracking settings
If there's a single result in the track dialog for manga, it is selected so all you need to do it press "Track"
2020-01-16 23:26:20 -08:00
Jay
12c511cc65 Added progress bar to webview 2020-01-15 00:58:59 -08:00
Jay
47bfeddb05 Fixed webview starting in the middle of a new page 2020-01-15 00:17:40 -08:00
Jay
c476112266 Updates to expanding thumbnail 2020-01-15 00:07:45 -08:00
Jay
7008752639 Moved drag & drop sorting to library presenter
Where it always belonged
also added radio buttons sort category by (used to be called reorder)
also added unread sorting to that^
2020-01-14 21:29:32 -08:00
Jay
09bb216cda Final Final fix for extension notifation + badge
Using coroutine for notifcation job
Now setting a badge beside extension in drawer to signify updates, this is updated every hour or when the api is hit
2020-01-13 04:16:05 -08:00
Jay
4b8373367b Cleanup + pull to refresh on web view 2020-01-13 01:05:04 -08:00
Jay
d4ae7d2825 Merge branch 'up_master' 2020-01-13 00:22:17 -08:00
Jay
0577c45194 Tap on manga cover to make larger 2020-01-12 21:56:59 -08:00
arkon
f3e228e8a4
Indicate obsolete extensions (#2494)
* Indicate obsolete extensions

* Make obsolete indicators red

* Move obsolete extensions up the list

* Add base button theme for holder

* Use red button color state instead of explicit text color
2020-01-12 18:27:04 -05:00
arkon
57595988f5 Restore transparent status bars, allow WebView app bar to scroll away 2020-01-12 11:47:26 -05:00
arkon
81418a7712 Tweak reader seekbar height for Android 5 UI bug (closes #2487) 2020-01-11 22:29:31 -05:00
arkon
885c7bbb10 Add descriptions to reader prev/next buttons for a11y 2020-01-11 22:14:02 -05:00
arkon
d4c25359bd Remove clickable attributes from unclickable text in reader 2020-01-11 22:13:46 -05:00
arkon
3892b93bca Rename tracker icon images 2020-01-11 22:01:26 -05:00
Jay
1e30d249ee Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 93e4b9104b, reversing
changes made to 3c81f60041.
2020-01-10 23:50:02 -08:00
Jay
93e4b9104b Merge remote-tracking branch 'upstream/master' 2020-01-10 23:48:39 -08:00
arkon
797553ce16
Convert webview into an activity (#2470)
Based on 65804ebb3a
2020-01-10 22:22:12 -05:00
Jay
5f2eb19ea3 Fixes for merging from upstream 2020-01-09 19:31:09 -08:00
Jay
b1d221c117 Merge remote-tracking branch 'upstream/master' 2020-01-09 18:15:42 -08:00
arkon
f7669b6797 Replace left/right layout attributes with start/end 2020-01-09 19:10:55 -05:00
arkon
19adbeebd5 Convert nav drawer icon to webp 2020-01-09 18:49:14 -05:00
arkon
07caea8b4e Clean up splash screen code 2020-01-09 18:29:36 -05:00
arkon
e411f54236
Remove up/down animation for FAB, add list padding (#2456) 2020-01-08 21:33:10 -05:00
arkon
6025b44e5b
Add fast scroller to library (#2459) 2020-01-08 21:32:07 -05:00
Jay
68c3d28b4b The Downloads Update
Pending downloads can be move to the top or bottom of the queue with a menu button on the right side, they can also be cancelled
Mass Migration now shows progress and total manga in the title
Fixed the issue where deleted downloads using the old folder format said they weren't (they were)
Fixed cancelled downloads not deleting the temp folder
Changed the format of downloads yet again, now it's just chapter id and the name
Added option to reorder pending downloads by newest or oldest chapter
2020-01-07 23:32:30 -08:00
Jay
b668cc9abc Fixes to the fast scroller for this fork + remove keyword searching 2020-01-06 02:28:15 -08:00
Carlos
d8f385cc63 add fast scroller to library view 2020-01-06 00:50:29 -08:00
Jay
f66c84091a Converting new icons to vectors 2020-01-05 17:05:49 -08:00
Jay
aa0212132c Updated to Unix line endings 2020-01-05 14:30:59 -08:00
Jay
1d11d55a18 Merge remote-tracking branch 'upstream/master' 2020-01-05 12:45:00 -08:00
arkon
600fbb2ef8 Update files to use unix line endings
cmd: `find . -type f -print0 | xargs -0 dos2unix`
2020-01-05 14:43:07 -05:00
arkon
78689e7443
Migrate to AndroidX (#2424)
* Migrate to AndroidX (automatic conversion by Android Studio)

* AndroidX dependency code updates

* Fix source preference reparenting

* fixes the androidx prefererences icon spacing issue

(cherry picked from commit b76a15d960)

* Fix source preference screen heading size/list padding

Co-authored-by: Carlos <cargo8005@gmail.com>
2020-01-05 11:29:27 -05:00
Jay
ce30d9602b General settings split into General and Library 2020-01-05 01:09:10 -08:00
Jay
2535ea92eb Another fix for mass migration
Also fixing some deprecated code
2020-01-04 23:21:10 -08:00
Jay
142dc1c12a Refactoring + fixes for auto-migrate 2020-01-04 18:52:06 -08:00
Jay
d64754e3e0 Cleanup of olf auto migration 2020-01-04 18:39:42 -08:00
Jay
c4321e3adf Part 2 of Auto-Migration Done 2020-01-04 18:19:09 -08:00
Jay
6d6ff95982 Fixes for this new auto migration ui 2020-01-04 04:14:40 -08:00
Jay
10206ae7b3 Finished Part 1 of new auto source migration 2020-01-04 02:28:43 -08:00
Jay
8ba75831e6 Implemented Auto Source Migration
Co-Authored-By: NerdNumber9 <nerdnumber9@users.noreply.github.com>
2020-01-03 16:48:24 -08:00
Jay
64ca61dfcb Chapter FAB is now sticky 2020-01-03 13:35:41 -08:00
Jay
53f7b3a762 Reorder downloads + Fixes to extensions autochecker 2019-12-22 12:13:22 -08:00
Jay
65804ebb3a Set Webview as an activity
This way it will not reload on orientation change or theme switching
Webview toolbar now also has history buttons in toolbar, pressing back now reverses in history
Webview title is also now the websites title
2019-11-17 18:46:12 -08:00
Jay
1291adf821 Library updates are now in groups, tapping on them take you directly to the chapter to read
Fixes to lollipop snackbar and webview
2019-11-05 00:07:20 -08:00
Jay
cc5c9a4699 Fixed snackbar in categories + Fixed touch offset when tabs needs to appear 2019-11-03 15:36:56 -08:00
Jay
2c7f0743db Going to manga chapters now jumps to your last unread chapter
Fixes to dark theme dialogs for custom download amount
2019-11-03 13:45:30 -08:00
Jay
7f7acfc55a More updates
Seperation of Updating Library and New Chapters found
If there is only one manga update, a start reading action is added to the notificaion
Fixed issue with nav bar not being transparent when starting a shortcut from launcher
Insets work on manga info scrolling text
2019-11-02 01:26:14 -07:00
Jay
d719cae942 More snack 2019-10-30 01:19:30 -07:00
Jay
1d0f6e8bce Fixed action mode bar + drawer in 3 button landscape 2019-10-29 22:23:47 -07:00
Jay
25bf5602ba Migration for androidx 2019-10-28 22:51:46 -07:00
Jay
197b5cf6a4 Still more insets work
Fixed insets for landscape manga info controller + using snackbars for adding and removing mangas
2019-10-28 02:27:01 -07:00
Jay
fee8ccab86 Theme fixes
And one more inset fix for catalogue
2019-10-27 23:20:17 -07:00
Jay
507807eee0 Fixed various reader themes + dialogs 2019-10-27 19:05:35 -07:00
Jay
06d2be7dcf Merge remote-tracking branch 'upstream/master' into Automatic_Reader_Background 2019-10-27 15:08:06 -07:00
Jay
c66fb3c410 Update library_list_recycler.xml 2019-10-26 23:06:41 -07:00
Jay
7a7ada3125 Use of newest jetbrains kourtines + more insets fixed 2019-10-26 22:43:57 -07:00
Jay
dd25736fb9 Added Notch support
+ removed force dark where needed

Co-Authored-By: tonarii <tonarii@users.noreply.github.com>
2019-10-26 18:26:31 -07:00
Jay
8b69813f34 More stuff
Cleartext (http sites) support
Moved view extensions to view extensions
Even more insets support
2019-10-26 18:04:52 -07:00
Jay
3930345cbd more insets work 2019-10-26 14:20:46 -07:00
Jay
b9e3e3de55 Android 29 SDK + edge to edge 2019-10-25 01:44:47 -07:00
Jay
c9fbe98bc4 Update catalogue_controller.xml 2019-10-24 02:54:27 -07:00
Jay
c0e4b9bb38 Dark Theme based on system 2019-10-23 23:43:18 -07:00
MCAxiaz
e8638cb0b3 Hide Empty Search Results in Catalogues (#2066)
* test2

* remove nothing_found view and associated resources
2019-07-01 13:06:19 +02:00
Deumiankio
021dde66eb Add color filter blend modes (#2013)
* Add color filter blend modes

* Only show modes supported by currently used API level.

* Fix arrays.xml for API level <=27.
2019-04-29 19:32:49 +02:00
inorichi
e7606e6dca Add option to open manga details in a WebView 2019-04-08 02:08:40 +02:00
Deumiankio
e47dd3d587 Add 32-bit color mode to reader settings (#1941)
* add ARGB_8888 mode to reader settings

* Only show option on Oreo or later.
Only show option in settings screen.
2019-03-30 14:21:35 +01:00
inorichi
ca3f0873f3 Extract hardcoded strings from layouts 2019-03-15 08:48:12 +01:00
inorichi
3f2d375a53 Reduce priority of jcenter repository 2019-03-14 17:32:08 +01:00
inorichi
18f89cc341
New reader (#1550)
* Delete old reader

* Add utility methods

* Update dependencies

* Add new reader

* Update tracking services. Extract transition strings into resources

* Restore delete read chapters

* Documentation and some minor changes

* Remove content providers for compressed files, they are not needed anymore

* Update subsampling. New changes allow to parse magic numbers and decode tiles with a single stream. Drop support for custom image decoders. Other minor fixes
2018-09-01 17:12:59 +02:00
inorichi
18883f1ba3 Crop borders for webtoon now have a separate setting. Close #972 2018-04-27 16:55:12 +02:00
inorichi
6de36a88c0 Fix tracking search layout 2018-04-13 16:28:09 +02:00
inorichi
8017324033 Fix #1351 2018-04-08 18:58:28 +02:00
inorichi
499def3daa Fix downloaded text drawn outside the screen 2018-04-06 08:29:17 +02:00
inorichi
69f51b88bf Fix typo in layout 2018-04-05 22:08:23 +02:00
inorichi
e0d680201a Update constraint layout & fix broken layouts 2018-04-05 21:50:44 +02:00
inorichi
50b48ab25c Fix info layout + disable tag clicks for now 2018-03-09 22:35:10 +01:00
Josh
233e76724a Fixes and Tweaks to Info Page (#1198)
* Fixes inorichi/tachiyomi#1194 by putting the name in a auto size

* removed ellipsizing of title

* moved the genre tags inside of the scroll view for inorichi/tachiyomi#1196

* saving my layout options for the night
2018-03-09 21:42:39 +01:00
inorichi
8e50ac67bc Bugfixes and extension installation improvements 2018-03-02 18:10:10 +01:00
Carlos
fc1f290b85 removed extra blank lines (#1259)
fixed results not showing for jellybean
made edit text max line 1 to prevent it newlines being added and moving the edit text into the list view
2018-02-18 19:36:34 +01:00
Carlos
40b222f8bc Improve tracking search results (#1178)
* initial commit
changed tracking info screen
added ability to click logo to launch website

* added publishing status and type to description.
adjusted layout some

* added start date to track info

* tweaked layout

* tweaked layout

* tweaked layout

* code review changes

* code review changes part 2

* code review changes
2018-02-17 13:04:49 +01:00
Carlos
854112095b Downloading extensions from Github Repo. (#1101)
Downloading extensions from Github Repo.
2018-02-05 22:50:56 +01:00
Carlos
c3ced0d089 adjusted chapters item since Android 16 doesnt support right and left (#1221) 2018-01-31 14:38:05 +01:00
Bram van de Kerkhof
6a310bbaa9
Added custom download option (#1185)
* Added custom download option

* Implemented new design. TODO comments (like always...)

* W00t comments

* Implemented code review.

* Fixed commit breaking mistake :O

* Small design fix
2018-01-23 21:18:55 +01:00
Bram van de Kerkhof
bc8753da85
Remove teal background 2018-01-23 19:03:50 +01:00
Carlos
7f63e318f1 Catalog visuals update 1155 (#1167)
* adjusted search to be lower in navview

* close drawer on search
moved search and reset to bottom

* switched sort icon to arrow

* allow secondary drawer to swipe open and close

* fixed click to collapse for sortgroup, and group item
updated to rc4 flexibleadapter

* added header to drawer

* changed string to Search filters

* collapsed sort group

* fixed arrow size

* added divider line

* fixed vector size

* add divider id and tools text
2018-01-23 18:50:48 +01:00
Carlos
6c749319cf increase touch area for 3 dot in chapter list (#1205)
* increase touch area for 3 dot in chapter list

* moved 3 dot over and made it vertical

* adjusted location slightly
2018-01-23 18:49:26 +01:00
Josh
34d21c1de3 Information Page Improvements (click to search, copy to clipboard, etc) (#1139)
* adds long click to copy details per inorichi/tachiyomi#1127

* Added the latest update date for inorichi/tachiyomi#1098 and possible fix for inorichi/tachiyomi#1141

* cleanup some mistakes I left

* adds modifications to full name display for inorichi/tachiyomi#1141 and click to search on various information pieces for inorichi/tachiyomi#860

* This modifies how the full title shows up in the info pages and also properly ellipsizes the titles in the catalogue/library list views

* Changes full title layout in horizontal mode

* Adds the tags in using AndroidTagGroup library

* reverting the sdk version in the gradle build

* code cleanup

* added back status update
2018-01-18 19:15:33 +01:00
inorichi
a75457ad88 Add a new screen to help migrating manga from sources 2018-01-12 22:02:05 +01:00
Carlos
6027671c09 Address #1154 (#1160)
* change add to library icon add toast

* adjusted toast messages
added toast to catalog long click

* adjusted strings
2018-01-08 14:08:48 +01:00
Andy Bao
fe7001975a Fix padding in RecyclerViews (#1148) 2018-01-06 18:50:40 +01:00
Bram van de Kerkhof
bdcc6e52e6
Small new user improvements (#1143)
- Changed empty library string
- Added empty view for Categories
2018-01-01 14:57:20 +01:00
inorichi
08baf798aa Give view pager unique ids, avoiding subtle bugs 2017-12-04 22:22:35 +01:00
inorichi
297fed6aef Repackage catalogue to match the UI 2017-12-03 12:58:38 +01:00
inorichi
04638535d8 Fix library options menu shown in chapters screen. Resolves #1096 2017-11-30 15:37:20 +01:00
inorichi
28a21d0b8f Minor changes to download cache. Also keep the library view, as recreation is expensive 2017-11-28 23:58:37 +01:00
inorichi
25898d34ca Update page indicator colors and new Readmangatoday domain 2017-11-23 18:00:49 +01:00
inorichi
d4101c7bdf Page indicator now uses an outline instead of overlapping shadows 2017-11-20 13:55:56 +01:00
inorichi
88d1f29fe2 Move page indicator to bottom center, and use a shadow instead of a background. Other category in catalogue list is now placed at the end 2017-11-18 14:09:38 +01:00
Carlos
afa89ac125 added extra padding on page number to prevent cut off on rounded corner devices. (#1056) 2017-11-06 22:08:49 +01:00
inorichi
5c4139be45 Update flexible adapter. Show fast scroller in chapters screen 2017-11-02 16:58:32 +01:00
inorichi
d0567de4e6 Download badge 2017-10-21 17:08:49 +02:00
Bram van de Kerkhof
bfd46f28e0 Reversed some things from AMOLED update (#1015) 2017-10-01 10:44:48 +02:00
Bram van de Kerkhof
9b40d10352 Improved AMOLED theme. Added Button style for borderless buttons. (#1009)
* Improved AMOLED theme. Added Button style for borderless buttons. Some UI improvements.

* Deleted unused drawables from app.
2017-09-29 08:34:13 +02:00
Bram van de Kerkhof
54c8b3ef29 Global Search (#849)
* Global Search

* Cards are now independent of design by use of recycler.

* Added local

* Some attribute fixes + moved onclick to controller.

* Lots of improvements to code

* Reversed some stuff. Thanks API 16

* Code fixes

* Performance improvements

* Moved adapter creation to constructor

* Small changes

* Removed sources settings from settings menu. Added OnChangeListener in catalogue. Made setting icon visible if room.

* bug fix

* Code review part uno

* Code review part uno-2

* Single recycler approach

* Add last source used

* Fix scroll state and some layout issues

* Fix wrong item binding

* Use data class for items

* Calculate item position and count while binding

* Fix background color with slices

* Reuse slices. Fix card background. Flatten constraint layout

* Fix global_search scroll issue

* Store last state with global search

* Minor changes

* Remove catalogue toolbar spinner. Persist catalogue across process restarts

* Save view state of recycler views. Set toolbar title with current query
2017-09-23 13:11:39 +02:00
Bram van de Kerkhof
75cb94b51a Fix tint on AMOLED theme (#966)
Fix tint on AMOLED theme
2017-08-30 21:50:19 +02:00
len
e8b432485d Minor changes 2017-08-15 15:06:21 +02:00
Carlos
a12a34e3bb Add Batoto Scanlator to Chapter view (#789)
* Added scanlator for Batoto on chapter list

* adjusted item_chapter layout for scanlator
adjusted so db chapters get updated if scanlator does not match source scanlator

* adjusted item_chapter layout for scanlator
adjusted chapter holder to dynamically set title max lines depending on if scanlator exists

* fixed excess blank line

* changed scanlator to be instantiated instead lateint to prevent toast message erro when viewing chapters by catalog

* changed item_chapter.xml to constraint layout

* removed accidental changes to catalog

* cleaned up code.

* fixed issue where long title was running into 3 dot menu
fixed issue where no scanlator for manga was causing date to not be bottom lined
fixed general chapter layout to be more similar to existing

* allow scanlator to be null

* fixed merge issue

* fixed merge issue

* attempt to fix whitespace carriage return issue

* attempt to fix whitespace carriage return issue

* attempt to fix whitespace carriage return issue
2017-08-15 15:05:41 +02:00
inorichi
b79855c01d Remove circle image view dependency 2017-08-09 12:38:54 +02:00
inorichi
ca2236958a Reorganize layouts by feature 2017-05-25 12:16:58 +02:00
len
72ea256906 Downloads with conductor. Remove flexible adapter 4 dependency and unused classes. 2017-05-23 20:03:16 +02:00
len
a5a12f8b3a Add landscape layout for manga info. Fix portrait layout image paddings when the tab layout was expanded 2017-05-20 14:56:31 +02:00
len
bbe180ecd1 Improve tab layout animation. Fixes #800 and #801 2017-05-20 12:15:44 +02:00
Bram van de Kerkhof
062788f222 Fixed tracking cardview + readded AMOLED theme. (#798)
* Fixed cardview margin for sources

* Added AMOLED again

* changed padding to margin
2017-05-16 10:18:46 +02:00
len
0da2f91771 Info shows last chapter instead of chapter count. Resolves #765 2017-05-14 19:55:48 +02:00
inorichi
ff190e02d4 Preferences with conductor (#792)
* Settings with conductor WIP

* Add downloads preference controller. Implement source/track login

* Improve settings controllers

* Backup settings controller

* Delete preferences xml

* Remove keys from xml

* PreferenceKeys is now an object

* Remove now unused dependency
2017-05-14 00:45:14 +02:00
inorichi
29fd5747eb Recent chapters with constraint layout 2017-05-08 13:06:40 +02:00
Carlos
fa8f5bc0d8 Add images and 'view chapters' to library updates (#785)
* added option to open manga directly from library update
added covers for manga in library update
added ability to click covers to open manga directly from library update

* Removed 3 dot option to open manga
Adjusted covers to circles and material standard for recent chapter

* fixed potential null pointer on cover click

* adjusted circle imageview size for recently read
2017-05-08 09:22:49 +02:00
Bram van de Kerkhof
2118434823 Initial AMOLED theme + some CardView fixes (#787)
* Initial AMOLED theme + some CardView fixes

* small fix
2017-05-07 12:36:25 +02:00
inorichi
2eeac0bf8b UI with Conductor (#784) 2017-05-06 15:49:39 +02:00
Bram van de Kerkhof
4ebb3a894d Added round icon + added shortcuts (#732)
* Added round icon + added shortcuts

* Moved values to companion
2017-04-04 17:42:39 +02:00
len
e619870eec Fix #716 2017-03-20 20:34:26 +01:00
len
a5520c1936 Manga info with constraint layout 2017-03-12 13:00:47 +01:00
len
112cdd54e3 Update chapters adapter 2017-03-11 21:20:46 +01:00
len
4d7b188999 Fix #636. Minor improvements. Dependency updates 2017-02-23 22:30:43 +01:00
len
6de260d73f Fix #660. Update subsampling 2017-02-19 23:39:53 +01:00
len
91c58640a7 Add crop borders functionality, #219 2017-02-12 00:30:32 +01:00
len
fe413d52d6 Show loading/error for images in catalogue grid view. Update support lib 2017-02-04 19:07:06 +01:00
len
cdf5bbadea Disable elevation in recent chapters. Improve downloads discovery 2017-01-22 23:13:07 +01:00
len
c6b89a826c Update recent chapters adapter 2017-01-22 20:06:43 +01:00
len
7f8bfd759f Fix filter input text introducing a new line. Also fix filter drawer clicks propagated to the views below 2017-01-21 20:31:25 +01:00
Bram van de Kerkhof
c445ea90ba Notification Improvements (#594)
* Download notifier improvements

* Notification improvements

Added a Notification Service.

Added a Notification Activity Handler.

* Removed service. Everything is now managed by single broadcast

* Fixed some flags

* Fixed ReaderActivity call

* Code review

* Added Handler. Removed dismiss onDestroy
2017-01-20 21:18:15 +01:00
len
871e17c2f5 Rewrite catalogue adapter 2017-01-17 20:13:29 +01:00
len
f86c3c81bf Catalogue with only one recycler 2017-01-16 22:18:15 +01:00
len
71ab6d38e4 Complete group filters 2017-01-15 17:04:31 +01:00