From 37c43f171076096979b4347f458245257ff296c0 Mon Sep 17 00:00:00 2001
From: amaitland <alex@maitlandcomputing.com.au>
Date: Tue, 5 Aug 2014 14:57:24 +1000
Subject: [PATCH] Restructure View/ViewModels into their own distinct folders

---
 .../CefSharp.MinimalExample.Wpf.csproj                      | 6 +++---
 CefSharp.MinimalExample.Wpf/MainWindow.xaml                 | 2 +-
 .../{Views/Main => ViewModels}/MainViewModel.cs             | 2 +-
 CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml  | 2 +-
 .../Views/{Main => }/MainView.xaml.cs                       | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)
 rename CefSharp.MinimalExample.Wpf/{Views/Main => ViewModels}/MainViewModel.cs (95%)
 rename CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml (94%)
 rename CefSharp.MinimalExample.Wpf/Views/{Main => }/MainView.xaml.cs (71%)

diff --git a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
index f0e9378..5576d07 100644
--- a/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
+++ b/CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
@@ -78,10 +78,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Views\Main\MainView.xaml.cs">
+    <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Main\MainViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -94,7 +94,7 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Views\Main\MainView.xaml">
+    <Page Include="Views\MainView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/CefSharp.MinimalExample.Wpf/MainWindow.xaml b/CefSharp.MinimalExample.Wpf/MainWindow.xaml
index d8e3ed1..a02a076 100644
--- a/CefSharp.MinimalExample.Wpf/MainWindow.xaml
+++ b/CefSharp.MinimalExample.Wpf/MainWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="CefSharp.MinimalExample.Wpf.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:main="clr-namespace:CefSharp.MinimalExample.Wpf.Views.Main"
+        xmlns:main="clr-namespace:CefSharp.MinimalExample.Wpf.Views"
         Title="{Binding WebBrowser.Title}"
         WindowState="Maximized">
     <main:MainView/>
diff --git a/CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs b/CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs
similarity index 95%
rename from CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs
rename to CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs
index 86cb910..74e99cd 100644
--- a/CefSharp.MinimalExample.Wpf/Views/Main/MainViewModel.cs
+++ b/CefSharp.MinimalExample.Wpf/ViewModels/MainViewModel.cs
@@ -3,7 +3,7 @@ using CefSharp.Wpf;
 using System.ComponentModel;
 using System.Windows;
 
-namespace CefSharp.MinimalExample.Wpf.Views.Main
+namespace CefSharp.MinimalExample.Wpf.ViewModels
 {
     public class MainViewModel
     {
diff --git a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml
similarity index 94%
rename from CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml
rename to CefSharp.MinimalExample.Wpf/Views/MainView.xaml
index 4d443a4..f376536 100644
--- a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml
+++ b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CefSharp.MinimalExample.Wpf.Views.Main.MainView"
+<UserControl x:Class="CefSharp.MinimalExample.Wpf.Views.MainView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml.cs b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml.cs
similarity index 71%
rename from CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml.cs
rename to CefSharp.MinimalExample.Wpf/Views/MainView.xaml.cs
index 7ffc2b8..2881ad1 100644
--- a/CefSharp.MinimalExample.Wpf/Views/Main/MainView.xaml.cs
+++ b/CefSharp.MinimalExample.Wpf/Views/MainView.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows.Controls;
+using CefSharp.MinimalExample.Wpf.ViewModels;
 
-namespace CefSharp.MinimalExample.Wpf.Views.Main
+namespace CefSharp.MinimalExample.Wpf.Views
 {
     public partial class MainView : UserControl
     {