Merge pull request #117 from nullinside-development-group/bug/volume

Bug/volume

Author: ProgrammingByPermutation

src/TwitchStreamingTools/ViewModels/Pages/ChatViewModel.cs

@@ -169,7 +169,7 @@ from user in _selectedTwitchChatNames
         OutputDevice = Configuration.GetDefaultAudioDevice(),
         TtsOn = true,
         TtsVoice = Configuration.GetDefaultTtsVoice(),
-        TtsVolume = 50
+        TtsVolume = Configuration.GetDefaultTtsVolume() ?? 50u
       }).ToList();
 
     _configuration.WriteConfiguration();
@@ -194,7 +194,7 @@ from user in _selectedTwitchChatNames
         OutputDevice = Configuration.GetDefaultAudioDevice(),
         TtsOn = true,
         TtsVoice = Configuration.GetDefaultTtsVoice(),
-        TtsVolume = 50
+        TtsVolume = Configuration.GetDefaultTtsVolume() ?? 50u
       }).ToList();
 
     _configuration.WriteConfiguration();

src/TwitchStreamingTools/Views/MainWindow.axaml

@@ -19,32 +19,65 @@
         Icon="/Assets/logo.ico"
         Title="Twitch Streaming Tools">
     <Window.Styles>
+        <Style Selector="Slider">
+            <Setter Property="FocusAdorner">
+                <FocusAdornerTemplate>
+                    <Rectangle Stroke="rgb(204, 200, 175)" StrokeThickness="2" />
+                </FocusAdornerTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="CheckBox">
+            <Setter Property="FocusAdorner">
+                <FocusAdornerTemplate>
+                    <Rectangle Stroke="rgb(204, 200, 175)" StrokeThickness="2" />
+                </FocusAdornerTemplate>
+            </Setter>
+        </Style>
         <Style Selector="Label">
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
         </Style>
         <Style Selector="TextBox">
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
+            <Setter Property="SelectionBrush">rgb(54, 52, 46)</Setter>
         </Style>
         <Style Selector="TextBox:focus">
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
         </Style>
+        <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
+            <Setter Property="BorderBrush">rgb(204, 200, 175)</Setter>
+        </Style>
         <Style Selector="TextBlock">
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
         </Style>
         <Style Selector="Button">
             <Setter Property="Background">#353332</Setter>
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
+            <Setter Property="FocusAdorner">
+                <FocusAdornerTemplate>
+                    <Rectangle Stroke="rgb(204, 200, 175)" StrokeThickness="2" />
+                </FocusAdornerTemplate>
+            </Setter>
         </Style>
         <Style Selector="ListBoxItem">
             <Setter Property="Background">#353332</Setter>
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
+            <Setter Property="FocusAdorner">
+                <FocusAdornerTemplate>
+                    <Rectangle Stroke="rgb(204, 200, 175)" StrokeThickness="2" />
+                </FocusAdornerTemplate>
+            </Setter>
         </Style>
         <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
             <Setter Property="Background">#4F4D4C</Setter>
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
         </Style>
         <Style Selector="PathIcon">
             <Setter Property="Foreground">rgb(204, 200, 175)</Setter>
+            <Setter Property="FocusAdorner">
+                <FocusAdornerTemplate>
+                    <Rectangle Stroke="rgb(204, 200, 175)" StrokeThickness="2" />
+                </FocusAdornerTemplate>
+            </Setter>
         </Style>
     </Window.Styles>