From 0daf17a3f093793c7542120d4f72d7a0643d75e9 Mon Sep 17 00:00:00 2001
From: Patrick Fic <pfic@outlook.com>
Date: Thu, 16 Jan 2020 14:37:05 -0800
Subject: [PATCH] Added main page + started notify icon implementation.

---
 BodyshopUploader/BodyshopUploader.csproj      | 13 ++++++
 .../ViewModels/LoginViewModel.commands.cs     | 12 ++---
 .../ViewModels/MainViewModel.commands.cs      | 26 +++++++++++
 BodyshopUploader/ViewModels/MainViewModel.cs  | 18 ++++++++
 .../ViewModels/MainViewModel.props.cs         | 19 ++++++++
 BodyshopUploader/Views/Login.xaml             | 10 ++--
 BodyshopUploader/Views/Main.xaml              | 46 +++++++++++++++++++
 BodyshopUploader/Views/Main.xaml.cs           | 30 ++++++++++++
 BodyshopUploader/packages.config              |  1 +
 9 files changed, 166 insertions(+), 9 deletions(-)
 create mode 100644 BodyshopUploader/ViewModels/MainViewModel.commands.cs
 create mode 100644 BodyshopUploader/ViewModels/MainViewModel.cs
 create mode 100644 BodyshopUploader/ViewModels/MainViewModel.props.cs
 create mode 100644 BodyshopUploader/Views/Main.xaml
 create mode 100644 BodyshopUploader/Views/Main.xaml.cs

diff --git a/BodyshopUploader/BodyshopUploader.csproj b/BodyshopUploader/BodyshopUploader.csproj
index e4ef107..7b7d84c 100644
--- a/BodyshopUploader/BodyshopUploader.csproj
+++ b/BodyshopUploader/BodyshopUploader.csproj
@@ -53,6 +53,9 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -99,6 +102,9 @@
     <Compile Include="Utils\RelayCommand.cs" />
     <Compile Include="ViewModels\LoginViewModel.commands.cs" />
     <Compile Include="ViewModels\LoginViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.commands.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.props.cs" />
     <Compile Include="Views\Login.xaml.cs">
       <DependentUpon>Login.xaml</DependentUpon>
     </Compile>
@@ -106,10 +112,17 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Views\Main.xaml.cs">
+      <DependentUpon>Main.xaml</DependentUpon>
+    </Compile>
     <Page Include="Views\Login.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Main.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/BodyshopUploader/ViewModels/LoginViewModel.commands.cs b/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
