moved enums into separate folder

arkein · May 8, 2016 · a5f3b02 · a5f3b02
1 parent 395e5bc
commit a5f3b02
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 16 deletions.
diff --git a/Hearthstone Treasury/Controls/TransactionTemplateControl.xaml b/Hearthstone Treasury/Controls/TransactionTemplateControl.xaml
@@ -6,12 +6,13 @@
              xmlns:local="clr-namespace:Hearthstone_Treasury.Controls"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Models="clr-namespace:Hearthstone_Treasury.ViewModels"
+             xmlns:Enums="clr-namespace:Hearthstone_Treasury.Enums"
              xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
              mc:Ignorable="d">
     <UserControl.Resources>
         <ObjectDataProvider x:Key="categoryEnum" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type Type="Models:CategoryEnum"/>
+                <x:Type Type="Enums:CategoryEnum"/>
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
     </UserControl.Resources>

diff --git a/Hearthstone Treasury/Controls/TransactionsListingControl.xaml b/Hearthstone Treasury/Controls/TransactionsListingControl.xaml
@@ -6,13 +6,14 @@
              xmlns:local="clr-namespace:Hearthstone_Treasury.Controls"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:Models="clr-namespace:Hearthstone_Treasury.ViewModels"
+             xmlns:Enums="clr-namespace:Hearthstone_Treasury.Enums"
              xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>
         <ObjectDataProvider x:Key="categoryEnum" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type Type="Models:CategoryEnum"/>
+                <x:Type Type="Enums:CategoryEnum"/>
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
         <CollectionViewSource x:Key="TransactionsViewSource" Source="{Binding Transactions}">

diff --git a/Hearthstone Treasury/Enums/CategoryEnum.cs b/Hearthstone Treasury/Enums/CategoryEnum.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Hearthstone_Treasury.Enums
+{
+    [Serializable]
+    public enum CategoryEnum
+    {
+        Pack,
+        Arena,
+        AdventureWing,
+        Daily,
+        Wins,
+        Other
+    }
+}
diff --git a/Hearthstone Treasury/Hearthstone Treasury.csproj b/Hearthstone Treasury/Hearthstone Treasury.csproj
@@ -123,6 +123,7 @@
     <Compile Include="Controls\TreasuryMenuItem.xaml.cs">
       <DependentUpon>TreasuryMenuItem.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Enums\CategoryEnum.cs" />
     <Compile Include="HearthstoneTreasuryPlugin.cs" />
     <Compile Include="ViewModels\NewTransactionViewModel.cs" />
     <Compile Include="ViewModels\StatisticsViewModel.cs" />

diff --git a/Hearthstone Treasury/HearthstoneTreasuryPlugin.cs b/Hearthstone Treasury/HearthstoneTreasuryPlugin.cs
@@ -4,6 +4,8 @@
 using System.IO;
 using System.Windows;
 using ReactiveUI;
+using Hearthstone_Treasury.Enums;
+using System.Linq;
 
 namespace Hearthstone_Treasury
 {

diff --git a/Hearthstone Treasury/ViewModels/NewTransactionViewModel.cs b/Hearthstone Treasury/ViewModels/NewTransactionViewModel.cs
@@ -1,4 +1,5 @@
-using ReactiveUI;
+using Hearthstone_Treasury.Enums;
+using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
 namespace Hearthstone_Treasury.ViewModels

diff --git a/Hearthstone Treasury/ViewModels/TransactionListViewModel.cs b/Hearthstone Treasury/ViewModels/TransactionListViewModel.cs
@@ -1,10 +1,10 @@
-using ReactiveUI;
+using Hearthstone_Treasury.Enums;
+using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
-using System.Windows;
 
 namespace Hearthstone_Treasury.ViewModels
 {
@@ -21,6 +21,11 @@ public TransactionListViewModel(ReactiveList<TransactionViewModel> transactionsL
             TransactionTemplate.CreateTransaction.Subscribe(t => AddTransactionFromTemplate());
         }
 
+        public void AddTransaction(TransactionViewModel transaction)
+        {
+            Transactions.Add(transaction);
+        }
+
         private void AddTransactionFromTemplate()
         {
             Transactions.Add(new TransactionViewModel()

diff --git a/Hearthstone Treasury/ViewModels/TransactionViewModel.cs b/Hearthstone Treasury/ViewModels/TransactionViewModel.cs
@@ -1,20 +1,10 @@
 using System;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Hearthstone_Treasury.Enums;
 
 namespace Hearthstone_Treasury.ViewModels
 {
-    [Serializable]
-    public enum CategoryEnum
-    {
-        Pack,
-        Arena,
-        AdventureWing,
-        Daily,
-        Wins,
-        Other
-    }
-
     [Serializable]
     public class TransactionViewModel : ReactiveObject
     {