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

Amend reading config

Browse Source
This commit is contained in:
TheXamlGuy
2024-04-21 19:53:47 +01:00
parent 51a96dba8f
commit a2a576f033
45 changed files with 561 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/AllNavigationView.axaml
+5
View File
@@ -0,0 +1,5 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.AllNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="All" />
Bitvault.Avalonia/AllNavigationView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class AllNavigationView : NavigationViewItem
{
public AllNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/App.axaml
+61 -7
View File
@@ -1,10 +1,64 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="Bitvault.Avalonia.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
<Application
x:Class="Bitvault.Avalonia.App"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="using:FluentAvalonia.UI.Controls"
RequestedThemeVariant="Default">
<Application.Styles>
<FluentTheme />
<ThemeResources />
<Style Selector="ui|SettingsExpanderItem">
<Style Selector="^ /template/ Expander#Expander">
<Setter Property="IsVisible" Value="False" />
</Style>
<Style Selector="^:footerBottom /template/ ContentPresenter#FooterPresenter">
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>
</Style>
<Style Selector="ui|SettingsExpander /template/ Expander#Expander ToggleButton">
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
</Style>
<Style Selector="Button">
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
</Style>
<Style Selector="TextBox">
<Setter Property="CornerRadius" Value="0" />
<Setter Property="BorderThickness" Value="0 0 0 2" />
<Style Selector="^:focus">
<Style Selector="^ /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0 0 0 2" />
</Style>
</Style>
</Style>
<Style Selector="OverlayPopupHost">
<Setter Property="Template">
<ControlTemplate>
<!-- Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test -->
<LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
<VisualLayerManager IsPopup="True">
<LayoutTransformControl>
<LayoutTransformControl.LayoutTransform>
<ScaleTransform ScaleX="1.4" ScaleY="1.4" />
</LayoutTransformControl.LayoutTransform>
<ContentPresenter
Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</LayoutTransformControl>
</VisualLayerManager>
</LayoutTransformControl>
</ControlTemplate>
</Setter>
</Style>
</Application.Styles>
<Application.Resources>
<Thickness x:Key="TextControlThemePadding">0,5,6,6</Thickness>
<FontFamily x:Key="SymbolFontFamily">avares://HyperX.Launcher.Avalonia/Assets/SegoeIcons.ttf#Segoe Fluent Icons</FontFamily>
<StaticResource x:Key="TextControlBackground" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="ControlFillColorTransparentBrush" />
<x:Double x:Key="SettingsExpanderItemAdaptiveWidthTrigger">0</x:Double>
<Thickness x:Key="SettingsExpanderItemBottomFooterMargin">0,8,0,0</Thickness>
</Application.Resources>
</Application>
Bitvault.Avalonia/App.axaml.cs
+38 -2
View File
@@ -1,5 +1,10 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Toolkit.Avalonia;
using Toolkit.Foundation;
namespace Bitvault.Avalonia;
@@ -10,8 +15,39 @@ public partial class App : Application
AvaloniaXamlLoader.Load(this);
}
public override void OnFrameworkInitializationCompleted()
public override async void OnFrameworkInitializationCompleted()
{
base.OnFrameworkInitializationCompleted();
IHost? host = DefaultBuilder.Create()
.ConfigureServices((context, services) =>
{
services.AddAvalonia();
services.AddHandler<AppHandler>();
//services.AddTransient<IVaultComponent, VaultComponent>();
//services.AddInitializer<VaultComponentsCollectionInitializer>();
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime)
{
services.AddTemplate<MainWindowViewModel, MainWindow>("MainWindow");
}
services.AddTemplate<MainViewModel, MainView>("Main");
services.AddHandler<MainViewHandler>();
services.AddTemplate<VaultNavigationViewModel, VaultNavigationView>();
services.AddTemplate<AllNavigationViewModel, AllNavigationView>();
services.AddTemplate<StarredNavigationViewModel, StarredNavigationView>();
services.AddTemplate<CategoriesNavigationViewModel, CategoriesNavigationView>();
services.AddTemplate<ArchiveNavigationViewModel, ArchiveNavigationView>();
services.AddTemplate<VaultViewModel, VaultView>("Vault");
services.AddConfiguration<VaultConfiguration>(args => args.Name = "foo1", $"{nameof(VaultConfiguration)}:Personal");
services.AddConfiguration<VaultConfiguration>(args => args.Name = "foo2", $"{nameof(VaultConfiguration)}:Test");
})
.Build();
await host.RunAsync();
}
}
Bitvault.Avalonia/AppHandler.cs
+24
View File
@@ -0,0 +1,24 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using System.Threading;
using System.Threading.Tasks;
using Toolkit.Foundation;
namespace Bitvault.Avalonia;
public class AppHandler(IPublisher publisher) :
INotificationHandler<Started>
{
public async Task Handle(Started args, CancellationToken cancellationToken = default)
{
if (Application.Current is Application application)
{
if (application.ApplicationLifetime is IApplicationLifetime lifetime)
{
await publisher.Publish(new Navigate(lifetime is IClassicDesktopStyleApplicationLifetime ? "MainWindow" : "Main",
lifetime is IClassicDesktopStyleApplicationLifetime ? typeof(IClassicDesktopStyleApplicationLifetime) :
typeof(ISingleViewApplicationLifetime)), cancellationToken);
}
}
}
}
Bitvault.Avalonia/ArchiveNavigationView.axaml
+5
View File
@@ -0,0 +1,5 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.ArchiveNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="Archive" />
Bitvault.Avalonia/ArchiveNavigationView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class ArchiveNavigationView : NavigationViewItem
{
public ArchiveNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/Bitvault.Avalonia.csproj
+16 -5
View File
@@ -9,11 +9,22 @@
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
<PackageReference Include="Avalonia" Version="11.1.0-beta1" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta1" />
<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview2" />
<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bitvault\Bitvault.csproj" />
<ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
<ProjectReference Include="..\Toolkit\Toolkit.Foundation\Toolkit.Foundation.csproj" />
<ProjectReference Include="..\Toolkit\Toolkit.UI.Avalonia\Toolkit.UI.Avalonia.csproj" />
<ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
</ItemGroup>
</Project>
Bitvault.Avalonia/CategoriesNavigationView.axaml
+5
View File
@@ -0,0 +1,5 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.CategoriesNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="Categories" />
Bitvault.Avalonia/CategoriesNavigationView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class CategoriesNavigationView : NavigationViewItem
{
public CategoriesNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/MainView.axaml
+16 -7
View File
@@ -1,8 +1,17 @@
<UserControl 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"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Bitvault.Avalonia.MainView">
Welcome to Avalonia!
<UserControl
x:Class="Bitvault.Avalonia.MainView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:MainViewModel">
<NavigationView MenuItemTemplate="{Binding Template}" MenuItemsSource="{Binding}">
<Frame x:Name="Main">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Loaded">
<NavigateAction Context="Main" Route="Vault" />
</EventTriggerBehavior>
</Interaction.Behaviors>
</Frame>
</NavigationView>
</UserControl>
Bitvault.Avalonia/MainView.axaml.cs
+7 -8
View File
@@ -1,12 +1,11 @@
using Avalonia.Controls;
using Toolkit.Foundation;
namespace Bitvault.Avalonia
namespace Bitvault.Avalonia;
[NavigationTarget("Main")]
public partial class MainView : UserControl
{
public partial class MainView : UserControl
{
public MainView()
{
InitializeComponent();
}
}
public MainView() => InitializeComponent();
}
Bitvault.Avalonia/MainWindow.axaml
+15 -9
View File
@@ -1,9 +1,15 @@
<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"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Bitvault.Avalonia.MainWindow"
Title="MainWindow">
Welcome to Avalonia!
</Window>
<windowing:AppWindow
x:Class="Bitvault.Avalonia.MainWindow"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:windowing="using:FluentAvalonia.UI.Windowing"
Background="Transparent"
TransparencyLevelHint="Mica">
<!--<ContentControl x:Name="Window">
<Interaction.Behaviors>
<AttachedBehavior>
<NavigateAction Context="Window" Route="Main" />
</AttachedBehavior>
</Interaction.Behaviors>
</ContentControl>-->
</windowing:AppWindow>
Bitvault.Avalonia/MainWindow.axaml.cs
+9 -7
View File
@@ -1,12 +1,14 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Windowing;
using Toolkit.Foundation;
namespace Bitvault.Avalonia
namespace Bitvault.Avalonia;
[NavigationTarget("Window")]
public partial class MainWindow : AppWindow
{
public partial class MainWindow : Window
public MainWindow()
{
public MainWindow()
{
InitializeComponent();
}
InitializeComponent();
TitleBar.ExtendsContentIntoTitleBar = true;
}
}
Bitvault.Avalonia/StarredNavigationView.axaml
+5
View File
@@ -0,0 +1,5 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.StarredNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="Starred" />
Bitvault.Avalonia/StarredNavigationView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class StarredNavigationView : NavigationViewItem
{
public StarredNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/VaultComponent.cs
+14
View File
@@ -0,0 +1,14 @@
using Toolkit.Foundation;
namespace Bitvault.Avalonia;
public class VaultComponent :
IVaultComponent
{
public IComponentBuilder Create() =>
ComponentBuilder.Create()
.AddServices(services =>
{
});
}
Bitvault.Avalonia/VaultNavigationView.axaml
+8
View File
@@ -0,0 +1,8 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.VaultNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:VaultNavigationViewModel"
Content="Test"
MenuItemsSource="{Binding}" />
Bitvault.Avalonia/VaultNavigationView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia
{
public partial class VaultNavigationView : NavigationViewItem
{
public VaultNavigationView() => InitializeComponent();
}
}
Bitvault.Avalonia/VaultView.axaml
+11
View File
@@ -0,0 +1,11 @@
<UserControl
x:Class="Bitvault.Avalonia.VaultView"
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">
<Grid ColumnDefinitions="1*, Auto, 2*">
<ListBox Grid.Column="0" />
<GridSplitter Grid.Column="1" />
</Grid>
</UserControl>
Bitvault.Avalonia/VaultView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class VaultView : UserControl
{
public VaultView() => InitializeComponent();
}