diff --git a/src/Artemis.UI.Avalonia/App.axaml b/src/Artemis.UI.Avalonia/App.axaml index fb754aab7..816b5fd50 100644 --- a/src/Artemis.UI.Avalonia/App.axaml +++ b/src/Artemis.UI.Avalonia/App.axaml @@ -18,6 +18,7 @@ + diff --git a/src/Artemis.UI.Avalonia/Artemis.UI.Avalonia.csproj b/src/Artemis.UI.Avalonia/Artemis.UI.Avalonia.csproj index e3b4cb988..34818821e 100644 --- a/src/Artemis.UI.Avalonia/Artemis.UI.Avalonia.csproj +++ b/src/Artemis.UI.Avalonia/Artemis.UI.Avalonia.csproj @@ -9,6 +9,9 @@ + + + diff --git a/src/Artemis.UI.Avalonia/Assets/Images/home-banner.png b/src/Artemis.UI.Avalonia/Assets/Images/home-banner.png new file mode 100644 index 000000000..a0eb5d65f Binary files /dev/null and b/src/Artemis.UI.Avalonia/Assets/Images/home-banner.png differ diff --git a/src/Artemis.UI.Avalonia/MainWindow.axaml b/src/Artemis.UI.Avalonia/MainWindow.axaml index 2472b6c84..484b6a22b 100644 --- a/src/Artemis.UI.Avalonia/MainWindow.axaml +++ b/src/Artemis.UI.Avalonia/MainWindow.axaml @@ -8,6 +8,19 @@ Title="Artemis.UI.Avalonia" ExtendClientAreaToDecorationsHint="True" TransparencyLevelHint="AcrylicBlur" - Background="Transparent" - Content="{Binding}"> + Background="Transparent"> + + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml b/src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml index daac27813..6a2506586 100644 --- a/src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml +++ b/src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml @@ -2,7 +2,139 @@ 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:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia" + xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" + xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" + mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="900" x:Class="Artemis.UI.Avalonia.Screens.Home.Views.HomeView"> - Home :> + + + + + + + + + + + + + + + + + + + + + Plugins + + Artemis is built up using plugins. This means devices, brushes, effects and modules (for supporting games!) can all be added via plugins. + + + Under Settings > Plugins you can find your currently installed plugins, these default plugins are created by Artemis developers. + + + We're also keeping track of a list of third-party plugins on our wiki. + + + + + + + Get more plugins + + + + + + + + + + + Have a chat + + If you need help, have some feedback or have any other questions feel free to contact us through any of the following channels. + + + + + + + + + GitHub + + + + + + Website + + + + + + Discord + + + + + + E-mail + + + + + + + + + + + + Open Source + + This project is completely open source. If you like it and want to say thanks you could hit the GitHub Star button, I like numbers. You could even make plugins, there's a full documentation on the website + + + + + + + + Donate + + + + Feel like you want to make a donation? It would be gratefully received. Click the button to donate via PayPal. + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarScreenViewModel.cs b/src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarScreenViewModel.cs index 0a8b89867..051393e44 100644 --- a/src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarScreenViewModel.cs +++ b/src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarScreenViewModel.cs @@ -33,10 +33,5 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels public abstract Type ScreenType { get; } public abstract MainScreenViewModel CreateInstance(IKernel kernel, IScreen screen); - - public bool IsActive(IObservable routerCurrentViewModel) - { - return false; - } } } \ No newline at end of file diff --git a/src/Artemis.UI.Avalonia/Screens/Root/Views/RootView.axaml b/src/Artemis.UI.Avalonia/Screens/Root/Views/RootView.axaml index 13ae28f59..51f17fcc9 100644 --- a/src/Artemis.UI.Avalonia/Screens/Root/Views/RootView.axaml +++ b/src/Artemis.UI.Avalonia/Screens/Root/Views/RootView.axaml @@ -5,29 +5,22 @@ xmlns:reactiveUi="http://reactiveui.net" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Artemis.UI.Avalonia.Screens.Root.Views.RootView"> - - - - - - - - + - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml b/src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml index 747b22e92..9210a465a 100644 --- a/src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml +++ b/src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml @@ -24,27 +24,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Artemis.UI.Avalonia/Styles/Border.axaml b/src/Artemis.UI.Avalonia/Styles/Border.axaml new file mode 100644 index 000000000..99084de91 --- /dev/null +++ b/src/Artemis.UI.Avalonia/Styles/Border.axaml @@ -0,0 +1,24 @@ + + + + + I'm in a panel yo! + + + + + + + + + \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Home/HomeView.xaml b/src/Artemis.UI/Screens/Home/HomeView.xaml index 1f6d99cc9..d5be8da8f 100644 --- a/src/Artemis.UI/Screens/Home/HomeView.xaml +++ b/src/Artemis.UI/Screens/Home/HomeView.xaml @@ -27,7 +27,7 @@ - +