diff --git a/.gitattributes b/.gitattributes
index b4eb89c..8d46239 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,3 +11,5 @@
*.csx text encoding=UTF-8 diff=csharp
*.json text encoding=UTF-8 diff=json
+
+*.axaml text encoding=UTF-8 diff=xml
diff --git a/Directory.Packages.props b/Directory.Packages.props
index e68bcaf..b72d740 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,6 +9,7 @@
+
diff --git a/app/InkForge.Common/App.axaml b/app/InkForge.Common/App.axaml
index 0f70103..0104aff 100644
--- a/app/InkForge.Common/App.axaml
+++ b/app/InkForge.Common/App.axaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="InkForge.Common.App"
RequestedThemeVariant="Default">
-
+
diff --git a/app/InkForge.Common/Microsoft/Extensions/DependencyInjection/InkForgeServiceCollection.cs b/app/InkForge.Common/Microsoft/Extensions/DependencyInjection/InkForgeServiceCollection.cs
index 26a8152..918eddf 100644
--- a/app/InkForge.Common/Microsoft/Extensions/DependencyInjection/InkForgeServiceCollection.cs
+++ b/app/InkForge.Common/Microsoft/Extensions/DependencyInjection/InkForgeServiceCollection.cs
@@ -1,7 +1,11 @@
using InkForge.Common.Controllers;
using InkForge.Common.Data;
+using InkForge.Common.ViewModels;
+using InkForge.Common.Views;
using InkForge.Data;
+using ReactiveUI;
+
namespace Microsoft.Extensions.DependencyInjection;
public static class InkForgeServiceCollections
@@ -14,6 +18,8 @@ public static class InkForgeServiceCollections
services.AddSingleton();
+ services.AddTransient, LandingView>();
+
return services;
}
}
diff --git a/app/InkForge.Common/ViewModels/AppViewModel.cs b/app/InkForge.Common/ViewModels/AppViewModel.cs
index 88a9a6a..0447cb3 100644
--- a/app/InkForge.Common/ViewModels/AppViewModel.cs
+++ b/app/InkForge.Common/ViewModels/AppViewModel.cs
@@ -16,5 +16,6 @@ public class AppViewModel : ReactiveObject
public AppViewModel(WorkspaceController workspace)
{
+ View = new LandingViewModel();
}
}
diff --git a/app/InkForge.Common/Views/LandingView.axaml b/app/InkForge.Common/Views/LandingView.axaml
new file mode 100644
index 0000000..1750269
--- /dev/null
+++ b/app/InkForge.Common/Views/LandingView.axaml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/InkForge.Common/Views/LandingView.axaml.cs b/app/InkForge.Common/Views/LandingView.axaml.cs
new file mode 100644
index 0000000..5cc1310
--- /dev/null
+++ b/app/InkForge.Common/Views/LandingView.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia.ReactiveUI;
+
+using InkForge.Common.ViewModels;
+
+namespace InkForge.Common.Views;
+
+public partial class LandingView : ReactiveUserControl
+{
+ public LandingView()
+ {
+ InitializeComponent();
+ }
+}
diff --git a/app/InkForge.Desktop/InkForge.Desktop.csproj b/app/InkForge.Desktop/InkForge.Desktop.csproj
index 3e749c6..6c8a490 100644
--- a/app/InkForge.Desktop/InkForge.Desktop.csproj
+++ b/app/InkForge.Desktop/InkForge.Desktop.csproj
@@ -10,6 +10,7 @@
+
diff --git a/app/InkForge.Desktop/Views/MainWindow.axaml b/app/InkForge.Desktop/Views/MainWindow.axaml
index 668eae7..0acd472 100644
--- a/app/InkForge.Desktop/Views/MainWindow.axaml
+++ b/app/InkForge.Desktop/Views/MainWindow.axaml
@@ -2,8 +2,23 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ xmlns:ifcvm="using:InkForge.Common.ViewModels"
+ xmlns:reactiveui="http://reactiveui.net"
+ mc:Ignorable="d"
+ d:DesignWidth="800"
+ d:DesignHeight="450"
x:Class="InkForge.Desktop.Views.MainWindow"
+ x:DataType="ifcvm:AppViewModel"
Title="InkForge">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file