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
Binary file added assets/branding/souls-tracker-skull-compact.ico
Binary file not shown.
Binary file added assets/branding/souls-tracker-skull-compact.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions eng/Version.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<PropertyGroup>
<VersionPrefix>1.0.0</VersionPrefix>
<VersionPrefix>1.0.1</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Version>$(VersionPrefix)</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<AssemblyVersion>1.0.1.0</AssemblyVersion>
<FileVersion>1.0.1.0</FileVersion>
<InformationalVersion>$(Version)</InformationalVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion installer/SoulsTracker.iss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AppId={{B4485F7A-7828-447D-9B55-4CA4A9A3851A}
AppName={#AppName}
AppVersion={#AppVersion}
AppPublisher={#AppPublisher}
SetupIconFile=..\assets\branding\souls-tracker-skull.ico
SetupIconFile=..\assets\branding\souls-tracker-skull-compact.ico
DefaultDirName={localappdata}\Programs\SoulsTracker
DefaultGroupName={#AppName}
DisableProgramGroupPage=yes
Expand Down
4 changes: 2 additions & 2 deletions src/SoulsTracker.Desktop/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:local="clr-namespace:SoulsTracker.Desktop"
xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
Title="SoulsTracker"
Icon="/SoulsTracker.Desktop;component/assets/branding/souls-tracker-skull.ico"
Icon="/SoulsTracker.Desktop;component/assets/branding/souls-tracker-skull-compact.ico"
Width="1060"
Height="760"
MinWidth="560"
Expand Down Expand Up @@ -252,7 +252,7 @@
<Border Grid.Row="0" Background="#1B1F26" BorderBrush="{StaticResource BorderBrush}" BorderThickness="0,0,0,1" Padding="24,16">
<Grid>
<Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /></Grid.ColumnDefinitions>
<Image x:Name="SoulsTrackerSkullIcon" Width="38" Height="38" VerticalAlignment="Center" Source="/SoulsTracker.Desktop;component/assets/branding/souls-tracker-skull.png" AutomationProperties.Name="SoulsTracker skull application icon" />
<Image x:Name="SoulsTrackerSkullIcon" Width="38" Height="38" VerticalAlignment="Center" Source="/SoulsTracker.Desktop;component/assets/branding/souls-tracker-skull-compact.png" AutomationProperties.Name="SoulsTracker skull application icon" />
<StackPanel Grid.Column="1" Margin="12,0,0,0">
<TextBlock FontSize="22" FontWeight="SemiBold" Text="SoulsTracker" />
<TextBlock x:Name="HeaderSubtitleTextBlock" Style="{StaticResource MutedText}" Text="Death Tracker and Boss List" />
Expand Down
10 changes: 5 additions & 5 deletions src/SoulsTracker.Desktop/SoulsTracker.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</ItemGroup>

<ItemGroup>
<Resource Include="..\..\assets\branding\souls-tracker-skull.ico">
<Link>assets\branding\souls-tracker-skull.ico</Link>
<Resource Include="..\..\assets\branding\souls-tracker-skull-compact.ico">
<Link>assets\branding\souls-tracker-skull-compact.ico</Link>
</Resource>
<Resource Include="..\..\assets\branding\souls-tracker-skull.png">
<Link>assets\branding\souls-tracker-skull.png</Link>
<Resource Include="..\..\assets\branding\souls-tracker-skull-compact.png">
<Link>assets\branding\souls-tracker-skull-compact.png</Link>
</Resource>
</ItemGroup>

Expand All @@ -27,7 +27,7 @@
<UseWPF>true</UseWPF>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<ApplicationIcon>../../assets/branding/souls-tracker-skull.ico</ApplicationIcon>
<ApplicationIcon>../../assets/branding/souls-tracker-skull-compact.ico</ApplicationIcon>
</PropertyGroup>

</Project>
10 changes: 5 additions & 5 deletions tests/SoulsTracker.Desktop.Tests/MainWindowBindingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -480,16 +480,16 @@ public void StreamingUtilityLayoutPreservesAccessibleControlsAndUsesTheConfigure
}

[Fact]
public void DesktopAndInstallerUseTheOriginalSkullIconResource()
public void DesktopAndInstallerUseTheCompactSkullIconResource()
{
string root = FindRepositoryRoot();
string desktopProject = File.ReadAllText(Path.Combine(root, "src", "SoulsTracker.Desktop", "SoulsTracker.Desktop.csproj"));
string installer = File.ReadAllText(Path.Combine(root, "installer", "SoulsTracker.iss"));

Assert.Contains("<ApplicationIcon>../../assets/branding/souls-tracker-skull.ico</ApplicationIcon>", desktopProject, StringComparison.Ordinal);
Assert.Contains("SetupIconFile=..\\assets\\branding\\souls-tracker-skull.ico", installer, StringComparison.Ordinal);
Assert.True(File.Exists(Path.Combine(root, "assets", "branding", "souls-tracker-skull.ico")));
Assert.True(File.Exists(Path.Combine(root, "assets", "branding", "souls-tracker-skull.png")));
Assert.Contains("<ApplicationIcon>../../assets/branding/souls-tracker-skull-compact.ico</ApplicationIcon>", desktopProject, StringComparison.Ordinal);
Assert.Contains("SetupIconFile=..\\assets\\branding\\souls-tracker-skull-compact.ico", installer, StringComparison.Ordinal);
Assert.True(File.Exists(Path.Combine(root, "assets", "branding", "souls-tracker-skull-compact.ico")));
Assert.True(File.Exists(Path.Combine(root, "assets", "branding", "souls-tracker-skull-compact.png")));
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions web_overlay/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web_overlay/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "soulstracker-overlay",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"type": "module",
"scripts": {
Expand Down
Loading