diff --git a/assets/branding/souls-tracker-skull-compact.ico b/assets/branding/souls-tracker-skull-compact.ico new file mode 100644 index 0000000..6734d99 Binary files /dev/null and b/assets/branding/souls-tracker-skull-compact.ico differ diff --git a/assets/branding/souls-tracker-skull-compact.png b/assets/branding/souls-tracker-skull-compact.png new file mode 100644 index 0000000..220c010 Binary files /dev/null and b/assets/branding/souls-tracker-skull-compact.png differ diff --git a/eng/Version.props b/eng/Version.props index f0ee9f8..de46539 100644 --- a/eng/Version.props +++ b/eng/Version.props @@ -1,10 +1,10 @@ - 1.0.0 + 1.0.1 $(VersionPrefix) - 1.0.0.0 - 1.0.0.0 + 1.0.1.0 + 1.0.1.0 $(Version) diff --git a/installer/SoulsTracker.iss b/installer/SoulsTracker.iss index b9bd323..97de5a7 100644 --- a/installer/SoulsTracker.iss +++ b/installer/SoulsTracker.iss @@ -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 diff --git a/src/SoulsTracker.Desktop/MainWindow.xaml b/src/SoulsTracker.Desktop/MainWindow.xaml index a2c6d23..b34383a 100644 --- a/src/SoulsTracker.Desktop/MainWindow.xaml +++ b/src/SoulsTracker.Desktop/MainWindow.xaml @@ -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" @@ -252,7 +252,7 @@ - + diff --git a/src/SoulsTracker.Desktop/SoulsTracker.Desktop.csproj b/src/SoulsTracker.Desktop/SoulsTracker.Desktop.csproj index d01df4a..50bf732 100644 --- a/src/SoulsTracker.Desktop/SoulsTracker.Desktop.csproj +++ b/src/SoulsTracker.Desktop/SoulsTracker.Desktop.csproj @@ -11,11 +11,11 @@ - - assets\branding\souls-tracker-skull.ico + + assets\branding\souls-tracker-skull-compact.ico - - assets\branding\souls-tracker-skull.png + + assets\branding\souls-tracker-skull-compact.png @@ -27,7 +27,7 @@ true win-x64 true - ../../assets/branding/souls-tracker-skull.ico + ../../assets/branding/souls-tracker-skull-compact.ico diff --git a/tests/SoulsTracker.Desktop.Tests/MainWindowBindingTests.cs b/tests/SoulsTracker.Desktop.Tests/MainWindowBindingTests.cs index bb5c158..211ee7b 100644 --- a/tests/SoulsTracker.Desktop.Tests/MainWindowBindingTests.cs +++ b/tests/SoulsTracker.Desktop.Tests/MainWindowBindingTests.cs @@ -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("../../assets/branding/souls-tracker-skull.ico", 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("../../assets/branding/souls-tracker-skull-compact.ico", 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] diff --git a/web_overlay/package-lock.json b/web_overlay/package-lock.json index 961f9e4..068e7b4 100644 --- a/web_overlay/package-lock.json +++ b/web_overlay/package-lock.json @@ -1,12 +1,12 @@ { "name": "soulstracker-overlay", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "soulstracker-overlay", - "version": "1.0.0", + "version": "1.0.1", "devDependencies": { "@playwright/test": "1.61.1", "typescript": "7.0.2" diff --git a/web_overlay/package.json b/web_overlay/package.json index 2a75a7d..03e2fa8 100644 --- a/web_overlay/package.json +++ b/web_overlay/package.json @@ -1,6 +1,6 @@ { "name": "soulstracker-overlay", - "version": "1.0.0", + "version": "1.0.1", "private": true, "type": "module", "scripts": {