refactor(icon changer): added Enum file; refactor/style: cleanup

SoundSwitch/Framework/Configuration/ISoundSwitchConfiguration.cs

@@ -63,7 +63,7 @@ public interface ISoundSwitchConfiguration : IConfiguration
         /// <summary>
         /// What to do with the TrayIcon when changing default device
         /// </summary>
-        IconChangerFactory.ActionEnum SwitchIcon { get; set; }
+        IconChangerEnum SwitchIcon { get; set; }
 
         HashSet<ProfileSetting> ProfileSettings { get; set; }
         HashSet<Profile.Profile> Profiles { get; set; }

SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs

@@ -68,7 +68,7 @@ public SoundSwitchConfiguration()
             AutoAddNewConnectedDevices = false;
 
             SelectedDevices = new HashSet<DeviceInfo>();
-            SwitchIcon = IconChangerFactory.ActionEnum.Never;
+            SwitchIcon = IconChangerEnum.Never;
             MigratedFields = new HashSet<string>();
         }
 
@@ -105,7 +105,7 @@ public SoundSwitchConfiguration()
         public bool KeepSystrayIcon { get; set; }
 
         public bool SwitchForegroundProgram { get; set; }
-        public IconChangerFactory.ActionEnum SwitchIcon { get; set; }
+        public IconChangerEnum SwitchIcon { get; set; }
 
         [Obsolete]
         public HashSet<ProfileSetting> ProfileSettings { get; set; } = new();
@@ -176,7 +176,7 @@ public bool Migrate()
 #pragma warning disable 612
             if (!MigratedFields.Contains(nameof(KeepSystrayIcon)))
             {
-                SwitchIcon = KeepSystrayIcon ? IconChangerFactory.ActionEnum.Never : IconChangerFactory.ActionEnum.Always;
+                SwitchIcon = KeepSystrayIcon ? IconChangerEnum.Never : IconChangerEnum.Always;
                 MigratedFields.Add(nameof(KeepSystrayIcon));
                 migrated = true;
             }

SoundSwitch/Framework/NotificationManager/Notification/NotificationBanner.cs

@@ -23,7 +23,6 @@
 using SoundSwitch.Framework.Banner.Position;
 using SoundSwitch.Framework.NotificationManager.Notification.Configuration;
 using SoundSwitch.Localization;
-using SoundSwitch.Model;
 using SoundSwitch.Properties;
 
 namespace SoundSwitch.Framework.NotificationManager.Notification

SoundSwitch/Framework/NotificationManager/Notification/NotificationSound.cs

@@ -69,9 +69,7 @@ public void NotifyProfileChanged(Profile.Profile profile, Bitmap icon, uint? pro
             }
         }
 
-        public void NotifyMuteChanged(string microphoneName, bool newMuteState)
-        {
-        }
+        public void NotifyMuteChanged(string microphoneName, bool newMuteState) { }
 
         public void OnSoundChanged(CachedSound newSound) => Configuration.CustomSound = newSound;
 

SoundSwitch/Framework/TrayIcon/Icon/Changer/AbstractIconChanger.cs

@@ -1,4 +1,18 @@
-using NAudio.CoreAudioApi;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using NAudio.CoreAudioApi;
 using Serilog;
 using SoundSwitch.Audio.Manager;
 using SoundSwitch.Audio.Manager.Interop.Enum;
