Skip to content

Commit bc2648c

Browse files
committed
Code quality
1 parent 589e37a commit bc2648c

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,14 @@ private void EditQuickAccessLink(object commandParameter)
383383
return;
384384
}
385385

386-
var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings,SelectedQuickAccessLink);
386+
var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings.QuickAccessLinks,SelectedQuickAccessLink);
387387
quickAccessLinkSettings.ShowDialog();
388388
}
389389

390390
[RelayCommand]
391391
private void AddQuickAccessLink(object commandParameter)
392392
{
393-
var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings);
393+
var quickAccessLinkSettings = new QuickAccessLinkSettings(Settings.QuickAccessLinks);
394394
quickAccessLinkSettings.ShowDialog();
395395
}
396396

Plugins/Flow.Launcher.Plugin.Explorer/Views/QuickAccessLinkSettings.xaml.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.ObjectModel;
34
using System.ComponentModel;
45
using System.Linq;
56
using System.Runtime.CompilerServices;
@@ -53,20 +54,21 @@ public string SelectedName
5354
private bool IsEdit { get; set; }
5455
[CanBeNull] private AccessLink SelectedAccessLink { get; set; }
5556

56-
private Settings Settings { get; }
57-
public QuickAccessLinkSettings(Settings settings)
57+
public ObservableCollection<AccessLink> QuickAccessLinks { get; set; }
58+
59+
public QuickAccessLinkSettings(ObservableCollection<AccessLink> quickAccessLinks)
5860
{
59-
Settings = settings;
61+
QuickAccessLinks = quickAccessLinks;
6062
InitializeComponent();
6163
}
6264

63-
public QuickAccessLinkSettings(Settings settings,AccessLink selectedAccessLink)
65+
public QuickAccessLinkSettings(ObservableCollection<AccessLink> quickAccessLinks,AccessLink selectedAccessLink)
6466
{
6567
IsEdit = true;
6668
_selectedName = selectedAccessLink.Name;
6769
_selectedPath = selectedAccessLink.Path;
6870
SelectedAccessLink = selectedAccessLink;
69-
Settings = settings;
71+
QuickAccessLinks = quickAccessLinks;
7072
InitializeComponent();
7173
}
7274

@@ -88,7 +90,7 @@ private void OnDoneButtonClick(object sender, RoutedEventArgs e)
8890
return;
8991
}
9092

91-
if (Settings.QuickAccessLinks.Any(x => x.Path == SelectedPath && x.Name == SelectedName))
93+
if (QuickAccessLinks.Any(x => x.Path == SelectedPath && x.Name == SelectedName))
9294
{
9395
var warning = Main.Context.API.GetTranslation("plugin_explorer_quick_access_link_select_different_folder");
9496
Main.Context.API.ShowMsgBox(warning);
@@ -99,9 +101,8 @@ private void OnDoneButtonClick(object sender, RoutedEventArgs e)
99101
EditAccessLink();
100102
return;
101103
}
102-
var container = Settings.QuickAccessLinks;
103104
var newAccessLink = new AccessLink { Name = SelectedName, Path = SelectedPath };
104-
container.Add(newAccessLink);
105+
QuickAccessLinks.Add(newAccessLink);
105106
DialogResult = false;
106107
Close();
107108
}
@@ -120,12 +121,12 @@ private void EditAccessLink()
120121
{
121122
if (SelectedAccessLink == null)throw new ArgumentException("Access Link object is null");
122123

123-
var obj = Settings.QuickAccessLinks.FirstOrDefault(x => x.GetHashCode() == SelectedAccessLink.GetHashCode());
124-
int index = Settings.QuickAccessLinks.IndexOf(obj);
124+
var obj = QuickAccessLinks.FirstOrDefault(x => x.GetHashCode() == SelectedAccessLink.GetHashCode());
125+
int index = QuickAccessLinks.IndexOf(obj);
125126
if (index >= 0)
126127
{
127128
SelectedAccessLink = new AccessLink { Name = SelectedName, Path = SelectedPath };
128-
Settings.QuickAccessLinks[index] = SelectedAccessLink;
129+
QuickAccessLinks[index] = SelectedAccessLink;
129130
}
130131
DialogResult = false;
131132
IsEdit = false;

0 commit comments

Comments
 (0)