Revert "Remove WPF Material Design theme to attempt to remove blanking."

This reverts commit 0a89c0c767.

# Conflicts:
#	BodyshopUploader/Releases/RELEASES

BodyshopUploader/Views/Login.xaml

@@ -12,6 +12,13 @@
         xmlns:p="clr-namespace:BodyshopPartner.Properties"
         xmlns:util="clr-namespace:BodyshopPartner.Utils"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal"
+        TextOptions.TextRenderingMode="Auto"
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{DynamicResource MaterialDesignFont}"
         Closing="Window_Closing"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen">
@@ -26,7 +33,7 @@
                     Value="8" />
         </Style>
         <Style TargetType="TextBox"
-             >
+               BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
             <Setter Property="Margin"
                     Value="8" />
         </Style>
@@ -48,7 +55,7 @@
                    VerticalAlignment="Center" />
 
             <TextBlock Text="{x:Static p:Resources.Title_Login_Header}"
-                       
+                       Style="{StaticResource MaterialDesignHeadline6TextBlock}"
                        VerticalAlignment="Center" />
         </StackPanel>
 
@@ -78,7 +85,7 @@
         <Button Command="{Binding LoginCommand}"
                 CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                 Content="{x:Static p:Resources.Login}"
-       
+                Style="{StaticResource MaterialDesignRaisedButton}"
                 IsDefault="True"
                 materialDesign:ButtonProgressAssist.Value="-1"
                 materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"

BodyshopUploader/Views/Main.xaml

@@ -13,10 +13,15 @@
         Title="{x:Static p:Resources.Title_Main}"
         Height="600"
         Width="800"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal"
+        TextOptions.TextRenderingMode="Auto"
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{DynamicResource MaterialDesignFont}"
         Loaded="Window_Loaded"
-        Closing="Window_Closing"
-        xmlns:ui="http://schemas.modernwpf.com/2019"
-        ui:WindowHelper.UseModernWindowStyle="True">
+        Closing="Window_Closing">
     <Window.DataContext>
         <vm:MainViewModel />
     </Window.DataContext>
@@ -28,7 +33,8 @@
             <Setter Property="Margin"
                     Value="8" />
         </Style>
-        <Style TargetType="TextBox">
+        <Style TargetType="TextBox"
+               BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
             <Setter Property="Margin"
                     Value="8" />
         </Style>
@@ -55,10 +61,12 @@
                         MenuActivation="RightClick"
                         ToolTipText="Bodyshop Uploader">
             <tb:TaskbarIcon.TrayPopup>
-                <Border BorderBrush="Black"
+                <Border Background="{DynamicResource MaterialDesignPaper}"
+                        BorderBrush="Black"
                         BorderThickness="2">
                     <DockPanel Margin="12">
                         <TextBlock DockPanel.Dock="Top"
+                                   Style="{StaticResource MaterialDesignHeadline5TextBlock}"
                                    Text="{x:Static p:Resources.Label_MonitorStatus}" />
                         <ItemsControl ItemsSource="{Binding MonitoringPaths}">
                             <ItemsControl.ItemTemplate>
@@ -70,9 +78,11 @@
                                                 <ColumnDefinition Width="Auto" />
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Grid.Column="0"
+                                                       Style="{StaticResource MaterialDesignBody2TextBlock}"
                                                        Margin="8"
                                                        Text="{Binding FilePath}" />
                                             <TextBlock Grid.Column="1"
+                                                       Style="{StaticResource MaterialDesignBody2TextBlock}"
                                                        Margin="8"
                                                        Text="{Binding FolderMonitor.EnableRaisingEvents,
                                         Converter={StaticResource MonitorStatusConverter}}" />
@@ -103,6 +113,7 @@
             <ComboBox ItemsSource="{Binding ShopData}"
                       Margin="4"
                       SelectedItem="{Binding ActiveShop}"
+                      Style="{StaticResource MaterialDesignFloatingHintComboBox}"
                       materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_ActiveShop}"
                       DisplayMemberPath="ShopName">
                 <ComboBox.ItemsPanel>
@@ -113,7 +124,6 @@
             </ComboBox>
             <Button Command="{Binding LogoutCommand, UpdateSourceTrigger=PropertyChanged}"
                     Margin="8"
-                    Style="{StaticResource }"
                     Content="{x:Static p:Resources.Actions_Logout}" />
             <Separator />
             <CheckBox IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=AutoStartMonitor}"
@@ -121,13 +131,24 @@
                       Content="{x:Static p:Resources.Label_AutoStartMonitor}" />
             <CheckBox IsChecked="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}"
                       Margin="8"
-                      Content="{x:Static p:Resources.Label_StartWithWindows}"
+                      Content="{x:Static p:Resources.Label_StartWithWindows}" 
                       Command="{Binding StartWithWindowsCommand}"
-                      CommandParameter="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}" />
+                      CommandParameter="{Binding Source={x:Static p:Settings.Default}, Path=StartWithWindows}"/>
 
