3758 Commits

Author	SHA1	Message	Date
Andrei Zavatski	416f9d89db	CI fixes	2019-08-03 05:49:01 +03:00
Andrei Zavatski	37be4fbf16	Use GridContainer for layout	2019-08-03 05:34:14 +03:00
Joehu	0082695cd8	Choose default category sorting instead of being always first	2019-08-02 13:22:58 -07:00
Andrei Zavatski	de96e5dfc6	Apply suggested changes	2019-08-02 07:41:11 +03:00
Andrei Zavatski	5547592768	CI fixes	2019-08-01 23:04:18 +03:00
Andrei Zavatski	e66a3494b9	make the container hidden by default	2019-08-01 22:50:01 +03:00
Andrei Zavatski	13fe1732d8	adjust height values to avoid random jumps	2019-08-01 21:32:04 +03:00
Andrei Zavatski	90c59ab39d	implement PreviousUsernamesContainer	2019-08-01 21:26:59 +03:00
Andrei Zavatski	0f36088ef8	Add loved section	2019-08-01 11:06:29 +03:00
Dean Herbert	26909dc580	Update follower count API source (#5397) ... Update follower count API source	2019-07-31 00:24:18 +09:00
Dean Herbert	4c6cccb3a3	Update settings in line with framework changes	2019-07-30 23:31:21 +09:00
Dean Herbert	5bb31ecb00	Merge branch 'master' into update-follower-count	2019-07-30 22:20:33 +09:00
smoogipoo	fab3ec3e5b	Add maximum height to skin dropdown	2019-07-30 19:28:02 +09:00
David Zhao	1956098166	Add a fallback for humanizer localization failure	2019-07-30 14:06:08 +09:00
Max Hübner	316b11d08b	use single line if-statement	2019-07-28 20:36:21 +02:00
Dean Herbert	663f34d3d8	Remove width specifications	2019-07-29 02:47:26 +09:00
Max Hübner	f7b9ddb48c	combine Text and TextBold	2019-07-28 12:40:21 +02:00
Max Hübner	df8d4d8966	add truncation to base class	2019-07-28 12:16:32 +02:00
Max Hübner	c6d4ce0f8a	revert truncation in derived class	2019-07-28 12:14:06 +02:00
Dean Herbert	a24e57dd3d	Merge branch 'master' into refactor-osd	2019-07-28 13:10:01 +09:00
Dean Herbert	ddb98c705a	Merge branch 'master' into update-follower-count	2019-07-28 12:53:40 +09:00
Max Hübner	edf6453e04	truncate long usernames in private chat	2019-07-27 18:56:37 +02:00
Dean Herbert	56b27db7a4	Use "Click" instead of "Action"	2019-07-26 13:17:33 +09:00
Dean Herbert	7ec6ac7b0e	Remove unnecessary override	2019-07-26 13:15:36 +09:00
Max Hübner	78a8a6490e	close chat tabs with middle mouse button	2019-07-24 17:17:29 +02:00
Dan Balasescu	bc64c56a26	Merge branch 'master' into remove-text-shadow	2019-07-23 20:16:33 +09:00
Dean Herbert	704fe2d655	Remove text shadow in chat	2019-07-23 16:04:50 +09:00
smoogipoo	5e72ed0d12	Fix potential nullref	2019-07-23 15:35:12 +09:00
Andrei Zavatski	ffcc1c62af	simplify moving condition	2019-07-22 23:22:39 +03:00
Andrei Zavatski	ee6fed5b33	Use fixed height	2019-07-22 18:17:49 +03:00
Dean Herbert	2f111e6cf4	Fix incorrect corner radius	2019-07-22 23:57:26 +09:00
Dean Herbert	4dc9309a7e	Merge branch 'master' into underscored_link	2019-07-22 23:46:57 +09:00
Dean Herbert	cdf75b4098	Public before private	2019-07-22 22:14:09 +09:00
Andrei Zavatski	075ca3d8ea	CI fix	2019-07-22 14:47:35 +03:00
Andrei Zavatski	3e95cb9145	Use bindable and disable button	2019-07-22 14:35:18 +03:00
Andrei Zavatski	de8ac9a428	Simple implementation	2019-07-21 21:41:07 +03:00
Lucas A	2926932a1a	Add MusicControllerToast used to display current music playback status on OSD	2019-07-20 21:10:17 +02:00
Lucas A	2ab30281fb	Merge changes of branch refactor-osd into music-controller-hotkeys	2019-07-20 20:53:40 +02:00
Dean Herbert	2a94b68ecb	Simplify logic	2019-07-20 22:50:17 +09:00
Dean Herbert	2df279f902	Merge branch 'master' into loading-fix	2019-07-20 22:46:09 +09:00
smoogipoo	066bee3535	Simplify offset calculation	2019-07-19 16:02:33 +09:00
smoogipoo	2a66cf36d5	Merge remote-tracking branch 'Joehuu/master' into requests-limit-usage	2019-07-19 15:33:18 +09:00
Andrei Zavatski	fa978a47b0	Fix loading animation is no longer present	2019-07-18 15:08:50 +03:00
smoogipoo	f87e9b8017	Remove unnecessary tooltip text	2019-07-18 20:17:19 +09:00
smoogipoo	ca72409dc2	More closely match osu-web styling	2019-07-18 20:16:10 +09:00
Dan Balasescu	85ce44be74	Merge branch 'master' into remove-unnecessary-transforms-1	2019-07-18 18:16:36 +09:00
Dean Herbert	f175f597e7	Update follower count API source	2019-07-18 14:05:57 +09:00
Dan Balasescu	883c090248	Fix disabled state potentially not being set	2019-07-17 20:02:20 +09:00
smoogipoo	cca472d412	Fix direct ruleset selector binding in ctor	2019-07-17 19:19:45 +09:00
Joehu	83ffb1d542	Remove unnecessary transforms on top score user section	2019-07-15 14:15:03 -07:00
Andrei Zavatski	9458bca58f	Update usage of requests	2019-07-15 13:37:25 +03:00
Andrei Zavatski	d62e42ba14	Remove custom link container implementation	2019-07-15 13:09:21 +03:00
Andrei Zavatski	cfb1e0683c	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-07-15 12:32:02 +03:00
Dean Herbert	d4c1005c7e	Fix incorrect comparison in line updating logic	2019-07-15 15:53:19 +09:00
Andrei Zavatski	b93b26a036	Fix link formatting	2019-07-14 19:38:46 +03:00
Andrei Zavatski	c8192d6f3a	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-07-14 19:10:47 +03:00
Lucas A	bbc3cbf563	Restore deleted line	2019-07-12 20:22:31 +02:00
Lucas A	09d679de8d	Move text display layout to Toast.	2019-07-12 08:50:53 +02:00
StanR	1e04fcc6b5	Apply fixes	2019-07-11 17:47:09 +03:00
Dean Herbert	19e8198bff	Merge branch 'master' into flow_container_insert	2019-07-11 22:53:57 +09:00
StanR	cd7c03c13a	Add genre and language sections to beatmapset overlay	2019-07-11 16:44:48 +03:00
Dean Herbert	2c62891c48	Make Toast base class abstract	2019-07-11 15:15:34 +09:00
Dean Herbert	dd13e2508a	Add note about toast height	2019-07-11 15:14:57 +09:00
Dean Herbert	3bc789fca8	Remove osd prefix and prefer upper-case OSD	2019-07-11 15:09:54 +09:00
Dean Herbert	85f2212ebc	Reduce spacing and font for rank position	2019-07-11 11:32:42 +09:00
Dean Herbert	8f9b8ed5a1	Simplify information propagation logic	2019-07-11 11:17:33 +09:00
Dean Herbert	cc9ee472d6	Move score nulling out of loading property	2019-07-11 11:07:30 +09:00
Dean Herbert	a49bde7ed3	Move protected below public	2019-07-11 10:38:32 +09:00
Andrei Zavatski	953d32366c	Move request inside the ScoresContainer again	2019-07-10 19:40:29 +03:00
Andrei Zavatski	a041421e0d	Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score	2019-07-10 19:39:41 +03:00
Dean Herbert	f21e700b7a	Code style cleanup	2019-07-11 00:42:14 +09:00
Dean Herbert	2285c2b1df	Merge branch 'master' into user-best-score	2019-07-11 00:31:26 +09:00
Dean Herbert	3b448b0086	Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master	2019-07-11 00:25:35 +09:00
Dean Herbert	b225b2eb39	Rename to IsUserPaused	2019-07-11 00:18:19 +09:00
iiSaLMaN	c3315e805f	Use milliseconds for BasicStats' beatmap length	2019-07-10 16:49:32 +03:00
Andrei Zavatski	a0389c338b	CI fixes	2019-07-09 17:56:08 +03:00
Andrei Zavatski	9907a58ec4	Revert animations and apply suggested changes	2019-07-09 17:38:17 +03:00
Desconocidosmh	2546f647be	Completely change the way we fix the bug	2019-07-09 11:32:49 +02:00
Andrei Zavatski	e8b9b1b0bf	visibility logic adjustments	2019-07-09 12:16:58 +03:00
Andrei Zavatski	8d6af1625a	Visibility improvements	2019-07-09 11:40:51 +03:00
Andrei Zavatski	eb4ef8f6ac	CI fixes	2019-07-09 08:25:10 +03:00
Andrei Zavatski	8d46d4a28e	Fix grade layout	2019-07-09 08:09:31 +03:00
Andrei Zavatski	5d81445454	Move api request outside the scores container	2019-07-09 08:05:34 +03:00
Desconocidosmh	39f04e497d	Add UserRequestedPause	2019-07-08 11:24:06 +02:00
Andrei Zavatski	1e5639acee	Add forgotten symbol	2019-07-08 12:10:08 +03:00
Andrei Zavatski	67a6abb96c	Add user top score on selected beatmap	2019-07-08 11:49:33 +03:00
iiSaLMaN	90d5484818	Return BPM back to OnlineInfo ... Revert commit of "Move BPM out of OnlineInfo"	2019-07-08 09:10:41 +03:00
iiSaLMaN	729f0901f7	Move Length out of OnlineInfo	2019-07-07 20:25:36 +03:00
iiSaLMaN	3ea9629daf	Move BPM out of OnlineInfo	2019-07-07 20:11:44 +03:00
Salman Ahmed	b10c35b6ab	Update label text ... Co-Authored-By: Aergwyn <aergwyn@t-online.de>	2019-07-07 06:13:27 +03:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
iiSaLMaN	530e07110f	Use a descriptive name for the setting	2019-07-06 06:32:25 +03:00
Lucas A	5f8bd6eca7	Fix CI issues + minor issues	2019-07-05 16:51:15 +02:00
Lucas A	5cad2b2192	Add missing function to MusicController	2019-07-05 16:28:37 +02:00
Lucas A	c9e44e5e34	Add OsdIconToast + test	2019-07-05 16:25:09 +02:00
Lucas A	b5bd863dd0	Add methods to MusicController to play or pause, select next or previous track	2019-07-05 16:21:50 +02:00
Dan Balasescu	f32796db5c	Merge branch 'master' into changelog-comments	2019-07-05 23:42:46 +09:30
Lucas A	4f0429d046	Add OsdTrackedSettingToast	2019-07-05 16:03:46 +02:00
Lucas A	6288cc6e5c	Refactor OnScreenDisplay to allow displaying of custom messages on OSD	2019-07-05 16:03:22 +02:00
Dean Herbert	99da04527d	Replays -> scores	2019-07-05 14:07:14 +09:00
Dean Herbert	fcdba6b3f5	Merge branch 'master' into import-stable-scores	2019-07-05 13:34:03 +09:00
Dean Herbert	4885f0f0c7	Add messaging telling users how to leave changelog comments	2019-07-04 15:47:06 +09:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
Dean Herbert	e55d6232d1	Merge branch 'master' into direct-ruleset-selector	2019-07-04 00:56:36 +09:00
Dean Herbert	db3e9c7e60	Fix WaveOverlayContainer being always present (#5210) ... Fix WaveOverlayContainer being always present	2019-07-04 00:35:22 +09:00
Andrei Zavatski	cfac90b228	Use ConstrainedIconContainer instead of SpriteIcon	2019-07-03 14:34:24 +03:00
Andrei Zavatski	d6740d9688	Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector	2019-07-03 14:19:41 +03:00
Dean Herbert	1219bea077	Fix layout of profile top header to match web (#5218) ... Fix layout of profile top header to match web	2019-07-03 17:48:18 +09:00
Dean Herbert	d22a1229cb	Remove unnecessary disposal	2019-07-03 12:06:20 +09:00
Dean Herbert	23acddcb56	Rename download buttons to avoid ambiguity	2019-07-03 12:02:35 +09:00
Dean Herbert	466bc7f28a	Merge branch 'master' into watch-replays-4	2019-07-03 11:47:10 +09:00
Joehu	a1fb41ea66	Use FillFlowContainer on flag and country	2019-07-02 10:53:52 -07:00
Joehu	d387629e53	Fix layout of profile top header to match web	2019-07-02 10:52:24 -07:00
Dean Herbert	2fcd428d73	Merge branch 'master' into fix-overlay-presence	2019-07-02 23:40:49 +09:00
naoey	1ff6a9d085	Remove unused using	2019-07-02 16:25:40 +05:30
naoey	eaa19d5a49	Remove unused/unnecessary fields	2019-07-02 16:13:47 +05:30
Andrei Zavatski	082fa0d808	simplify updateState logic	2019-07-02 13:35:02 +03:00
naoey	ee516d2515	Make direct panel download and replay buttons share UI	2019-07-02 15:55:30 +05:30
Andrei Zavatski	2971bd8cbc	Add disable trigger to a testcase	2019-07-02 13:22:38 +03:00
Andrei Zavatski	08dfe413c1	Refactor Ruleset Selector in Direct	2019-07-02 13:07:36 +03:00
Dean Herbert	451765784a	Centralise SocialOverlay's scheduling logic ... Just some clean-ups to make it easier to confirm correct logic	2019-07-02 15:25:40 +09:00
Dean Herbert	d27a0db45c	Enforce StartHidden on relevant overlays	2019-07-02 15:23:47 +09:00
Dean Herbert	2645967dc4	Fix wave-based overlays always being present before initial display	2019-07-02 15:17:35 +09:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
Salman Ahmed	72e5cbb07f	Add checkbox for hiding health bar	2019-07-02 01:45:09 +03:00
Roman Kapustin	7bdf737956	Make notification insertion cleaner	2019-07-01 18:41:40 +03:00
Roman Kapustin	0c95dff3d6	Make FlowContainer insertion cleaner	2019-07-01 18:41:08 +03:00
Dean Herbert	e6c1b059bc	Disable dimming main content	2019-07-01 18:49:36 +09:00
Dean Herbert	5d94c67c76	Merge remote-tracking branch 'upstream/master' into selector-hiding	2019-07-01 18:49:18 +09:00
Dean Herbert	3902da9135	Merge remote-tracking branch 'upstream/master' into abstract-menu	2019-06-28 18:13:44 +09:00
Dean Herbert	6d0cc1f770	Remove GC debug setting	2019-06-28 15:59:19 +09:00
smoogipoo	23df1a5d42	Merge remote-tracking branch 'HollyHacker/master' into abstract-menu	2019-06-28 13:42:56 +09:00
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
Dean Herbert	4952fb3716	Merge branch 'master' into fix-toolbar-bar	2019-06-27 19:58:13 +09:00
Dan Balasescu	2ee4fde5f0	Merge branch 'master' into fix-settings-subpanel-dim	2019-06-27 18:30:36 +09:00
smoogipoo	f6f547a91b	Fix ruleset selector line not moving on first display	2019-06-27 18:25:38 +09:00
Dean Herbert	98ba38d421	Merge branch 'master' into user_profile_modes	2019-06-27 15:34:21 +09:00
Dean Herbert	d6c28dc6d7	Simplify and fix state management	2019-06-27 15:31:47 +09:00
Dean Herbert	25499f74a7	Remove redundant font set	2019-06-27 15:31:36 +09:00
smoogipoo	b397652af4	Remove ability to set arbitrary accent colours	2019-06-27 15:02:26 +09:00
smoogipoo	7f5587d894	RulesetTabItem -> ProfileRulesetTabItem	2019-06-27 14:54:31 +09:00
smoogipoo	803198ff20	Gamemode -> Ruleset	2019-06-27 14:53:18 +09:00
smoogipoo	9e2e393ab7	DownloadAllowed -> DownloadEnabled	2019-06-27 13:38:21 +09:00
smoogipoo	c1277b5db2	Test the download button directly for safety	2019-06-27 13:35:14 +09:00
Dean Herbert	f3aab143aa	Fix settings subpanels dimming main content	2019-06-27 13:16:16 +09:00
Dean Herbert	3294464bc6	Fix typo in variable	2019-06-27 12:47:05 +09:00
Dean Herbert	a5ccfeb18e	Remove unnecessary fill flow	2019-06-27 12:34:22 +09:00
Dean Herbert	be901294f7	Simplify text layout	2019-06-27 12:33:14 +09:00
Dean Herbert	cd6f452bfa	Remove weird download button exposure	2019-06-27 12:22:38 +09:00
Dean Herbert	32c3bee71b	Avoid public exposure	2019-06-27 12:11:04 +09:00
Dean Herbert	cc9a7839c9	Fix layout regression	2019-06-27 12:04:01 +09:00
Dean Herbert	d6da21b0f0	Tidy up fetch methods ... Anonymise some test data further	2019-06-27 12:00:31 +09:00
Dean Herbert	375a6f406d	Merge remote-tracking branch 'upstream/master' into not-available-to-download	2019-06-27 11:44:41 +09:00
Dean Herbert	322d92d3e0	Rename class to BeatmapAvailability	2019-06-27 11:40:22 +09:00
iiSaLMaN	9ada4d68b1	Make fields protected and expose them in tests	2019-06-26 22:42:34 +03:00
Andrei Zavatski	2e49b4ffcd	Update the component with an abstract RulesetSelector class	2019-06-26 18:56:40 +03:00
Andrei Zavatski	e9f3a1ba63	Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes	2019-06-26 18:31:36 +03:00
Dean Herbert	768d6c2fb3	ModelInfo -> Model	2019-06-27 00:29:09 +09:00
naoey	f3a84de7b5	Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite	2019-06-26 18:17:53 +05:30
Dean Herbert	c34f6180e6	Merge branch 'master' into generic-download-model-manager	2019-06-26 20:37:56 +09:00
David Zhao	4510c868f4	Remove selector toggling logic for now	2019-06-26 19:39:47 +09:00
Dean Herbert	6812eccdd1	Fix MusicController holding references to beatmaps while inacti… (#5158) ... Fix MusicController holding references to beatmaps while inactive	2019-06-26 19:30:16 +09:00
David Zhao	e92c1ca009	Fix styling, private tabClosed, remove type check	2019-06-26 19:25:54 +09:00
smoogipoo	6ce86e6083	General refactoring	2019-06-26 17:52:25 +09:00
David Zhao	a1a0a9ee6b	Merge branch 'master' into selector-hiding	2019-06-26 17:45:05 +09:00
Dean Herbert	2707a7179e	Fix MusiController holding references to beatmaps while inactive	2019-06-26 13:18:03 +09:00
David Zhao	6c8cc9728f	fix channel selector not being closed	2019-06-26 12:00:58 +09:00
Dean Herbert	9e1cb90dd8	Remove existing argument for ItemAdded event ... For all usages, it looks like this was unnecessary.	2019-06-26 11:40:41 +09:00
Salman Ahmed	eaf6f6891d	Rename to DownloadButtonsContainer	2019-06-26 05:22:08 +03:00
Salman Ahmed	f4e765cf99	Merge branch 'master' into not-available-to-download	2019-06-26 05:13:58 +03:00
naoey	9d88295ece	Merge remote-tracking branch 'upstream/master' into generic-download-model-manager	2019-06-25 18:27:16 +05:30
Andrei Zavatski	bae0258d8d	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-25 14:16:05 +03:00
Dan Balasescu	47974ca854	Merge branch 'master' into beatmap-overlay-load	2019-06-25 19:05:17 +09:00
Dean Herbert	ba2f22be47	Improve loading state of BeatmapSet header	2019-06-25 14:47:29 +09:00
smoogipoo	fb94cd43a4	Remove unnecessary local item storage in SettingsDropdown	2019-06-25 12:00:05 +09:00
Dean Herbert	cc1e67dc6c	Merge branch 'master' into fix-avatar-display-update-2	2019-06-25 10:18:46 +09:00
jorolf	4d8f49b9bc	update code to work with https://github.com/ppy/osu-framework/pull/2568	2019-06-24 23:17:07 +02:00
Andrei Zavatski	b7d15982d7	Remove useless parentheses	2019-06-24 23:30:35 +03:00
Andrei Zavatski	4a05c560cf	Remove unwanted class and move the bind logic outside the RulesetSelector	2019-06-24 23:13:28 +03:00
Andrei Zavatski	35516e7304	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 22:52:24 +03:00
HoLLy	739077ef4f	Only hide UpdateableAvatar/Flag immediately	2019-06-24 18:24:31 +02:00
Dean Herbert	6a541d9a10	Merge branch 'master' into user_profile_modes	2019-06-25 00:59:51 +09:00
Dean Herbert	c0b5153094	Merge branch 'master' into music-effect-arrow-keys-hover	2019-06-24 21:49:45 +09:00
Dean Herbert	88b182ab3f	Merge branch 'master' into generic-download-model-manager	2019-06-24 18:35:58 +09:00
HoLLy	aed83471f4	Replace Reset with overridden TransformImmediately/TransformDuration	2019-06-24 10:51:45 +02:00
Dean Herbert	2473a9487a	Add missing using	2019-06-24 17:38:11 +09:00
Dean Herbert	6e2138491b	Merge branch 'master' into useroverlay-tabs	2019-06-24 17:27:47 +09:00
Dan Balasescu	18d64df0c4	Merge branch 'master' into add-numberbox	2019-06-24 15:22:30 +09:00
Joehu	7ac6558f59	Allow controlling music and effect volume by arrow keys when hovering	2019-06-23 22:53:02 -07:00
Dan Balasescu	00a2aa7881	Merge branch 'master' into useroverlay-overall-improvements	2019-06-24 13:28:17 +09:00
smoogipoo	5272b3a929	Use .Darken() instead of hex-based colour	2019-06-24 13:27:58 +09:00
Dean Herbert	c988dfbdaa	Make things a bit more sensible	2019-06-24 11:43:34 +09:00
Andrei Zavatski	35db20a337	Remove useless bindable check	2019-06-24 02:01:00 +03:00
Andrei Zavatski	60ff497add	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 01:06:54 +03:00
mulraf	dfb791ed3e	Update PopupDialog.cs ... Changed Spacings	2019-06-23 22:59:14 +02:00
mulraf	7bbd6b810f	Update PopupDialog.cs ... New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)	2019-06-23 20:33:43 +02:00
Andrei Zavatski	8430ac6d1c	remove unused using	2019-06-23 19:19:36 +03:00
Andrei Zavatski	1c20df780a	Adjust triangles colour	2019-06-23 17:08:18 +03:00
Ganendra Afrasya	d540565197	Merge branch 'master' into difficulty-icon-tooltip	2019-06-22 11:54:00 +07:00