fix asset loading

NicoVIII · Feb 28, 2020 · bcc7b29 · bcc7b29
1 parent 47978d5
commit bcc7b29
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj b/src/Andromeda/AvaloniaApp.FSharp/Andromeda.AvaloniaApp.FSharp.fsproj
@@ -12,12 +12,13 @@
     <ProjectReference Include="../Core/Andromeda.Core.fsproj" />
   </ItemGroup>
   <ItemGroup>
-    <AvaloniaResource Include="Assets/*" />
+    <AvaloniaResource Include="Assets\*" />
     <AvaloniaResource Include="Styles.xaml" />
     <Compile Include="Config.fs" />
     <Compile Include="Logger.fs" />
     <Compile Include="Icons.fs" />
     <Compile Include="DomainTypes.fs" />
+    <Compile Include="AvaloniaHelper.fs" />
     <!-- Main window components -->
     <Compile Include="LeftBar.fs" />
     <!-- Own windows -->

diff --git a/src/Andromeda/AvaloniaApp.FSharp/AvaloniaHelper.fs b/src/Andromeda/AvaloniaApp.FSharp/AvaloniaHelper.fs
@@ -0,0 +1,15 @@
+namespace Andromeda.AvaloniaApp.FSharp
+
+open Avalonia
+open Avalonia.Platform
+open System
+
+module AvaloniaHelper =
+    let loadAssetPath (path: string) =
+        let uri =
+            if path.StartsWith("/")
+            then Uri(path, UriKind.Relative)
+            else Uri(path, UriKind.RelativeOrAbsolute);
+
+        let assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+        assets.Open(uri)
diff --git a/src/Andromeda/AvaloniaApp.FSharp/Config.fs b/src/Andromeda/AvaloniaApp.FSharp/Config.fs
@@ -1,4 +1,4 @@
 namespace Andromeda.AvaloniaApp.FSharp
 
 module Config =
-    let version = "v0.3.0-beta.5"
+    let version = "v0.3.0-beta.6"
diff --git a/src/Andromeda/AvaloniaApp.FSharp/Main.fs b/src/Andromeda/AvaloniaApp.FSharp/Main.fs
@@ -10,6 +10,7 @@ open Avalonia.FuncUI.DSL
 open Avalonia.Input
 open Avalonia.Layout
 open Avalonia.Media
+open Avalonia.Platform
 open Avalonia.Threading
 open Elmish
 open GogApi.DotNet.FSharp.Listing
@@ -18,7 +19,6 @@ open System
 open System.ComponentModel
 open System.Diagnostics
 open System.IO
-open System.Threading
 open System.Threading.Tasks
 
 module Main =
@@ -420,7 +420,7 @@ module Main =
         inherit HostWindow()
         do
             base.Title <- "Andromeda"
-            base.Icon <- WindowIcon "Assets/logo.ico"
+            base.Icon <- WindowIcon (AvaloniaHelper.loadAssetPath "avares://Andromeda.AvaloniaApp.FSharp/Assets/logo.ico")
             base.Width <- 1024.0
             base.Height <- 660.0