From 3acdc942bcd4a13a3b6a4cdcadccc60b78be22da Mon Sep 17 00:00:00 2001
From: shinichi <shinichi@hotmail.nl>
Date: Mon, 19 Oct 2020 14:53:47 +0200
Subject: [PATCH 1/3] move files and copy code

from stackoverflow :P
---
 Hashing/WPFStuff/FocusAdvancement.cs          | 40 ++++++++++++
 .../{ => WPFStuff}/MagicCode/WindowResizer.cs |  0
 Hashing/{ => WPFStuff}/ObservableObject.cs    |  0
 Hashing/WPFStuff/Styles/Buttons.xaml          | 65 +++++++++++++++++++
 Hashing/WPFStuff/Styles/Colors.xaml           | 25 +++++++
 Hashing/WPFStuff/Styles/Fonts.xaml            |  5 ++
 Hashing/WPFStuff/Styles/Texts.xaml            | 11 ++++
 Hashing/WPFStuff/Styles/Windows.xaml          |  5 ++
 8 files changed, 151 insertions(+)
 create mode 100644 Hashing/WPFStuff/FocusAdvancement.cs
 rename Hashing/{ => WPFStuff}/MagicCode/WindowResizer.cs (100%)
 rename Hashing/{ => WPFStuff}/ObservableObject.cs (100%)
 create mode 100644 Hashing/WPFStuff/Styles/Buttons.xaml
 create mode 100644 Hashing/WPFStuff/Styles/Colors.xaml
 create mode 100644 Hashing/WPFStuff/Styles/Fonts.xaml
 create mode 100644 Hashing/WPFStuff/Styles/Texts.xaml
 create mode 100644 Hashing/WPFStuff/Styles/Windows.xaml

diff --git a/Hashing/WPFStuff/FocusAdvancement.cs b/Hashing/WPFStuff/FocusAdvancement.cs
new file mode 100644
index 0000000..1f34e44
--- /dev/null
+++ b/Hashing/WPFStuff/FocusAdvancement.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Util.WPF
+{
+    public static class FocusAdvancement
+    {
+        public static bool GetAdvancesByEnterKey(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(AdvancesByEnterKeyProperty);
+        }
+
+        public static void SetAdvancesByEnterKey(DependencyObject obj, bool value)
+        {
+            obj.SetValue(AdvancesByEnterKeyProperty, value);
+        }
+
+        public static readonly DependencyProperty AdvancesByEnterKeyProperty =
+            DependencyProperty.RegisterAttached("AdvancesByEnterKey", typeof(bool), typeof(FocusAdvancement),
+            new UIPropertyMetadata(OnAdvancesByEnterKeyPropertyChanged));
+
+        static void OnAdvancesByEnterKeyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var element = d as UIElement;
+            if (element == null) return;
+
+            if ((bool)e.NewValue) element.KeyDown += Keydown;
+            else element.KeyDown -= Keydown;
+        }
+
+        static void Keydown(object sender, KeyEventArgs e)
+        {
+            if (!e.Key.Equals(Key.Enter)) return;
+
+            var element = sender as UIElement;
+            if (element != null) element.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+        }
+    }
+}
diff --git a/Hashing/MagicCode/WindowResizer.cs b/Hashing/WPFStuff/MagicCode/WindowResizer.cs
similarity index 100%
rename from Hashing/MagicCode/WindowResizer.cs
rename to Hashing/WPFStuff/MagicCode/WindowResizer.cs
diff --git a/Hashing/ObservableObject.cs b/Hashing/WPFStuff/ObservableObject.cs
similarity index 100%
rename from Hashing/ObservableObject.cs
rename to Hashing/WPFStuff/ObservableObject.cs
diff --git a/Hashing/WPFStuff/Styles/Buttons.xaml b/Hashing/WPFStuff/Styles/Buttons.xaml
new file mode 100644
index 0000000..c951dd8
--- /dev/null
+++ b/Hashing/WPFStuff/Styles/Buttons.xaml
@@ -0,0 +1,65 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ClientApp">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Colors.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="{x:Type Button}" x:Key="Hoverless">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
+                        <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type Button}" x:Key="SystemIconButton" BasedOn="{StaticResource Hoverless}" >
+        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True"/>
+        <Setter Property="Padding" Value="4"/>
+    </Style>
+
+    <Style TargetType="{x:Type Button}" x:Key="WindowControlButton">
+        <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMainBrush}"/>
+        <Setter Property="Padding" Value="6"/>
+
+        <Setter Property="LayoutTransform">
+            <Setter.Value>
+                <ScaleTransform ScaleX="2"/>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
+                        <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BackgroundSemiLightBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="{x:Type Button}" x:Key="WindowCloseButton" BasedOn="{StaticResource WindowControlButton}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="Red"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Hashing/WPFStuff/Styles/Colors.xaml b/Hashing/WPFStuff/Styles/Colors.xaml
new file mode 100644
index 0000000..8e4f8ef
--- /dev/null
+++ b/Hashing/WPFStuff/Styles/Colors.xaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ClientApp">
+
+    <Color x:Key="BackgroundLight">#efefef</Color>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLight}"/>
+
+
+    <Color x:Key="BackgroundVeryLight">#fafafa</Color>
+    <SolidColorBrush x:Key="BackgroundVeryLightBrush" Color="{StaticResource BackgroundVeryLight}"/>
+
+    <Color x:Key="BackgroundSemiLight">#d7d7d7</Color>
+    <SolidColorBrush x:Key="BackgroundSemiLightBrush" Color="{StaticResource BackgroundSemiLight}"/>
+
+    <Color x:Key="ForegroundMain">#686868</Color>
+    <SolidColorBrush x:Key="ForegroundMainBrush" Color="{StaticResource ForegroundMain}"/>
+
+    <Color x:Key="ForegroundVeryDark">#000</Color>
+    <SolidColorBrush x:Key="ForegroundVeryDarkBrush" Color="{StaticResource ForegroundVeryDark}"/>
+
+    <Color x:Key="ForegroundWhite">#fff</Color>
+    <SolidColorBrush x:Key="ForegroundWhiteBrush" Color="{StaticResource ForegroundWhite}"/>
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Hashing/WPFStuff/Styles/Fonts.xaml b/Hashing/WPFStuff/Styles/Fonts.xaml
new file mode 100644
index 0000000..b0e7544
--- /dev/null
+++ b/Hashing/WPFStuff/Styles/Fonts.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ClientApp">
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Hashing/WPFStuff/Styles/Texts.xaml b/Hashing/WPFStuff/Styles/Texts.xaml
new file mode 100644
index 0000000..4fdba93
--- /dev/null
+++ b/Hashing/WPFStuff/Styles/Texts.xaml
@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ClientApp">
+
+    <Style TargetType="{x:Type TextBlock}" x:Key="HeaderText">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMainBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="0 4"/>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Hashing/WPFStuff/Styles/Windows.xaml b/Hashing/WPFStuff/Styles/Windows.xaml
new file mode 100644
index 0000000..b0e7544
--- /dev/null
+++ b/Hashing/WPFStuff/Styles/Windows.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:ClientApp">
+
+</ResourceDictionary>
\ No newline at end of file

