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

Add vault content navigation

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-06 21:57:03 +01:00
parent ed54c27269
commit bb2194d57c
8 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta2" />
<PackageReference Include="Avalonia.Desktop" Version="11.2.999-cibuild0048140-alpha" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bitvault.Avalonia\Bitvault.Avalonia.csproj" />
Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj
+56
View File
@@ -0,0 +1,56 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.999-cibuild0048140-alpha" />
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.999-cibuild0048140-alpha" />
<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-preview1" />
<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.999-cibuild0048140-alpha.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.999-cibuild0048140-alpha" />
</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>
<ItemGroup>
<Compile Update="AddVaultContentActionView.axaml.cs">
<DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
</Compile>
<Compile Update="OpenView.axaml.cs">
<DependentUpon>OpenView.axaml</DependentUpon>
</Compile>
<Compile Update="ManageNavigationView.axaml.cs">
<DependentUpon>ManageNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="VaultHeaderView.axaml.cs">
<DependentUpon>VaultHeaderView.axaml</DependentUpon>
</Compile>
<Compile Update="VaultNavigationView.axaml.cs">
<DependentUpon>VaultNavigationView.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
Bitvault.Avalonia/Bitvault.Avalonia.csproj
+3 -6
View File
@@ -12,13 +12,10 @@
<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Remove="VaultContentNavigationView.axaml.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta2" />
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.999-cibuild0048140-alpha" />
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta2" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.999-cibuild0048140-alpha" />
<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-preview1" />
@@ -30,7 +27,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta2" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.999-cibuild0048140-alpha" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bitvault\Bitvault.csproj" />
Bitvault.Avalonia/VaultContentNavigationView.axaml
+15
View File
@@ -0,0 +1,15 @@
<ListBoxItem
x:Class="Bitvault.Avalonia.VaultContentNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:Name="Name"
x:CompileBindings="False"
x:DataType="vm:VaultContentNavigationViewModel"
Content="{Binding Name}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<NavigateAction Context="Content" Route="AddVaultContent" />
</DataTriggerBehavior>
</Interaction.Behaviors>
</ListBoxItem>
Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
+14 -4
View File
@@ -1,8 +1,18 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class VaultContentNavigationView : ListBoxItem
namespace Bitvault.Avalonia
{
public VaultContentNavigationView() => InitializeComponent();
public partial class VaultContentNavigationView : ListBoxItem
{
public VaultContentNavigationView()
{
InitializeComponent();
Tapped += VaultContentNavigationView_Tapped;
}
private void VaultContentNavigationView_Tapped(object? sender, global::Avalonia.Input.TappedEventArgs e)
{
}
}
}
Bitvault.Avalonia/VaultView.axaml
+7 -1
View File
@@ -28,7 +28,13 @@
Grid.Column="0"
Margin="2,-1,0,0"
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}" />
ItemsSource="{Binding}">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="IsSelected" Value="{ReflectionBinding Selected}" />
</Style>
</ListBox.Styles>
</ListBox>
<Frame
x:Name="Content"
Grid.Row="1"
Bitvault/VaultContentNavigationViewModel.cs
-5
View File
@@ -24,9 +24,4 @@ public partial class VaultContentNavigationViewModel(IServiceProvider provider,
private string? description = description;
public IContentTemplate Template { get; set; } = template;
partial void OnSelectedChanged(bool value)
{
throw new NotImplementedException();
}
}
Toolkit
+1 -1
Submodule Toolkit updated: 40845bb5b3...ff8e97f030