Settings 储存方式变更

Yoctillion · Feb 15, 2016 · 29fcdd8 · 29fcdd8
1 parent f157afc
commit 29fcdd8
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 74 deletions.
diff --git a/NotifyEx/Models/HpNotifier.cs b/NotifyEx/Models/HpNotifier.cs
@@ -10,6 +10,7 @@
 using System.Reactive.Linq;
 using Grabacr07.KanColleWrapper.Models;
 using NotifyEx.Models.NotifyType;
+using NotifyEx.Models.Settings;
 
 namespace NotifyEx.Models
 {
@@ -20,17 +21,14 @@ internal class HpNotifier
     {
         public static HpNotifier Current = new HpNotifier();
 
-        private static readonly Settings Settings = Settings.Default;
-
         public bool Enabled
         {
-            get { return Settings.EnabledLowHpNotifier; }
+            get { return NotifierSettings.EnabledLowHpNotifier.Value; }
             set
             {
-                if (Settings.EnabledLowHpNotifier != value)
+                if (NotifierSettings.EnabledLowHpNotifier.Value != value)
                 {
-                    Settings.EnabledLowHpNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledLowHpNotifier.Value = value;
                 }
             }
         }
@@ -40,13 +38,12 @@ public bool Enabled
         /// </summary>
         public bool EnabledShowDamageControl
         {
-            get { return Settings.EnabledShowDamageControl; }
+            get { return NotifierSettings.EnabledShowDamageControl.Value; }
             set
             {
-                if (Settings.EnabledShowDamageControl != value)
+                if (NotifierSettings.EnabledShowDamageControl.Value != value)
                 {
-                    Settings.EnabledShowDamageControl = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledShowDamageControl.Value = value;
                 }
             }
         }

diff --git a/NotifyEx/Models/Settings/NotifierSettings.cs b/NotifyEx/Models/Settings/NotifierSettings.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using MetroTrilithon.Serialization;
+
+namespace NotifyEx.Models.Settings
+{
+    public static class NotifierSettings
+    {
+        #region Ship count notifier settings
+
+        public static SerializableProperty<bool> EnabledShipNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledShipNotifier) { AutoSave = true };
+
+        public static SerializableProperty<uint> ShipWarningCount { get; }
+            = new SerializableProperty<uint>(GetKey(), Provider.Roaming, Properties.Settings.Default.WarningShipCount) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledEventShipNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledEventShipNotifier) { AutoSave = true };
+
+        public static SerializableProperty<uint> EventShipWarningCount { get; }
+            = new SerializableProperty<uint>(GetKey(), Provider.Roaming, Properties.Settings.Default.EventWarningShipCount) { AutoSave = true };
+
+        #endregion
+
+        #region Slot count notifier settings
+
+        public static SerializableProperty<bool> EnabledSlotNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledSlotNotifier) { AutoSave = true };
+
+        public static SerializableProperty<uint> SlotWarningCount { get; }
+            = new SerializableProperty<uint>(GetKey(), Provider.Roaming, Properties.Settings.Default.WarningShipCount) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledEventSlotNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledEventSlotNotifier) { AutoSave = true };
+
+        public static SerializableProperty<uint> EventSlotWarningCount { get; }
+            = new SerializableProperty<uint>(GetKey(), Provider.Roaming, Properties.Settings.Default.EventWarningSlotCount) { AutoSave = true };
+
+        #endregion
+
+        #region Heavily damaged notifier settings
+
+        public static SerializableProperty<bool> EnabledLowHpNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledLowHpNotifier) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledShowDamageControl { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledShowDamageControl) { AutoSave = true };
+
+        #endregion
+
+        #region Lack of supply notifier
+
+        public static SerializableProperty<bool> EnabledSupplyNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledSupplyNotifier) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledSortieSupplyNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledSortieSupplyNotifier) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledExerciseSupplyNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledExerciseSupplyNotifier) { AutoSave = true };
+
+        public static SerializableProperty<bool> EnabledExpenditionSupplyNotifier { get; }
+            = new SerializableProperty<bool>(GetKey(), Provider.Roaming, Properties.Settings.Default.EnabledExpenditionSupplyNotifier) { AutoSave = true };
+
+        #endregion
+
+        private static string GetKey([CallerMemberName] string propertyName = "")
+        {
+            return $"{nameof(NotifierSettings)}.{propertyName}";
+        }
+    }
+}
diff --git a/NotifyEx/Models/Settings/Provider.cs b/NotifyEx/Models/Settings/Provider.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MetroTrilithon.Serialization;
+
+namespace NotifyEx.Models.Settings
+{
+    public static class Provider
+    {
+        public static string RoamingPath { get; } = Path.Combine(Environment.GetFolderPath(
+            Environment.SpecialFolder.ApplicationData),
+            "grabacr.net", "KanColleViewer", "NotifyEx.xaml");
+
+        public static ISerializationProvider Roaming { get; } = new FileSettingsProvider(RoamingPath);
+    }
+}
diff --git a/NotifyEx/Models/ShipNotifier.cs b/NotifyEx/Models/ShipNotifier.cs
@@ -9,6 +9,7 @@
 using MetroTrilithon.Lifetime;
 using MetroTrilithon.Mvvm;
 using NotifyEx.Models.NotifyType;
