Configuration

Directory.Packages.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-
     <AvaloniaVersion>11.0.9</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -21,7 +20,10 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
     <PackageVersion Include="ReactiveUI" Version="19.5.41" />

app/InkForge.Common/App.axaml.cs

@@ -5,18 +5,48 @@ using Avalonia.Markup.Xaml;
 
 using InkForge.Common.ViewModels;
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
 
 using ReactiveUI;
 
+using Splat;
+using Splat.Microsoft.Extensions.DependencyInjection;
+
 namespace InkForge.Common;
 
 public partial class App : Application
 {
-	public static readonly StyledProperty<IServiceProvider> ServiceProviderProperty = AvaloniaProperty.Register<App, IServiceProvider>(nameof(ServiceProvider));
+	public static readonly StyledProperty<IServiceProvider> ServiceProviderProperty
+		= AvaloniaProperty.Register<App, IServiceProvider>(
+			name: nameof(ServiceProvider),
+			coerce: OnServiceProviderChanged);
 
 	public IServiceProvider ServiceProvider => GetValue(ServiceProviderProperty);
 
+	public static void Configure(IServiceCollection services, IConfigurationManager configuration)
+	{
+		configuration.SetBasePath(AppContext.BaseDirectory);
+		configuration.AddJsonFile(
+			new ManifestEmbeddedFileProvider(typeof(App).Assembly),
+			"Properties/Settings.json", false, false);
+		configuration.AddJsonFile(
+			Path.Combine(
+				Environment.GetFolderPath(
+					Environment.SpecialFolder.ApplicationData,
+					Environment.SpecialFolderOption.DoNotVerify),
+				"InkForge",
+				"UserSettings.json"), true, true);
+		configuration.AddJsonFile("Settings.json", true, true);
+
+		services.UseMicrosoftDependencyResolver();
+		Locator.CurrentMutable.InitializeSplat();
+		Locator.CurrentMutable.InitializeReactiveUI();
+
+		services.AddInkForge();
+	}
+
 	public override void Initialize()
 	{
 		AvaloniaXamlLoader.Load(this);
@@ -36,4 +66,10 @@ public partial class App : Application
 
 		base.OnFrameworkInitializationCompleted();
 	}
+
+	private static IServiceProvider OnServiceProviderChanged(AvaloniaObject @object, IServiceProvider provider)
+	{
+		provider.UseMicrosoftDependencyResolver();
+		return provider;
+	}
 }

app/InkForge.Common/InkForge.Common.csproj

@@ -5,6 +5,7 @@
     <RootNamespace>InkForge</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,8 +13,10 @@
     <PackageReference Include="Avalonia.Fonts.Inter" />
     <PackageReference Include="Avalonia.ReactiveUI" />
     <PackageReference Include="Avalonia.Themes.Fluent" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
     <PackageReference Include="Microsoft.Extensions.Http" />
+    <PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,4 +24,8 @@
     <ProjectReference Include="..\..\shared\migrations\InkForge.Sqlite\InkForge.Sqlite.csproj" />
   </ItemGroup>
 
-</Project>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Settings.json" />
+  </ItemGroup>
+
+</Project>

app/InkForge.Common/Properties/ApplicationSettings.cs

@@ -0,0 +1,6 @@
+namespace InkForge.Common.Properties;
+
+public class ApplicationSettings
+{
+	public List<string> History { get; } = [];
+}

app/InkForge.Common/Properties/ConfigContext.cs

@@ -2,6 +2,7 @@ using System.Text.Json.Serialization;
 
 namespace InkForge.Common.Properties;
 
+[JsonSerializable(typeof(ApplicationSettings))]
 [JsonSerializable(typeof(IDictionary<string, object>))]
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Metadata)]
 public partial class ConfigContext : JsonSerializerContext;

app/InkForge.Common/Properties/Settings.json

@@ -0,0 +1 @@
+{}

app/InkForge.Desktop/InkForge.Desktop.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" />
     <PackageReference Include="Dock.Avalonia" />
-    <PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
   </ItemGroup>
 
   <ItemGroup>

app/InkForge.Desktop/Program.cs

@@ -1,26 +1,31 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 
 using InkForge.Common;
 using InkForge.Common.ViewModels;
-using InkForge.Data;
 using InkForge.Desktop.Views;
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 using ReactiveUI;
 
-using Splat;
-using Splat.Microsoft.Extensions.DependencyInjection;
-
 static class Program
 {
+	private static readonly ConfigurationManager Configuration = new();
+
 	[STAThread]
 	public static void Main(string[] args)
 		=> BuildAvaloniaApp()
 			.UseMicrosoftDependencyInjection()
-			.StartWithClassicDesktopLifetime(args);
+			.StartWithClassicDesktopLifetime(args, WithMicrosoftDependencyInjection);
+
+	private static void WithMicrosoftDependencyInjection(IClassicDesktopStyleApplicationLifetime lifetime)
+	{
+		Configuration.AddCommandLine(lifetime.Args ?? []);
+	}
 
 	public static AppBuilder BuildAvaloniaApp()
 		=> AppBuilder.Configure<App>()
@@ -31,20 +36,12 @@ static class Program
 
 	private static void ConfigureServices(IServiceCollection services)
 	{
-		services.UseMicrosoftDependencyResolver();
-		var mutableResolver = Locator.CurrentMutable;
-		mutableResolver.InitializeSplat();
-		mutableResolver.InitializeReactiveUI();
-
-		services.AddInkForge();
-
 		services.AddTransient<IViewFor<AppViewModel>, MainWindow>();
 	}
 
 	private static void OnSetup(this IServiceCollection services, AppBuilder appBuilder)
 	{
 		var dispatcher = Dispatcher.UIThread;
-
 		var app = appBuilder.Instance!;
 		services
 			.AddSingleton(app)
@@ -52,8 +49,9 @@ static class Program
 			.AddSingleton(app.PlatformSettings!)
 			.AddSingleton(dispatcher);
 
+		ConfigureServices(services);
+
 		var serviceProvider = services.BuildServiceProvider();
-		serviceProvider.UseMicrosoftDependencyResolver();
 		app.SetValue(App.ServiceProviderProperty, serviceProvider);
 		dispatcher.ShutdownFinished += (_, _) => serviceProvider.Dispose();
 	}
@@ -61,7 +59,8 @@ static class Program
 	private static AppBuilder UseMicrosoftDependencyInjection(this AppBuilder builder)
 	{
 		ServiceCollection services = [];
-		ConfigureServices(services);
+		App.Configure(services, Configuration);
+
 		builder.AfterSetup(services.OnSetup);
 		return builder;
 	}