1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-22 01:12:56 +08:00
Commit Graph

975 Commits

Author SHA1 Message Date
Dean Herbert
f65d2db77f Remove "V2" suffix from ChatOverlay components 2022-05-30 17:54:09 +09:00
Jai Sharma
58d39734d0 Integrate ChatOverlayV2 into main game 2022-05-23 21:02:47 +01:00
Huo Yaoyuan
7cf4dabe29 Fix IDE0005 and IDE0034 2022-05-03 13:09:19 +08:00
Salman Ahmed
c7ab9a8928 Add ruleset tab item tooltips 2022-04-30 15:37:44 +03:00
Salman Ahmed
4016fe1e19 Adjust profile ruleset selector to new design
Looks weird with `AlwaysPresent`.
2022-04-29 12:19:55 +03:00
Salman Ahmed
ef56dc07b5 Hide "modding" tab in user profile until it's implemented 2022-04-29 07:47:10 +03:00
Salman Ahmed
be2d616e34 Fix localisation use cases not falling back to default(LocalisableString)
Previously such use cases have been returning `null` values just fine since `GetLocalisableString` was returning `LocalisableFormattableString`, and these null values were wrapped in `LocalisableString`s implicitly, therefore not requiring an explicit fallback string and `null` doesn't break anything.
2022-04-28 11:21:00 +03:00
Salman Ahmed
33d516eecb Move guest participation beatmap up to below loved 2022-04-22 09:28:29 +03:00
Salman Ahmed
40d823bf69 Use localised string for guest participation beatmaps header 2022-04-22 09:18:46 +03:00
Salman Ahmed
2c21bd89e7 Display beatmap guest participations in user profile 2022-04-22 07:56:01 +03:00
Salman Ahmed
a9ea0ab91b Add support for fetching user guest participations 2022-04-22 07:55:39 +03:00
Joseph Madamba
5e5c8e78a6 Use existing web localisation for most hardcoded strings 2022-04-20 16:31:11 -07:00
Salman Ahmed
c858ec2483 Pagination -> `PaginationParameters 2022-04-19 02:48:34 +03:00
Salman Ahmed
96d4369cc8 Introduce Pagination and simplify paginated API requests 2022-04-19 02:04:23 +03:00
Salman Ahmed
f08449e432 Update paginated profile subsections to display items inline with web 2022-04-18 23:04:21 +03:00
Salman Ahmed
129c290ca0 Dispose cancellation token source on disposal 2022-03-04 10:01:07 +03:00
Salman Ahmed
76c293b9e9 Fix cancellation token source recreated on every medal 2022-03-04 10:00:56 +03:00
Dean Herbert
3a37e6e8b1 Fix profile badges potentially showing on incorrect profile when switching users
Closes https://github.com/ppy/osu/issues/17081.
2022-03-04 12:01:00 +09:00
Salman Ahmed
ccd6648961 Update pinned score container header to use localised title 2022-02-11 09:22:09 +03:00
Salman Ahmed
4f7003928a Add score container for pinned scores in ranks section 2022-02-10 21:32:18 +03:00
Bartłomiej Dach
03e4ec4214
Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-15 14:45:42 +01:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
51251e3204 Fix CI reported warnings 2022-01-12 22:39:00 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
88d4e95ad8
Rename BeatmapCard{ => Normal} 2021-12-21 08:26:21 +01:00
Bartłomiej Dach
a6ccbafc77
Fix rank graph showing for unranked users 2021-12-19 13:40:22 +01:00
Dean Herbert
bff02bedbf Rename APIScoreInfo to APIScore 2021-12-10 16:11:49 +09:00
Bartłomiej Dach
999bba439f
Clarify usages of reverse child ID flow with inline comments 2021-12-06 21:02:40 +01:00
Bartłomiej Dach
af10223ac4
Add reverse fill flows & depth specs at usage sites for correct Z-ordering 2021-12-05 20:07:46 +01:00
Dean Herbert
2acf46154a Remove many unused resolutions of RulesetStore 2021-12-03 18:16:29 +09:00
Dean Herbert
e75e209053 Cache and consume IRulesetStore where feasible 2021-12-03 18:16:01 +09:00
Bartłomiej Dach
42b09fd1ec
Use beatmap cards in user profile overlay 2021-11-25 22:30:47 +01:00
Dean Herbert
729f681938 Update cases where equality can be used instead of primary key equality 2021-11-24 12:49:57 +09:00
Dean Herbert
db4e4c982c Add hover effect to supporter button 2021-11-18 13:35:42 +09:00
Joseph Madamba
cd5e379c48 Link osu!supporter icon to its web page 2021-11-17 14:43:34 -08:00
Dean Herbert
6b6dd93e9e Fix LinkFlowContainer not creating user links supporting full IUser specification 2021-11-08 14:17:47 +09:00
Dean Herbert
b9983add15 Rename User to APIUser and move to correct namespace 2021-11-04 18:21:31 +09:00
Dean Herbert
47914c49ba Fix missed null consideration 2021-11-03 04:54:36 +09:00
Dean Herbert
caa9d8997b Merge branch 'master' into score-refactor/less-create-score-info 2021-11-01 22:59:11 +09:00
Dean Herbert
a16c8f1ebc Update all beatmap overlay views to use APIBeatmap/APIBeatmapSet 2021-10-29 18:50:55 +09:00
Dean Herbert
31403daa20 Change DrawableProfileScore to use APIScoreInfo 2021-10-29 15:14:52 +09:00
Dean Herbert
817369903a Rename API score classes 2021-10-29 13:40:56 +09:00
Dean Herbert
7245baba69 Remove IBeatmapSetOnlineInfo implementation from BeatmapSetInfo to avoid null cases 2021-10-28 00:50:45 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
c701579c69 Refactor BeatmapMetadataContainer and usages to use interface types 2021-10-22 21:38:50 +09:00
Dean Herbert
69e7810dad Enable nullable and switch classes to structs 2021-10-21 18:54:36 +09:00
Dean Herbert
32d01f022f Rename usages which rely on online backing 2021-10-21 16:58:42 +09:00
Dean Herbert
853cf6feaa Rename last remaining BeatmapInfo Beatmap usage 2021-10-04 17:35:53 +09:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Jamie Taylor
8d1e43423e
Update calls to use new variable name 2021-09-10 14:18:40 +09:00
Dean Herbert
2251bf3bcb Use lambda spec for method 2021-09-01 17:08:20 +09:00
Salman Ahmed
b0d7104650 Convert to class to allow not displaying tooltips
With `struct` content, it is never possible to not show a tooltip.
2021-08-31 21:13:24 +03:00
Salman Ahmed
3969350c9a Convert to readonly struct and replace with constructor temporarily 2021-08-31 20:45:32 +03:00
Salman Ahmed
208f66cc76 Simplify user graph tooltips logic
The same tooltip can be used for the rank graph, the play history graph,
and the replay history graph.

The only difference between those three is the displayed label, which
has now been included as part of the `TooltipContent`, rather than
unnecessarily recreating tooltips just for different sprite texts.
2021-08-31 19:59:38 +03:00
Dean Herbert
fa2bf42188 Update tooltip implementations 2021-08-30 16:05:00 +09:00
Salman Ahmed
e374ef163d Update localisable formattable extensions usages inline with framework change 2021-08-29 15:00:28 +03:00
Lucas A
73393a5a0d Localise weighting percentage. 2021-07-31 15:56:25 +02:00
Jamie Taylor
c1d8a7e2ad
Add and use 'Submit' select sample variant for particular components 2021-07-30 21:35:28 +09:00
Lucas A
b0b46eed40
Apply review suggestions.
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-07-24 21:32:26 +02:00
Lucas A
fa68caa892 Fix CI inspections. 2021-07-24 19:34:12 +02:00
Lucas A
eba78317d5 Localise kudosu info stats. 2021-07-24 10:16:47 +02:00
Lucas A
5b55366178 Localise profile header stat buttons. 2021-07-24 10:14:13 +02:00
Lucas A
be26414fe3 Localise user history graph. 2021-07-24 10:13:20 +02:00
Lucas A
6095aa2791 Localise profile line chart. 2021-07-24 10:08:47 +02:00
Lucas A
c92f69467a Localise counter pills. 2021-07-24 10:06:31 +02:00
Lucas A
d23e47c253 Localise level progess bar stats. 2021-07-24 10:03:13 +02:00
Lucas A
011fad167d Localise rank graph tooltip. 2021-07-23 23:38:31 +02:00
Lucas A
48c21674ed Localise expanded header container. 2021-07-23 23:19:51 +02:00
Lucas A
a3f9d96a8e Localise collapsed header container. 2021-07-23 23:12:22 +02:00
Lucas A
00ec229bde Localise stat values according to the current locale. 2021-07-22 19:20:20 +02:00
Bartłomiej Dach
1e634d9db0
Adjust user beatmap sections on profile overlay to match web 2021-07-20 21:55:17 +02:00
Dean Herbert
13cb658d29 Mark identifiers as verbatim strings 2021-07-19 18:15:09 +09:00
Lucas A
80885301a3 Fix codefactor issues. 2021-07-18 19:36:34 +02:00
Lucas A
9257cd7fad Revert the use of an enum in ProfileHeader. 2021-07-18 19:18:06 +02:00
Lucas A
2c26248042 Localise missing text of PaginatedKudosuHistoryContainer. 2021-07-17 17:36:49 +02:00
Lucas A
28845364a3 Localise score weighting. 2021-07-17 16:52:35 +02:00
Lucas A
77d8f240f8 Use ctor default values. 2021-07-17 16:41:42 +02:00
Lucas A
a7c280508f Throw instead of silently returning. 2021-07-17 16:40:37 +02:00
Lucas A
2545275f71 Partly localise Kudosu section. 2021-07-17 16:29:09 +02:00
Lucas A
148eb890ff Localise Historical section. 2021-07-17 16:24:11 +02:00
Lucas A
2f3ed4a4ab Fix PaginatedProfileSubsection ctor arguments 2021-07-17 16:13:33 +02:00
Lucas A
fbbf8ce5a3 Localise Ranks section. 2021-07-17 15:53:24 +02:00
Lucas A
d17f658985 Localise Recent section. 2021-07-17 15:50:56 +02:00
Lucas A
5bb45c7f84 Localise beatmap section. 2021-07-17 15:45:17 +02:00
Lucas A
d36842aa15 Localise TopHeaderContainer 2021-07-17 15:32:28 +02:00
Lucas A
213e3c0716 Localise DetailHeaderContainer 2021-07-17 15:29:34 +02:00
Lucas A
c6a27e4baa Localise CentreHeaderContainer. 2021-07-17 15:27:40 +02:00
Lucas A
2cfec1dc32 Localise osu!supporter badge. 2021-07-17 15:26:18 +02:00
Lucas A
a0c6945f8f Localise user graph. 2021-07-17 15:25:45 +02:00
Lucas A
306a34a802 Localise level badge tooltip. 2021-07-17 15:21:30 +02:00
Lucas A
4d276b114b Localise profile header. 2021-07-17 15:18:45 +02:00
Lucas A
d9c7ea2026 Localise profile section titles. 2021-07-17 14:57:05 +02:00
Lucas A
e6b8307b8e Localise ProfileHeader 2021-07-17 14:46:14 +02:00
Jamie Taylor
2eb12a59b7
Rename function to be more accurate 2021-07-09 11:16:47 +09:00
Jamie Taylor
546f55d341
Change profile section expansion to use dropdown sounds 2021-07-08 20:23:11 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
Dean Herbert
a0e5301c9f Update usages of showGuestOnNull 2021-06-17 16:33:43 +09:00
Dean Herbert
d9cc1c227b Allow UpdateableAvatar to handle displaying username as tooltip 2021-06-17 16:31:12 +09:00
Bartłomiej Dach
f52375eed2 Merge branch 'master' into mbd-beatmap-set-cover 2021-05-03 15:58:13 +02:00
Joseph Madamba
cc056088bd Update profile subsections to use counters instead of missing text in line with web 2021-05-02 14:44:20 -07:00
Joseph Madamba
3e74d61dab Add best count from api 2021-05-02 13:33:25 -07:00
Joseph Madamba
59cb5f4679 Get recent count from api instead 2021-05-02 13:33:25 -07:00
Dean Herbert
eeb66a955e
Merge branch 'master' into mbd-beatmap-set-cover 2021-04-30 08:14:33 +09:00
Salman Ahmed
9f8af03a70 Remove irrelevant change 2021-04-13 09:28:58 +03:00
Salman Ahmed
a664efe12b Fix history graph tooltips leaking to others
Since there was no check about which tooltip content came from which graph, all history graphs use the "Replays Watched" tooltip, as it is the latest created one.
2021-04-13 07:59:14 +03:00
Salman Ahmed
8f84abf348 Display "replays watched" tooltip for replays subsection 2021-04-12 21:51:06 +03:00
Joehu
9bc6cdf042 Fix singular format regression on forum post text 2021-03-21 11:19:07 -07:00
Joehu
e31d583a7f Add comments count to user profile overlay 2021-03-21 11:16:59 -07:00
Bartłomiej Dach
f95ce90c95 Adjust kudosu count formatting 2021-03-17 23:32:08 +01:00
Joehu
08ffe425f9 Update kudosu description color in line with web 2021-03-17 14:46:23 -07:00
Joehu
599c55fca5 Update total kudosu earned description text in line with web 2021-03-17 13:22:00 -07:00
Joehu
6cea74f0fa Remove available kudosu section from user profile overlay in line with web 2021-03-17 13:21:41 -07:00
Joehu
393f1fbd3f Remove skype 2021-03-15 10:07:50 -07:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
Salman Ahmed
a407bfe73b Privatize UserRanks and expose a similar CountryRank field instead 2021-02-18 15:37:52 +03:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Salman Ahmed
acfb2d2980 Refactor beatmap set covers into using ModelBackedDrawable<T> 2021-01-24 00:32:33 +03:00
Andrei Zavatski
2eba2a9abf Rename FriendsButton to FollowersButton 2021-01-21 23:40:23 +03:00
Andrei Zavatski
c631354b57 Rename property 2021-01-21 23:39:19 +03:00
Andrei Zavatski
4555b9ff70 Make ProfileHeaderButton height defined 2021-01-21 22:56:12 +03:00
Andrei Zavatski
e87197c7fc Adjust text size 2021-01-21 22:48:31 +03:00
Andrei Zavatski
343166f158 Make CreateIcon a property 2021-01-21 22:47:44 +03:00
Andrei Zavatski
a7c22ebe88 Implement MappingSubscribersButton component 2021-01-21 22:02:54 +03:00
Andrei Zavatski
2aa1df9ea4 Implement ProfileHeaderStatisticsButton component 2021-01-21 21:38:52 +03:00
Andrei Zavatski
05d3914fee Rename friends tooltip to followers 2021-01-21 21:26:33 +03:00
Dean Herbert
323da82477 Add website root URL and update most links to use it
For what it's worth, I intentionally didn't include news / changelog /
supporter, because these should never change.
2020-12-24 18:11:42 +09:00
Salman Ahmed
904a4daa98 Add todo comment reminding of updating friends list along 2020-12-17 13:33:49 +03:00
Dean Herbert
e36b1051c1 Add spacing between inline comments 2020-11-24 13:15:59 +09:00
Dean Herbert
82640418ba Invert hide logic for readability 2020-11-24 13:12:04 +09:00
Dean Herbert
44ca67c534 Simplify fill logic and add xmldoc 2020-11-24 13:10:11 +09:00
Bartłomiej Dach
5701b32bae Handle constant graphs better 2020-11-23 22:12:32 +01:00
Bartłomiej Dach
8347ecf494 Simplify row tick creation code 2020-11-23 21:52:47 +01:00
Bartłomiej Dach
7b0d3dfe0c Refactor tick calculation code for readability 2020-11-23 21:38:04 +01:00
Bartłomiej Dach
bb5aa9a9c9 Guard against empty values early 2020-11-23 21:24:37 +01:00
Bartłomiej Dach
e9ffeb8b5d Make missing date check more robust 2020-11-23 21:09:42 +01:00
Andrei Zavatski
1b33d30039 Simplify horizontal ticks creation 2020-11-23 08:52:29 +03:00
Andrei Zavatski
b745fb681a Fix incorrect static using placement 2020-11-22 04:40:55 +03:00
Andrei Zavatski
4887132947 Adjustments for edge cases support 2020-11-22 04:28:17 +03:00
Andrei Zavatski
f07f8089d6 Adjust monthsPerTick value 2020-11-22 03:58:56 +03:00
Andrei Zavatski
e6c116f0ab Rework horizontal ticks creation 2020-11-22 03:49:00 +03:00
Andrei Zavatski
6e581902cd Simplify column ticks creation 2020-11-22 03:11:38 +03:00
Andrei Zavatski
453f0ba675 Make tick lines thicker 2020-11-22 02:34:29 +03:00
Andrei Zavatski
3cb1d04667 Move dates fill into it's own method 2020-11-22 02:25:12 +03:00
Andrei Zavatski
d4b56aac84 Add missing whitespace 2020-11-22 02:17:54 +03:00
Andrei Zavatski
9d7ddf8343 Merge master with conflicts resolved 2020-11-22 02:13:35 +03:00
Andrei Zavatski
fe4c622041 Make OnUserChanged private 2020-11-21 23:13:46 +03:00
Andrei Zavatski
dbfc839df3 Move missing text to PaginatedProfileSubsection 2020-11-21 23:03:54 +03:00
Andrei Zavatski
11c3ccfcaa Move rulesets property to PaginatedProfileSubsection 2020-11-21 22:49:56 +03:00
Andrei Zavatski
718ba9253b Implement ProfileSubsection component 2020-11-21 03:18:24 +03:00
Andrei Zavatski
c4cb1440ab Rename PaginatedContainerHeader to ProfileSubsectionHeader 2020-11-21 02:59:01 +03:00
Andrei Zavatski
a52c98b55c Fix broken test scene 2020-11-14 21:20:37 +03:00
Andrei Zavatski
fe9d17fc56 Fix CodeFactor issues 2020-11-14 20:31:03 +03:00
Andrei Zavatski
a94546f905 CI fixes 2020-11-14 20:17:32 +03:00
Andrei Zavatski
5354bf1fa5 Ticks distribution improvements 2020-11-14 20:07:52 +03:00
Andrei Zavatski
02168c6c2f Implement dates with zero count fill 2020-11-14 19:17:01 +03:00
Andrei Zavatski
af174aa653 Implement chart subsections 2020-11-14 18:48:47 +03:00
Andrei Zavatski
ae4a2e74fa Implement ProfileSubsection 2020-11-14 18:21:10 +03:00
Andrei Zavatski
01f28a35c3 Implement vertical ticks creation 2020-11-14 07:28:01 +03:00
Andrei Zavatski
d98c59f2a4 Implement horizontal ticks creation 2020-11-14 06:38:02 +03:00
Andrei Zavatski
9d8e7e8954 ProfileLineChart layout implementation 2020-11-14 04:46:26 +03:00
Andrei Zavatski
f753f138c6 Add counter to most played beatmaps section in user overlay 2020-11-12 03:11:29 +03:00
Dean Herbert
6593aac3f2
Merge pull request #7762 from EVAST9919/history-graph 2020-11-11 11:35:34 +09:00
Dean Herbert
53c968e137 Fix user profile best performance weighting being out of order 2020-11-11 10:19:59 +09:00
Andrei Zavatski
6c428d8b11 Merge master with conflicts resolved 2020-11-11 01:37:01 +03:00
Dean Herbert
833c0b223e Clamp index to valid bounds 2020-11-10 18:08:12 +09:00
Andrei Zavatski
e464e719ef Merge remote-tracking branch 'refs/remotes/ppy/master' into history-graph 2020-11-10 10:22:57 +03:00
Dean Herbert
37feedae7a Fix potential crash due to stale index 2020-11-10 07:27:38 +09:00
Dean Herbert
1548c0dc25 Ensure graph hover state is updated after data changes 2020-11-10 07:27:27 +09:00
Berkan Diler
fe3a23750c Use char overloads for string methods 2020-10-16 11:52:29 +02:00
Dean Herbert
703f58bb2f Remove last.fm support
Has been broken for ages, and their service isn't really something
people use these days.
2020-10-16 11:54:11 +09:00
smoogipoo
22c5e9f64f Rename missing parameter 2020-09-11 12:19:26 +09:00
smoogipoo
be5d143b5a Reorder params 2020-09-11 12:17:12 +09:00
Andrei Zavatski
cfc6e2175d Add missing header to MostPlayedBeatmapsContainer 2020-09-10 20:58:37 +03:00
Andrei Zavatski
913e3faf60 Move PaginatedContainerWithHeader logic to a base class 2020-09-10 20:48:06 +03:00
Andrei Zavatski
e5f70d8eae Simplify counter visibility changes in PaginatedContainerHeader 2020-09-10 20:31:00 +03:00
Andrei Zavatski
931e567c7e Replace counter font size with an actual value 2020-09-10 20:25:35 +03:00
Andrei Zavatski
9b504272e4 Make Header a property 2020-09-10 20:24:43 +03:00
Andrei Zavatski
95eeebd93f Fix setting count for recent scores is overcomplicated 2020-09-08 15:31:00 +03:00
Andrei Zavatski
1bc41bcfd7 Move scores counter logic to a better place 2020-09-08 00:04:14 +03:00
Andrei Zavatski
f88b2509f8 Fix ProfileSection header margin is too small 2020-09-07 23:43:26 +03:00
Andrei Zavatski
c72a192cb5 Fix recent plays counter is always zero 2020-09-07 23:33:04 +03:00
Andrei Zavatski
e39609d3ca Implement PaginatedContainerWithHeader component 2020-09-07 23:08:50 +03:00
Andrei Zavatski
b7bd084296 Remove missing text where not needed 2020-09-07 22:30:43 +03:00
Andrei Zavatski
1c55039994 Remove old header from PaginatedContainer 2020-09-07 22:24:10 +03:00
Andrei Zavatski
3a24cc1aa9 Implement PaginatedContainerHeader component 2020-09-07 22:13:29 +03:00
Dean Herbert
dbf44fbaf2 Update names and icons to match new designs 2020-09-03 16:34:58 +09:00
Dean Herbert
e6a2409415
Merge branch 'master' into panel-load-debounce 2020-07-30 16:03:17 +09:00
Andrei Zavatski
d4496eb982 Update ShowMoreButton in line with web 2020-07-30 04:51:09 +03:00
smoogipoo
42e88c53d7 Embed behaviour into UserCoverBackground 2020-07-28 20:50:55 +09:00
Andrei Zavatski
ad9492804a Apply suggestions 2020-07-21 22:56:44 +03:00
Andrei Zavatski
0145ca09e5 Apply changes to overlays 2020-07-21 20:11:10 +03:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
Dean Herbert
ed9663985b Rename panels 2020-04-21 20:55:33 +09:00
Dean Herbert
9b9b710ded Move and rename remaining direct classes 2020-04-21 16:41:07 +09:00
TheWildTree
a5781d7fc5 Replace ScreenTitle with OverlayTitle and update titles to match new design 2020-03-24 22:08:20 +01:00
Bartłomiej Dach
af7d6d0a4e Invert data length checks for consistency 2020-03-21 14:45:32 +01:00
Bartłomiej Dach
d167e0c8b9 Mark properties as [CanBeNull] 2020-03-21 14:35:04 +01:00