Feat/qol

src/Nullinside.TwitchStreamingTools/App.axaml

@@ -1,7 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="Nullinside.TwitchStreamingTools.App"
-             xmlns:twitchStreamingTools="clr-namespace:Nullinside.TwitchStreamingTools"
              xmlns:twitchStreamingTools1="clr-namespace:Nullinside.TwitchStreamingTools"
              RequestedThemeVariant="Dark">
     <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

src/Nullinside.TwitchStreamingTools/Controls/Keybind.axaml

@@ -3,10 +3,20 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels="clr-namespace:Nullinside.TwitchStreamingTools.Controls.ViewModels"
+             xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Nullinside.TwitchStreamingTools.Controls.Keybind"
              x:DataType="viewModels:KeybindViewModel">
     <StackPanel>
-        <Button Content="{Binding Keybind}" Command="{Binding ListenForKeystroke}" />
+        <Button IsVisible="{Binding !Listening}" 
+                Content="{Binding Keybind, TargetNullValue='[None]'}"
+                Command="{Binding ListenForKeystroke}" 
+                ToolTip.Tip="ESC to unset" />
+        <StackPanel IsVisible="{Binding Listening}"
+                    Orientation="Horizontal">
+            <controls:Loading Width="25" 
+                              Height="25" />
+            <Label>Press a key...</Label>
+        </StackPanel>
     </StackPanel>
 </UserControl>

src/Nullinside.TwitchStreamingTools/Controls/ViewModels/KeybindViewModel.cs

@@ -1,5 +1,6 @@
 using System.Reactive;
 
+using Nullinside.TwitchStreamingTools.Models;
 using Nullinside.TwitchStreamingTools.Services;
 using Nullinside.TwitchStreamingTools.ViewModels;
 
