Improved settings code (#919)

yaira2 · web-flow · commit bbc166502842 · 2020-06-05T12:56:41.000-04:00
diff --git a/Files/DataModels/TerminalModel.cs b/Files/DataModels/TerminalModel.cs
@@ -1,5 +1,4 @@
 ﻿using Newtonsoft.Json;
-using System.ComponentModel.DataAnnotations;
 
 namespace Files.DataModels
 {
diff --git a/Files/Filesystem/ListedItem.cs b/Files/Filesystem/ListedItem.cs
@@ -1,7 +1,6 @@
 ﻿using Files.Enums;
 using System;
 using System.ComponentModel;
-using System.IO;
 using Windows.Storage;
 using Windows.UI.Xaml.Media.Imaging;
 
@@ -158,7 +157,7 @@ public static string GetFriendlyDate(DateTimeOffset d)
             else
             {
                 return string.Format(ResourceController.GetTranslation("SecondsAgo"), elapsed.Seconds);
-            }            
+            }
         }
     }
 }
diff --git a/Files/Helpers/PackageHelper.cs b/Files/Helpers/PackageHelper.cs
@@ -44,4 +44,4 @@ public static async Task<bool> IsAppInstalledAsync(string packageName)
             }
         }
     }
-}
+}
diff --git a/Files/UserControls/LayoutModes/GenericFileBrowser.xaml b/Files/UserControls/LayoutModes/GenericFileBrowser.xaml
@@ -362,7 +362,7 @@
             x:Load="{x:Bind local:App.InteractionViewModel.IsContentLoadingIndicatorVisible, Mode=OneWay}"
             Background="Transparent"
             VerticalAlignment="Top"
-            IsIndeterminate="True"/>
+            IsIndeterminate="True" />
         <TextBlock
             x:Name="EmptyText"
             x:Uid="EmptyFolder"
diff --git a/Files/UserControls/LayoutModes/GridViewBrowser.xaml b/Files/UserControls/LayoutModes/GridViewBrowser.xaml
@@ -548,7 +548,7 @@
             x:Load="{x:Bind local:App.InteractionViewModel.IsContentLoadingIndicatorVisible, Mode=OneWay}"
             Background="Transparent"
             VerticalAlignment="Top"
-            IsIndeterminate="True"/>
+            IsIndeterminate="True" />
         <TextBlock
             x:Name="EmptyText"
             x:Uid="EmptyFolder"
