Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
ControlPad/bin/
ControlPad/obj/
ControlPad/publish/
ControlPad.Avalonia/bin/
ControlPad.Avalonia/obj/
ControlPad.Tests/bin/
ControlPad.Tests/obj/

Expand Down
8 changes: 8 additions & 0 deletions ControlPad.Avalonia/App.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlPad.Avalonia.App"
RequestedThemeVariant="Default">
<Application.Styles>
<FluentTheme />
</Application.Styles>
</Application>
23 changes: 23 additions & 0 deletions ControlPad.Avalonia/App.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;

namespace ControlPad.Avalonia;

public partial class App : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}

public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow = new MainWindow();
}

base.OnFrameworkInitializationCompleted();
}
}
20 changes: 20 additions & 0 deletions ControlPad.Avalonia/ControlPad.Avalonia.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.12" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.12">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
50 changes: 50 additions & 0 deletions ControlPad.Avalonia/MainWindow.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Window xmlns="https://github.com/avaloniaui"
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"
xmlns:views="using:ControlPad.Avalonia.Views"
mc:Ignorable="d"
d:DesignWidth="650"
d:DesignHeight="600"
x:Class="ControlPad.Avalonia.MainWindow"
Title="Slidr"
Width="650"
Height="600"
CanResize="False">
<Grid RowDefinitions="Auto,Auto,*" ColumnDefinitions="170,*">
<Border Grid.Row="0" Grid.ColumnSpan="2" Background="#2B2B2B" Padding="12,8">
<TextBlock Text="Slidr"
FontSize="14"
FontWeight="SemiBold"
VerticalAlignment="Center" />
</Border>

<Border x:Name="BoardDisconnectedBar"
Grid.Row="1"
Grid.ColumnSpan="2"
Background="#4A2F2F"
BorderBrush="#7A3F3F"
BorderThickness="1"
Padding="10,8"
IsVisible="False">
<TextBlock Text="Board not connected. Please connect your board to use this app." />
</Border>

<Border Grid.Row="2" Grid.Column="0" Background="#222222" Padding="10">
<StackPanel Spacing="8">
<Button x:Name="HomeButton" Content="Home" Click="HomeButton_Click"/>
<Button x:Name="SliderButton" Content="Slider" Click="SliderButton_Click"/>
<Button x:Name="ButtonButton" Content="Button" Click="ButtonButton_Click"/>
<StackPanel Height="12" />
<Button x:Name="SettingsButton" Content="Settings" Click="SettingsButton_Click"/>
<Button x:Name="ExitButton" Content="Exit" Click="ExitButton_Click" />
</StackPanel>
</Border>

<Border Grid.Row="2" Grid.Column="1" Margin="10" BorderBrush="#3C3C3C" BorderThickness="1" CornerRadius="6">
<ContentControl x:Name="MainContentHost">
<views:HomeView />
</ContentControl>
</Border>
</Grid>
</Window>
44 changes: 44 additions & 0 deletions ControlPad.Avalonia/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using Avalonia.Controls;
using Avalonia.Interactivity;
using ControlPad.Avalonia.Views;

namespace ControlPad.Avalonia;

public partial class MainWindow : Window
{
private readonly HomeView _homeView = new();
private readonly SliderCategoriesView _sliderCategoriesView = new();
private readonly ButtonCategoriesView _buttonCategoriesView = new();
private readonly SettingsView _settingsView = new();

public MainWindow()
{
InitializeComponent();
MainContentHost.Content = _homeView;
}

private void HomeButton_Click(object? sender, RoutedEventArgs e)
{
MainContentHost.Content = _homeView;
}

private void SliderButton_Click(object? sender, RoutedEventArgs e)
{
MainContentHost.Content = _sliderCategoriesView;
}

private void ButtonButton_Click(object? sender, RoutedEventArgs e)
{
MainContentHost.Content = _buttonCategoriesView;
}

private void SettingsButton_Click(object? sender, RoutedEventArgs e)
{
MainContentHost.Content = _settingsView;
}

private void ExitButton_Click(object? sender, RoutedEventArgs e)
{
Close();
}
}
17 changes: 17 additions & 0 deletions ControlPad.Avalonia/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Avalonia;
using System;

namespace ControlPad.Avalonia;

class Program
{
[STAThread]
public static void Main(string[] args) => BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args);

