Merge pull request #4 from Gaardsholt/idle-color

Gaardsholt · web-flow · commit 942afff0db08 · 2020-07-26T12:59:13.000+02:00
Added option to control idle color
diff --git a/AppSettings.cs b/AppSettings.cs
@@ -17,6 +17,7 @@ public class Settings
         public string Ring_Tune => Configuration.GetValue("AppSettings:Ring_Tune", "OpenOffice");
         public string Ring_Color => Configuration.GetValue("AppSettings:Ring_Color", "Red");
         public int Ring_Time => Configuration.GetValue("AppSettings:Ring_Time", 5000);
+        public string Idle_Color => Configuration.GetValue("AppSettings:Idle_Color", "Off");
 
         public Settings()
         {
diff --git a/README.md b/README.md
@@ -13,8 +13,9 @@
 | ApiKey      |               |                                                                   *                                                                   |
 | KeyName     | ApiKey        |                                                                   *                                                                   |
 | Ring_Tune   | OpenOffice    | "OpenOffice", "Quiet", "Funky", "FairyTale", "KuandoTrain", "TelephoneNordic", "TelephoneOriginal", "TelephonePickMeUp", "IM1", "IM2" |
-| Ring_Color  | Red           |                                                "Red", "Green", "Blue", "Yellow", "Off                                                 |
+| Ring_Color  | Red           |                                                "Red", "Green", "Blue", "Yellow", "Off"                                                |
 | Ring_Time   | 5000          |                                                                                                                                       |
+| Idle_Color  | Off           |                                                           See "Ring_Color"                                                            |
 
 
 Example of a appsettings.json:
@@ -26,8 +27,9 @@ Example of a appsettings.json:
     "Ring_Time": 5500,
     "Ring_Tune": "OpenOffice",
     "Ring_Color": "Red",
+    "KeyName": "ApiKey",
     "ApiKey": "some-key",
-    "KeyName": "ApiKey"
+    "Idle_Color": "Off"
   }
 }
 ```
diff --git a/ServerConnect.cs b/ServerConnect.cs
@@ -14,11 +14,13 @@ class ServerConnect
 
         public ContextMenuStrip _menu;
         private static Settings _settings;
+        private static Busylight.BusylightColor _idleColor;
 
         public ServerConnect(Settings settings, ContextMenuStrip menu)
         {
             _settings = settings;
             _menu = menu;
+            _idleColor = GetColorFromString(_settings.Idle_Color);
 
             connection = new HubConnectionBuilder()
                 .WithUrl(new Uri(_settings.SignalR_Uri), options =>
@@ -65,13 +67,14 @@ public async Task Connect()
 
                 busy.Alert(color, tune, Busylight.BusylightVolume.High);
                 await Task.Delay(_settings.Ring_Time);
-                busy.Light(Busylight.BusylightColor.Off);
+                busy.Light(_idleColor);
             });
 
             try
             {
                 await ConnectWithRetryAsync();
                 AddClickEvent();
+                busy.Light(_idleColor);
             }
             catch (Exception e)
             {
diff --git a/appsettings.json b/appsettings.json
@@ -2,9 +2,10 @@
   "AppSettings": {
     "Location": "Brande",
     "SignalR_Uri": "http://localhost:50625/BusyHub",
-    "Ring_Time": 5500,
+    "Ring_Time": 6800,
     "Ring_Tune": "OpenOffice",
     "Ring_Color": "Red",
+    "Idle_Color":  "Blue",
     "ApiKey": "some-key"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class Settings`
`17`	`17`	`public string Ring_Tune => Configuration.GetValue("AppSettings:Ring_Tune", "OpenOffice");`
`18`	`18`	`public string Ring_Color => Configuration.GetValue("AppSettings:Ring_Color", "Red");`
`19`	`19`	`public int Ring_Time => Configuration.GetValue("AppSettings:Ring_Time", 5000);`
	`20`	`+ public string Idle_Color => Configuration.GetValue("AppSettings:Idle_Color", "Off");`
`20`	`21`
`21`	`22`	`public Settings()`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,13 @@ class ServerConnect`
`14`	`14`
`15`	`15`	`public ContextMenuStrip _menu;`
`16`	`16`	`private static Settings _settings;`
	`17`	`+ private static Busylight.BusylightColor _idleColor;`
`17`	`18`
`18`	`19`	`public ServerConnect(Settings settings, ContextMenuStrip menu)`
`19`	`20`	`{`
`20`	`21`	`_settings = settings;`
`21`	`22`	`_menu = menu;`
	`23`	`+ _idleColor = GetColorFromString(_settings.Idle_Color);`
`22`	`24`
`23`	`25`	`connection = new HubConnectionBuilder()`
`24`	`26`	`.WithUrl(new Uri(_settings.SignalR_Uri), options =>`
`@@ -65,13 +67,14 @@ public async Task Connect()`
`65`	`67`
`66`	`68`	`busy.Alert(color, tune, Busylight.BusylightVolume.High);`
`67`	`69`	`await Task.Delay(_settings.Ring_Time);`
`68`		`- busy.Light(Busylight.BusylightColor.Off);`
	`70`	`+ busy.Light(_idleColor);`
`69`	`71`	`});`
`70`	`72`
`71`	`73`	`try`
`72`	`74`	`{`
`73`	`75`	`await ConnectWithRetryAsync();`
`74`	`76`	`AddClickEvent();`
	`77`	`+ busy.Light(_idleColor);`
`75`	`78`	`}`
`76`	`79`	`catch (Exception e)`
`77`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`	`"AppSettings": {`
`3`	`3`	`"Location": "Brande",`
`4`	`4`	`"SignalR_Uri": "http://localhost:50625/BusyHub",`
`5`		`- "Ring_Time": 5500,`
	`5`	`+ "Ring_Time": 6800,`
`6`	`6`	`"Ring_Tune": "OpenOffice",`
`7`	`7`	`"Ring_Color": "Red",`
	`8`	`+ "Idle_Color": "Blue",`
`8`	`9`	`"ApiKey": "some-key"`
`9`	`10`	`}`
`10`	`11`	`}`