Skip to content

Code Quality: Made private UserSettingsService property into a readonly field #11009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Code Quality: Made private UserSettingsService property into a readonly field #11009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
572b3dc
Made private UserSettingsService property into a readonly field.
QuaintMako Jan 14, 2023
d2ca0c6
Merge branch 'main' into SettingServicesReadonly
QuaintMako Jan 19, 2023
dded4de
PR review fixing.
QuaintMako Jan 19, 2023
cc13f8e
Forgotten coma
QuaintMako Jan 19, 2023
62d557c
Merge branch 'main' into SettingServicesReadonly
QuaintMako Jan 20, 2023
d7396d5
Forgotten rename during merge
QuaintMako Jan 21, 2023
a791d3f
Merge branch 'main' into SettingServicesReadonly
QuaintMako Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe
View file
Open in desktop
Binary file not shown.
14 changes: 6 additions & 8 deletions src/Files.App/DataModels/SidebarPinnedModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Files.App.DataModels
{
public class SidebarPinnedModel
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

private SidebarPinnedController? controller;

Expand Down Expand Up @@ -277,13 +277,11 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
/// </summary>
public async Task AddAllItemsToSidebar()
{
if (UserSettingsService.PreferencesSettingsService.ShowFavoritesSection)
{
foreach (string path in FavoriteItems)
{
await AddItemToSidebarAsync(path);
}
}
if (!userSettingsService.PreferencesSettingsService.ShowFavoritesSection)
return;

foreach (string path in FavoriteItems)
await AddItemToSidebarAsync(path);
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private static char[] RestrictedCharacters

#region Properties

private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

#endregion

Expand Down Expand Up @@ -128,7 +128,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
var deleteFromRecycleBin = source.Select(item => item.Path).Any(path => recycleBinHelpers.IsPathUnderRecycleBin(path));
var canBeSentToBin = !deleteFromRecycleBin && await recycleBinHelpers.HasRecycleBin(source.FirstOrDefault()?.Path);

if (showDialog && UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog) // Check if the setting to show a confirmation dialog is on
if (showDialog && userSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog) // Check if the setting to show a confirmation dialog is on
{
var incomingItems = new List<BaseFileSystemDialogItemViewModel>();
List<ShellFileItem>? binItems = null;
Expand Down Expand Up @@ -261,7 +261,7 @@ public async Task<ReturnResult> PerformOperationTypeAsync(DataPackageOperation o
}
if (destination.StartsWith(CommonPaths.RecycleBinPath, StringComparison.Ordinal))
{
showDialog |= UserSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog;
showDialog |= userSettingsService.FoldersSettingsService.ShowConfirmDeleteDialog;
return await RecycleItemsFromClipboard(packageView, destination, showDialog, registerHistory);
}
else if (operation.HasFlag(DataPackageOperation.Copy))
Expand Down
22 changes: 10 additions & 12 deletions src/Files.App/Filesystem/Search/FolderSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Files.App.Filesystem.Search
{
public class FolderSearch
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

private IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();

Expand Down Expand Up @@ -157,7 +157,7 @@ private async Task SearchAsync(BaseStorageFolder folder, IList<ListedItem> resul

try
{
if (!item.Name.StartsWith('.') || UserSettingsService.FoldersSettingsService.ShowDotFiles)
if (!item.Name.StartsWith('.') || userSettingsService.FoldersSettingsService.ShowDotFiles)
results.Add(await GetListedItemAsync(item));
}
catch (Exception ex)
Expand Down Expand Up @@ -216,9 +216,9 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
var startWithDot = findData.cFileName.StartsWith('.');

bool shouldBeListed = (!isHidden ||
(UserSettingsService.FoldersSettingsService.ShowHiddenItems &&
(!isSystem || UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles);
(userSettingsService.FoldersSettingsService.ShowHiddenItems &&
(!isSystem || userSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || userSettingsService.FoldersSettingsService.ShowDotFiles);

if (shouldBeListed)
{
Expand All @@ -237,7 +237,7 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
{
IStorageItem item = (BaseStorageFile)await GetStorageFileAsync(match.FilePath);
item ??= (BaseStorageFolder)await GetStorageFolderAsync(match.FilePath);
if (!item.Name.StartsWith('.') || UserSettingsService.FoldersSettingsService.ShowDotFiles)
if (!item.Name.StartsWith('.') || userSettingsService.FoldersSettingsService.ShowDotFiles)
results.Add(await GetListedItemAsync(item));
}
catch (Exception ex)
Expand Down Expand Up @@ -273,10 +273,8 @@ private async Task AddItemsAsync(string folder, IList<ListedItem> results, Cance
hiddenOnlyFromWin32 = (results.Count != 0);
}

if (!IsAQSQuery && (!hiddenOnlyFromWin32 || UserSettingsService.FoldersSettingsService.ShowHiddenItems))
{
if (!IsAQSQuery && (!hiddenOnlyFromWin32 || userSettingsService.FoldersSettingsService.ShowHiddenItems))
await SearchWithWin32Async(folder, hiddenOnlyFromWin32, UsedMaxItemCount - (uint)results.Count, results, token);
}
}
}

Expand Down Expand Up @@ -309,9 +307,9 @@ await Task.Run(() =>
var startWithDot = findData.cFileName.StartsWith('.');

bool shouldBeListed = (hiddenOnly ?
isHidden && (!isSystem || !UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles) :
!isHidden || (UserSettingsService.FoldersSettingsService.ShowHiddenItems && (!isSystem || UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles);
isHidden && (!isSystem || !userSettingsService.FoldersSettingsService.ShowProtectedSystemFiles) :
!isHidden || (userSettingsService.FoldersSettingsService.ShowHiddenItems && (!isSystem || userSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || userSettingsService.FoldersSettingsService.ShowDotFiles);

if (shouldBeListed)
{
Expand Down
48 changes: 24 additions & 24 deletions src/Files.App/Helpers/LayoutPreferences/LayoutPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Files.App.Helpers.LayoutPreferences
{
public class LayoutPreferences
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public SortOption DirectorySortOption;
public SortDirection DirectorySortDirection;
Expand All @@ -24,35 +24,35 @@ public class LayoutPreferences

public LayoutPreferences()
{
var defaultLayout = UserSettingsService.FoldersSettingsService.DefaultLayoutMode;
var defaultLayout = userSettingsService.FoldersSettingsService.DefaultLayoutMode;

LayoutMode = defaultLayout is FolderLayoutModes.Adaptive ? FolderLayoutModes.DetailsView : defaultLayout;
GridViewSize = UserSettingsService.LayoutSettingsService.DefaultGridViewSize;
DirectorySortOption = UserSettingsService.FoldersSettingsService.DefaultSortOption;
DirectoryGroupOption = UserSettingsService.FoldersSettingsService.DefaultGroupOption;
DirectorySortDirection = UserSettingsService.LayoutSettingsService.DefaultDirectorySortDirection;
SortDirectoriesAlongsideFiles = UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
GridViewSize = userSettingsService.LayoutSettingsService.DefaultGridViewSize;
DirectorySortOption = userSettingsService.FoldersSettingsService.DefaultSortOption;
DirectoryGroupOption = userSettingsService.FoldersSettingsService.DefaultGroupOption;
DirectorySortDirection = userSettingsService.LayoutSettingsService.DefaultDirectorySortDirection;
SortDirectoriesAlongsideFiles = userSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
IsAdaptiveLayoutOverridden = defaultLayout is not FolderLayoutModes.Adaptive;

ColumnsViewModel = new ColumnsViewModel();
ColumnsViewModel.DateCreatedColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowDateCreatedColumn;
ColumnsViewModel.DateModifiedColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowDateColumn;
ColumnsViewModel.ItemTypeColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowTypeColumn;
ColumnsViewModel.SizeColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowSizeColumn;
ColumnsViewModel.TagColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowFileTagColumn;
ColumnsViewModel.DateDeletedColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowDateDeletedColumn;
ColumnsViewModel.OriginalPathColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowOriginalPathColumn;
ColumnsViewModel.StatusColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowSyncStatusColumn;
ColumnsViewModel.DateCreatedColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowDateCreatedColumn;
ColumnsViewModel.DateModifiedColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowDateColumn;
ColumnsViewModel.ItemTypeColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowTypeColumn;
ColumnsViewModel.SizeColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowSizeColumn;
ColumnsViewModel.TagColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowFileTagColumn;
ColumnsViewModel.DateDeletedColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowDateDeletedColumn;
ColumnsViewModel.OriginalPathColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowOriginalPathColumn;
ColumnsViewModel.StatusColumn.UserCollapsed = !userSettingsService.FoldersSettingsService.ShowSyncStatusColumn;

ColumnsViewModel.NameColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.NameColumnWidth;
ColumnsViewModel.DateModifiedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateModifiedColumnWidth;
ColumnsViewModel.DateCreatedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateCreatedColumnWidth;
ColumnsViewModel.ItemTypeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TypeColumnWidth;
ColumnsViewModel.SizeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.SizeColumnWidth;
ColumnsViewModel.TagColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TagColumnWidth;
ColumnsViewModel.DateDeletedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateDeletedColumnWidth;
ColumnsViewModel.OriginalPathColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.OriginalPathColumnWidth;
ColumnsViewModel.StatusColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.SyncStatusColumnWidth;
ColumnsViewModel.NameColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.NameColumnWidth;
ColumnsViewModel.DateModifiedColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.DateModifiedColumnWidth;
ColumnsViewModel.DateCreatedColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.DateCreatedColumnWidth;
ColumnsViewModel.ItemTypeColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.TypeColumnWidth;
ColumnsViewModel.SizeColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.SizeColumnWidth;
ColumnsViewModel.TagColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.TagColumnWidth;
ColumnsViewModel.DateDeletedColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.DateDeletedColumnWidth;
ColumnsViewModel.OriginalPathColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.OriginalPathColumnWidth;
ColumnsViewModel.StatusColumn.UserLengthPixels = userSettingsService.FoldersSettingsService.SyncStatusColumnWidth;
}

public override bool Equals(object? obj)
Expand Down
14 changes: 4 additions & 10 deletions src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Files.App.UserControls.FilePreviews
{
public sealed partial class MediaPreview : UserControl
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public MediaPreview(MediaPreviewViewModel model)
{
Expand All @@ -26,29 +26,23 @@ public MediaPreview(MediaPreviewViewModel model)

private void PlayerContext_Loaded(object sender, RoutedEventArgs e)
{
PlayerContext.MediaPlayer.Volume = UserSettingsService.PreviewPaneSettingsService.MediaVolume;
PlayerContext.MediaPlayer.Volume = userSettingsService.PreviewPaneSettingsService.MediaVolume;
PlayerContext.MediaPlayer.VolumeChanged += MediaPlayer_VolumeChanged;
ViewModel.TogglePlaybackRequested += TogglePlaybackRequestInvoked;
}

private void MediaPlayer_VolumeChanged(MediaPlayer sender, object args)
{
if (sender.Volume != UserSettingsService.PreviewPaneSettingsService.MediaVolume)
{
UserSettingsService.PreviewPaneSettingsService.MediaVolume = sender.Volume;
}
if (sender.Volume != userSettingsService.PreviewPaneSettingsService.MediaVolume)
userSettingsService.PreviewPaneSettingsService.MediaVolume = sender.Volume;
}

private void TogglePlaybackRequestInvoked(object sender, EventArgs e)
{
if (PlayerContext.MediaPlayer.PlaybackSession.PlaybackState is not MediaPlaybackState.Playing)
{
PlayerContext.MediaPlayer.Play();
}
else
{
PlayerContext.MediaPlayer.Pause();
}
}

private void TogglePlaybackAcceleratorInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/UserControls/Widgets/BundlesWidget.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Files.App.UserControls.Widgets
{
public sealed partial class BundlesWidget : UserControl, IWidgetItemModel, IDisposable
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public BundlesViewModel ViewModel
{
Expand All @@ -27,7 +27,7 @@ public BundlesViewModel ViewModel

public string WidgetHeader => "Bundles".GetLocalizedResource();

public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowBundlesWidget;
public bool IsWidgetSettingEnabled => userSettingsService.PreferencesSettingsService.ShowBundlesWidget;

public BundlesWidget()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public async Task LoadCardThumbnailAsync()

public sealed partial class DrivesWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public delegate void DrivesWidgetInvokedEventHandler(object sender, DrivesWidgetInvokedEventArgs e);

Expand Down Expand Up @@ -103,7 +103,7 @@ public IShellPage AppInstance

public string WidgetHeader => "Drives".GetLocalizedResource();

public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowDrivesWidget;
public bool IsWidgetSettingEnabled => userSettingsService.PreferencesSettingsService.ShowDrivesWidget;

public DrivesWidget()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public async Task LoadCardThumbnailAsync()

public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public ObservableCollection<FolderCardItem> ItemsAdded = new();

Expand Down Expand Up @@ -118,7 +118,7 @@ public FolderWidget()

public event PropertyChangedEventHandler PropertyChanged;

public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowFoldersWidget;
public bool IsWidgetSettingEnabled => userSettingsService.PreferencesSettingsService.ShowFoldersWidget;

public ICommand LibraryCardCommand { get; }

Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Files.App.UserControls.Widgets
{
public sealed partial class RecentFilesWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
{
private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public delegate void RecentFilesOpenLocationInvokedEventHandler(object sender, PathNavigationEventArgs e);

Expand All @@ -44,7 +44,7 @@ public sealed partial class RecentFilesWidget : UserControl, IWidgetItemModel, I

public string WidgetHeader => "RecentFiles".GetLocalizedResource();

public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowRecentFilesWidget;
public bool IsWidgetSettingEnabled => userSettingsService.PreferencesSettingsService.ShowRecentFilesWidget;

private Visibility emptyRecentsTextVisibility = Visibility.Collapsed;
public Visibility EmptyRecentsTextVisibility
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/ViewModels/FolderSettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class FolderSettingsViewModel : ObservableObject

public event EventHandler<LayoutPreferenceEventArgs>? LayoutPreferencesUpdateRequired;

private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

public FolderSettingsViewModel()
{
Expand Down Expand Up @@ -503,10 +503,10 @@ public void OnDefaultPreferencesChanged(string folderPath, string settingsName)
var prefs = GetLayoutPreferencesForPath(folderPath);
switch (settingsName)
{
case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
case nameof(userSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
SortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
break;
case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
case nameof(userSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
LayoutPreference = prefs;
// TODO: update layout
break;
Expand Down
Loading