public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.WithInterFont()
.LogToTrace();
}
10 changes: 10 additions & 0 deletions ControlPad.Avalonia/Views/ButtonCategoriesView.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlPad.Avalonia.Views.ButtonCategoriesView">
<Grid>
<TextBlock Text="Button Categories"
FontSize="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions ControlPad.Avalonia/Views/ButtonCategoriesView.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Avalonia.Controls;

namespace ControlPad.Avalonia.Views;

public partial class ButtonCategoriesView : UserControl
{
public ButtonCategoriesView()
{
InitializeComponent();
}
}
10 changes: 10 additions & 0 deletions ControlPad.Avalonia/Views/HomeView.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlPad.Avalonia.Views.HomeView">
<Grid>
<TextBlock Text="Home"
FontSize="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions ControlPad.Avalonia/Views/HomeView.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Avalonia.Controls;

namespace ControlPad.Avalonia.Views;

public partial class HomeView : UserControl
{
public HomeView()
{
InitializeComponent();
}
}
10 changes: 10 additions & 0 deletions ControlPad.Avalonia/Views/SettingsView.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlPad.Avalonia.Views.SettingsView">
<Grid>
<TextBlock Text="Settings"
FontSize="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions ControlPad.Avalonia/Views/SettingsView.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Avalonia.Controls;

namespace ControlPad.Avalonia.Views;

public partial class SettingsView : UserControl
{
public SettingsView()
{
InitializeComponent();
}
}
10 changes: 10 additions & 0 deletions ControlPad.Avalonia/Views/SliderCategoriesView.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="ControlPad.Avalonia.Views.SliderCategoriesView">
<Grid>
<TextBlock Text="Slider Categories"
FontSize="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</UserControl>
11 changes: 11 additions & 0 deletions ControlPad.Avalonia/Views/SliderCategoriesView.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Avalonia.Controls;

namespace ControlPad.Avalonia.Views;

public partial class SliderCategoriesView : UserControl
{
public SliderCategoriesView()
{
InitializeComponent();
}
}
10 changes: 10 additions & 0 deletions ControlPad.Avalonia/app.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="ControlPad.Avalonia.Desktop"/>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</assembly>
14 changes: 14 additions & 0 deletions ControlPad.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 17.14.36212.18
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlPad", "ControlPad\ControlPad.csproj", "{D35BB3DA-59CF-B3B9-1C64-51118D02B4EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlPad.Avalonia", "ControlPad.Avalonia\ControlPad.Avalonia.csproj", "{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlPad.Tests", "ControlPad.Tests\ControlPad.Tests.csproj", "{9BC9BA13-FBC5-47F4-9CAD-8864C84C4AC7}"
EndProject
Global
Expand All @@ -29,6 +31,18 @@ Global
{D35BB3DA-59CF-B3B9-1C64-51118D02B4EA}.Release|x64.Build.0 = Release|Any CPU
{D35BB3DA-59CF-B3B9-1C64-51118D02B4EA}.Release|x86.ActiveCfg = Release|Any CPU
{D35BB3DA-59CF-B3B9-1C64-51118D02B4EA}.Release|x86.Build.0 = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|x64.ActiveCfg = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|x64.Build.0 = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|x86.ActiveCfg = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Debug|x86.Build.0 = Debug|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|Any CPU.Build.0 = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|x64.ActiveCfg = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|x64.Build.0 = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|x86.ActiveCfg = Release|Any CPU
{0A31B3E6-246A-4CCA-8E9C-E7B3B38D4874}.Release|x86.Build.0 = Release|Any CPU
{9BC9BA13-FBC5-47F4-9CAD-8864C84C4AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BC9BA13-FBC5-47F4-9CAD-8864C84C4AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BC9BA13-FBC5-47F4-9CAD-8864C84C4AC7}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,31 @@ dotnet build ControlPad/ControlPad.csproj -c Release
dotnet run --project ControlPad/ControlPad.csproj
```

### Avalonia Port (In Progress)

A parallel Avalonia port scaffold now exists at:

`ControlPad.Avalonia/ControlPad.Avalonia.csproj`

Build:

```bash
dotnet build ControlPad.Avalonia/ControlPad.Avalonia.csproj
```

Run:

```bash
dotnet run --project ControlPad.Avalonia/ControlPad.Avalonia.csproj
```

The existing WPF app in `ControlPad/` remains the primary implementation.

### Tests

```bash
dotnet test ControlPad.Tests/ControlPad.Tests.csproj
```
### Publishing

```bash
Expand Down
Loading