Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace WheelWizard.CustomDistributions;
public interface ICustomDistributionSingletonService
{
List<IDistribution> GetAllDistributions();

// FIXME: Abstract this reference away. A generic Distributions service kinda loses its purpose when you still have to reference a distribution by name (like done here)
// Instead you would want something like DistService.GetCurrentDistro()
// The rest of the application should not have to know what distribution is currently active.
Expand Down
2 changes: 1 addition & 1 deletion WheelWizard/Features/CustomDistributions/RetroRewind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private async Task<OperationResult> DownloadAndExtractRetroRewind(ProgressWindow

//where all distributions are stored
var destinationParentDir = _fileSystem.DirectoryInfo.New(PathManager.RiivolutionWhWzFolderPath);

OperationResult? result = null;
try
{
Expand Down
3 changes: 3 additions & 0 deletions WheelWizard/Features/WheelWizardData/Domain/BadgeVariant.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ public enum BadgeVariant
SummitShowdown_GoldWinner,
SummitShowdown_SilverWinner,
SummitShowdown_BronzeWinner,
Leafstruck_GoldWinner,
Leafstruck_SilverWinner,
Leafstruck_BronzeWinner,
}
67 changes: 66 additions & 1 deletion WheelWizard/Views/Components/WhWzLibrary/Badge.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
</Setter>
</Style>

<!-- SUMMIT SHOWDOWN BADGES -->
<!-- SUMMIT SHOWDOWN BADGES -->
<Style Selector="controls|Badge.SummitShowdown_GoldWinner">
<Setter Property="Template">
<ControlTemplate>
Expand Down Expand Up @@ -279,4 +279,69 @@
</ControlTemplate>
</Setter>
</Style>



<!-- LEAFSTRUCK BADGES -->
<Style Selector="controls|Badge.Leafstruck_GoldWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1"
CornerRadius="999" Background="{StaticResource Warning100}" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="{StaticResource Warning600}" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="controls|Badge.Leafstruck_SilverWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1"
CornerRadius="999" Background="{StaticResource Neutral50}" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="{StaticResource Neutral400}" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>

<Style Selector="controls|Badge.Leafstruck_BronzeWinner">
<Setter Property="Template">
<ControlTemplate>
<Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
<Border Grid.Row="1" Grid.Column="1" CornerRadius="999" Background="#FFD19D" />

<Path Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" Grid.ColumnSpan="3"
Fill="#EC5616" Data="{StaticResource Award}"
Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path.RenderTransform>
<TransformGroup>
<RotateTransform Angle="21"/>
</TransformGroup>
</Path.RenderTransform>
</Path>
</Grid>
</ControlTemplate>
</Setter>
</Style>
</Styles>
9 changes: 6 additions & 3 deletions WheelWizard/Views/Components/WhWzLibrary/Badge.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ public class Badge : TemplatedControl
{ BadgeVariant.Firestarter_GoldWinner, "Firestarter Tournament Winner" },
{ BadgeVariant.Firestarter_SilverWinner, "Firestarter Tournament Runner-Up" },
{ BadgeVariant.Firestarter_BronzeWinner, "Firestarter Tournament Runner-Up" },
{ BadgeVariant.SummitShowdown_GoldWinner, "Summit Showdown Tourney Winner" },
{ BadgeVariant.SummitShowdown_SilverWinner, "Summit Showdown Tourney Runner-Up" },
{ BadgeVariant.SummitShowdown_BronzeWinner, "Summit Showdown Tourney Runner-Up" },
{ BadgeVariant.SummitShowdown_GoldWinner, "Summit Showdown Tournament Winner" },
{ BadgeVariant.SummitShowdown_SilverWinner, "Summit Showdown Tournament Runner-Up" },
{ BadgeVariant.SummitShowdown_BronzeWinner, "Summit Showdown Tournament Runner-Up" },
{ BadgeVariant.Leafstruck_GoldWinner, "Leafstruck Tournament Winner" },
{ BadgeVariant.Leafstruck_SilverWinner, "Leafstruck Tournament Runner-Up" },
{ BadgeVariant.Leafstruck_BronzeWinner, "Leafstruck Tournament Runner-Up" },
};

public static readonly StyledProperty<string> HoverTipProperty = AvaloniaProperty.Register<Badge, string>(
Expand Down
Loading