@@ -19,7 +20,12 @@ public class KeybindViewModel : ViewModelBase {
   /// <summary>
   ///   The keybind, if set.
   /// </summary>
-  private Nullinside.TwitchStreamingTools.Controls.ViewModels.Keybind? _keybind;
+  private Keybind? _keybind;
+
+  /// <summary>
+  ///   True if listening for keystrokes, false otherwise.
+  /// </summary>
+  private bool _listening;
 
   /// <summary>
   ///   Initializes a new instance of the <see cref="KeybindViewModel" /> class.
@@ -33,11 +39,19 @@ public KeybindViewModel(IGlobalKeyPressService service) {
   /// <summary>
   ///   The keybind.
   /// </summary>
-  public Nullinside.TwitchStreamingTools.Controls.ViewModels.Keybind? Keybind {
+  public Keybind? Keybind {
     get => _keybind;
     set => this.RaiseAndSetIfChanged(ref _keybind, value);
   }
 
+  /// <summary>
+  ///   True if listening for keystrokes, false otherwise.
+  /// </summary>
+  public bool Listening {
+    get => _listening;
+    set => this.RaiseAndSetIfChanged(ref _listening, value);
+  }
+
   /// <summary>
   ///   Listens for keystrokes.
   /// </summary>
@@ -47,6 +61,7 @@ public Nullinside.TwitchStreamingTools.Controls.ViewModels.Keybind? Keybind {
   ///   Starts listening for keystrokes.
   /// </summary>
   private void StartListenKeystroke() {
+    Listening = true;
     _service.OnKeystroke -= OnKeystroke;
     _service.OnKeystroke += OnKeystroke;
   }
@@ -55,12 +70,13 @@ private void StartListenKeystroke() {
   ///   Called whenever a keystroke is pressed.
   /// </summary>
   /// <param name="keybind">The key that was press.</param>
-  private void OnKeystroke(Nullinside.TwitchStreamingTools.Controls.ViewModels.Keybind keybind) {
+  private void OnKeystroke(Keybind keybind) {
     if (_service.IsModifier(keybind.Key)) {
       return;
     }
 
-    Keybind = keybind;
+    Keybind = keybind.Key == Keys.Escape ? null : keybind;
     _service.OnKeystroke -= OnKeystroke;
+    Listening = false;
   }
 }

src/Nullinside.TwitchStreamingTools/Nullinside.TwitchStreamingTools.csproj

@@ -15,8 +15,8 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AssemblyName>Nullinside.TwitchStreamingTools</AssemblyName>
         <RootNamespace>Nullinside.TwitchStreamingTools</RootNamespace>
-        <Company />
-        <Product />
+        <Company/>
+        <Product/>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DocumentationFile>bin\Debug\TwitchStreamingTools.xml</DocumentationFile>
@@ -53,22 +53,22 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.3.6" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.6" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.6" />
+        <PackageReference Include="Avalonia" Version="11.3.6"/>
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.6"/>
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6"/>
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.6"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.6" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.6"/>
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6"/>
         <PackageReference Include="DynamicData" Version="9.4.1"/>
-        <PackageReference Include="log4net" Version="3.2.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
+        <PackageReference Include="log4net" Version="3.2.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9"/>
         <PackageReference Include="NAudio.Wasapi" Version="2.2.1"/>
         <PackageReference Include="NAudio.WinMM" Version="2.2.1"/>
         <PackageReference Include="PInvoke.User32" Version="0.7.124"/>
-        <PackageReference Include="System.Speech" Version="9.0.9" />
-        <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.4" />
-        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.6.4" />
+        <PackageReference Include="System.Speech" Version="9.0.9"/>
+        <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.4"/>
+        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.6.4"/>
     </ItemGroup>
 
     <ItemGroup>

src/Nullinside.TwitchStreamingTools/Views/MainWindow.axaml

@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
         xmlns:viewModels="clr-namespace:Nullinside.TwitchStreamingTools.ViewModels"
         xmlns:controls1="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
         xmlns:m="clr-namespace:Nullinside.TwitchStreamingTools.Models"

src/Nullinside.TwitchStreamingTools/Views/NewVersionWindow.axaml

@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
         xmlns:viewModels="clr-namespace:Nullinside.TwitchStreamingTools.ViewModels"
         xmlns:controls1="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
         x:Name="Window"

src/Nullinside.TwitchStreamingTools/Views/Pages/AccountView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              xmlns:pages="clr-namespace:Nullinside.TwitchStreamingTools.ViewModels.Pages"
              xmlns:controls1="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/SettingsView.axaml

@@ -2,8 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:settingsView="clr-namespace:Nullinside.TwitchStreamingTools.Views.Pages.SettingsView"
-             xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              xmlns:pages1="clr-namespace:Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView"
              xmlns:controls1="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              xmlns:settingsView1="clr-namespace:Nullinside.TwitchStreamingTools.Views.Pages.SettingsView"
@@ -41,17 +39,17 @@
                 Skip TTS Button:
             </Label>
             <controls1:Keybind Grid.Row="0"
-                              Grid.Column="1"
-                              DataContext="{Binding SkipTtsKeyBinding}" />
+                               Grid.Column="1"
+                               DataContext="{Binding SkipTtsKeyBinding}" />
             <Label Grid.Row="1"
                    Grid.Column="0"
                    HorizontalAlignment="Right"
                    VerticalAlignment="Center">
                 Skip All TTS Button:
             </Label>
             <controls1:Keybind Grid.Row="1"
-                              Grid.Column="1"
-                              DataContext="{Binding SkipAllTtsKeyBinding}" />
+                               Grid.Column="1"
+                               DataContext="{Binding SkipAllTtsKeyBinding}" />
             <Label Grid.Row="2"
                    Grid.Column="0"
                    HorizontalAlignment="Right"
@@ -230,7 +228,7 @@
             <Grid Grid.Row="8"
                   Grid.Column="1">
                 <settingsView1:TtsSkipUsernamesControl Margin="0,0,5,0"
-                                                      DataContext="{Binding TtsSkipUsernamesViewModel}" />
+                                                       DataContext="{Binding TtsSkipUsernamesViewModel}" />
             </Grid>
             <Label Grid.Row="9"
                    Grid.Column="0"
@@ -242,7 +240,7 @@
             <Grid Grid.Row="9"
                   Grid.Column="1">
                 <settingsView1:TtsPhoneticWordsControl Margin="0,0,5,0"
-                                                      DataContext="{Binding TtsPhoneticWordsViewModel}" />
+                                                       DataContext="{Binding TtsPhoneticWordsViewModel}" />
             </Grid>
         </Grid>
     </ScrollViewer>

src/Nullinside.TwitchStreamingTools/Views/Pages/SettingsView/TtsSkipUsernamesControl.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              xmlns:settingView="clr-namespace:Nullinside.TwitchStreamingTools.ViewModels.Pages.SettingsView"
              xmlns:controls1="clr-namespace:Nullinside.TwitchStreamingTools.Controls"
              mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="300"
@@ -24,6 +23,6 @@
         <TextBox Grid.Row="0" Grid.Column="0" Text="{Binding UserToAdd}" />
         <Button Grid.Row="0" Grid.Column="1" Margin="5,0,0,0" Command="{Binding AddUser}">Add User</Button>
         <controls1:TwoListView Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" MaxHeight="200"
-                              DataContext="{Binding TwoListViewModel}" />
+                               DataContext="{Binding TwoListViewModel}" />
     </Grid>
 </UserControl>