Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

277 current map redesign #287

Merged
merged 4 commits into from
Aug 22, 2024
Merged

277 current map redesign #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
676e475
Update current map design to fit mockup
araszka Aug 20, 2024
f669ff6
Update next map widget design
araszka Aug 20, 2024
fe7f07c
Center author name in next map widget
araszka Aug 20, 2024
052ff8f
Merge branch 'master' into 277-current-map-redesign
araszka Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/Modules/CurrentMapModule/Services/CurrentMapService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ ICurrentMapSettings settings
public async Task ShowWidgetAsync()
{
var map = await client.Remote.GetCurrentMapInfoAsync();
await ShowManialinkAsync(map.UId);
await ShowManialinkAsync(map.UId, map.AuthorTime);
}

public async Task ShowWidgetAsync(MapGbxEventArgs args)
{
await ShowManialinkAsync(args.Map.Uid);
await ShowManialinkAsync(args.Map.Uid, args.Map.AuthorTime);
}

public async Task HideWidgetAsync()
Expand All @@ -39,7 +39,7 @@ public async Task HideWidgetAsync()
logger.LogDebug("Hiding current map widget");
}

private async Task ShowManialinkAsync(string mapUId)
private async Task ShowManialinkAsync(string mapUId, int authorTime)
{
var dbMap = await mapRepository.GetMapByUidAsync(mapUId);

Expand All @@ -48,16 +48,19 @@ private async Task ShowManialinkAsync(string mapUId)
return;
}

var author = dbMap.Author?.NickName;
var authorNickName = dbMap.Author?.NickName ?? "Unknown";

if (dbMap.Author?.NickName == dbMap.Author?.AccountId)
if (authorNickName == dbMap.Author?.AccountId)
{
var serverMap = await client.Remote.GetCurrentMapInfoAsync();
author = serverMap.AuthorNickname.Length > 0 ? serverMap.AuthorNickname : serverMap.Author;
authorNickName = serverMap.AuthorNickname.Length > 0 ? serverMap.AuthorNickname : serverMap.Author;
}

logger.LogDebug("Current map {mapName} by {author} ({authorTime}).", dbMap.Name, authorNickName, authorTime);

await manialinkManager.SendPersistentManialinkAsync("CurrentMapModule.CurrentMapWidget",
new { map = dbMap, mapAuthor = author, settings });
new { map = dbMap, mapAuthor = authorNickName, authorTime, settings });

logger.LogDebug("Showing current map widget");
}
}
50 changes: 30 additions & 20 deletions src/Modules/CurrentMapModule/Templates/CurrentMapWidget.mt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,40 @@
<import component="EvoSC.Style.UIStyle" as="UIStyle"/>

<property type="ICurrentMapSettings" name="settings"/>
<property type="IMap?" name="map" default="null"/>
<property type="string" name="mapAuthor" default="null"/>
<property type="IMap" name="map"/>
<property type="string" name="mapAuthor"/>
<property type="int" name="authorTime"/>

<template>
<UIStyle/>
<Widget header="current map" height="10" position="{{ settings.Position }}" y="{{ settings.Y }}">
<Widget height="9" position="{{ settings.Position }}" y="{{ settings.Y + 4.5 }}">
<template slot="body">
<frame pos='{{ settings.Position=="right" ? settings.Width-2.0 : 0 }} 0'>
<label text="{{ map?.Name }}"
class="text-primary"
pos="0 -3"
valign="center"
halign="right"
size="{{ settings.Width-2 }} 5"
/>
<label text="$<$tby {{ mapAuthor }}$>"
class="text-primary"
textsize="0.75"
pos="0 -6.5"
valign="center"
halign="right"
size="{{ settings.Width-2 }} 5"
/>
</frame>
<label text="{{ map.Name }}"
textfont="{{ Font.Bold }}"
textsize="0.75"
class="text-primary"
pos="{{ settings.Width/2.0 }} -2.5"
halign="center"
valign="center"
size="{{ settings.Width-4 }} 5"
/>
<label text="{{ Icons.User }} $<{{ mapAuthor.ToUpper() }}$>"
textprefix="$t"
textfont="{{ Font.Thin }}"
class="text-primary"
textsize="0.35"
pos="2.0 -5.5"
size="{{ settings.Width/2.0 }} 5"
/>
<label text="{{ RaceTime.FromMilliseconds(authorTime) }} {{ Icons.ClockO }}"
textprefix="$t"
textfont="{{ Font.Thin }}"
class="text-primary"
textsize="0.35"
pos="{{ settings.Width - 1.5 }} -5.5"
size="{{ settings.Width/2.0 }} 5"
halign="right"
/>
</template>
</Widget>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/NextMapModule/Controllers/NextMapEventController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task ShowNextMapOnPodiumStartAsync(object sender, PodiumEventArgs a
{
var nextMap = await nextMapService.GetNextMapAsync();
await manialinkManager.SendManialinkAsync(Template,
new { mapName = nextMap.Name, author = nextMap.Author?.NickName, settings });
new { mapName = nextMap.Name, mapAuthor = nextMap.Author?.NickName ?? "Unknown", settings });
}

[Subscribe(GbxRemoteEvent.BeginMap)]
Expand Down
41 changes: 21 additions & 20 deletions src/Modules/NextMapModule/Templates/NextMap.mt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,31 @@
<import component="EvoSC.Style.UIStyle" as="UIStyle"/>

<property type="INextMapSettings" name="settings" />
<property type="string" name="mapName" />
<property type="string" name="author" />
<property type="string" name="mapName"/>
<property type="string" name="mapAuthor"/>

<template>
<UIStyle/>
<Widget header="upcoming map" height="10" position="{{ settings.Position }}" y="{{ settings.Y }}">
<Widget header="upcoming map" height="9" position="{{ settings.Position }}" y="{{ settings.Y + 4.5 }}">
<template slot="body">
<frame pos='{{ settings.Position=="right" ? settings.Width-2.0 : 0 }} 0'>
<label text="{{ mapName }}"
class="text-primary"
pos="0 -3"
valign="center"
halign="right"
size="{{ settings.Width-2 }} 5"
/>
<label text="$<$tby {{ author }}$>"
class="text-primary"
textsize="0.75"
pos="0 -6.5"
valign="center"
halign="right"
size="{{ settings.Width-2 }} 5"
/>
</frame>
<label text="{{ mapName }}"
textfont="{{ Font.Bold }}"
textsize="0.75"
class="text-primary"
pos="{{ settings.Width/2.0 }} -2.5"
halign="center"
valign="center"
size="{{ settings.Width-4 }} 5"
/>
<label text="{{ Icons.User }} $<{{ mapAuthor.ToUpper() }}$>"
textprefix="$t"
textfont="{{ Font.Thin }}"
class="text-primary"
textsize="0.35"
halign="center"
pos="{{ settings.Width/2.0 }} -5.5"
size="{{ settings.Width/2.0 }} 5"
/>
</template>
</Widget>
</template>
Expand Down
Loading