Feature: Expand / Collapse row via button

Author: BornToBeRoot

Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs

@@ -47,7 +47,8 @@ public int SelectedTabIndex
     }
 
     #region Profiles
-    public ICollectionView _profiles;
+
+    private ICollectionView _profiles;
     public ICollectionView Profiles
     {
         get => _profiles;

Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs

@@ -164,7 +164,7 @@ public IPScannerHostViewModel(IDialogCoordinator instance)
 
         TabItems = new ObservableCollection<DragablzTabItem>
         {
-            new DragablzTabItem(Localization.Resources.Strings.NewTab, new IPScannerView(_tabId), _tabId)
+            new(Localization.Resources.Strings.NewTab, new IPScannerView(_tabId), _tabId)
         };
 
         // Profiles
@@ -191,14 +191,14 @@ private void LoadSettings()
     #endregion
 
     #region ICommand & Actions
-    public ICommand AddTabCommand => new RelayCommand(p => AddTabAction());
+    public ICommand AddTabCommand => new RelayCommand(_ => AddTabAction());
 
     private void AddTabAction()
     {
         AddTab();
     }
 
-    public ICommand ScanProfileCommand => new RelayCommand(p => ScanProfileAction(), ScanProfile_CanExecute);
+    public ICommand ScanProfileCommand => new RelayCommand(_ => ScanProfileAction(), ScanProfile_CanExecute);
 
     private bool ScanProfile_CanExecute(object obj)
     {
@@ -210,44 +210,44 @@ private void ScanProfileAction()
         AddTab(SelectedProfile);
     }
 
-    public ICommand AddProfileCommand => new RelayCommand(p => AddProfileAction());
+    public ICommand AddProfileCommand => new RelayCommand(_ => AddProfileAction());
 
     private void AddProfileAction()
     {
-        ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.IPScanner);
+        ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, null, null, ApplicationName.IPScanner).ConfigureAwait(true);
     }
 
-    private bool ModifyProfile_CanExecute(object obj) => SelectedProfile != null && !SelectedProfile.IsDynamic;
+    private bool ModifyProfile_CanExecute(object obj) => SelectedProfile is { IsDynamic: false };
 
-    public ICommand EditProfileCommand => new RelayCommand(p => EditProfileAction(), ModifyProfile_CanExecute);
+    public ICommand EditProfileCommand => new RelayCommand(_ => EditProfileAction(), ModifyProfile_CanExecute);
 
     private void EditProfileAction()
     {
-        ProfileDialogManager.ShowEditProfileDialog(this, _dialogCoordinator, SelectedProfile);
+        ProfileDialogManager.ShowEditProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(true);
     }
 
-    public ICommand CopyAsProfileCommand => new RelayCommand(p => CopyAsProfileAction(), ModifyProfile_CanExecute);
+    public ICommand CopyAsProfileCommand => new RelayCommand(_ => CopyAsProfileAction(), ModifyProfile_CanExecute);
 
     private void CopyAsProfileAction()
     {
-        ProfileDialogManager.ShowCopyAsProfileDialog(this, _dialogCoordinator, SelectedProfile);
+        ProfileDialogManager.ShowCopyAsProfileDialog(this, _dialogCoordinator, SelectedProfile).ConfigureAwait(true);
     }
 
-    public ICommand DeleteProfileCommand => new RelayCommand(p => DeleteProfileAction(), ModifyProfile_CanExecute);
+    public ICommand DeleteProfileCommand => new RelayCommand(_ => DeleteProfileAction(), ModifyProfile_CanExecute);
 
     private void DeleteProfileAction()
     {
-        ProfileDialogManager.ShowDeleteProfileDialog(this, _dialogCoordinator, new List<ProfileInfo> { SelectedProfile });
+        ProfileDialogManager.ShowDeleteProfileDialog(this, _dialogCoordinator, new List<ProfileInfo> { SelectedProfile }).ConfigureAwait(true);
     }
 
     public ICommand EditGroupCommand => new RelayCommand(EditGroupAction);
 
     private void EditGroupAction(object group)
     {
-        ProfileDialogManager.ShowEditGroupDialog(this, _dialogCoordinator, ProfileManager.GetGroup(group.ToString()));
+        ProfileDialogManager.ShowEditGroupDialog(this, _dialogCoordinator, ProfileManager.GetGroup(group.ToString())).ConfigureAwait(true);
     }
 
-    public ICommand ClearSearchCommand => new RelayCommand(p => ClearSearchAction());
+    public ICommand ClearSearchCommand => new RelayCommand(_ => ClearSearchAction());
 
     private void ClearSearchAction()
     {
@@ -348,8 +348,8 @@ private void SetProfilesView(ProfileInfo profile = null)
         else
             SelectedProfile = Profiles.Cast<ProfileInfo>().FirstOrDefault();
     }