From f07c3f94844acfcc4d5cf5aa4827d6269afa7f00 Mon Sep 17 00:00:00 2001
From: shinichi <shinichi@hotmail.nl>
Date: Mon, 19 Oct 2020 15:14:01 +0200
Subject: [PATCH 2/3] moving and fixing

---
 ClientApp/App.xaml                                | 10 +++++-----
 ClientApp/Views/LoginView.xaml                    |  5 +++--
 DoctorApp/App.xaml                                | 10 +++++-----
 Hashing/Hashing.projitems                         | 15 ++++++++-------
 .../WPFStuff/{ => MagicCode}/FocusAdvancement.cs  |  0
 5 files changed, 21 insertions(+), 19 deletions(-)
 rename Hashing/WPFStuff/{ => MagicCode}/FocusAdvancement.cs (100%)

diff --git a/ClientApp/App.xaml b/ClientApp/App.xaml
index 61cadcc..daae7b7 100644
--- a/ClientApp/App.xaml
+++ b/ClientApp/App.xaml
@@ -19,11 +19,11 @@
             </DataTemplate>
 
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Styles/Fonts.xaml"/>
-                <ResourceDictionary Source="Styles/Colors.xaml"/>
-                <ResourceDictionary Source="Styles/Buttons.xaml"/>
-                <ResourceDictionary Source="Styles/Texts.xaml"/>
-                <ResourceDictionary Source="Styles/Windows.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Fonts.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Colors.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Buttons.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Texts.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Windows.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/ClientApp/Views/LoginView.xaml b/ClientApp/Views/LoginView.xaml
index 9266c85..6dc238e 100644
--- a/ClientApp/Views/LoginView.xaml
+++ b/ClientApp/Views/LoginView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ClientApp.Views"
              xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
+      xmlns:Util="clr-namespace:Util.WPF"
              mc:Ignorable="d" 
       ShowsNavigationUI="False"
              d:DesignHeight="450" d:DesignWidth="800">
@@ -14,10 +15,10 @@
         </DockPanel.Background>
         <StackPanel VerticalAlignment="Center" Width="auto">
             <Label Content="Username" HorizontalContentAlignment="Center" />
