Merge branch 'hotfix/16_Assets_Loading' into develop

Author: EvilLord666

app/Wissance.Zerial/Wissance.Zerial.Desktop/App.axaml.cs

@@ -20,9 +20,18 @@ public override void Initialize()
 
         public override void OnFrameworkInitializationCompleted()
         {
-            string assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
-            string assemblyDir = Path.GetDirectoryName(assemblyLocation);
-            string localizationDir = Path.Combine(assemblyDir, LocalizationJsonDir);
+            string localizationDir = "";
+            if (!IsSnapApp)
+            {
+                string assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
+                string assemblyDir = Path.GetDirectoryName(assemblyLocation);
+                localizationDir = Path.Combine(assemblyDir, LocalizationJsonDir);
+            }
+            else
+            {
+                localizationDir = Path.Combine(SnapBaseDir, LocalizationJsonDir);
+            }
+
             Localizer.SetLocalizer(new JsonLocalizer(localizationDir));
             SetDefaultLanguage();
 
@@ -53,5 +62,9 @@ private void SetDefaultLanguage()
 
         private const string DefaultCountryCode = "en";
         private const string LocalizationJsonDir = "Assets/Languages";
+        private const string ZerialSnapPackageName = "wissance-zerial";
+        private const string SnapBaseDir = $"/snap/{ZerialSnapPackageName}/current";
+        
+        public static bool IsSnapApp { get; set; }
     }
 }

app/Wissance.Zerial/Wissance.Zerial.Desktop/Program.cs

@@ -16,12 +16,13 @@ public static void Main(string[] args)
             string snapEnv = args.FirstOrDefault(a => a.Contains("snap"));
             Environment = snapEnv != null ? SnapEnvironmentKey : OtherEnvironmentKey;
             Console.WriteLine($"Current environment is: {snapEnv}");
-
-            BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+            bool isSnapRunning = snapEnv != null;
+            App.IsSnapApp = isSnapRunning;
+            BuildAvaloniaApp(isSnapRunning).StartWithClassicDesktopLifetime(args);
         }
 
         // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp()
+        public static AppBuilder BuildAvaloniaApp(bool fromSnap)
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .WithInterFont()