demo tidy up

Author: ButchersBoy

MahMaterialDragablzMashUp/MahMaterialDragablzMashUp.csproj renamed to MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MahMaterialDragablzMashUp</RootNamespace>
-    <AssemblyName>MahMaterialDragablzMashUp</AssemblyName>
+    <RootNamespace>MahAppsDragablzDemo</RootNamespace>
+    <AssemblyName>MahAppsDragablzDemo</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -60,10 +60,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA157\lib\net45\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

MahMaterialDragablzMashUp/Properties/Resources.Designer.cs

@@ -7,8 +7,8 @@
     <ProjectGuid>{CF0A27A8-EF82-44E5-B673-ECCC150C48ED}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MaterialDesignColors.WpfExample</RootNamespace>
-    <AssemblyName>MaterialDesignColors.WpfExample</AssemblyName>
+    <RootNamespace>MaterialDesignDemo</RootNamespace>
+    <AssemblyName>MaterialDesignDemo</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -47,11 +47,9 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />

MahMaterialDragablzMashUp/Properties/Settings.Designer.cs

@@ -7,8 +7,8 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
+using MaterialDesignColors.WpfExample.Domain;
 using MaterialDesignThemes.Wpf;
-using Microsoft.Expression.Interactivity.Core;
 
 namespace MaterialDesignColors.WpfExample
 {
@@ -19,7 +19,7 @@ public PaletteSelectorViewModel()
             Swatches = new SwatchesProvider().Swatches;            
         }
 
-        public ICommand ToggleBaseCommand { get; } = new ActionCommand(o => ApplyBase((bool)o));
+        public ICommand ToggleBaseCommand { get; } = new AnotherCommandImplementation(o => ApplyBase((bool)o));
 
         private static void ApplyBase(bool isDark)
         {
@@ -28,14 +28,14 @@ private static void ApplyBase(bool isDark)
 
         public IEnumerable<Swatch> Swatches { get; }
 
-        public ICommand ApplyPrimaryCommand { get; } = new ActionCommand(o => ApplyPrimary((Swatch)o));
+        public ICommand ApplyPrimaryCommand { get; } = new AnotherCommandImplementation(o => ApplyPrimary((Swatch)o));
 
         private static void ApplyPrimary(Swatch swatch)
         {
             new PaletteHelper().ReplacePrimaryColor(swatch);
         }
 
-        public ICommand ApplyAccentCommand { get; } = new ActionCommand(o => ApplyAccent((Swatch)o));
+        public ICommand ApplyAccentCommand { get; } = new AnotherCommandImplementation(o => ApplyAccent((Swatch)o));
 
         private static void ApplyAccent(Swatch swatch)
         {

MainDemo.Wpf/MainDemo.Wpf.csproj renamed to MainDemo.Wpf/MaterialDesignDemo.csproj

@@ -7,11 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdresgen", "mdresgen\mdresg
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.Wpf", "MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj", "{F079FB0A-A8ED-4216-B6A5-345756751A04}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainDemo.Wpf", "MainDemo.Wpf\MainDemo.Wpf.csproj", "{CF0A27A8-EF82-44E5-B673-ECCC150C48ED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignDemo", "MainDemo.Wpf\MaterialDesignDemo.csproj", "{CF0A27A8-EF82-44E5-B673-ECCC150C48ED}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignColors.Wpf", "MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj", "{90B53209-C60C-4655-B28D-A1B3E1044BA3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahMaterialDragablzMashUp", "MahMaterialDragablzMashUp\MahMaterialDragablzMashUp.csproj", "{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahAppsDragablzDemo", "MahMaterialDragablzMashUp\MahAppsDragablzDemo.csproj", "{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{7D0AC158-FD01-4EA3-8F8A-D19C085C77DF}"
 	ProjectSection(SolutionItems) = preProject