From 14a39983118c24ecc90c42e6c68c8cc69a272c63 Mon Sep 17 00:00:00 2001
From: Xjph <archseraphim@gmail.com>
Date: Mon, 6 Sep 2021 18:27:19 -0230
Subject: [PATCH] improve icon handling

---
 ObservatoryCore/{ => Assets}/EOCIcon-Presized.ico | Bin
 ObservatoryCore/ObservatoryCore.csproj            |   6 +++++-
 ObservatoryCore/UI/Views/MainWindow.axaml         |   3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename ObservatoryCore/{ => Assets}/EOCIcon-Presized.ico (100%)

diff --git a/ObservatoryCore/EOCIcon-Presized.ico b/ObservatoryCore/Assets/EOCIcon-Presized.ico
similarity index 100%
rename from ObservatoryCore/EOCIcon-Presized.ico
rename to ObservatoryCore/Assets/EOCIcon-Presized.ico
diff --git a/ObservatoryCore/ObservatoryCore.csproj b/ObservatoryCore/ObservatoryCore.csproj
index 81c958d..5b5cae9 100644
--- a/ObservatoryCore/ObservatoryCore.csproj
+++ b/ObservatoryCore/ObservatoryCore.csproj
@@ -18,7 +18,7 @@
     <AssemblyVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
     <Version Condition=" '$(VersionSuffix)' == '' ">0.0.1.0</Version>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
-    <ApplicationIcon>EOCIcon-Presized.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\EOCIcon-Presized.ico</ApplicationIcon>
   </PropertyGroup>
   
   <ItemGroup>
@@ -33,6 +33,10 @@
     <PackageReference Include="System.Speech" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Reference Include="ObservatoryFramework">
       <HintPath>..\..\ObservatoryFramework\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath>
diff --git a/ObservatoryCore/UI/Views/MainWindow.axaml b/ObservatoryCore/UI/Views/MainWindow.axaml
index 484fd1a..5bd6e5c 100644
--- a/ObservatoryCore/UI/Views/MainWindow.axaml
+++ b/ObservatoryCore/UI/Views/MainWindow.axaml
@@ -7,5 +7,6 @@
         x:Class="Observatory.UI.Views.MainWindow"
         Title="Elite Observatory"
         ExtendClientAreaToDecorationsHint="True"
-        Content="{Binding core}">
+        Content="{Binding core}"
+        Icon="/Assets/EOCIcon-Presized.ico">
 </Window> 
\ No newline at end of file