Launcher Preferences are now saved and loaded

MinecraftZenova · Apr 10, 2020 · a3c22ff · a3c22ff
1 parent 0c8fa39
commit a3c22ff
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 17 deletions.
diff --git a/ZenovaLauncher/App.xaml.cs b/ZenovaLauncher/App.xaml.cs
@@ -28,6 +28,7 @@ public void AppStart(object sender, StartupEventArgs e)
             SetupEnvironment();
             VersionManager.instance = new VersionManager(Path.Combine(VersionsDirectory, "versions.json"));
             ProfileManager.instance = new ProfileManager(ProfilesDirectory);
+            Preferences.LoadPreferences(DataDirectory);
             Dispatcher.Invoke(async () =>
             {
                 await VersionManager.instance.LoadMinecraftVersions();
@@ -38,6 +39,7 @@ public void AppStart(object sender, StartupEventArgs e)
         public void AppExit(object sender, ExitEventArgs e)
         {
             ProfileManager.instance.SaveProfiles();
+            Preferences.SavePreferences();
         }
 
         private void SetupEnvironment()

diff --git a/ZenovaLauncher/NotifyPropertyChangedBase.cs b/ZenovaLauncher/NotifyPropertyChangedBase.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZenovaLauncher
+{
+    public class NotifyPropertyChangedBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void OnPropertyChanged(string name)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(name));
+        }
+    }
+}
diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml b/ZenovaLauncher/Pages/ProfilesPage.xaml
@@ -42,7 +42,7 @@
                             <ComboBox
                                 x:Name="SortProfileBox"
                                 Style="{DynamicResource StandardComboBoxStyle}"
-                                SelectedIndex="0"
+                                SelectedIndex="{Binding Path=ProfileSortingId}"
                                 MinWidth="120"
                                 HorizontalContentAlignment="Left"
                                 Background="Transparent"
@@ -58,9 +58,9 @@
                         <ui:SimpleStackPanel Margin="15,0,0,0">
                             <TextBlock Margin="0,-8,0,0" FontSize="15" FontWeight="SemiBold" Typography.Capitals="AllSmallCaps" Text="Versions" />
                             <ui:SimpleStackPanel Orientation="Horizontal" Spacing="13">
-                                <CheckBox x:Name="ReleasesBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Releases" Click="CheckBoxClick" IsChecked="True" />
-                                <CheckBox x:Name="BetasBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Beta Builds" Click="CheckBoxClick" />
-                                <CheckBox x:Name="HistoricalBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Historical" Click="CheckBoxClick" />
+                                <CheckBox x:Name="ReleasesBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Releases" Click="CheckBoxClick" IsChecked="{Binding Path=EnableReleases}" />
+                                <CheckBox x:Name="BetasBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Beta Builds" Click="CheckBoxClick" IsChecked="{Binding Path=EnableBetas}" />
+                                <CheckBox x:Name="HistoricalBox" Style="{DynamicResource SmallCheckBoxStyle}" Content="Historical" Click="CheckBoxClick" IsChecked="{Binding Path=EnableHistorical}" />
                             </ui:SimpleStackPanel>
                         </ui:SimpleStackPanel>
                     </ui:SimpleStackPanel>

diff --git a/ZenovaLauncher/Pages/ProfilesPage.xaml.cs b/ZenovaLauncher/Pages/ProfilesPage.xaml.cs
@@ -24,8 +24,12 @@ public partial class ProfilesPage : Page
         public ProfilesPage() {
             InitializeComponent();
             ProfileListBox.ItemsSource = ProfileManager.instance;
+            SortProfileBox.DataContext = Preferences.instance;
+            ReleasesBox.DataContext = Preferences.instance;
+            BetasBox.DataContext = Preferences.instance;
+            HistoricalBox.DataContext = Preferences.instance;
 
-            SortProfileList(true);
+            SortProfileList(Preferences.instance.ProfileSorting);
             FilterProfileList();
         }
 
@@ -56,7 +60,7 @@ private void DuplicateProfileClick(object sender, RoutedEventArgs e)
                 index++;
             newProfile.Name += " (" + index + ")";
             ProfileManager.instance.Add(newProfile);
-            SortProfileList(SortProfileBox.SelectedIndex == 0);
+            SortProfileList(Preferences.instance.ProfileSorting);
         }
 
         private void DeleteProfileClick(object sender, RoutedEventArgs e)
@@ -72,7 +76,7 @@ private void ProfileSelected(object sender, MouseButtonEventArgs e)
 
         private void SortChanged(object sender, SelectionChangedEventArgs e)
         {
-            SortProfileList((sender as ComboBox).SelectedIndex == 0);
+            SortProfileList(Preferences.instance.ProfileSorting);
         }
 
         private void CheckBoxClick(object sender, RoutedEventArgs e)
@@ -83,20 +87,20 @@ private void CheckBoxClick(object sender, RoutedEventArgs e)
         protected void FilterProfileList()
         {
             List<Predicate<object>> predicates = new List<Predicate<object>>();
-            if (ReleasesBox.IsChecked == true)
+            if (Preferences.instance.EnableReleases)
                 predicates.Add(Profile.releaseFilter);
-            if (BetasBox.IsChecked == true)
+            if (Preferences.instance.EnableBetas)
                 predicates.Add(Profile.betaFilter);
-            if (HistoricalBox.IsChecked == true)
+            if (Preferences.instance.EnableHistorical)
                 predicates.Add(Profile.historicalFilter);
             if(ProfileListBox != null)
                 ProfileListBox.Items.Filter = o => predicates.Any(predicate => predicate(o));
         }
 
