Reorder day/night configurations to be more consistent

Tyrrrz · May 31, 2024 · 6c7d8bc · 6c7d8bc
1 parent c07c6c1
commit 6c7d8bc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/LightBulb/Services/SettingsService.cs b/LightBulb/Services/SettingsService.cs
@@ -67,20 +67,20 @@ public bool IsExtendedGammaRangeUnlocked
 
     public double MaximumBrightness => 1;
 
-    private ColorConfiguration _nightConfiguration = new(3900, 0.85);
-    public ColorConfiguration NightConfiguration
-    {
-        get => _nightConfiguration;
-        set => SetProperty(ref _nightConfiguration, value);
-    }
-
     private ColorConfiguration _dayConfiguration = new(6600, 1);
     public ColorConfiguration DayConfiguration
     {
         get => _dayConfiguration;
         set => SetProperty(ref _dayConfiguration, value);
     }
 
+    private ColorConfiguration _nightConfiguration = new(3900, 0.85);
+    public ColorConfiguration NightConfiguration
+    {
+        get => _nightConfiguration;
+        set => SetProperty(ref _nightConfiguration, value);
+    }
+
     private TimeSpan _configurationTransitionDuration = TimeSpan.FromMinutes(40);
     public TimeSpan ConfigurationTransitionDuration
     {

diff --git a/LightBulb/ViewModels/Components/Settings/GeneralSettingsTabViewModel.cs b/LightBulb/ViewModels/Components/Settings/GeneralSettingsTabViewModel.cs
@@ -7,79 +7,79 @@ namespace LightBulb.ViewModels.Components.Settings;
 public class GeneralSettingsTabViewModel(SettingsService settingsService)
     : SettingsTabViewModelBase(settingsService, 0, "General")
 {
-    public double NightTemperature
+    public double DayTemperature
     {
-        get => SettingsService.NightConfiguration.Temperature;
+        get => SettingsService.DayConfiguration.Temperature;
         set
         {
-            SettingsService.NightConfiguration = new ColorConfiguration(
+            SettingsService.DayConfiguration = new ColorConfiguration(
                 Math.Clamp(
                     value,
                     SettingsService.MinimumTemperature,
                     SettingsService.MaximumTemperature
                 ),
-                NightBrightness
+                DayBrightness
             );
 
-            if (NightTemperature > DayTemperature)
-                DayTemperature = NightTemperature;
+            if (DayTemperature < NightTemperature)
+                NightTemperature = DayTemperature;
         }
     }
 
-    public double DayTemperature
+    public double NightTemperature
     {
-        get => SettingsService.DayConfiguration.Temperature;
+        get => SettingsService.NightConfiguration.Temperature;
         set
         {
-            SettingsService.DayConfiguration = new ColorConfiguration(
+            SettingsService.NightConfiguration = new ColorConfiguration(
                 Math.Clamp(
                     value,
                     SettingsService.MinimumTemperature,
                     SettingsService.MaximumTemperature
                 ),
-                DayBrightness
+                NightBrightness
             );
 
-            if (DayTemperature < NightTemperature)
-                NightTemperature = DayTemperature;
+            if (NightTemperature > DayTemperature)
+                DayTemperature = NightTemperature;
         }
     }
 
-    public double NightBrightness
+    public double DayBrightness
     {
-        get => SettingsService.NightConfiguration.Brightness;
+        get => SettingsService.DayConfiguration.Brightness;
         set
         {
-            SettingsService.NightConfiguration = new ColorConfiguration(
-                NightTemperature,
+            SettingsService.DayConfiguration = new ColorConfiguration(
+                DayTemperature,
                 Math.Clamp(
                     value,
                     SettingsService.MinimumBrightness,
                     SettingsService.MaximumBrightness
                 )
             );
 
-            if (NightBrightness > DayBrightness)
-                DayBrightness = NightBrightness;
+            if (DayBrightness < NightBrightness)
+                NightBrightness = DayBrightness;
         }
     }
 
-    public double DayBrightness
+    public double NightBrightness
     {
-        get => SettingsService.DayConfiguration.Brightness;
+        get => SettingsService.NightConfiguration.Brightness;
         set
         {
-            SettingsService.DayConfiguration = new ColorConfiguration(
-                DayTemperature,
+            SettingsService.NightConfiguration = new ColorConfiguration(
+                NightTemperature,
                 Math.Clamp(
                     value,
                     SettingsService.MinimumBrightness,
                     SettingsService.MaximumBrightness
                 )
             );
 
-            if (DayBrightness < NightBrightness)
-                NightBrightness = DayBrightness;
+            if (NightBrightness > DayBrightness)
+                DayBrightness = NightBrightness;
         }
     }