formatting, and version to 1.3

TheJoeFin · TheJoeFin · commit 7ca536236177 · 2021-01-02T07:08:13.000-06:00
diff --git a/Program.cs b/Program.cs
@@ -90,8 +90,7 @@ static void Main() {
             Application.Run(context);
         }
 
-        public AppContext()
-        {
+        public AppContext() {
             this.components = new Container();
             this.timer = new Timer(components);
             timer.Tick += new EventHandler(timer_Tick);
@@ -125,8 +124,7 @@ public AppContext()
             }
         }
 
-        void SetIsLightTheme()
-        {
+        void SetIsLightTheme() {
             var settings = new vm.UISettings();
             Windows.UI.Color color = settings.GetColorValue(vm.UIColorType.Accent);
             var foreground = settings.GetColorValue(vm.UIColorType.Foreground);
@@ -141,14 +139,12 @@ void SetIsLightTheme()
                 isLightTheme = true;
         }
 
-        private static String HexConverter(Color c)
-        {
+        private static String HexConverter(Color c) {
             return "#" + c.R.ToString("X2") + c.G.ToString("X2") + c.B.ToString("X2");
         }
 
         private void setIcons() {
-            switch (Settings.Default.Icon)
-            {
+            switch (Settings.Default.Icon) {
                 case "Mug":
                     if (isLightTheme){
                         this.offIcon = new Icon(
@@ -279,6 +275,7 @@ void showSettings() {
 
         private void SettingsForm_FormClosing(object sender, FormClosingEventArgs e) {
             setContextMenu();
+            SetIsLightTheme();
             setIcons();
 
             if (isActivated)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/SettingsForm.cs b/SettingsForm.cs
@@ -1,15 +1,10 @@
 ﻿using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Drawing;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using Caffeinated.Properties;
-using Microsoft.Win32;
 using Windows.ApplicationModel;
-using vm = Windows.UI.ViewManagement;
 
 namespace Caffeinated {
     public partial class SettingsForm : BaseForm {
@@ -40,8 +35,7 @@ public SettingsForm() : base() {
         }
 
         private void setRadioButtons() {
-            switch (Settings.Default.Icon)
-            {
+            switch (Settings.Default.Icon) {
                 case "Mug":
                     mugRDBTN.Checked = true;
                     break;
@@ -54,8 +48,7 @@ private void setRadioButtons() {
             }
         }
 
-        private void DeleteMI_Click(object sender, EventArgs e)
-        {
+        private void DeleteMI_Click(object sender, EventArgs e) {
             Duration durationToDelete = DefaultDurationBox.SelectedItem as Duration;
 
             DialogResult result = MessageBox.Show(
@@ -64,8 +57,7 @@ private void DeleteMI_Click(object sender, EventArgs e)
                     MessageBoxButtons.YesNo
                 );
 
-            switch (result)
-            {
+            switch (result) {
                 case DialogResult.None:
                     break;
                 case DialogResult.OK:
@@ -94,8 +86,7 @@ private async void setStartupCheckBox() {
             StartupTask startupTask = await StartupTask.GetAsync("StartCaffeinated");
             Debug.WriteLine("Startup is " + startupTask.State.ToString());
 
-            switch (startupTask.State)
-            {
+            switch (startupTask.State) {
                 case StartupTaskState.Disabled:
                     // Task is disabled but can be enabled.
                     StartupChkBox.Checked = false;
@@ -122,10 +113,7 @@ private void cancelBtn_Click(object sender, EventArgs e) {
             this.Close();
         }
 
-        private void DefaultDurationBox_SelectedIndexChanged(
-            object sender,
-            EventArgs e
-        ) {
+        private void DefaultDurationBox_SelectedIndexChanged(object sender,EventArgs e) {
             var item = DefaultDurationBox.SelectedItem as Duration;
             if (item != null) {
                 Settings.Default.DefaultDuration = item.Minutes;
@@ -154,8 +142,7 @@ private void addCustomDurationBTN_Click(object sender, EventArgs e) {
             int newDuration = 0;
             int.TryParse(CustomDurationTXBX.Text, out newDuration);
 
-            if ( newDuration < 0)
-            {
+            if ( newDuration < 0) {
                 CustomDurationTXBX.Text = "";
                 MessageBox.Show(
                     "Enter a positive number.",
@@ -165,8 +152,7 @@ private void addCustomDurationBTN_Click(object sender, EventArgs e) {
                 return;
             }
 
-            if (Settings.Default.RealDurations.Contains(newDuration))
-            {
+            if (Settings.Default.RealDurations.Contains(newDuration)) {
                 CustomDurationTXBX.Text = "";
                 MessageBox.Show(
                     $"{newDuration} is already a duration.",
@@ -176,16 +162,14 @@ private void addCustomDurationBTN_Click(object sender, EventArgs e) {
                 return;
             }
 
-            Duration newCustomDuration = new Duration
-            {
+            Duration newCustomDuration = new Duration {
                 Minutes = newDuration
             };
 
             Durations.Add(newCustomDuration);
             var sortedDurations = Durations.OrderByDescending(i => i).ToList();
             Durations.Clear();
-            foreach (var item in sortedDurations)
-            {
+            foreach (var item in sortedDurations) {
                 Durations.Add(item);
             }
             Settings.Default.RealDurations.Add(newDuration); 
@@ -194,18 +178,15 @@ private void addCustomDurationBTN_Click(object sender, EventArgs e) {
             CustomDurationTXBX.Text = "";            
         }
 
-        private void defaultRDBTN_Click(object sender, EventArgs e)
-        {
+        private void defaultRDBTN_Click(object sender, EventArgs e) {
             Settings.Default.Icon = "Default";
         }
 
-        private void eyeZZZRDBTN_Click(object sender, EventArgs e)
-        {
+        private void eyeZZZRDBTN_Click(object sender, EventArgs e) {
             Settings.Default.Icon = "Eye-ZZZ";
         }
 
-        private void mugRDBTN_Click(object sender, EventArgs e)
-        {
+        private void mugRDBTN_Click(object sender, EventArgs e) {
             Settings.Default.Icon = "Mug";
         }
     }