-        protected void SortProfileList(bool sortType)
+        protected void SortProfileList(Profile.ProfileSortType sortType)
         {
-            string sortTypeString = sortType ? "LastPlayed" : "Name";
-            ListSortDirection sortDirection = sortType ? ListSortDirection.Descending : ListSortDirection.Ascending;
+            string sortTypeString = sortType == Profile.ProfileSortType.ByLastPlayed ? "LastPlayed" : "Name";
+            ListSortDirection sortDirection = sortType == Profile.ProfileSortType.ByLastPlayed ? ListSortDirection.Descending : ListSortDirection.Ascending;
             if (ProfileListBox != null)
             {
                 ProfileListBox.Items.SortDescriptions.Clear();

diff --git a/ZenovaLauncher/Preferences.cs b/ZenovaLauncher/Preferences.cs
@@ -0,0 +1,61 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZenovaLauncher
+{
+    public class Preferences : NotifyPropertyChangedBase
+    {
+        public static Preferences instance;
+
+        private static string _preferencesFile = "preferences.json";
+        private static JsonSerializerSettings camelCaseSerialization;
+
+        public bool EnableReleases { get; set; }
+        public bool EnableBetas { get; set; }
+        public bool EnableHistorical { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public Profile.ProfileSortType ProfileSorting { get; set; }
+        [JsonIgnore]
+        public int ProfileSortingId
+        {
+            get { return (int)ProfileSorting; }
+            set { ProfileSorting = (Profile.ProfileSortType)value; }
+        }
+
+
+        public static void LoadPreferences(string dataDir)
+        {
+            _preferencesFile = Path.Combine(dataDir, _preferencesFile);
+            camelCaseSerialization = new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() };
+            if (File.Exists(_preferencesFile))
+            {
+                instance = JsonConvert.DeserializeObject<Preferences>(File.ReadAllText(_preferencesFile), camelCaseSerialization);
+            }
+            else
+            {
+                instance = new Preferences();
+                instance.SetDefaultPreferences();
+            }
+        }
+
+        public static void SavePreferences()
+        {
+            File.WriteAllText(_preferencesFile, JsonConvert.SerializeObject(instance, Formatting.Indented, camelCaseSerialization));
+        }
+
+        public void SetDefaultPreferences()
+        {
+            EnableReleases = true;
+            EnableBetas = false;
+            EnableHistorical = false;
+            ProfileSorting = Profile.ProfileSortType.ByLastPlayed;
+        }
+    }
+}
diff --git a/ZenovaLauncher/Profiles/Profile.cs b/ZenovaLauncher/Profiles/Profile.cs
@@ -3,9 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Data;
 
 namespace ZenovaLauncher
 {
@@ -61,5 +63,11 @@ public enum ProfileType
             LatestRelease,
             LatestBeta
         }
+
+        public enum ProfileSortType
+        {
+            ByLastPlayed,
+            ByName
+        }
     }
 }
diff --git a/ZenovaLauncher/Profiles/ProfileManager.cs b/ZenovaLauncher/Profiles/ProfileManager.cs
@@ -90,7 +90,7 @@ public void SaveProfiles()
             DirectoryInfo di = new DirectoryInfo(_profilesDir);
             foreach (FileInfo file in di.EnumerateFiles()) file.Delete();
             foreach (DirectoryInfo dir in di.EnumerateDirectories()) dir.Delete(true);
-            File.WriteAllText(Path.Combine(_profilesDir, _profilesFile), JsonConvert.SerializeObject(this));
+            File.WriteAllText(Path.Combine(_profilesDir, _profilesFile), JsonConvert.SerializeObject(this, Formatting.Indented));
         }
     }
 }
diff --git a/ZenovaLauncher/ZenovaLauncher.csproj b/ZenovaLauncher/ZenovaLauncher.csproj
@@ -72,6 +72,7 @@
     <Compile Include="Dialogs\AddProfileDialog.xaml.cs">
       <DependentUpon>AddProfileDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="NotifyPropertyChangedBase.cs" />
     <Compile Include="Pages\ModsPage.xaml.cs">
       <DependentUpon>ModsPage.xaml</DependentUpon>
     </Compile>
@@ -81,6 +82,7 @@
     <Compile Include="Pages\ProfilesPage.xaml.cs">
       <DependentUpon>ProfilesPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Preferences.cs" />
     <Compile Include="Profiles\MinecraftVersion.cs" />
     <Compile Include="Profiles\Profile.cs" />
     <Compile Include="Pages\SettingsPage.xaml.cs">
@@ -239,9 +241,12 @@
     <PostBuildEvent>$(ProjectDir)Inno\ISCC.exe $(ProjectDir)SetupZenovaLauncher.iss</PostBuildEvent>
   </PropertyGroup>
   <Target Name="SpicNSpan" AfterTargets="Clean">
-    <RemoveDir Directories="$(TargetDir)" /> <!-- bin -->
-    <RemoveDir Directories="$(SolutionDir).vs" /> <!-- .vs -->
-    <RemoveDir Directories="$(ProjectDir)$(BaseIntermediateOutputPath)" /> <!-- obj -->
+    <RemoveDir Directories="$(TargetDir)" />
+    <!-- bin -->
+    <RemoveDir Directories="$(SolutionDir).vs" />
+    <!-- .vs -->
+    <RemoveDir Directories="$(ProjectDir)$(BaseIntermediateOutputPath)" />
+    <!-- obj -->
     <RemoveDir Directories="$(ProjectDir)Output" />
   </Target>
 </Project>