Skip to content

Commit

Permalink
Use consistent new expression syntax style
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahStolk committed Sep 9, 2024
1 parent da15e77 commit a17cb63
Show file tree
Hide file tree
Showing 42 changed files with 188 additions and 188 deletions.
12 changes: 6 additions & 6 deletions src/DevilDaggersInfo.Web.Client.Core.CanvasArena/Color.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public static Color FromHsv(float hue, float saturation, float value)

return hi switch
{
0 => new(v, t, p),
1 => new(q, v, p),
2 => new(p, v, t),
3 => new(p, q, v),
4 => new(t, p, v),
_ => new(v, p, q),
0 => new Color(v, t, p),
1 => new Color(q, v, p),
2 => new Color(p, v, t),
3 => new Color(p, q, v),
4 => new Color(t, p, v),
_ => new Color(v, p, q),
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
await JSRuntime.InvokeAsync<object>("arenaInitialResize");
}

_context = new(_canvasId);
_context = new WebAssemblyCanvasArena(_canvasId);

Render();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async Task<AuthenticationState> ClearTokenAndGetDefaultState()
if (await _localStorageService.ContainKeyAsync(LocalStorageAuthKey))
await _localStorageService.RemoveItemAsync(LocalStorageAuthKey);

return new(new ClaimsPrincipal(new ClaimsIdentity()));
return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

private async Task UpdateComponent()
{
await DateSelected.InvokeAsync(new(_year, _month, _day));
await DateSelected.InvokeAsync(new DateTime(_year, _month, _day));
}

private void NextYear()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public partial class SearchDropdown<TKey>
[Parameter]
public bool ShowDisplayValue { get; set; } = true;

private Dictionary<TKey, string> FilteredItems => Values == null ? new() : _searchValue == null ? Values : Values
private Dictionary<TKey, string> FilteredItems => Values == null ? new Dictionary<TKey, string>() : _searchValue == null ? Values : Values
.Where(kvp =>
kvp.Key.ToString()?.Contains(_searchValue, StringComparison.InvariantCultureIgnoreCase) == true ||
kvp.Value.Contains(_searchValue, StringComparison.InvariantCultureIgnoreCase))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public static MarkupString ToNoBreakString(this object? obj)

public static MarkupString ToNoBreakString(this string? str)
{
return new(str?.Replace(" ", "&nbsp;") ?? string.Empty);
return new MarkupString(str?.Replace(" ", "&nbsp;") ?? string.Empty);
}