index 2e38694..8f4e67f 100644
--- a/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
+++ b/BodyshopUploader/ViewModels/LoginViewModel.commands.cs
@@ -5,18 +5,18 @@ namespace BodyshopUploader.ViewModels
 {
     public partial class LoginViewModel : BaseViewModel
     {
-        private ICommand _testCommand;
-        public ICommand TestCommand
+        private ICommand _openMainCommand;
+        public ICommand OpenMainCommand
         {
             get
             {
-                if (_testCommand == null)
+                if (_openMainCommand == null)
                 {
-                    _testCommand = new RelayCommand(
+                    _openMainCommand = new RelayCommand(
                         p => true,
-                        p => Console.WriteLine("Hi"));
+                        p => { Views.Main m = new Views.Main(); m.Show(); });
                 }
-                return _testCommand;
+                return _openMainCommand;
             }
         }
 
diff --git a/BodyshopUploader/ViewModels/MainViewModel.commands.cs b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
new file mode 100644
index 0000000..92496db
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Windows.Input;
+
+namespace BodyshopUploader.ViewModels
+{
+    public partial class MainViewModel : BaseViewModel
+    {
+        private ICommand _testCommand;
+        public ICommand TestCommand
+        {
+            get
+            {
+                if (_testCommand == null)
+                {
+                    _testCommand = new RelayCommand(
+                        p => true,
+                        p =>
+                        {
+                            logger.Info("test command clicked");
+                        });
+                }
+                return _testCommand;
+            }
+        }
+    }
+}
diff --git a/BodyshopUploader/ViewModels/MainViewModel.cs b/BodyshopUploader/ViewModels/MainViewModel.cs
new file mode 100644
index 0000000..c7f2623
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BodyshopUploader.ViewModels
+{
+    public partial class MainViewModel:BaseViewModel
+    {
+        private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
+        public MainViewModel()
+        {
+            logger.Trace("Main VM Created.");
+        }
+    }
+}
diff --git a/BodyshopUploader/ViewModels/MainViewModel.props.cs b/BodyshopUploader/ViewModels/MainViewModel.props.cs
new file mode 100644
index 0000000..2d1e511
--- /dev/null
+++ b/BodyshopUploader/ViewModels/MainViewModel.props.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BodyshopUploader.ViewModels
+{
+    public partial class MainViewModel : BaseViewModel
+    {
+        private int _progress = 5;
+        public int Progress
+        {
+            get { return _progress; }
+            set { SetProperty(ref _progress, value); }
+        }
+    }
+}
diff --git a/BodyshopUploader/Views/Login.xaml b/BodyshopUploader/Views/Login.xaml
index a477826..53187f4 100644
--- a/BodyshopUploader/Views/Login.xaml
+++ b/BodyshopUploader/Views/Login.xaml
@@ -6,14 +6,18 @@
         xmlns:local="clr-namespace:BodyshopUploader.Views"
         xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.Title_Login}" Height="450" Width="800"
-        xmlns:p = "clr-namespace:BodyshopUploader.Properties">
+        Title="{x:Static p:Resources.Title_Login}"
+        Height="450"
+        Width="800"
+        xmlns:p="clr-namespace:BodyshopUploader.Properties">
     <Window.DataContext>
         <vm:LoginViewModel />
     </Window.DataContext>
 
     <StackPanel>
-        <TextBlock Text="{x:Static p:Resources.Login}" />
+        <Button Command="{Binding OpenMainCommand}"
+                Content="{x:Static p:Resources.Login}" />
+
         <TextBlock Text="{Binding Progress, TargetNullValue=QUE, FallbackValue=QUE2}" />
     </StackPanel>
 </Window>
diff --git a/BodyshopUploader/Views/Main.xaml b/BodyshopUploader/Views/Main.xaml
new file mode 100644
index 0000000..5b431c2
--- /dev/null
+++ b/BodyshopUploader/Views/Main.xaml
@@ -0,0 +1,46 @@
+<Window x:Class="BodyshopUploader.Views.Main"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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:local="clr-namespace:BodyshopUploader.Views"
+        mc:Ignorable="d"
+        Title="Main"
+        Height="450"
+        xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
+        Width="800"
+        xmlns:tb="http://www.hardcodet.net/taskbar"
+        xmlns:p="clr-namespace:BodyshopUploader.Properties">
+    <Window.DataContext>
+        <vm:MainViewModel />
+    </Window.DataContext>
+    <StackPanel>
+        <tb:TaskbarIcon IconSource="../favicon.ico"
+                        PopupActivation="LeftClick"
+                        MenuActivation="RightClick"
+                        ToolTipText="Bodyshop Uploader">
+            <tb:TaskbarIcon.TrayPopup>
+                <Border Background="White"
+                        BorderBrush="Orange"
+                        BorderThickness="2"
+                        Width="160"
+                        Height="40">
+                    <Button Content="Click Me!"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center" />
+                </Border>
+            </tb:TaskbarIcon.TrayPopup>
+            <tb:TaskbarIcon.ContextMenu>
+                <ContextMenu Background="LightCoral">
+                    <MenuItem Header="First Menu Item" />
+                    <MenuItem Header="Second Menu Item" />
+                </ContextMenu>
+            </tb:TaskbarIcon.ContextMenu>
+        </tb:TaskbarIcon>
+        <TextBlock>
+            Main Window
+        </TextBlock>
+        <TextBlock Text="{Binding Progress}" />
+        <Button Command="{Binding TestCommand}" />
+    </StackPanel>
+</Window>
diff --git a/BodyshopUploader/Views/Main.xaml.cs b/BodyshopUploader/Views/Main.xaml.cs
new file mode 100644
index 0000000..2f55e55
--- /dev/null
+++ b/BodyshopUploader/Views/Main.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BodyshopUploader.Views
+{
+    /// <summary>
+    /// Interaction logic for Main.xaml
+    /// </summary>
+    public partial class Main : Window
+    {
+        public Main()
+        {
+            InitializeComponent();
+       
+        }
+
+ 
+    }
+}
diff --git a/BodyshopUploader/packages.config b/BodyshopUploader/packages.config
index f49b2f6..8168088 100644
--- a/BodyshopUploader/packages.config
+++ b/BodyshopUploader/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="NLog" version="4.6.8" targetFramework="net472" />
   <package id="NLog.Config" version="4.6.8" targetFramework="net472" />