diff --git a/build.ps1 b/build.ps1 index 8c9f4f0..19247d5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ param( [string] $Architecture = "x64", - [string] $Version = "0.0.3.0" + [string] $Version = "0.0.4.0" ) $ErrorActionPreference = "Stop"; diff --git a/src/PipManager/App.xaml b/src/PipManager/App.xaml index ad3dcdf..7454926 100644 --- a/src/PipManager/App.xaml +++ b/src/PipManager/App.xaml @@ -4,7 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:valueConverters="clr-namespace:ValueConverters;assembly=ValueConverters" - xmlns:xamlFlair="clr-namespace:XamlFlair;assembly=XamlFlair.WPF" DispatcherUnhandledException="OnDispatcherUnhandledException" Exit="OnExit" Startup="OnStartup"> diff --git a/src/PipManager/Resources/Library/DeletionWarningContentDialog.cs b/src/PipManager/Resources/Library/DeletionWarningContentDialog.cs index aa0afeb..78045f7 100644 --- a/src/PipManager/Resources/Library/DeletionWarningContentDialog.cs +++ b/src/PipManager/Resources/Library/DeletionWarningContentDialog.cs @@ -8,7 +8,7 @@ namespace PipManager.Resources.Library; public class DeletionWarningContentDialog { private readonly ContentDialog _contentDialog; - public List LibraryList { get; set; } + private List LibraryList { get; set; } public DeletionWarningContentDialog(ContentPresenter? contentPresenter, List libraryList) { diff --git a/src/PipManager/Resources/Library/LibraryStyles.xaml b/src/PipManager/Resources/Library/LibraryStyles.xaml index d04d543..beac0a6 100644 --- a/src/PipManager/Resources/Library/LibraryStyles.xaml +++ b/src/PipManager/Resources/Library/LibraryStyles.xaml @@ -2,10 +2,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:lang="clr-namespace:PipManager.Languages" - xmlns:library="clr-namespace:PipManager.Resources.Library" xmlns:pages="clr-namespace:PipManager.Models.Pages" - xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" - xmlns:valueConverters="clr-namespace:ValueConverters;assembly=ValueConverters"> + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"> packageUpdates, System.Action callback) { - ConfirmCallback = callback; + _confirmCallback = callback; PackageUpdateItems = new ObservableCollection(packageUpdates); ShowOverlay(); } @@ -38,6 +37,6 @@ public void ShowPackageUpdateOverlay(List packageUpdates, Sys private void Confirm() { CloseOverlay(); - ConfirmCallback?.Invoke(); + _confirmCallback?.Invoke(); } } diff --git a/src/PipManager/ViewModels/Pages/Search/SearchDetailViewModel.cs b/src/PipManager/ViewModels/Pages/Search/SearchDetailViewModel.cs index dc1b727..b5c71e0 100644 --- a/src/PipManager/ViewModels/Pages/Search/SearchDetailViewModel.cs +++ b/src/PipManager/ViewModels/Pages/Search/SearchDetailViewModel.cs @@ -13,7 +13,6 @@ using Microsoft.Win32; using PipManager.Models.Action; using PipManager.Services.Action; -using PipManager.Services.Mask; using Wpf.Ui; using Wpf.Ui.Appearance; using Wpf.Ui.Controls; @@ -28,7 +27,6 @@ public record SearchDetailMessage(QueryListItemModel Package); private readonly HttpClient _httpClient; private readonly IThemeService _themeService; private readonly IToastService _toastService; - private readonly IMaskService _maskService; private readonly IActionService _actionService; private readonly IEnvironmentService _environmentService; @@ -61,14 +59,13 @@ public record SearchDetailMessage(QueryListItemModel Package); [ObservableProperty] private QueryListItemModel? _package; - public SearchDetailViewModel(INavigationService navigationService, HttpClient httpClient, IThemeService themeService, IToastService toastService, IEnvironmentService environmentService, IMaskService maskService, IActionService actionService) + public SearchDetailViewModel(INavigationService navigationService, HttpClient httpClient, IThemeService themeService, IToastService toastService, IEnvironmentService environmentService, IActionService actionService) { _navigationService = navigationService; _httpClient = httpClient; _themeService = themeService; _toastService = toastService; _environmentService = environmentService; - _maskService = maskService; _actionService = actionService; WeakReferenceMessenger.Default.Register(this, Receive); diff --git a/src/PipManager/Views/Pages/Lab/LabPage.xaml b/src/PipManager/Views/Pages/Lab/LabPage.xaml index f151b16..09b4493 100644 --- a/src/PipManager/Views/Pages/Lab/LabPage.xaml +++ b/src/PipManager/Views/Pages/Lab/LabPage.xaml @@ -18,6 +18,5 @@ mc:Ignorable="d"> - \ No newline at end of file diff --git a/src/PipManager/Views/Pages/Library/LibraryDetailPage.xaml b/src/PipManager/Views/Pages/Library/LibraryDetailPage.xaml index a57af06..4029612 100644 --- a/src/PipManager/Views/Pages/Library/LibraryDetailPage.xaml +++ b/src/PipManager/Views/Pages/Library/LibraryDetailPage.xaml @@ -1,4 +1,5 @@ - + + + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">