-        
-        
-           
+            <Button Command="{Binding AddMonitoringPathCommand, UpdateSourceTrigger=PropertyChanged}"
+                    Margin="8"
+                    ToolTip="{x:Static p:Resources.Label_AddMonitoringPath}"
+                    Content="{x:Static p:Resources.Label_AddFolder}" />
+            <Button Command="{Binding StartFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
+                    Margin="8"
+                    Content="{x:Static p:Resources.Label_StartAllMonitors}" />
+            <Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
+                    Margin="8"
+                    Content="{x:Static p:Resources.Label_StopAllMonitors}" />
+            <Separator />
+            <Button Command="{Binding BrowseForQbFolderCommand, UpdateSourceTrigger=PropertyChanged}"
+                    Margin="8"
+                    Content="{x:Static p:Resources.Label_BrowseForQb}" />
             <Separator />
             <!--<Button DockPanel.Dock="Top"
                     Margin="8"
@@ -137,7 +158,7 @@
                    Margin="8"
                    HorizontalAlignment="Center"
                    Content="{Binding AppVersion}" />
-            <StackPanel Visibility="{Binding UpdateAvailable, Converter={StaticResource BoolVisibilityConverter}}">
+            <StackPanel Visibility="{Binding UpdateAvailable, Converter={StaticResource BooleanToVisibilityConverter}}">
 
                 <Button Content="Update"
                         Command="{Binding InstallUpdatesCommand}" />
@@ -150,29 +171,17 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <DockPanel Grid.Row="0">
-            <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-                <Button Command="{Binding AddMonitoringPathCommand, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="8"
-                        ToolTip="{x:Static p:Resources.Label_AddMonitoringPath}"
-                        Content="{x:Static p:Resources.Label_AddFolder}" />
-                <Button Command="{Binding StartFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="8"
-                        Content="{x:Static p:Resources.Label_StartAllMonitors}" />
-                <Button Command="{Binding StopFolderMonitorsCommand, UpdateSourceTrigger=PropertyChanged}"
-                        Margin="8"
-                        Content="{x:Static p:Resources.Label_StopAllMonitors}" />
-            </StackPanel>
-            <DataGrid 
+            <DataGrid Grid.Row="0"
                       ItemsSource="{Binding MonitoringPaths}"
                       AutoGenerateColumns="False"
                       VerticalContentAlignment="Center"
                       IsReadOnly="True"
                       HorizontalContentAlignment="Center"
-                          Margin="8" 
-                HeadersVisibility="Column"
-                          CanUserAddRows="False"
-                      CanUserSortColumns="True">
+                      Margin="8"
+                      CanUserAddRows="False"
+                      CanUserSortColumns="True"
+                      materialDesign:DataGridAssist.CellPadding="4 2 2 2"
+                      materialDesign:DataGridAssist.ColumnHeaderPadding="4 2 2 2">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding FilePath}"
                                         Header="{x:Static p:Resources.Label_FilePath}" />
@@ -186,11 +195,13 @@
                                     <Button Command="{Binding DataContext.RemoveMonitoringPathCommand,
                                         RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                                             CommandParameter="{Binding .}"
+                                            Style="{StaticResource MaterialDesignOutlinedButton}"
                                             Margin="4"
                                             Content="{x:Static p:Resources.Label_Remove}" />
                                     <Button Command="{Binding DataContext.RestartMonitoringPathCommand,
                                         RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                                             CommandParameter="{Binding .}"
+                                            Style="{StaticResource MaterialDesignOutlinedButton}"
                                             Margin="4"
                                             Content="{x:Static p:Resources.Label_Restart}" />
                                 </StackPanel>
@@ -199,29 +210,13 @@
                     </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
-            </DockPanel>
             <DockPanel Grid.Row="1"
                        Height="Auto">
-                <Grid DockPanel.Dock="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBox Grid.Column="0"
-                        IsReadOnly="True"
-                             Text="{Binding Source={x:Static properties:Settings.Default},
+                <TextBox DockPanel.Dock="Top"
+                         Text="{Binding Source={x:Static properties:Settings.Default},
                                Path=QuickBooksFilePath}"
-                             ui:TextBoxHelper.IsEnabled="False"
-                             ToolTip="{x:Static p:Resources.Label_QbFilePath}"
-                             materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_QbFilePath}"
-                             TextChanged="TextBox_TextChanged" />
-                    <Button Grid.Column="1" Command="{Binding BrowseForQbFolderCommand, UpdateSourceTrigger=PropertyChanged}"
-                            Margin="8"
-                            Style="{StaticResource AccentButtonStyle}"
-                            Content="{x:Static p:Resources.Label_BrowseForQb}" />
-                </Grid>
-            
-                
+                         materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_QbFilePath}"
+                         TextChanged="TextBox_TextChanged" />
                 <TextBox Height="Auto"
                          materialDesign:HintAssist.Hint="{x:Static p:Resources.Label_InteractionLog}"
                          Text="{Binding HttpServerLog}"