-        
-    public void RefreshProfiles()
+
+    private void RefreshProfiles()
     {
         if (!_isViewActive)
             return;

Source/NETworkManager/ViewModels/IPScannerViewModel.cs

@@ -266,9 +266,9 @@ private void LoadSettings()
 
     #region ICommands & Actions
 
-    public ICommand ScanCommand => new RelayCommand(p => ScanAction(), Scan_CanExecute);
+    public ICommand ScanCommand => new RelayCommand(_ => ScanAction(), Scan_CanExecute);
 
-    private bool Scan_CanExecute(object paramter)
+    private bool Scan_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
     }
@@ -278,7 +278,7 @@ private void ScanAction()
         Scan();
     }
 
-    public ICommand DetectSubnetCommand => new RelayCommand(p => DetectSubnetAction());
+    public ICommand DetectSubnetCommand => new RelayCommand(_ => DetectSubnetAction());
 
     private void DetectSubnetAction()
     {
@@ -299,14 +299,14 @@ private void RedirectDataToApplicationAction(object name)
         EventSystem.RedirectToApplication(applicationName, host);
     }
 
-    public ICommand PerformDNSLookupIPAddressCommand => new RelayCommand(p => PerformDNSLookupIPAddressAction());
+    public ICommand PerformDNSLookupIPAddressCommand => new RelayCommand(_ => PerformDNSLookupIPAddressAction());
 
     private void PerformDNSLookupIPAddressAction()
     {
         EventSystem.RedirectToApplication(ApplicationName.DNSLookup, SelectedResult.PingInfo.IPAddress.ToString());
     }
 
-    public ICommand PerformDNSLookupHostnameCommand => new RelayCommand(p => PerformDNSLookupHostnameAction());
+    public ICommand PerformDNSLookupHostnameCommand => new RelayCommand(_ => PerformDNSLookupHostnameAction());
 
     private void PerformDNSLookupHostnameAction()
     {
@@ -320,7 +320,7 @@ private void CustomCommandAction(object guid)
         CustomCommand(guid);
     }
 
-    public ICommand AddProfileSelectedHostCommand => new RelayCommand(p => AddProfileSelectedHostAction());
+    public ICommand AddProfileSelectedHostCommand => new RelayCommand(_ => AddProfileSelectedHostAction());
 
     private async void AddProfileSelectedHostAction()
     {
@@ -336,56 +336,56 @@ private async void AddProfileSelectedHostAction()
         await ProfileDialogManager.ShowAddProfileDialog(this, _dialogCoordinator, profileInfo);
     }
 
-    public ICommand CopySelectedStatusCommand => new RelayCommand(p => CopySelectedStatusAction());
+    public ICommand CopySelectedStatusCommand => new RelayCommand(_ => CopySelectedStatusAction());
 
     private void CopySelectedStatusAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.IsReachable.ToString());
     }
 
-    public ICommand CopySelectedIPAddressCommand => new RelayCommand(p => CopySelectedIPAddressAction());
+    public ICommand CopySelectedIPAddressCommand => new RelayCommand(_ => CopySelectedIPAddressAction());
 
     private void CopySelectedIPAddressAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.PingInfo.IPAddress.ToString());
     }
 
-    public ICommand CopySelectedHostnameCommand => new RelayCommand(p => CopySelectedHostnameAction());
+    public ICommand CopySelectedHostnameCommand => new RelayCommand(_ => CopySelectedHostnameAction());
 
     private void CopySelectedHostnameAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.Hostname);
     }
 
-    public ICommand CopySelectedPortStatusCommand => new RelayCommand(p => CopySelectedPortStatusAction());
+    public ICommand CopySelectedPortStatusCommand => new RelayCommand(_ => CopySelectedPortStatusAction());
 
     private void CopySelectedPortStatusAction()
     {
         ClipboardHelper.SetClipboard(ResourceTranslator.Translate(ResourceIdentifier.PortState, SelectedResult.IsAnyPortOpen ? PortState.Open : PortState.Closed));
     }
 
-    public ICommand CopySelectedPingStatusCommand => new RelayCommand(p => CopySelectedPingStatusAction());
+    public ICommand CopySelectedPingStatusCommand => new RelayCommand(_ => CopySelectedPingStatusAction());
 
     private void CopySelectedPingStatusAction()
     {
         ClipboardHelper.SetClipboard(ResourceTranslator.Translate(ResourceIdentifier.PortState, SelectedResult.PingInfo.Status));
     }
 
-    public ICommand CopySelectedMACAddressCommand => new RelayCommand(p => CopySelectedMACAddressAction());
+    public ICommand CopySelectedMACAddressCommand => new RelayCommand(_ => CopySelectedMACAddressAction());
 
     private void CopySelectedMACAddressAction()
     {
         ClipboardHelper.SetClipboard(MACAddressHelper.GetDefaultFormat(SelectedResult.MACAddress.ToString()));
     }
 