@@ -10,20 +24,14 @@ public abstract class AbstractIconChanger : IIconChanger
     {
         private readonly ILogger _log;
 
-        protected AbstractIconChanger()
-        {
-            _log = Log.ForContext("IconChanger", TypeEnum);
-        }
+        protected AbstractIconChanger() => _log = Log.ForContext("IconChanger", TypeEnum);
 
-        public abstract IconChangerFactory.ActionEnum TypeEnum { get; }
+        public abstract IconChangerEnum TypeEnum { get; }
         public abstract string Label { get; }
 
         protected abstract DataFlow Flow { get; }
 
-        protected virtual bool NeedsToChangeIcon(DeviceInfo deviceInfo)
-        {
-            return deviceInfo.Type == Flow;
-        }
+        protected virtual bool NeedsToChangeIcon(DeviceInfo deviceInfo) => deviceInfo.Type == Flow;
 
         public void ChangeIcon(UI.Component.TrayIcon trayIcon)
         {

SoundSwitch/Framework/TrayIcon/Icon/Changer/AlwaysIconChanger.cs

@@ -1,18 +1,29 @@
-using NAudio.CoreAudioApi;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using NAudio.CoreAudioApi;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Localization;
 
 namespace SoundSwitch.Framework.TrayIcon.Icon.Changer
 {
     public class AlwaysIconChanger : AbstractIconChanger
     {
-        public override IconChangerFactory.ActionEnum TypeEnum => IconChangerFactory.ActionEnum.Always;
+        public override IconChangerEnum TypeEnum => IconChangerEnum.Always;
         public override string Label => TrayIconStrings.iconChanger_both;
 
-        protected override bool NeedsToChangeIcon(DeviceInfo deviceInfo)
-        {
-            return true;
-        }
+        protected override bool NeedsToChangeIcon(DeviceInfo deviceInfo) => true;
 
         protected override DataFlow Flow => DataFlow.Render;
     }

SoundSwitch/Framework/TrayIcon/Icon/Changer/NeverIconIconChanger.cs

@@ -1,4 +1,18 @@
-using SoundSwitch.Audio.Manager.Interop.Enum;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using SoundSwitch.Audio.Manager.Interop.Enum;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Localization;
 using SoundSwitch.Properties;
@@ -7,16 +21,11 @@ namespace SoundSwitch.Framework.TrayIcon.Icon.Changer
 {
     public class NeverIconIconChanger : IIconChanger
     {
-        public IconChangerFactory.ActionEnum TypeEnum => IconChangerFactory.ActionEnum.Never;
+        public IconChangerEnum TypeEnum => IconChangerEnum.Never;
         public string Label => TrayIconStrings.iconChanger_none;
 
-        public void ChangeIcon(UI.Component.TrayIcon trayIcon)
-        {
-            trayIcon.ReplaceIcon(Resources.Switch_SoundWave);
-        }
+        public void ChangeIcon(UI.Component.TrayIcon trayIcon) => trayIcon.ReplaceIcon(Resources.Switch_SoundWave);
 
-        public void ChangeIcon(UI.Component.TrayIcon trayIcon, DeviceFullInfo deviceInfo, ERole role)
-        {
-        }
+        public void ChangeIcon(UI.Component.TrayIcon trayIcon, DeviceFullInfo deviceInfo, ERole role) { }
     }
 }

SoundSwitch/Framework/TrayIcon/Icon/Changer/PlaybackIconChanger.cs

@@ -1,11 +1,25 @@
-using NAudio.CoreAudioApi;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using NAudio.CoreAudioApi;
 using SoundSwitch.Localization;
 
 namespace SoundSwitch.Framework.TrayIcon.Icon.Changer
 {
     public class PlaybackIconChanger : AbstractIconChanger
     {
-        public override IconChangerFactory.ActionEnum TypeEnum => IconChangerFactory.ActionEnum.Playback;
+        public override IconChangerEnum TypeEnum => IconChangerEnum.Playback;
         public override string Label => TrayIconStrings.iconChanger_playback;
         protected override DataFlow Flow => DataFlow.Render;
     }

SoundSwitch/Framework/TrayIcon/Icon/Changer/RecordingIconChanger.cs

@@ -1,11 +1,25 @@
-using NAudio.CoreAudioApi;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using NAudio.CoreAudioApi;
 using SoundSwitch.Localization;
 
 namespace SoundSwitch.Framework.TrayIcon.Icon.Changer
 {
     public class RecordingIconChanger : AbstractIconChanger
     {
-        public override IconChangerFactory.ActionEnum TypeEnum => IconChangerFactory.ActionEnum.Recording;
+        public override IconChangerEnum TypeEnum => IconChangerEnum.Recording;
         public override string Label => TrayIconStrings.iconChanger_recording;
         protected override DataFlow Flow => DataFlow.Capture;
     }

SoundSwitch/Framework/TrayIcon/Icon/IIconChanger.cs

@@ -1,10 +1,24 @@
-using SoundSwitch.Audio.Manager.Interop.Enum;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using SoundSwitch.Audio.Manager.Interop.Enum;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Framework.Factory;
 
 namespace SoundSwitch.Framework.TrayIcon.Icon
 {
-    public interface IIconChanger : IEnumImpl<IconChangerFactory.ActionEnum>
+    public interface IIconChanger : IEnumImpl<IconChangerEnum>
     {
 
         /// <summary>

SoundSwitch/Framework/TrayIcon/Icon/IconChangerEnum.cs

@@ -0,0 +1,24 @@
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+namespace SoundSwitch.Framework.TrayIcon.Icon
+{
+    public enum IconChangerEnum
+    {
+        Never = 0,
+        Recording = 1,
+        Playback = 2,
+        Always = 3
+    }
+}

SoundSwitch/Framework/TrayIcon/Icon/IconChangerFactory.cs

@@ -1,23 +1,29 @@
-using SoundSwitch.Framework.Factory;
+/********************************************************************
+* Copyright (C) 2015-2017 Antoine Aflalo
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+********************************************************************/
+
+using SoundSwitch.Framework.Factory;
 using SoundSwitch.Framework.TrayIcon.Icon.Changer;
 
 namespace SoundSwitch.Framework.TrayIcon.Icon
 {
-    public class IconChangerFactory : AbstractFactory<IconChangerFactory.ActionEnum, IIconChanger>
+    public class IconChangerFactory : AbstractFactory<IconChangerEnum, IIconChanger>
     {
-        public enum ActionEnum
-        {
-            Never,
-            Recording,
-            Playback,
-            Always
-        }
-
-        private static readonly IEnumImplList<IconChangerFactory.ActionEnum, IIconChanger> Impl = new EnumImplList<ActionEnum, IIconChanger>()
+        private static readonly IEnumImplList<IconChangerEnum, IIconChanger> Impl = new EnumImplList<IconChangerEnum, IIconChanger>()
         {
+            new NeverIconIconChanger(),
             new PlaybackIconChanger(),
             new RecordingIconChanger(),
-            new NeverIconIconChanger(),
             new AlwaysIconChanger()
         };