dan/Hyperbar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bunch of insane work

Browse Source
This commit is contained in:
TheXamlGuy
2024-02-08 22:16:58 +00:00
parent 28d79f77d0
commit 2aeb4d1b54
58 changed files with 547 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hyperbar.Windows/App.xaml
+1 -1
View File
@@ -10,7 +10,7 @@
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
</ResourceDictionary.MergedDictionaries>
<DataTemplate x:Key="DefaultDataTemplate">
<ui:TemplateGeneratorControl />
<ui:ViewModelTemplatePresenter />
</DataTemplate>
</ResourceDictionary>
</Application.Resources>
Hyperbar.Windows/App.xaml.cs
+6 -1
View File
@@ -37,7 +37,9 @@ public partial class App :
services.AddHostedService<AppService>();
services.AddSingleton<IDispatcher>(new Dispatcher(DispatcherQueue.GetForCurrentThread()));
services.AddTransient<ITemplateFactory, TemplateFactory>();
services.AddTransient<IViewModelTemplateDescriptorProvider, ViewModelTemplateDescriptorProvider>();
services.AddTransient<IViewModelTemplateFactory, ViewModelTemplateFactory>();
services.AddHandler<AppConfigurationChangedHandler>();
services.AddConfiguration<AppConfiguration>(args =>
@@ -55,6 +57,9 @@ public partial class App :
services.AddContentTemplate<SettingsButtonViewModel, SettingsButtonView>();
services.AddContentTemplate<SettingsViewModel, SettingsView>("Settings");
services.AddContentTemplate<GeneralSettingsNavigationViewModel, GeneralSettingsNavigationView>();
services.AddContentTemplate<WidgetSettingsNavigationViewModel, WidgetSettingsNavigationView>();
services.AddTransient<IInitializer, AppInitializer>();
})
.Build();
Hyperbar.Windows/ApplicationBarView.xaml
+3 -3
View File
@@ -3,7 +3,7 @@
x:Class="Hyperbar.Windows.ApplicationBarView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:windows="using:Hyperbar.UI.Windows">
xmlns:ui="using:Hyperbar.UI.Windows">
<UserControl.Resources>
<SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
<SolidColorBrush x:Key="ButtonBorderBrush" Color="Transparent" />
@@ -17,7 +17,7 @@
</UserControl.Resources>
<ItemsControl
Margin="6,0,6,0"
ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}"
ItemTemplateSelector="{ui:ViewModelTemplate}"
ItemsSource="{x:Bind ViewModel, Mode=OneWay}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
@@ -36,7 +36,7 @@
</ItemsControl.ItemContainerTransitions>
<ItemsControl.ItemContainerStyle>
<Style TargetType="ContentPresenter">
<Setter Property="windows:GridExtension.GridColumnBindingPath" Value="Index" />
<Setter Property="ui:GridExtension.GridColumnBindingPath" Value="Index" />
</Style>
</ItemsControl.ItemContainerStyle>
</ItemsControl>
Hyperbar.Windows/ApplicationBarViewModel.cs
+5 -5
View File
@@ -2,13 +2,13 @@
[NotificationHandler(nameof(IWidgetHostViewModel))]
public partial class ApplicationBarViewModel :
ObservableCollectionViewModel<IDisposable>,
ITemplatedViewModel
ObservableCollectionViewModel<IDisposable>
{
public ApplicationBarViewModel(ITemplateFactory templateFactory,
public ApplicationBarViewModel(IViewModelTemplateFactory templateFactory,
IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer) : base(serviceFactory, mediator, disposer)
IDisposer disposer) : base(serviceProvider, serviceFactory, mediator, disposer)
{
TemplateFactory = templateFactory;
@@ -16,5 +16,5 @@ public partial class ApplicationBarViewModel :
Add<SecondaryViewModel>(1);
}
public ITemplateFactory TemplateFactory { get; }
public IViewModelTemplateFactory TemplateFactory { get; }
}
Hyperbar.Windows/GeneralSettingsNavigationView.xaml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<NavigationViewItem
x:Class="Hyperbar.Windows.GeneralSettingsNavigationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="General" />
Hyperbar.Windows/GeneralSettingsNavigationView.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
using Microsoft.UI.Xaml.Controls;
namespace Hyperbar.Windows;
public sealed partial class GeneralSettingsNavigationView :
NavigationViewItem
{
public GeneralSettingsNavigationView() =>
InitializeComponent();
}
Hyperbar.Windows/GeneralSettingsNavigationViewModel.cs
+10
View File
@@ -0,0 +1,10 @@
namespace Hyperbar.Windows;
public class GeneralSettingsNavigationViewModel(IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
string text) :
NavigationViewModel(serviceProvider, serviceFactory, mediator, disposer, text)
{
}
Hyperbar.Windows/Hyperbar.Windows.csproj
+12
View File
@@ -15,10 +15,12 @@
</PropertyGroup>
<ItemGroup>
<None Remove="ApplicationBarView.xaml" />
<None Remove="GeneralSettingsNavigationView.xaml" />
<None Remove="PrimaryView.xaml" />
<None Remove="SecondaryView.xaml" />
<None Remove="SettingsButtonView.xaml" />
<None Remove="SettingsView.xaml" />
<None Remove="WidgetSettingsNavigationView.xaml" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
@@ -55,6 +57,16 @@
<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
</ItemGroup>
<ItemGroup>
<Page Update="GeneralSettingsNavigationView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="WidgetSettingsNavigationView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="SettingsView.xaml">
<Generator>MSBuild:Compile</Generator>
Hyperbar.Windows/PrimaryView.xaml
+2 -2
View File
@@ -3,10 +3,10 @@
x:Class="Hyperbar.Windows.PrimaryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:windows="using:Hyperbar.UI.Windows">
xmlns:ui="using:Hyperbar.UI.Windows">
<ItemsControl
HorizontalAlignment="Center"
ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}"
ItemTemplateSelector="{ui:ViewModelTemplate}"
ItemsSource="{x:Bind ViewModel}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
Hyperbar.Windows/PrimaryViewModel.cs
+5 -5
View File
@@ -3,17 +3,17 @@
namespace Hyperbar.Widget;
[NotificationHandler(nameof(IWidgetHostViewModel))]
public partial class PrimaryViewModel(ITemplateFactory templateFactory,
public partial class PrimaryViewModel(IViewModelTemplateFactory templateFactory,
IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
int index) :
ObservableCollectionViewModel<IWidgetViewModel>(serviceFactory, mediator, disposer),
IWidgetHostViewModel,
ITemplatedViewModel
ObservableCollectionViewModel<IWidgetViewModel>(serviceProvider, serviceFactory, mediator, disposer),
IWidgetHostViewModel
{
[ObservableProperty]
private int index = index;
public ITemplateFactory TemplateFactory => templateFactory;
public IViewModelTemplateFactory TemplateFactory => templateFactory;
}
Hyperbar.Windows/SecondaryView.xaml
+2 -2
View File
@@ -3,9 +3,9 @@
x:Class="Hyperbar.Windows.SecondaryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:windows="using:Hyperbar.UI.Windows">
xmlns:ui="using:Hyperbar.UI.Windows">
<Grid>
<ItemsControl ItemTemplateSelector="{Binding Converter={windows:DataTemplateConverter}}" ItemsSource="{x:Bind ViewModel, Mode=OneWay}">
<ItemsControl ItemTemplateSelector="{ui:ViewModelTemplate}" ItemsSource="{x:Bind ViewModel, Mode=OneWay}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<ItemsStackPanel Orientation="Horizontal" />
Hyperbar.Windows/SecondaryViewModel.cs
+5 -5
View File
@@ -4,17 +4,17 @@ using Hyperbar.Windows;
namespace Hyperbar.Widget;
public partial class SecondaryViewModel :
ObservableCollectionViewModel<IDisposable>,
ITemplatedViewModel
ObservableCollectionViewModel<IDisposable>
{
[ObservableProperty]
private int index;
public SecondaryViewModel(ITemplateFactory templateFactory,
public SecondaryViewModel(IViewModelTemplateFactory templateFactory,
IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
int index) : base(serviceFactory, mediator, disposer)
int index) : base(serviceProvider, serviceFactory, mediator, disposer)
{
TemplateFactory = templateFactory;
this.index = index;
@@ -22,5 +22,5 @@ public partial class SecondaryViewModel :
Add<SettingsButtonViewModel>();
}
public ITemplateFactory TemplateFactory { get; }
public IViewModelTemplateFactory TemplateFactory { get; }
}
Hyperbar.Windows/SettingsButtonViewModel.cs
+5 -5
View File
@@ -4,21 +4,21 @@ using CommunityToolkit.Mvvm.Input;
namespace Hyperbar.Windows;
public partial class SettingsButtonViewModel :
ObservableViewModel,
ITemplatedViewModel
ObservableViewModel
{
[ObservableProperty]
private IRelayCommand? invokeCommand;
public SettingsButtonViewModel(ITemplateFactory templateFactory,
public SettingsButtonViewModel(IViewModelTemplateFactory templateFactory,
IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer) : base(serviceFactory, mediator, disposer)
IDisposer disposer) : base(serviceProvider, serviceFactory, mediator, disposer)
{
TemplateFactory = templateFactory;
InvokeCommand = new AsyncRelayCommand(async () =>
await mediator.PublishAsync(new Navigate("Settings")));
}
public ITemplateFactory TemplateFactory { get; }
public IViewModelTemplateFactory TemplateFactory { get; }
}
Hyperbar.Windows/SettingsView.xaml
+4 -8
View File
@@ -3,7 +3,8 @@
x:Class="Hyperbar.Windows.SettingsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hyperbar="using:Hyperbar">
xmlns:ui="using:Hyperbar.UI.Windows"
xmlns:windows="using:Hyperbar.Windows">
<Window.SystemBackdrop>
<MicaBackdrop />
</Window.SystemBackdrop>
@@ -11,11 +12,6 @@
IsBackButtonVisible="Collapsed"
IsPaneToggleButtonVisible="False"
IsSettingsVisible="False"
MenuItemsSource="{x:Bind ViewModel, Mode=OneWay}">
<NavigationView.MenuItemTemplate>
<DataTemplate x:DataType="hyperbar:NavigationViewModel">
<NavigationViewItem Content="{x:Bind Text, Mode=OneWay}" />
</DataTemplate>
</NavigationView.MenuItemTemplate>
</NavigationView>
MenuItemTemplateSelector="{ui:ViewModelTemplate}"
MenuItemsSource="{x:Bind ViewModel, Mode=OneWay}" />
</Window>
Hyperbar.Windows/SettingsView.xaml.cs
+12 -1
View File
@@ -1,3 +1,5 @@
using Hyperbar.UI.Windows;
using Microsoft.UI;
using Microsoft.UI.Xaml;
namespace Hyperbar.Windows;
@@ -5,9 +7,18 @@ namespace Hyperbar.Windows;
public partial class SettingsView :
Window
{
public SettingsView() =>
public SettingsView()
{
InitializeComponent();
this.TitleBarConfiguration(args =>
{
args.ExtendsContentIntoTitleBar = true;
args.ButtonBackgroundColor = Colors.Transparent;
args.ButtonInactiveBackgroundColor = Colors.Transparent;
});
}
protected SettingsViewModel ViewModel =>
(SettingsViewModel)(Content as FrameworkElement)!.DataContext;
}
Hyperbar.Windows/SettingsViewModel.cs
+11 -5
View File
@@ -1,13 +1,19 @@
namespace Hyperbar.Windows;
public partial class SettingsViewModel :
ObservableCollectionViewModel<NavigationViewModel>
ObservableCollectionViewModel<INavigationViewModel>
{
public SettingsViewModel(IServiceFactory serviceFactory,
public SettingsViewModel(IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer) : base(serviceFactory, mediator, disposer)
IDisposer disposer,
IViewModelTemplateFactory templateFactory) : base(serviceProvider, serviceFactory, mediator, disposer)
{
Add<NavigationViewModel>("General");
Add<NavigationViewModel>("Widgets");
Add<GeneralSettingsNavigationViewModel>("General");
Add<WidgetSettingsNavigationViewModel>("Widgets");
TemplateFactory = templateFactory;
}
public IViewModelTemplateFactory TemplateFactory { get; }
}
Hyperbar.Windows/WidgetNavigationViewModel.cs
+10
View File
@@ -0,0 +1,10 @@
namespace Hyperbar.Windows;
public class WidgetNavigationViewModel(IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
string text) :
NavigationViewModel(serviceProvider, serviceFactory, mediator, disposer, text)
{
}
Hyperbar.Windows/WidgetSettingsNavigationView.xaml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<NavigationViewItem
x:Class="Hyperbar.Windows.WidgetSettingsNavigationView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="Widgets" />
Hyperbar.Windows/WidgetSettingsNavigationView.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
using Microsoft.UI.Xaml.Controls;
namespace Hyperbar.Windows;
public sealed partial class WidgetSettingsNavigationView :
NavigationViewItem
{
public WidgetSettingsNavigationView() =>
InitializeComponent();
}
Hyperbar.Windows/WidgetSettingsNavigationViewModel.cs
+11
View File
@@ -0,0 +1,11 @@
namespace Hyperbar.Windows;
public class WidgetSettingsNavigationViewModel(IServiceProvider serviceProvider,
IServiceFactory serviceFactory,
IMediator mediator,
IDisposer disposer,
string text) :
NavigationViewModel<WidgetNavigationViewModel>(serviceProvider, serviceFactory, mediator, disposer, text)
{
}