-    public ICommand CopySelectedVendorCommand => new RelayCommand(p => CopySelectedVendorAction());
+    public ICommand CopySelectedVendorCommand => new RelayCommand(_ => CopySelectedVendorAction());
 
     private void CopySelectedVendorAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.Vendor);
     }
 
-    public ICommand CopySelectedPortsCommand => new RelayCommand(p => CopySelectedPortsAction());
+    public ICommand CopySelectedPortsCommand => new RelayCommand(_ => CopySelectedPortsAction());
 
     private void CopySelectedPortsAction()
     {
@@ -399,28 +399,28 @@ private void CopySelectedPortsAction()
         ClipboardHelper.SetClipboard(stringBuilder.ToString());
     }
 
-    public ICommand CopySelectedBytesCommand => new RelayCommand(p => CopySelectedBytesAction());
+    public ICommand CopySelectedBytesCommand => new RelayCommand(_ => CopySelectedBytesAction());
 
     private void CopySelectedBytesAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.PingInfo.Bytes.ToString());
     }
 
-    public ICommand CopySelectedTimeCommand => new RelayCommand(p => CopySelectedTimeAction());
+    public ICommand CopySelectedTimeCommand => new RelayCommand(_ => CopySelectedTimeAction());
 
     private void CopySelectedTimeAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.PingInfo.Time.ToString());
     }
 
-    public ICommand CopySelectedTTLCommand => new RelayCommand(p => CopySelectedTTLAction());
+    public ICommand CopySelectedTTLCommand => new RelayCommand(_ => CopySelectedTTLAction());
 
     private void CopySelectedTTLAction()
     {
         ClipboardHelper.SetClipboard(SelectedResult.PingInfo.TTL.ToString());
     }
 
-    public ICommand ExportCommand => new RelayCommand(p => ExportAction());
+    public ICommand ExportCommand => new RelayCommand(_ => ExportAction());
 
     private void ExportAction()
     {
@@ -539,19 +539,16 @@ private async Task DetectIPRange()
             var subnetmaskDetected = false;
 
             // Get subnetmask, based on ip address
-            foreach (var networkInterface in await NetworkInterface.GetNetworkInterfacesAsync())
+            foreach (var networkInterface in (await NetworkInterface.GetNetworkInterfacesAsync()).Where(networkInterface => networkInterface.IPv4Address.Any(x => x.Item1.Equals(localIP))))
             {
-                if (networkInterface.IPv4Address.Any(x => x.Item1.Equals(localIP)))
-                {
-                    subnetmaskDetected = true;
+                subnetmaskDetected = true;
 
-                    Hosts = $"{localIP}/{Subnetmask.ConvertSubnetmaskToCidr(networkInterface.IPv4Address.First().Item2)}";
+                Hosts = $"{localIP}/{Subnetmask.ConvertSubnetmaskToCidr(networkInterface.IPv4Address.First().Item2)}";
 
-                    // Fix: If the user clears the textbox and then clicks again on the button, the textbox remains empty...
-                    OnPropertyChanged(nameof(Hosts));
+                // Fix: If the user clears the textbox and then clicks again on the button, the textbox remains empty...
+                OnPropertyChanged(nameof(Hosts));
 
-                    break;
-                }
+                break;
             }
 
             if (!subnetmaskDetected)
@@ -569,14 +566,14 @@ private async Task CustomCommand(object guid)
     {
         if (guid is Guid id)
         {
-            CustomCommandInfo info = (CustomCommandInfo)CustomCommands.FirstOrDefault(x => x.ID == id).Clone();
+            var info = (CustomCommandInfo)CustomCommands.FirstOrDefault(x => x.ID == id)?.Clone();
 
             if (info == null)
                 return; // ToDo: Log and error message
 
             // Replace vars
-            string hostname = !string.IsNullOrEmpty(SelectedResult.Hostname) ? SelectedResult.Hostname.TrimEnd('.') : "";
-            string ipAddress = SelectedResult.PingInfo.IPAddress.ToString();
+            var hostname = !string.IsNullOrEmpty(SelectedResult.Hostname) ? SelectedResult.Hostname.TrimEnd('.') : "";
+            var ipAddress = SelectedResult.PingInfo.IPAddress.ToString();
 
             info.FilePath = Regex.Replace(info.FilePath, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
             info.FilePath = Regex.Replace(info.FilePath, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
@@ -636,7 +633,7 @@ private async Task Export()
 
             SettingsManager.Current.IPScanner_ExportFileType = instance.FileType;
             SettingsManager.Current.IPScanner_ExportFilePath = instance.FilePath;
-        }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new ExportFileType[] { ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json }, true, SettingsManager.Current.IPScanner_ExportFileType, SettingsManager.Current.IPScanner_ExportFilePath);
+        }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new[] { ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json }, true, SettingsManager.Current.IPScanner_ExportFileType, SettingsManager.Current.IPScanner_ExportFilePath);
 
         customDialog.Content = new ExportDialog
         {