Skip to content

Commit 4b77a5a

Browse files
authored
Code Quality: Changed default settings for Network locations widget (#15446)
1 parent dac6a20 commit 4b77a5a

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

src/Files.App/Services/Settings/GeneralSettingsService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public bool ShowDrivesWidget
9999

100100
public bool ShowNetworkLocationsWidget
101101
{
102-
get => Get(false);
102+
get => Get(true);
103103
set => Set(value);
104104
}
105105

@@ -129,7 +129,7 @@ public bool DrivesWidgetExpanded
129129

130130
public bool NetworkLocationsWidgetExpanded
131131
{
132-
get => Get(true);
132+
get => Get(false);
133133
set => Set(value);
134134
}
135135

src/Files.App/ViewModels/HomeViewModel.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,72 +29,78 @@ public HomeViewModel()
2929

3030
// Methods
3131

32-
public void ReloadWidgets()
32+
private void ReloadWidgets()
3333
{
3434
var reloadQuickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidgetViewModel>(this);
3535
var reloadDrivesWidget = WidgetsHelpers.TryGetWidget<DrivesWidgetViewModel>(this);
3636
var reloadNetworkLocationsWidget = WidgetsHelpers.TryGetWidget<NetworkLocationsWidgetViewModel>(this);
3737
var reloadFileTagsWidget = WidgetsHelpers.TryGetWidget<FileTagsWidgetViewModel>(this);
3838
var reloadRecentFilesWidget = WidgetsHelpers.TryGetWidget<RecentFilesWidgetViewModel>(this);
39+
var insertIndex = 0;
3940

4041
if (reloadQuickAccessWidget)
4142
{
4243
var quickAccessWidget = new QuickAccessWidget();
4344

44-
AddWidget(
45+
InsertWidget(
4546
new(
4647
quickAccessWidget,
4748
quickAccessWidget.ViewModel,
4849
(value) => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded = value,
49-
() => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded));
50+
() => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded),
51+
insertIndex++);
5052
}
5153

5254
if (reloadDrivesWidget)
5355
{
5456
var drivesWidget = new DrivesWidget();
5557

56-
AddWidget(
58+
InsertWidget(
5759
new(
5860
drivesWidget,
5961
drivesWidget.ViewModel,
6062
(value) => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded = value,
61-
() => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded));
63+
() => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded),
64+
insertIndex++);
6265
}
6366

6467
if (reloadNetworkLocationsWidget)
6568
{
6669
var networkLocationsWidget = new NetworkLocationsWidget();
6770

68-
AddWidget(
71+
InsertWidget(
6972
new(
7073
networkLocationsWidget,
7174
networkLocationsWidget.ViewModel,
7275
(value) => UserSettingsService.GeneralSettingsService.NetworkLocationsWidgetExpanded = value,
73-
() => UserSettingsService.GeneralSettingsService.NetworkLocationsWidgetExpanded));
76+
() => UserSettingsService.GeneralSettingsService.NetworkLocationsWidgetExpanded),
77+
insertIndex++);
7478
}
7579

7680
if (reloadFileTagsWidget)
7781
{
7882
var fileTagsWidget = new FileTagsWidget();
7983

80-
AddWidget(
84+
InsertWidget(
8185
new(
8286
fileTagsWidget,
8387
fileTagsWidget.ViewModel,
8488
(value) => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded = value,
85-
() => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded));
89+
() => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded),
90+
insertIndex++);
8691
}
8792

8893
if (reloadRecentFilesWidget)
8994
{
9095
var recentFilesWidget = new RecentFilesWidget();
9196

92-
AddWidget(
97+
InsertWidget(
9398
new(
9499
recentFilesWidget,
95100
recentFilesWidget.ViewModel,
96101
(value) => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded = value,
97-
() => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded));
102+
() => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded),
103+
insertIndex++);
98104
}
99105
}
100106

@@ -109,12 +115,7 @@ public void RefreshWidgetList()
109115
ReloadWidgets();
110116
}
111117

112-
public bool AddWidget(WidgetContainerItem widgetModel)
113-
{
114-
return InsertWidget(widgetModel, WidgetItems.Count + 1);
115-
}
116-
117-
public bool InsertWidget(WidgetContainerItem widgetModel, int atIndex)
118+
private bool InsertWidget(WidgetContainerItem widgetModel, int atIndex)
118119
{
119120
// The widget must not be null and must implement IWidgetItemModel
120121
if (widgetModel.WidgetItemModel is not IWidgetViewModel widgetItemModel)
@@ -145,7 +146,7 @@ public bool CanAddWidget(string widgetName)
145146
return !(WidgetItems.Any((item) => item.WidgetItemModel.WidgetName == widgetName));
146147
}
147148

148-
public void RemoveWidgetAt(int index)
149+
private void RemoveWidgetAt(int index)
149150
{
150151
if (index < 0)
151152
{

0 commit comments

Comments
 (0)