Merge pull request #86 from dan0v/master

Code cleanup, use OpenSans

AmplitudeSoundboard.csproj

@@ -17,7 +17,7 @@
     <RootNamespace>Amplitude</RootNamespace>
     <NeutralLanguage>en</NeutralLanguage>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>2.10.1</Version>
+    <Version>2.10.2</Version>
     <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>partial</TrimMode>
@@ -47,13 +47,6 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(Configuration)' == 'Debug'">
-      <ItemGroup>
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.1.3"/>
-      </ItemGroup>
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Update="Localization\Language.Designer.cs">
       <DesignTime>True</DesignTime>

Assets/Fonts/NotoSansDisplay/OFL.txt → Assets/Fonts/OpenSans/OFL.txt

@@ -1,8 +1,8 @@
-Copyright 2012 Google Inc. All Rights Reserved.
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------

Helpers/BlankHotkeysManager.cs

@@ -27,7 +27,7 @@ namespace Amplitude.Helpers
     public class BlankHotkeysManager : IKeyboardHook
     {
         private static BlankHotkeysManager? _instance;
-        public static BlankHotkeysManager Instance => _instance ??= new BlankHotkeysManager();
+        public static IKeyboardHook Instance => _instance ??= new BlankHotkeysManager();
 
         public void Dispose()
         {

Helpers/HotkeysManager.cs

@@ -52,9 +52,9 @@ public void RegisterHotkeyAtStartup(string? id, string hotkeyString)
             }
 
             // Add hotkey to dict
-            if (Hotkeys.TryGetValue(hotkeyString, out List<string> val))
+            if (Hotkeys.TryGetValue(hotkeyString, out List<string>? val))
             {
-                val.Add(id);
+                val?.Add(id);
             }
             else
             {
@@ -119,15 +119,15 @@ public void RemoveHotkey(string? id, string? hotkeyString)
                 return;
             }
 
-            if (Hotkeys.TryGetValue(hotkeyString, out List<string> val))
+            if (Hotkeys.TryGetValue(hotkeyString, out List<string>? val))
             {
-                if (val.Count <= 1)
+                if (val?.Count <= 1)
                 {
                     Hotkeys.Remove(hotkeyString);
                 }
                 else
                 {
-                    val.Remove(id);
+                    val?.Remove(id);
                 }
             }
 

Helpers/IKeyboardHook.cs

@@ -26,7 +26,7 @@ namespace Amplitude.Helpers
 {
     public interface IKeyboardHook : IDisposable
     {
-        public static IKeyboardHook Instance { get; }
+        public static abstract IKeyboardHook Instance { get; }
         public void SetSoundClipHotkey(SoundClip clip, Action<SoundClip, string> callback);
         public void SetGlobalStopHotkey(Config config, Action<Config, string> callback);
     }

Helpers/ISoundEngine.cs

@@ -28,7 +28,7 @@ namespace Amplitude.Helpers
 {
     public interface ISoundEngine : IDisposable
     {
-        public static ISoundEngine Instance { get; }
+        public static abstract ISoundEngine Instance { get; }
 
         public ObservableCollection<PlayingClip> CurrentlyPlaying { get; }
         public ObservableCollection<SoundClip> Queued { get; }

Helpers/MSoundEngine.cs

@@ -35,21 +35,21 @@ namespace Amplitude.Helpers
     class MSoundEngine : ISoundEngine
     {
         private static MSoundEngine? _instance;
-        public static MSoundEngine Instance => _instance ??= new MSoundEngine();
+        public static ISoundEngine Instance => _instance ??= new MSoundEngine();
 
-        object currentlyPlayingLock = new object();
+        object currentlyPlayingLock = new();
 
-        private ObservableCollection<PlayingClip> _currentlyPlaying = new ObservableCollection<PlayingClip>();
+        private ObservableCollection<PlayingClip> _currentlyPlaying = [];
         public ObservableCollection<PlayingClip> CurrentlyPlaying => _currentlyPlaying;
 
-        object queueLock = new object();
+        object queueLock = new();
 
-        private ObservableCollection<SoundClip> _queued = new ObservableCollection<SoundClip>();
+        private ObservableCollection<SoundClip> _queued = [];
         public ObservableCollection<SoundClip> Queued => _queued;
 
 
         private const long TIMER_MS = 200;
-        private Timer timer = new Timer(TIMER_MS)
+        private Timer timer = new(TIMER_MS)
         {
             AutoReset = true,
         };

Helpers/SharpKeyboardHook.cs

@@ -38,13 +38,18 @@ public class SharpKeyboardHook : IKeyboardHook
         private readonly object keySetLock = new();
 
         private static SharpKeyboardHook? _instance;
-        public static SharpKeyboardHook Instance => _instance ??= new SharpKeyboardHook();
+        public static IKeyboardHook Instance => _instance ??= new SharpKeyboardHook();
+
+        static bool disposed = false;
 
         private SharpKeyboardHook()
         {
-            sharpHook.KeyPressed += HandleKeyPressed;
-            sharpHook.KeyReleased += HandleKeyReleased;
-            sharpHook.RunAsync();
+            if (!disposed)
+            {
+                sharpHook.KeyPressed += HandleKeyPressed;
+                sharpHook.KeyReleased += HandleKeyReleased;
+                sharpHook.RunAsync();
+            }
         }
 
         private void HandleKeyReleased(object? sender, KeyboardHookEventArgs e)
@@ -95,7 +100,7 @@ private void ProcessHotkey(string currentKey)
                 }
                 soundClipCallbacks.Clear();
             }
-            else if (currentKey != HotkeysManager.UNBIND_HOTKEY && App.HotkeysManager.Hotkeys.TryGetValue(fullKey, out List<string> values))
+            else if (currentKey != HotkeysManager.UNBIND_HOTKEY && App.HotkeysManager.Hotkeys.TryGetValue(fullKey, out List<string>? values))
             {
                 // Go through and call all the Play methods on these id's
                 foreach (string item in values)
@@ -233,6 +238,12 @@ public void SetGlobalStopHotkey(Config config, Action<Config, string> callback)
 
         public void Dispose()
         {
+            if (disposed)
+            {
+                return;
+            }
+
+            disposed = true;
             _instance = null;
             sharpHook.KeyPressed -= HandleKeyPressed;
             sharpHook.KeyReleased -= HandleKeyReleased;

Helpers/SoundClipManager.cs

@@ -159,7 +159,10 @@ private void ValidateSoundClip(SoundClip clip)
             }
 
             App.OutputProfileManager.ValidateOutputProfile(profile);
-            App.SoundEngine.CheckDeviceExistsAndGenerateErrors(profile);
+            if (profile != null)
+            {
+                App.SoundEngine.CheckDeviceExistsAndGenerateErrors(profile);
+            }
         }
 
         /// <summary>
@@ -184,10 +187,10 @@ public void SaveClip(SoundClip clip)
                     }
                 }
             }