-            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>
+            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True" />
             <Label Content="Password" HorizontalContentAlignment="Center"/>
             <PasswordBox x:Name="Password" Width="120"/>
-            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
+            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Slide" HorizontalAlignment="Center">
                 <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent"/>
             </Popup>
diff --git a/DoctorApp/App.xaml b/DoctorApp/App.xaml
index 86b2dd4..2a38c42 100644
--- a/DoctorApp/App.xaml
+++ b/DoctorApp/App.xaml
@@ -20,11 +20,11 @@
             </DataTemplate>
 
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Styles/Fonts.xaml"/>
-                <ResourceDictionary Source="Styles/Colors.xaml"/>
-                <ResourceDictionary Source="Styles/Buttons.xaml"/>
-                <ResourceDictionary Source="Styles/Texts.xaml"/>
-                <ResourceDictionary Source="Styles/Windows.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Fonts.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Colors.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Buttons.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Texts.xaml"/>
+                <ResourceDictionary Source="WPFStuff/Styles/Windows.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
 
diff --git a/Hashing/Hashing.projitems b/Hashing/Hashing.projitems
index c169d90..5958572 100644
--- a/Hashing/Hashing.projitems
+++ b/Hashing/Hashing.projitems
@@ -11,27 +11,28 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)DataParser.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Hasher.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)MagicCode\WindowResizer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ObservableObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WPFStuff\MagicCode\FocusAdvancement.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WPFStuff\MagicCode\WindowResizer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WPFStuff\ObservableObject.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Buttons.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)WPFStuff\Styles\Buttons.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Colors.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)WPFStuff\Styles\Colors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Fonts.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)WPFStuff\Styles\Fonts.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Texts.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)WPFStuff\Styles\Texts.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Windows.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)WPFStuff\Styles\Windows.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Hashing/WPFStuff/FocusAdvancement.cs b/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
similarity index 100%
rename from Hashing/WPFStuff/FocusAdvancement.cs
rename to Hashing/WPFStuff/MagicCode/FocusAdvancement.cs

From aeb5d59ce9b6717ac243350bc4baebb1dc98e262 Mon Sep 17 00:00:00 2001
From: shinichi <shinichi@hotmail.nl>
Date: Mon, 19 Oct 2020 15:32:14 +0200
Subject: [PATCH 3/3] implemented nextfocuable

---
 ClientApp/Views/LoginView.xaml                 | 6 +++---
 DoctorApp/Views/LoginView.xaml                 | 5 +++--
 Hashing/WPFStuff/MagicCode/FocusAdvancement.cs | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ClientApp/Views/LoginView.xaml b/ClientApp/Views/LoginView.xaml
index 6dc238e..ed554b4 100644
--- a/ClientApp/Views/LoginView.xaml
+++ b/ClientApp/Views/LoginView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ClientApp.Views"
              xmlns:viewModels="clr-namespace:ClientApp.ViewModels"
-      xmlns:Util="clr-namespace:Util.WPF"
+      xmlns:Util="clr-namespace:Util.MagicCode"
              mc:Ignorable="d" 
       ShowsNavigationUI="False"
              d:DesignHeight="450" d:DesignWidth="800">
@@ -17,8 +17,8 @@
             <Label Content="Username" HorizontalContentAlignment="Center" />
             <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True" />
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <PasswordBox x:Name="Password" Width="120"/>
-            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
+            <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
+            <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
             <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Slide" HorizontalAlignment="Center">
                 <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent"/>
             </Popup>
diff --git a/DoctorApp/Views/LoginView.xaml b/DoctorApp/Views/LoginView.xaml
index 144d10d..15c1bd0 100644
--- a/DoctorApp/Views/LoginView.xaml
+++ b/DoctorApp/Views/LoginView.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:DoctorApp.Views"
       xmlns:viewModels="clr-namespace:DoctorApp.ViewModels"
+                   xmlns:Util="clr-namespace:Util.MagicCode"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       >
@@ -12,9 +13,9 @@
     <DockPanel>
         <StackPanel VerticalAlignment="Center" Width="auto">
             <Label Content="Username" HorizontalContentAlignment="Center" />
-            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120"/>
+            <TextBox x:Name="Username" Text="{Binding Username}" TextWrapping="Wrap" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <PasswordBox x:Name="Password" Width="120"/>
+            <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
             <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Fade" HorizontalAlignment="Left">
                 <Label Content="Login failed" Foreground="Red" Background="#FFFF" />
diff --git a/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs b/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
index 1f34e44..16ebeea 100644
--- a/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
+++ b/Hashing/WPFStuff/MagicCode/FocusAdvancement.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.WPF
+namespace Util.MagicCode
 {
     public static class FocusAdvancement
     {