From 0f6305f5faaac84a83f9fa061c9df57180a48551 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Mon, 5 Jun 2023 12:02:32 +0200 Subject: [PATCH] [Deps]Bump CommunityToolkit.Mvvm to 8.2.0 (#25992) --- Directory.Packages.props | 2 +- NOTICE.md | 2 +- .../Hosts/Hosts/Helpers/HostsService.cs | 2 +- src/modules/Hosts/Hosts/Models/Entry.cs | 66 +++++++------------ .../Hosts/Hosts/ViewModels/MainViewModel.cs | 39 +++++------ .../WebBrowserPreviewer.cs | 2 +- 6 files changed, 46 insertions(+), 67 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e9ce26ecbb..b0bf98c742 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index f88a920756..61846f8c94 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -282,7 +282,7 @@ SOFTWARE. ## NuGet Packages used by PowerToys - CommunityToolkit.Labs.WinUI.SettingsControls 0.0.18 -- CommunityToolkit.Mvvm 8.0.0 +- CommunityToolkit.Mvvm 8.2.0 - CommunityToolkit.WinUI.UI 7.1.2 - CommunityToolkit.WinUI.UI.Controls 7.1.2 - ControlzEx 5.0.1 diff --git a/src/modules/Hosts/Hosts/Helpers/HostsService.cs b/src/modules/Hosts/Hosts/Helpers/HostsService.cs index 7d90e57144..690c4610de 100644 --- a/src/modules/Hosts/Hosts/Helpers/HostsService.cs +++ b/src/modules/Hosts/Hosts/Helpers/HostsService.cs @@ -124,7 +124,7 @@ namespace Hosts.Helpers if (!e.Valid) { - lineBuilder.Append(e.GetLine()); + lineBuilder.Append(e.Line); } else { diff --git a/src/modules/Hosts/Hosts/Models/Entry.cs b/src/modules/Hosts/Hosts/Models/Entry.cs index 23ce2518d6..55b79ca8ac 100644 --- a/src/modules/Hosts/Hosts/Models/Entry.cs +++ b/src/modules/Hosts/Hosts/Models/Entry.cs @@ -12,32 +12,33 @@ namespace Hosts.Models { public partial class Entry : ObservableObject { - private string _line; - + [ObservableProperty] + [NotifyPropertyChangedFor(nameof(Valid))] private string _address; - public string Address + partial void OnAddressChanged(string value) { - get => _address; - set + if (ValidationHelper.ValidIPv4(value)) { - SetProperty(ref _address, value); - SetAddressType(); - OnPropertyChanged(nameof(Valid)); + Type = AddressType.IPv4; + } + else if (ValidationHelper.ValidIPv6(value)) + { + Type = AddressType.IPv6; + } + else + { + Type = AddressType.Invalid; } } + [ObservableProperty] + [NotifyPropertyChangedFor(nameof(Valid))] private string _hosts; - public string Hosts + partial void OnHostsChanged(string value) { - get => _hosts; - set - { - SetProperty(ref _hosts, value); - OnPropertyChanged(nameof(Valid)); - SplittedHosts = _hosts.Split(' '); - } + SplittedHosts = value.Split(' '); } [ObservableProperty] @@ -55,7 +56,9 @@ namespace Hosts.Models [ObservableProperty] private bool _duplicate; - public bool Valid => ValidationHelper.ValidHosts(_hosts) && Type != AddressType.Invalid; + public bool Valid => ValidationHelper.ValidHosts(Hosts) && Type != AddressType.Invalid; + + public string Line { get; private set; } public AddressType Type { get; private set; } @@ -70,7 +73,7 @@ namespace Hosts.Models public Entry(int id, string line) { Id = id; - _line = line.Trim(); + Line = line.Trim(); Parse(); } @@ -85,9 +88,9 @@ namespace Hosts.Models public void Parse() { - Active = !_line.StartsWith("#", StringComparison.InvariantCultureIgnoreCase); + Active = !Line.StartsWith("#", StringComparison.InvariantCultureIgnoreCase); - var lineSplit = _line.TrimStart(' ', '#').Split('#'); + var lineSplit = Line.TrimStart(' ', '#').Split('#'); if (lineSplit.Length == 0) { @@ -146,33 +149,12 @@ namespace Hosts.Models { return new Entry { - _line = _line, + Line = Line, Address = Address, Hosts = Hosts, Comment = Comment, Active = Active, }; } - - public string GetLine() - { - return _line; - } - - private void SetAddressType() - { - if (ValidationHelper.ValidIPv4(_address)) - { - Type = AddressType.IPv4; - } - else if (ValidationHelper.ValidIPv6(_address)) - { - Type = AddressType.IPv6; - } - else - { - Type = AddressType.Invalid; - } - } } } diff --git a/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs b/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs index 0896e9c115..ab037d05e0 100644 --- a/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs +++ b/src/modules/Hosts/Hosts/ViewModels/MainViewModel.cs @@ -65,16 +65,12 @@ namespace Hosts.ViewModels [ObservableProperty] private bool _filtered; + [ObservableProperty] private bool _showOnlyDuplicates; - public bool ShowOnlyDuplicates + partial void OnShowOnlyDuplicatesChanged(bool value) { - get => _showOnlyDuplicates; - set - { - SetProperty(ref _showOnlyDuplicates, value); - ApplyFilters(); - } + ApplyFilters(); } private ObservableCollection _entries; @@ -126,11 +122,11 @@ namespace Hosts.ViewModels public void UpdateAdditionalLines(string lines) { - _additionalLines = lines; + AdditionalLines = lines; Task.Run(async () => { - var error = !await _hostsService.WriteAsync(_additionalLines, _entries); + var error = !await _hostsService.WriteAsync(AdditionalLines, _entries); await _dispatcherQueue.EnqueueAsync(() => Error = error); }); } @@ -168,10 +164,11 @@ namespace Hosts.ViewModels Task.Run(async () => { _readingHosts = true; - (_additionalLines, var entries) = await _hostsService.ReadAsync(); + var (additionalLines, entries) = await _hostsService.ReadAsync(); await _dispatcherQueue.EnqueueAsync(() => { + AdditionalLines = additionalLines; _entries = new ObservableCollection(entries); foreach (var e in _entries) @@ -199,22 +196,22 @@ namespace Hosts.ViewModels { var expressions = new List>>(4); - if (!string.IsNullOrWhiteSpace(_addressFilter)) + if (!string.IsNullOrWhiteSpace(AddressFilter)) { - expressions.Add(e => ((Entry)e).Address.Contains(_addressFilter, StringComparison.OrdinalIgnoreCase)); + expressions.Add(e => ((Entry)e).Address.Contains(AddressFilter, StringComparison.OrdinalIgnoreCase)); } - if (!string.IsNullOrWhiteSpace(_hostsFilter)) + if (!string.IsNullOrWhiteSpace(HostsFilter)) { - expressions.Add(e => ((Entry)e).Hosts.Contains(_hostsFilter, StringComparison.OrdinalIgnoreCase)); + expressions.Add(e => ((Entry)e).Hosts.Contains(HostsFilter, StringComparison.OrdinalIgnoreCase)); } - if (!string.IsNullOrWhiteSpace(_commentFilter)) + if (!string.IsNullOrWhiteSpace(CommentFilter)) { - expressions.Add(e => ((Entry)e).Comment.Contains(_commentFilter, StringComparison.OrdinalIgnoreCase)); + expressions.Add(e => ((Entry)e).Comment.Contains(CommentFilter, StringComparison.OrdinalIgnoreCase)); } - if (_showOnlyDuplicates) + if (ShowOnlyDuplicates) { expressions.Add(e => ((Entry)e).Duplicate); } @@ -244,10 +241,10 @@ namespace Hosts.ViewModels public async Task PingSelectedAsync() { - var selected = _selected; + var selected = Selected; selected.Ping = null; selected.Pinging = true; - selected.Ping = await _hostsService.PingAsync(_selected.Address); + selected.Ping = await _hostsService.PingAsync(Selected.Address); selected.Pinging = false; } @@ -289,7 +286,7 @@ namespace Hosts.ViewModels Task.Run(async () => { - var error = !await _hostsService.WriteAsync(_additionalLines, _entries); + var error = !await _hostsService.WriteAsync(AdditionalLines, _entries); await _dispatcherQueue.EnqueueAsync(() => Error = error); }); } @@ -298,7 +295,7 @@ namespace Hosts.ViewModels { Task.Run(async () => { - var error = !await _hostsService.WriteAsync(_additionalLines, _entries); + var error = !await _hostsService.WriteAsync(AdditionalLines, _entries); await _dispatcherQueue.EnqueueAsync(() => Error = error); }); } diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/WebBrowserPreviewer/WebBrowserPreviewer.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/WebBrowserPreviewer/WebBrowserPreviewer.cs index c7eefdebcf..c024c1edd7 100644 --- a/src/modules/peek/Peek.FilePreviewer/Previewers/WebBrowserPreviewer/WebBrowserPreviewer.cs +++ b/src/modules/peek/Peek.FilePreviewer/Previewers/WebBrowserPreviewer/WebBrowserPreviewer.cs @@ -71,7 +71,7 @@ namespace Peek.FilePreviewer.Previewers private IFileSystemItem File { get; } - public bool IsPreviewLoaded => preview != null; + public bool IsPreviewLoaded => Preview != null; private DispatcherQueue Dispatcher { get; }