Some style updates

philippn · Sep 21, 2014 · 4bcf999 · 4bcf999
1 parent c619fc0
commit 4bcf999
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/NowPlayingKiosk/MainWindow.xaml.cs b/NowPlayingKiosk/MainWindow.xaml.cs
@@ -1,13 +1,6 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Net;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
-using System.Security.Cryptography;
-using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -162,9 +155,9 @@ private void Window_KeyDown(object sender, KeyEventArgs e)
         private void LoadSkin()
         {
             string SkinPath = System.IO.Path.Combine(Directory.GetCurrentDirectory(), "Skin", "skin.xaml");
-            FileStream Fs = new FileStream(@SkinPath, FileMode.Open);
-            Grid Grid = System.Windows.Markup.XamlReader.Load(Fs) as Grid;
-            this.Content = Grid;
+            FileStream fs = new FileStream(@SkinPath, FileMode.Open);
+            Grid grid = System.Windows.Markup.XamlReader.Load(fs) as Grid;
+            Content = grid;
         }
 
         private void StartPoller()

diff --git a/NowPlayingKiosk/NowPlayingTrackInfoProvider.cs b/NowPlayingKiosk/NowPlayingTrackInfoProvider.cs
@@ -16,10 +16,11 @@ public TrackInfo(string artist, string title)
         public override bool Equals(Object obj)
         {
             if (obj == null || GetType() != obj.GetType()) return false;
-            TrackInfo o = (TrackInfo)obj;
+            TrackInfo o = (TrackInfo) obj;
             // Use Equals to compare instance variables.
             return Artist.Equals(o.Artist) && Title.Equals(o.Title);
         }
+
         public override int GetHashCode()
         {
             return Artist.GetHashCode() ^ Title.GetHashCode();

diff --git a/NowPlayingKiosk/SpotifyNowPlayingTrackInfoProvider.cs b/NowPlayingKiosk/SpotifyNowPlayingTrackInfoProvider.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NowPlayingKiosk
 {
@@ -28,11 +24,11 @@ public TrackInfo WhatIsNowPlaying()
             if (windowTitle != null)
             {
                 // For example "Foo Fighters – Monkey Wrench"
-                int Idx = windowTitle.IndexOf('–');
-                if (Idx != -1)
+                int idx = windowTitle.IndexOf('–');
+                if (idx != -1)
                 {
-                    string artist = windowTitle.Substring(0, Idx).Trim();
-                    string title = windowTitle.Substring(Idx + 1).Trim();
+                    string artist = windowTitle.Substring(0, idx).Trim();
+                    string title = windowTitle.Substring(idx + 1).Trim();
                     nowPlaying = new TrackInfo(artist, title);
                 }
             }