public static string ToCssClass(this CustomLeaderboardDagger customLeaderboardDagger)
Expand Down
20 changes: 10 additions & 10 deletions src/DevilDaggersInfo.Web.Client/NewsContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,52 +11,52 @@ public static class NewsContainer
[
new()
{
DateTime = new(2022, 01, 02),
DateTime = new DateOnly(2022, 01, 02),
Title = "V5 Beta",
},
new()
{
DateTime = new(2022, 01, 06),
DateTime = new DateOnly(2022, 01, 06),
Title = "V5 RELEASED",
},
new()
{
DateTime = new(2022, 01, 21),
DateTime = new DateOnly(2022, 01, 21),
Title = "V5.1 Update",
},
new()
{
DateTime = new(2022, 02, 06),
DateTime = new DateOnly(2022, 02, 06),
Title = "V5.2 Update",
},
new()
{
DateTime = new(2022, 03, 02),
DateTime = new DateOnly(2022, 03, 02),
Title = "V5.3 Update",
},
new()
{
DateTime = new(2022, 03, 18),
DateTime = new DateOnly(2022, 03, 18),
Title = "V5.4 Update",
},
new()
{
DateTime = new(2022, 04, 18),
DateTime = new DateOnly(2022, 04, 18),
Title = "V5.5 Update",
},
new()
{
DateTime = new(2022, 07, 22),
DateTime = new DateOnly(2022, 07, 22),
Title = "V5.6 Update and Replay Editor Alpha",
},
new()
{
DateTime = new(2022, 12, 04),
DateTime = new DateOnly(2022, 12, 04),
Title = "V5.7 Update",
},
new()
{
DateTime = new(2023, 03, 11),
DateTime = new DateOnly(2023, 03, 11),
Title = "New Unified Tools Alpha",
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@

try
{
HttpResponseMessage hrm = await Http.ToggleRole(Id, new() { RoleName = roleName });
HttpResponseMessage hrm = await Http.ToggleRole(Id, new ToggleRole { RoleName = roleName });

if (hrm.StatusCode == HttpStatusCode.OK)
NavigationManager.NavigateTo("/admin/users");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

if (httpResponseMessage.StatusCode == HttpStatusCode.OK)
{
LoginResponse authenticationResponse = await httpResponseMessage.Content.ReadFromJsonAsync<LoginResponse>() ?? throw new($"Could not deserialize {nameof(LoginResponse)}.");
LoginResponse authenticationResponse = await httpResponseMessage.Content.ReadFromJsonAsync<LoginResponse>() ?? throw new Exception($"Could not deserialize {nameof(LoginResponse)}.");
await Auth.SetTokenAsync(authenticationResponse.Token);
Navigation.NavigateTo("/", true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public partial class EntryPage
{
private static readonly Func<LineDataSet, LineData, List<MarkupString>> _initialHighlightTransformation = static (ds, d) =>
[
new($"<span style='text-align: right;'>{d.X.ToString(StringFormats.TimeFormat)}</span>"),
new($"<span style='color: {ds.Color}; text-align: right;'>{d.Y:0}</span>"),
new MarkupString($"<span style='text-align: right;'>{d.X.ToString(StringFormats.TimeFormat)}</span>"),
new MarkupString($"<span style='color: {ds.Color}; text-align: right;'>{d.Y:0}</span>"),
];
private static readonly Func<LineDataSet, LineData, List<MarkupString>> _highlightTransformation = static (ds, d) =>
[
new($"<span style='color: {ds.Color}; text-align: right;'>{d.Y:0}</span>"),
new MarkupString($"<span style='color: {ds.Color}; text-align: right;'>{d.Y:0}</span>"),
];

private bool _notFound;
Expand Down Expand Up @@ -73,7 +73,7 @@ protected override async Task OnInitializedAsync()

Upgrade? upgrade = i.GetUpgradeByHandLevel();
string color = upgrade == null ? "#fff2" : $"{upgrade.Color.HexCode}08";
_backgrounds.Add(new() { Color = color, ChartEndXValue = nextLevelUp == 0 ? _time : nextLevelUp });
_backgrounds.Add(new LineChartBackground { Color = color, ChartEndXValue = nextLevelUp == 0 ? _time : nextLevelUp });
if (nextLevelUp == 0)
break;
}
Expand Down Expand Up @@ -103,18 +103,18 @@ protected override async Task OnInitializedAsync()
{
int hit = GetCustomEntryData.DaggersHitData[i];
int fired = GetCustomEntryData.DaggersFiredData[i];
stats[i] = new(hit, fired, fired == 0 ? 0 : hit / (double)fired);
stats[i] = new Accuracy(hit, fired, fired == 0 ? 0 : hit / (double)fired);
}

List<MarkupString> AccuracyHighlighter(LineDataSet ds, LineData d)
{
Accuracy? stat = stats.Length <= d.Index ? null : stats[d.Index];
return stat == null ? [] :
[
new($"<span style='text-align: right;'>{d.X:0.0000}</span>"),
new($"<span style='color: {ds.Color}; text-align: right;'>{stat.Acc:0.00%}</span>"),
new($"<span style='text-align: right;'>{stat.Hit}</span>"),
new($"<span style='text-align: right;'>{stat.Fired}</span>"),
new MarkupString($"<span style='text-align: right;'>{d.X:0.0000}</span>"),
new MarkupString($"<span style='color: {ds.Color}; text-align: right;'>{stat.Acc:0.00%}</span>"),
new MarkupString($"<span style='text-align: right;'>{stat.Hit}</span>"),
new MarkupString($"<span style='text-align: right;'>{stat.Fired}</span>"),
];
}

Expand All @@ -124,11 +124,11 @@ List<MarkupString> AccuracyHighlighter(LineDataSet ds, LineData d)
LineChartOptions chartOptions = new()
{
HighlighterKeys = ["Time", "Accuracy", "Daggers Hit", "Daggers Fired"],
GridOptions = new() { MinimumRowHeightInPx = 50 },
ScaleYOptions = new() { NumberFormat = "0%" },
GridOptions = new LineChartGridOptions { MinimumRowHeightInPx = 50 },
ScaleYOptions = new LineChartScaleOptions { NumberFormat = "0%" },
Backgrounds = _backgrounds,
};
_lineCharts.Add(("Accuracy", dataOptions, chartOptions, [new("#f80", false, true, false, stats.Select((t, i) => new LineData(i, t.Acc, i)).ToList(), AccuracyHighlighter)]));
_lineCharts.Add(("Accuracy", dataOptions, chartOptions, [new LineDataSet("#f80", false, true, false, stats.Select((t, i) => new LineData(i, t.Acc, i)).ToList(), AccuracyHighlighter)]));
}

AddLineChart(
Expand Down Expand Up @@ -210,7 +210,7 @@ private void AddDataSet<T>(List<(LineDataSet Set, string Name)> dataSets, T[]? d
where T : struct, INumber<T>
{
if (data != null)
dataSets.Add((new(color, false, true, false, data.Take(_time).Select((val, i) => new LineData(i, double.CreateChecked(val), int.CreateChecked(val))).ToList(), dataSets.Count == 0 ? _initialHighlightTransformation : _highlightTransformation), name));
dataSets.Add((new LineDataSet(color, false, true, false, data.Take(_time).Select((val, i) => new LineData(i, double.CreateChecked(val), int.CreateChecked(val))).ToList(), dataSets.Count == 0 ? _initialHighlightTransformation : _highlightTransformation), name));
}

private void AddDataSets(List<(LineDataSet Set, string Name)> dataSets, string name)
Expand All @@ -226,7 +226,7 @@ private void AddDataSets(List<(LineDataSet Set, string Name)> dataSets, string n
LineChartOptions chartOptions = new()
{
HighlighterKeys = dataSets.ConvertAll(ds => ds.Name).Prepend("Time").ToList(),
GridOptions = new()
GridOptions = new LineChartGridOptions
{
MinimumRowHeightInPx = 50,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private void SetCategory(CategoryDropdown categoryDropdown)
GameMode = categoryDropdown.GameMode.ToString();
RankSorting = categoryDropdown.RankSorting.ToString();

NavigationManager.AddOrModifyQueryParameters(new(nameof(GameMode), GameMode), new(nameof(RankSorting), RankSorting));
NavigationManager.AddOrModifyQueryParameters(new KeyValuePair<string, object?>(nameof(GameMode), GameMode), new KeyValuePair<string, object?>(nameof(RankSorting), RankSorting));
}

private void Sort(CustomLeaderboardSorting sortBy)
Expand All @@ -113,7 +113,7 @@ private void Sort(CustomLeaderboardSorting sortBy)
_sortings[sortBy] = !_sortings[sortBy];
Ascending = _sortings[sortBy];

NavigationManager.AddOrModifyQueryParameters(new(nameof(SortBy), SortBy), new(nameof(Ascending), Ascending));
NavigationManager.AddOrModifyQueryParameters(new KeyValuePair<string, object?>(nameof(SortBy), SortBy), new KeyValuePair<string, object?>(nameof(Ascending), Ascending));
}

private async Task Fetch()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ else
@if (_categories != null)
{
<span>Category</span>
<SelectList CssWidthClass="w-64" CssOpenerClass="pl-2" TValue="CategoryDropdown" Values="@(_categories)" DisplayFunction="@(c => c.ToString())" Default="new(EnumConvert.GetGameMode(GameMode), EnumConvert.GetRankSorting(RankSorting))" Selected="@SetCategory" />
<SelectList CssWidthClass="w-64" CssOpenerClass="pl-2" TValue="CategoryDropdown" Values="@(_categories)" DisplayFunction="@(c => c.ToString())" Default="new CategoryDropdown(EnumConvert.GetGameMode(GameMode), EnumConvert.GetRankSorting(RankSorting))" Selected="@SetCategory" />
}
</div>

Expand Down Expand Up @@ -95,7 +95,7 @@ else
<div class="overflow-hidden text-right hidden xl:block text-xl font-goethe @CustomLeaderboardDagger.Leviathan.ToCssClass()">@customLeaderboard.RankSorting.GetDaggerValue(customLeaderboard.Daggers.Leviathan)</div>
}
<div class="overflow-hidden text-left hidden lg:block">@(customLeaderboard.TopPlayer?.ToNoBreakString() ?? MarkupStrings.NoDataMarkup)</div>
<div class="overflow-hidden text-right hidden lg:block text-xl font-goethe @(customLeaderboard.WorldRecordDagger?.ToCssClass())">@(customLeaderboard.WorldRecord.HasValue ? new(customLeaderboard.WorldRecord.Value.ToString(worldRecordFormat)) : MarkupStrings.NoDataMarkup)</div>
<div class="overflow-hidden text-right hidden lg:block text-xl font-goethe @(customLeaderboard.WorldRecordDagger?.ToCssClass())">@(customLeaderboard.WorldRecord.HasValue ? new MarkupString(customLeaderboard.WorldRecord.Value.ToString(worldRecordFormat)) : MarkupStrings.NoDataMarkup)</div>
</div>
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/DevilDaggersInfo.Web.Client/Pages/Custom/Mods/Index.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private void Sort(ModSorting sortBy)
_sortings[sortBy] = !_sortings[sortBy];
Ascending = _sortings[sortBy];

NavigationManager.AddOrModifyQueryParameters(new(nameof(SortBy), SortBy), new(nameof(Ascending), Ascending));
NavigationManager.AddOrModifyQueryParameters(new KeyValuePair<string, object?>(nameof(SortBy), SortBy), new KeyValuePair<string, object?>(nameof(Ascending), Ascending));
}

private async Task Fetch()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected override async Task OnParametersSetAsync()
}

SpawnsetBinary = spawnsetBinary;
SpawnsView = new(spawnsetBinary, GameConstants.CurrentVersion, GetSpawnset.MaxDisplayWaves ?? _defaultWaveCount);
SpawnsView = new SpawnsView(spawnsetBinary, GameConstants.CurrentVersion, GetSpawnset.MaxDisplayWaves ?? _defaultWaveCount);
EffectivePlayerSettings = spawnsetBinary.GetEffectivePlayerSettings();
}
}
2 changes: 1 addition & 1 deletion src/DevilDaggersInfo.Web.Client/Pages/Index.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected override async Task OnInitializedAsync()
return;

string html = await Http.Client.GetStringAsync(LatestNews.GetHtmlPath());
LatestNewsContent = new(html);
LatestNewsContent = new MarkupString(html);
}

private sealed record Section(string Text, string ImageUrl, string Url, string Alt);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private static DateTime ParseQuery(string? query)
if (query.Length < 16 || !int.TryParse(query[14..16], out int minute))
minute = 0;

return new(year, month, day, hour, minute, 0, DateTimeKind.Utc);
return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc);
}

private static bool DatesEqual(DateTime a, DateTime b)
Expand Down
Loading

0 comments on commit a17cb63

Please sign in to comment.