-            else if (SoundClips.TryGetValue(clip.Id, out SoundClip oldClip))
+            else if (SoundClips.TryGetValue(clip.Id, out SoundClip? oldClip))
             {
                 // Overwrite existing clip
-                App.HotkeysManager.RemoveHotkey(clip.Id, oldClip.Hotkey);
+                App.HotkeysManager.RemoveHotkey(clip.Id, oldClip?.Hotkey);
                 if (!string.IsNullOrEmpty(clip.Hotkey))
                 {
                     App.HotkeysManager.RegisterHotkeyAtStartup(clip.Id, clip.Hotkey);
@@ -211,9 +214,9 @@ public void RemoveSoundClip(string? id)
                 return;
             }
 
-            if (SoundClips.TryGetValue(id, out SoundClip clip))
+            if (SoundClips.TryGetValue(id, out SoundClip? clip))
             {
-                App.HotkeysManager.RemoveHotkey(id, clip.Hotkey);
+                App.HotkeysManager.RemoveHotkey(id, clip?.Hotkey);
 
                 SoundClips.Remove(id);
 

Helpers/ThemeManager.cs

@@ -102,7 +102,7 @@ private ThemeManager()
         ];
 
         public FontFamily TitleFont => FontFamily.Parse("avares://amplitude_soundboard/Assets/Fonts/JosefinSans/#Josefin Sans");
-        public FontFamily BodyFont => FontFamily.Parse("avares://amplitude_soundboard/Assets/Fonts/NotoSansDisplay/#Noto Sans Display");
+        public FontFamily BodyFont => FontFamily.Parse("avares://amplitude_soundboard/Assets/Fonts/OpenSans/#Open Sans");
 
         public Bitmap ArrowLeft => GetBitmap(folder + "/ArrowLeft.png");
         public Bitmap ArrowRight => GetBitmap(folder + "/ArrowRight.png");

Helpers/WindowManager.cs

@@ -99,13 +99,13 @@ public Dictionary<string, EditOutputProfile> EditOutputProfileWindows
 
         public void OpenEditOutputProfileWindow(string? Id = null)
         {
-            if (Id != null && EditOutputProfileWindows.TryGetValue(Id, out EditOutputProfile window))
+            if (Id != null && EditOutputProfileWindows.TryGetValue(Id, out EditOutputProfile? window))
             {
-                if (window.WindowState == WindowState.Minimized)
+                if (window?.WindowState == WindowState.Minimized)
                 {
                     window.WindowState = WindowState.Normal;
                 }
-                window.Activate();
+                window?.Activate();
             }
             else
             {
@@ -149,13 +149,13 @@ public void ClosedEditOutputProfileWindow(string Id)
 
         public void OpenEditSoundClipWindow(string? id = null)
         {
-            if (id != null && EditSoundClipWindows.TryGetValue(id, out EditSoundClip window))
+            if (id != null && EditSoundClipWindows.TryGetValue(id, out EditSoundClip? window))
             {
-                if (window.WindowState == WindowState.Minimized)
+                if (window?.WindowState == WindowState.Minimized)
                 {
                     window.WindowState = WindowState.Normal;
                 }
-                window.Activate();
+                window?.Activate();
             }
             else
             {
@@ -193,7 +193,7 @@ public void OpenEditSoundClipWindow((int row, int col) addToCell)
             sound.Show();
         }
 
-        public void OpenedEditSoundClipWindow(string id, EditSoundClip editSoundClip)
+        public void OpenedEditSoundClipWindow(string? id, EditSoundClip editSoundClip)
         {
             if (!string.IsNullOrEmpty(id) && !EditSoundClipWindows.ContainsKey(id))
             {
@@ -202,7 +202,7 @@ public void OpenedEditSoundClipWindow(string id, EditSoundClip editSoundClip)
             }
         }
 
-        public void ClosedEditSoundClipWindow(string id)
+        public void ClosedEditSoundClipWindow(string? id)
         {
             if (!string.IsNullOrEmpty(id) && EditSoundClipWindows.ContainsKey(id))
             {

Models/ErrorContainer.cs

@@ -42,7 +42,7 @@ public ErrorContainer(string errorMessage, SoundClip clip)
             if (!string.IsNullOrEmpty(clip?.Id))
             {
                 this.LinkedSoundClip = true;
-                this.SoundClipId = clip?.Id;
+                this.SoundClipId = clip.Id;
             }
         }
 
@@ -52,7 +52,7 @@ public ErrorContainer(string errorMessage, OutputProfile profile)
             if (!string.IsNullOrEmpty(profile?.Id))
             {
                 this.LinkedOutputProfile = true;
-                this.OutputProfileId = profile?.Id;
+                this.OutputProfileId = profile.Id;
             }
         }
 

Models/SoundClip.cs

@@ -149,9 +149,9 @@ public bool LoopClip
         }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
-        public ObservableCollection<OutputSettings> OutputSettingsFromProfile => App.OutputProfileManager.GetOutputProfile(OutputProfileId)?.OutputSettings;
+        public ObservableCollection<OutputSettings> OutputSettingsFromProfile => App.OutputProfileManager.GetOutputProfile(OutputProfileId)?.OutputSettings ?? [];
 
-        private ObservableCollection<OutputSettings> _outputSettings = new ObservableCollection<OutputSettings>();
+        private ObservableCollection<OutputSettings> _outputSettings = [];
         [Obsolete]
         public ObservableCollection<OutputSettings> OutputSettings
         {

NOTICE.txt

@@ -5,11 +5,11 @@ Copyright (c) .NET Foundation and Contributors All Rights Reserved
 https://github.com/AvaloniaUI/Avalonia
 
 BASS, BASS_AAC, BASSALAC, BASSFLAC, BASSmix, BASSOPUS
-Copyright (C) 2003-2021 un4seen developments
+Copyright (c) 2003-2021 un4seen developments
 https://www.un4seen.com/
 
 Josefin Sans
-Copyright (C) 2010 Santiago Orozco (hi@typemade.mx)
+Copyright (c) 2010 Santiago Orozco (hi@typemade.mx)
 https://github.com/googlefonts/josefinsans
 
 ManagedBass
@@ -19,8 +19,9 @@ https://github.com/ManagedBass/ManagedBass
 Material Design Icons
 https://github.com/google/material-design-icons
 
-Noto Sans Display
-https://github.com/googlefonts/noto-fonts
+Open Sans
+Copyright (c) 2020 The Open Sans Project Authors
+https://github.com/googlefonts/opensans
 
 SharpHook
 Copyright (c) 2021 Anatoliy Pylypchuk

ViewModels/EditSoundClipViewModel.cs

@@ -191,9 +191,10 @@ private void Model_PropertyChanged(object? sender, System.ComponentModel.Propert
 
         public void OutputProfileSelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            if (e.AddedItems.Count > 0 && ((OutputProfile)e.AddedItems[0]).Id != Model.OutputProfileId)
+            var id = ((OutputProfile?)e.AddedItems[0])?.Id;
+            if (e.AddedItems.Count > 0 && id != null && id != Model.OutputProfileId)
             {
-                Model.OutputProfileId = ((OutputProfile)e.AddedItems[0]).Id;
+                Model.OutputProfileId = id;
             }
         }
 

ViewModels/ViewModelBase.cs

@@ -47,7 +47,7 @@ public abstract class ViewModelBase : ReactiveObject, INotifyPropertyChanged, ID
 
         public virtual void Dispose() { }
 
-        public event PropertyChangedEventHandler? PropertyChanged;
+        public new event PropertyChangedEventHandler? PropertyChanged;
         protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

Views/About.axaml

@@ -44,7 +44,7 @@
 
     <TextBlock IsVisible="{Binding CanUseCustomTitlebar}" Text="{i18n:Localize AboutTitle}" Classes="TITLE" FontWeight="Bold" FontFamily="{Binding ThemeManager.TitleFont}" Margin="10,10,10,10" HorizontalAlignment="Center" IsHitTestVisible="False" ></TextBlock>
 
-    <Grid RowDefinitions="*,Auto" Margin="0,30,0,0">
+    <Grid RowDefinitions="*,Auto" Margin="0,30,0,0" Name="styleroot">
       <DockPanel Grid.Row="0">
         <Grid RowDefinitions="Auto,*,*">
           <!--Copyright-->