diff --git a/Files/View Models/InteractionViewModel.cs b/Files/View Models/InteractionViewModel.cs
@@ -8,6 +8,7 @@ namespace Files.Controls
     public class InteractionViewModel : ViewModelBase
     {
         private bool _IsContentLoadingIndicatorVisible = false;
+
         public bool IsContentLoadingIndicatorVisible
         {
             get => _IsContentLoadingIndicatorVisible;
diff --git a/Files/Views/InstanceTabsView.xaml b/Files/Views/InstanceTabsView.xaml
diff --git a/Files/Views/SettingsPages/Appearance.xaml b/Files/Views/SettingsPages/Appearance.xaml
@@ -110,7 +110,7 @@
                         Grid.Column="2"
                         Width="40"
                         HorizontalAlignment="Right"
-                        IsOn="{x:Bind local:App.AppSettings.AcrylicEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolNegationConverter}}"
+                        IsOn="{x:Bind AppSettings.AcrylicEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolNegationConverter}}"
                         OffContent=""
                         OnContent="" />
                 </Grid>
diff --git a/Files/Views/SettingsPages/Appearance.xaml.cs b/Files/Views/SettingsPages/Appearance.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using Files.Enums;
 using Files.Helpers;
+using Files.View_Models;
 using System;
 using System.Collections.Generic;
 using Windows.UI.Xaml;
@@ -9,6 +10,8 @@ namespace Files.SettingsPages
 {
     public sealed partial class Appearance : Page
     {
+        public SettingsViewModel AppSettings => App.AppSettings;
+
         public Appearance()
         {
             InitializeComponent();
diff --git a/Files/Views/SettingsPages/Experimental.xaml b/Files/Views/SettingsPages/Experimental.xaml
@@ -58,7 +58,7 @@
                         Grid.Column="2"
                         Width="40"
                         HorizontalAlignment="Right"
-                        IsOn="{x:Bind local2:App.AppSettings.DoubleTapToRenameFiles, Mode=TwoWay}"
+                        IsOn="{Binding AppSettings.DoubleTapToRenameFiles, Mode=TwoWay}"
                         OffContent=""
                         OnContent="" />
                 </Grid>
@@ -87,7 +87,7 @@
                         Grid.Column="2"
                         Width="40"
                         HorizontalAlignment="Right"
-                        IsOn="{x:Bind local2:App.AppSettings.PinRecycleBinToSideBar, Mode=TwoWay}"
+                        IsOn="{x:Bind AppSettings.PinRecycleBinToSideBar, Mode=TwoWay}"
                         OffContent=""
                         OnContent="" />
                 </Grid>
diff --git a/Files/Views/SettingsPages/Experimental.xaml.cs b/Files/Views/SettingsPages/Experimental.xaml.cs
@@ -1,10 +1,12 @@
-﻿using Windows.Storage;
+﻿using Files.View_Models;
+using Windows.Storage;
 using Windows.UI.Xaml.Controls;
 
 namespace Files.SettingsPages
 {
     public sealed partial class Experimental : Page
     {
+        public SettingsViewModel AppSettings => App.AppSettings;
         private StorageFolder localFolder = ApplicationData.Current.LocalFolder;
         private ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
 
diff --git a/Files/Views/SettingsPages/FilesAndFolders.xaml b/Files/Views/SettingsPages/FilesAndFolders.xaml
@@ -80,7 +80,7 @@
                         Grid.Column="1"
                         Width="40"
                         HorizontalAlignment="Right"
-                        IsOn="{x:Bind local:App.AppSettings.ShowFileExtensions, Mode=TwoWay}"
+                        IsOn="{Binding AppSettings.ShowFileExtensions, Mode=TwoWay}"
                         OffContent=""
                         OnContent="" />
                 </Grid>
diff --git a/Files/Views/SettingsPages/FilesAndFolders.xaml.cs b/Files/Views/SettingsPages/FilesAndFolders.xaml.cs
@@ -1,10 +1,13 @@
-﻿using Windows.UI.Xaml;
+﻿using Files.View_Models;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 namespace Files.SettingsPages
 {
     public sealed partial class FilesAndFolders : Page
     {
+        public SettingsViewModel AppSettings => App.AppSettings;
+
         public FilesAndFolders()
         {
             InitializeComponent();
diff --git a/Files/Views/SettingsPages/OnStartup.xaml b/Files/Views/SettingsPages/OnStartup.xaml
@@ -34,7 +34,7 @@
                     VerticalAlignment="Center"
                     Content="Open a new tab"
                     FontSize="16"
-                    IsChecked="{x:Bind local:App.AppSettings.OpenNewTabPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    IsChecked="{x:Bind AppSettings.OpenNewTabPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <RadioButton
                     x:Uid="SettingsOnStartupContinueWhereYouLeftOff"
@@ -51,7 +51,7 @@
                     VerticalAlignment="Center"
                     Content="Open a specific page"
                     FontSize="16"
-                    IsChecked="{x:Bind local:App.AppSettings.OpenASpecificPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    IsChecked="{x:Bind AppSettings.OpenASpecificPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <StackPanel Orientation="Horizontal" Visibility="{x:Bind OpenSpecificPage.IsChecked, Mode=OneWay}">
                     <TextBox
@@ -63,7 +63,7 @@
                         CornerRadius="2,0,0,2"
                         IsEnabled="False"
                         PlaceholderText="New Tab"
-                        Text="{x:Bind local:App.AppSettings.OpenASpecificPageOnStartupPath, Mode=OneWay}" />
+                        Text="{x:Bind AppSettings.OpenASpecificPageOnStartupPath, Mode=OneWay}" />
 
                     <Button
                         x:Name="btnOpenASpecificPageOnStartupPath"
diff --git a/Files/Views/SettingsPages/OnStartup.xaml.cs b/Files/Views/SettingsPages/OnStartup.xaml.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Files.View_Models;
+using System;
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml.Controls;
@@ -7,6 +8,7 @@ namespace Files.SettingsPages
 {
     public sealed partial class OnStartup : Page
     {
+        public SettingsViewModel AppSettings => App.AppSettings;
         public OnStartup()
         {
             InitializeComponent();
diff --git a/Files/Views/SettingsPages/Preferences.xaml b/Files/Views/SettingsPages/Preferences.xaml
@@ -55,7 +55,7 @@
                         Width="40"
                         HorizontalAlignment="Right"
                         IsEnabled="True"
-                        IsOn="{x:Bind local2:App.AppSettings.PinOneDriveToSideBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        IsOn="{Binding AppSettings.PinOneDriveToSideBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         OffContent=""
                         OnContent=""
                         Toggled="OneDrivePin_Toggled" />
@@ -86,7 +86,7 @@
                         Width="40"
                         HorizontalAlignment="Right"
                         IsEnabled="True"
-                        IsOn="{x:Bind local2:App.AppSettings.ShowConfirmDeleteDialog, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        IsOn="{Binding AppSettings.ShowConfirmDeleteDialog, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         OffContent=""
                         OnContent="" />
                 </Grid>
@@ -132,7 +132,7 @@
                             MinWidth="120"
                             MaxWidth="185"
                             HorizontalAlignment="Stretch"
-                            ItemsSource="{x:Bind local2:App.AppSettings.TerminalsModel.Terminals}"
+                            ItemsSource="{x:Bind AppSettings.TerminalsModel.Terminals}"
                             SelectionChanged="TerminalApp_SelectionChanged">
                             <ComboBox.ItemTemplate>
                                 <DataTemplate x:DataType="datamodels:TerminalModel">
diff --git a/Files/Views/SettingsPages/Preferences.xaml.cs b/Files/Views/SettingsPages/Preferences.xaml.cs
@@ -1,7 +1,7 @@
 ﻿using Files.DataModels;
+using Files.View_Models;
 using Newtonsoft.Json;
 using System;
-using System.Linq;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Xaml.Controls;
@@ -11,6 +11,7 @@ namespace Files.SettingsPages
 {
     public sealed partial class Preferences : Page
     {
+        public SettingsViewModel AppSettings => App.AppSettings;
         private StorageFolder localFolder = ApplicationData.Current.LocalFolder;
         private ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
 
@@ -59,7 +60,7 @@ private void TerminalApp_SelectionChanged(object sender, SelectionChangedEventAr
 
         private async void SaveTerminalSettings()
         {
-            await FileIO.WriteTextAsync(App.AppSettings.TerminalsModelFile, 
+            await FileIO.WriteTextAsync(App.AppSettings.TerminalsModelFile,
                 JsonConvert.SerializeObject(App.AppSettings.TerminalsModel, Formatting.Indented));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`		`-using System.ComponentModel.DataAnnotations;`
`3`	`2`
`4`	`3`	`namespace Files.DataModels`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using Files.Enums;`
`2`	`2`	`using System;`
`3`	`3`	`using System.ComponentModel;`
`4`		`-using System.IO;`
`5`	`4`	`using Windows.Storage;`
`6`	`5`	`using Windows.UI.Xaml.Media.Imaging;`
`7`	`6`
`@@ -158,7 +157,7 @@ public static string GetFriendlyDate(DateTimeOffset d)`
`158`	`157`	`else`
`159`	`158`	`{`
`160`	`159`	`return string.Format(ResourceController.GetTranslation("SecondsAgo"), elapsed.Seconds);`
`161`		`- }`
	`160`	`+ }`
`162`	`161`	`}`
`163`	`162`	`}`
`164`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ public static async Task<bool> IsAppInstalledAsync(string packageName)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace Files.Controls`
`8`	`8`	`public class InteractionViewModel : ViewModelBase`
`9`	`9`	`{`
`10`	`10`	`private bool _IsContentLoadingIndicatorVisible = false;`
	`11`	`+`
`11`	`12`	`public bool IsContentLoadingIndicatorVisible`
`12`	`13`	`{`
`13`	`14`	`get => _IsContentLoadingIndicatorVisible;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Files.Enums;`
`2`	`2`	`using Files.Helpers;`
	`3`	`+using Files.View_Models;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using Windows.UI.Xaml;`
`@@ -9,6 +10,8 @@ namespace Files.SettingsPages`
`9`	`10`	`{`
`10`	`11`	`public sealed partial class Appearance : Page`
`11`	`12`	`{`
	`13`	`+ public SettingsViewModel AppSettings => App.AppSettings;`
	`14`	`+`
`12`	`15`	`public Appearance()`
`13`	`16`	`{`
`14`	`17`	`InitializeComponent();`