This commit is contained in:
TheXamlGuy
2024-07-17 21:43:58 +01:00
parent eae11dc260
commit 9daebc7ba2
124 changed files with 233 additions and 247 deletions
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class AddItemNavigationView :
public partial class AddItemNavigationView :
SettingsExpander
{
public AddItemNavigationView() =>
public AddItemNavigationView() =>
InitializeComponent();
}
}
+8 -9
View File
@@ -1,7 +1,7 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Wallet.Data;
using FluentAvalonia.Core;
using HotAvalonia;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -11,8 +11,7 @@ using System.Collections.Generic;
using System.Linq;
using Toolkit.Avalonia;
using Toolkit.Foundation;
using FluentAvalonia.Core;
using Avalonia.Controls;
using Wallet.Data;
namespace Wallet.Avalonia;
@@ -50,7 +49,7 @@ public partial class App : Application
.AddConfiguration("Item:Server", ItemConfiguration.Server)
.AddConfiguration("Item:Education Record", ItemConfiguration.EducationRecord)
.AddConfiguration("Item:Travel Documents", ItemConfiguration.TravelDocuments)
.AddConfiguration("Item:Concert Ticket", ItemConfiguration.ConcertTicket)
.AddConfiguration("Item:Concert Ticket", ItemConfiguration.ConcertTicket)
.ConfigureServices((context, services) =>
{
services.AddAvalonia();
@@ -95,11 +94,11 @@ public partial class App : Application
provider.GetServices<IConfigurationDescriptor<ItemConfiguration>>().OrderBy(x => x.Name) ??
Enumerable.Empty<IConfigurationDescriptor<ItemConfiguration>>();
return new ItemConfigurationCollection(items.ToDictionary(x => x.Name,
return new ItemConfigurationCollection(items.ToDictionary(x => x.Name,
x => (Func<ItemConfiguration>)(() => x.Value)));
});
services.TryAddSingleton<IDecoratorService<ProfileImage<IImageDescriptor>>,
services.TryAddSingleton<IDecoratorService<ProfileImage<IImageDescriptor>>,
DecoratorService<ProfileImage<IImageDescriptor>>>();
services.TryAddSingleton<IDecoratorService<SecurityKey>, DecoratorService<SecurityKey>>();
@@ -115,7 +114,7 @@ public partial class App : Application
services.AddHandler<ItemHandler>();
services.AddHandler<ItemImageHandler>();
services.AddHandler<CreateItemHandler>();
services.AddHandler<DeleteItemHandler>();
services.AddHandler<UpdateItemHander>();
@@ -160,7 +159,7 @@ public partial class App : Application
services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
services.AddHandler<ItemNavigationViewModelActivatedHandler>();
services.AddTemplate<EmptyItemCollectionViewModel, EmptyItemCollectionView>("EmptyItemCollection");
services.AddScoped<IDecoratorService<ItemHeaderConfiguration>, DecoratorService<ItemHeaderConfiguration>>();
@@ -202,7 +201,7 @@ public partial class App : Application
services.AddHandler<ConfirmUpdateItemHandler>(nameof(ItemState.Write));
services.AddHandler<ConfirmCreateItemHandler>(nameof(ItemState.New));
services.AddHandler<ConfirmDeleteItemHandler>();
services.AddHandler<HyperlinkHandler>();
services.AddHandler<ItemChangedHandler>(ServiceLifetime.Singleton);
+2 -2
View File
@@ -16,6 +16,6 @@ public class ApplicationSplashScreen :
public int MinimumShowTime => 2000;
public Task RunTasks(CancellationToken cancellationToken) =>
public Task RunTasks(CancellationToken cancellationToken) =>
Task.CompletedTask;
}
}
@@ -5,6 +5,6 @@ namespace Wallet.Avalonia;
public partial class ArchiveNavigationView :
NavigationViewItem
{
public ArchiveNavigationView() =>
public ArchiveNavigationView() =>
InitializeComponent();
}
+1 -1
View File
@@ -6,4 +6,4 @@ public partial class BackActionView : UserControl
{
public BackActionView() =>
InitializeComponent();
}
}
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class CategoriesNavigationView :
public partial class CategoriesNavigationView :
NavigationViewItem
{
public CategoriesNavigationView() =>
public CategoriesNavigationView() =>
InitializeComponent();
}
@@ -7,4 +7,4 @@ public partial class CategoryNavigationView :
{
public CategoryNavigationView() =>
InitializeComponent();
}
}
@@ -2,7 +2,7 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class CommentEntryCollectionView :
public partial class CommentEntryCollectionView :
SettingsExpander
{
public CommentEntryCollectionView() =>
+2 -2
View File
@@ -2,10 +2,10 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia
{
public partial class CommentEntryView :
public partial class CommentEntryView :
SettingsExpanderItem
{
public CommentEntryView() =>
InitializeComponent();
}
}
}
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class CreateCommentEntryView :
public partial class CreateCommentEntryView :
SettingsExpanderItem
{
public CreateCommentEntryView() =>
public CreateCommentEntryView() =>
InitializeComponent();
}
}
@@ -5,6 +5,6 @@ namespace Wallet.Avalonia;
public partial class CreateItemNavigationView :
NavigationViewItem
{
public CreateItemNavigationView() =>
public CreateItemNavigationView() =>
InitializeComponent();
}
@@ -4,6 +4,6 @@ namespace Wallet.Avalonia;
public partial class CreateWalletNavigationView : SettingsExpander
{
public CreateWalletNavigationView() =>
public CreateWalletNavigationView() =>
InitializeComponent();
}
+3 -3
View File
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class DateEntryView :
public partial class DateEntryView :
SettingsExpander
{
public DateEntryView() =>
public DateEntryView() =>
InitializeComponent();
}
}
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class DropdownEntryCollectionView :
public partial class DropdownEntryCollectionView :
SettingsExpander
{
public DropdownEntryCollectionView() =>
public DropdownEntryCollectionView() =>
InitializeComponent();
}
}
@@ -2,9 +2,9 @@ using Avalonia.Controls;
namespace Wallet.Avalonia;
public partial class EmptyItemCollectionView :
public partial class EmptyItemCollectionView :
UserControl
{
public EmptyItemCollectionView() =>
public EmptyItemCollectionView() =>
InitializeComponent();
}
}
@@ -2,7 +2,7 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class FavouritesNavigationView :
public partial class FavouritesNavigationView :
NavigationViewItem
{
public FavouritesNavigationView() => InitializeComponent();
+3 -3
View File
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class HyperlinkEntryView :
public partial class HyperlinkEntryView :
SettingsExpander
{
public HyperlinkEntryView() =>
public HyperlinkEntryView() =>
InitializeComponent();
}
}
@@ -2,9 +2,9 @@ using Avalonia.Controls;
namespace Wallet.Avalonia;
public partial class ItemCategoryNavigationCollectionView :
public partial class ItemCategoryNavigationCollectionView :
UserControl
{
public ItemCategoryNavigationCollectionView() =>
InitializeComponent();
}
}
@@ -6,4 +6,4 @@ public partial class ItemCategoryNavigationView : ListBoxItem
{
public ItemCategoryNavigationView() =>
InitializeComponent();
}
}
+2 -2
View File
@@ -4,6 +4,6 @@ namespace Wallet.Avalonia;
public partial class ItemContentView : UserControl
{
public ItemContentView() =>
public ItemContentView() =>
InitializeComponent();
}
}
+1 -1
View File
@@ -9,4 +9,4 @@ namespace Wallet.Avalonia
InitializeComponent();
}
}
}
}
@@ -6,4 +6,4 @@ public partial class ItemNavigationCollectionView :
UserControl
{
public ItemNavigationCollectionView() => InitializeComponent();
}
}
+2 -2
View File
@@ -3,10 +3,10 @@ using System;
namespace Wallet.Avalonia;
public partial class ItemNavigationView :
public partial class ItemNavigationView :
ListBoxItem
{
public ItemNavigationView() =>
public ItemNavigationView() =>
InitializeComponent();
protected override Type StyleKeyOverride =>
+2 -2
View File
@@ -5,6 +5,6 @@ namespace Wallet.Avalonia;
public partial class ItemSectionView :
UserControl
{
public ItemSectionView() =>
public ItemSectionView() =>
InitializeComponent();
}
}
+1 -1
View File
@@ -13,7 +13,7 @@
MenuItemsSource="{Binding}"
SelectedItem="{Binding SelectedItem}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{ReflectionBinding SelectedItem.IsOpened, Mode=TwoWay}" Value="True">
<DataTriggerBehavior Binding="{ReflectionBinding SelectedItem.IsOpened}" Value="True">
<InvokeNavigationViewItemAction SelectedIndex="1" />
</DataTriggerBehavior>
</Interaction.Behaviors>
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Wallet.Avalonia
public partial class MaskedTextEntryView :
SettingsExpander
{
public MaskedTextEntryView() =>
public MaskedTextEntryView() =>
InitializeComponent();
}
}
}
+1 -1
View File
@@ -4,6 +4,6 @@ namespace Wallet.Avalonia;
public partial class OpenWalletView : UserControl
{
public OpenWalletView() =>
public OpenWalletView() =>
InitializeComponent();
}
+2 -2
View File
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class PasswordEntryView :
public partial class PasswordEntryView :
SettingsExpander
{
public PasswordEntryView() =>
InitializeComponent();
}
}
+3 -3
View File
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class PinEntryView :
public partial class PinEntryView :
SettingsExpander
{
public PinEntryView() =>
public PinEntryView() =>
InitializeComponent();
}
}
@@ -4,6 +4,6 @@ namespace Wallet.Avalonia;
public partial class SearchWalletActionView : UserControl
{
public SearchWalletActionView() =>
public SearchWalletActionView() =>
InitializeComponent();
}
+1 -1
View File
@@ -9,4 +9,4 @@ namespace Wallet.Avalonia
InitializeComponent();
}
}
}
}
+3 -3
View File
@@ -2,9 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class TextEntryView :
public partial class TextEntryView :
SettingsExpander
{
public TextEntryView() =>
public TextEntryView() =>
InitializeComponent();
}
}
@@ -2,8 +2,8 @@ using Avalonia.Controls;
namespace Wallet.Avalonia;
public partial class WalletNavigationCollectionView :
public partial class WalletNavigationCollectionView :
UserControl
{
public WalletNavigationCollectionView() => InitializeComponent();
}
}
+2 -1
View File
@@ -5,12 +5,13 @@
xmlns:ui="using:FluentAvalonia.UI.Controls"
xmlns:vm="using:Wallet"
x:DataType="vm:WalletNavigationViewModel"
BadgeBrush="{DynamicResource SystemFillColorAttentionBrush}"
BadgePath="F1 M 10 3.799999 C 8.559999 3.799999 7.226666 4.16 6 4.879999 C 4.773333 5.6 3.8 6.573334 3.08 7.799999 C 2.36 9.026667 2 10.360001 2 11.799999 C 2 13.24 2.36 14.573334 3.08 15.799999 C 3.8 17.026667 4.773333 18 6 18.719999 C 7.226666 19.439999 8.559999 19.799999 10 19.799999 C 11.439999 19.799999 12.773333 19.439999 14 18.719999 C 15.226665 18 16.199999 17.026667 16.92 15.799999 C 17.639999 14.573334 18 13.24 18 11.799999 C 18 10.360001 17.639999 9.026667 16.92 7.799999 C 16.199999 6.573334 15.226665 5.6 14 4.879999 C 12.773333 4.16 11.439999 3.799999 10 3.799999 Z "
BadgePlacement="BottomRight"
BadgeSize="10"
ContentTemplate="{x:Null}"
Foreground="#4CAF50"
IsBadgeVisible="True"
IsBadgeVisible="{Binding IsOpened}"
ListBoxExtension.IsItemInvokedEnabled="True"
ToolTip.Tip="{Binding Name}">
<OverflowItem.Resources>
@@ -1,4 +1,3 @@
using Avalonia.Controls;
using System;
using Toolkit.UI.Controls.Avalonia;
@@ -7,7 +6,7 @@ namespace Wallet.Avalonia;
public partial class WalletNavigationView :
OverflowItem
{
public WalletNavigationView() =>
public WalletNavigationView() =>
InitializeComponent();
protected override Type StyleKeyOverride =>