+using NotifyEx.Models.Settings;
 using NotifyEx.Properties;
 using StatefulModel;
 
@@ -20,18 +21,16 @@ namespace NotifyEx.Models
     internal class ShipNotifier : NotificationObject, IWarningCounter, IDisposableHolder
     {
         public static ShipNotifier Current { get; } = new ShipNotifier();
-
-        private static readonly Settings Settings = Settings.Default;
+
 
         public bool Enabled
         {
-            get { return Settings.EnabledShipNotifier; }
+            get { return NotifierSettings.EnabledShipNotifier.Value; }
             set
             {
-                if (Settings.EnabledShipNotifier != value)
+                if (NotifierSettings.EnabledShipNotifier.Value != value)
                 {
-                    Settings.EnabledShipNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledShipNotifier.Value = value;
                     this.RaisePropertyChanged();
                 }
             }
@@ -59,13 +58,12 @@ private set
 
         public uint NormalWarningCount
         {
-            get { return Settings.WarningShipCount; }
+            get { return NotifierSettings.ShipWarningCount.Value; }
             set
             {
-                if (Settings.WarningShipCount != value)
+                if (NotifierSettings.ShipWarningCount.Value != value)
                 {
-                    Settings.WarningShipCount = value;
-                    Settings.Save();
+                    NotifierSettings.ShipWarningCount.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }
@@ -74,13 +72,12 @@ public uint NormalWarningCount
 
         public bool EnabledEvent
         {
-            get { return Settings.EnabledEventShipNotifier; }
+            get { return NotifierSettings.EnabledEventShipNotifier.Value; }
             set
             {
-                if (Settings.EnabledEventShipNotifier != value)
+                if (NotifierSettings.EnabledEventShipNotifier.Value != value)
                 {
-                    Settings.EnabledEventShipNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledEventShipNotifier.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }
@@ -89,13 +86,12 @@ public bool EnabledEvent
 
         public uint EventWarningCount
         {
-            get { return Settings.EventWarningShipCount; }
+            get { return NotifierSettings.EventShipWarningCount.Value; }
             set
             {
-                if (Settings.EventWarningShipCount != value)
+                if (NotifierSettings.EventShipWarningCount.Value != value)
                 {
-                    Settings.EventWarningShipCount = value;
-                    Settings.Save();
+                    NotifierSettings.EventShipWarningCount.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }

diff --git a/NotifyEx/Models/SlotNotifier.cs b/NotifyEx/Models/SlotNotifier.cs
@@ -10,6 +10,7 @@
 using MetroTrilithon.Lifetime;
 using MetroTrilithon.Mvvm;
 using NotifyEx.Models.NotifyType;
+using NotifyEx.Models.Settings;
 using NotifyEx.Properties;
 using StatefulModel;
 
@@ -19,17 +20,14 @@ internal class SlotNotifier : NotificationObject, IWarningCounter, IDisposableHo
     {
         public static SlotNotifier Current { get; } = new SlotNotifier();
 
-        private static readonly Settings Settings = Settings.Default;
-
         public bool Enabled
         {
-            get { return Settings.EnabledSlotNotifier; }
+            get { return NotifierSettings.EnabledSlotNotifier.Value; }
             set
             {
-                if (Settings.EnabledSlotNotifier != value)
+                if (NotifierSettings.EnabledSlotNotifier.Value != value)
                 {
-                    Settings.EnabledSlotNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledSlotNotifier.Value = value;
                     this.RaisePropertyChanged();
                 }
             }
@@ -38,7 +36,7 @@ public bool Enabled
         public uint WarningCount =>
             this.EnabledEvent && Util.IsInEvent
                 ? this.EventWarningCount
-                : Settings.WarningSlotCount;
+                : this.NormalWarningCount;
 
         private uint _remain = uint.MaxValue;
 
@@ -57,13 +55,12 @@ private set
 
         public uint NormalWarningCount
         {
-            get { return Settings.WarningSlotCount; }
+            get { return NotifierSettings.SlotWarningCount.Value; }
             set
             {
-                if (Settings.WarningSlotCount != value)
+                if (NotifierSettings.SlotWarningCount.Value != value)
                 {
-                    Settings.WarningSlotCount = value;
-                    Settings.Save();
+                    NotifierSettings.SlotWarningCount.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }
@@ -72,13 +69,12 @@ public uint NormalWarningCount
 
         public bool EnabledEvent
         {
-            get { return Settings.EnabledEventSlotNotifier; }
+            get { return NotifierSettings.EnabledEventSlotNotifier.Value; }
             set
             {
-                if (Settings.EnabledEventSlotNotifier != value)
+                if (NotifierSettings.EnabledEventSlotNotifier.Value != value)
                 {
-                    Settings.EnabledEventSlotNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledEventSlotNotifier.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }
@@ -87,13 +83,12 @@ public bool EnabledEvent
 
         public uint EventWarningCount
         {
-            get { return Settings.EventWarningSlotCount; }
+            get { return NotifierSettings.EventSlotWarningCount.Value; }
             set
             {
-                if (Settings.EventWarningSlotCount != value)
+                if (NotifierSettings.EventSlotWarningCount.Value != value)
                 {
-                    Settings.EventWarningSlotCount = value;
-                    Settings.Save();
+                    NotifierSettings.EventSlotWarningCount.Value = value;
                     this.RaisePropertyChanged();
                     this.RaisePropertyChanged(nameof(this.WarningCount));
                 }

diff --git a/NotifyEx/Models/SupplyNotifier.cs b/NotifyEx/Models/SupplyNotifier.cs
@@ -7,6 +7,7 @@
 using Grabacr07.KanColleWrapper;
 using Grabacr07.KanColleWrapper.Models;
 using NotifyEx.Models.NotifyType;
+using NotifyEx.Models.Settings;
 using NotifyEx.Properties;
 
 namespace NotifyEx.Models
@@ -18,56 +19,50 @@ internal class SupplyNotifier
     {
         public static SupplyNotifier Current { get; } = new SupplyNotifier();
 
-        private static readonly Settings Settings = Settings.Default;
-
         public bool Enabled
         {
-            get { return Settings.EnabledSupplyNotifier; }
+            get { return NotifierSettings.EnabledSupplyNotifier.Value; }
             set
             {
-                if (Settings.EnabledSupplyNotifier != value)
+                if (NotifierSettings.EnabledSupplyNotifier.Value != value)
                 {
-                    Settings.EnabledSupplyNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledSupplyNotifier.Value = value;
                 }
             }
         }
 
         public bool EnabledSortie
         {
-            get { return Settings.EnabledSortieSupplyNotifier; }
+            get { return NotifierSettings.EnabledSortieSupplyNotifier.Value; }
             set
             {
-                if (Settings.EnabledSortieSupplyNotifier != value)
+                if (NotifierSettings.EnabledSortieSupplyNotifier.Value != value)
                 {
-                    Settings.EnabledSortieSupplyNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledSortieSupplyNotifier.Value = value;
                 }
             }
         }
 
         public bool EnabledExercise
         {
-            get { return Settings.EnabledExerciseSupplyNotifier; }
+            get { return NotifierSettings.EnabledExerciseSupplyNotifier.Value; }
             set
             {
-                if (Settings.EnabledExerciseSupplyNotifier != value)
+                if (NotifierSettings.EnabledExerciseSupplyNotifier.Value != value)
                 {
-                    Settings.EnabledExerciseSupplyNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledExerciseSupplyNotifier.Value = value;
                 }
             }
         }
 
         public bool EnabledExpendition
         {
-            get { return Settings.EnabledExpenditionSupplyNotifier; }
+            get { return NotifierSettings.EnabledExpenditionSupplyNotifier.Value; }
             set
             {
-                if (Settings.EnabledExpenditionSupplyNotifier != value)
+                if (NotifierSettings.EnabledExpenditionSupplyNotifier.Value != value)
                 {
-                    Settings.EnabledExpenditionSupplyNotifier = value;
-                    Settings.Save();
+                    NotifierSettings.EnabledExpenditionSupplyNotifier.Value = value;
                 }
             }
         }