Introduce Finance Calculator

src/CalcViewModel/ApplicationViewModel.cpp

@@ -44,6 +44,7 @@ ApplicationViewModel::ApplicationViewModel()
     : m_CalculatorViewModel(nullptr)
     , m_DateCalcViewModel(nullptr)
 	, m_GraphingCalcViewModel(nullptr)
+    , m_FinanceCalcViewModel(nullptr)
     , m_ConverterViewModel(nullptr)
     , m_PreviousMode(ViewMode::None)
     , m_mode(ViewMode::None)
@@ -147,6 +148,13 @@ void ApplicationViewModel::OnModeChanged()
             m_DateCalcViewModel = ref new DateCalculatorViewModel();
         }
     }
+    else if (NavCategory::IsFinanceCalculatorViewMode(m_mode))
+    {
+        if (!m_FinanceCalcViewModel)
+        {
+            m_FinanceCalcViewModel = ref new FinanceCalculatorViewModel();
+        }
+    }
     else if (NavCategory::IsConverterViewMode(m_mode))
     {
         if (!m_ConverterViewModel)

src/CalcViewModel/ApplicationViewModel.h

@@ -7,6 +7,7 @@
 #include "DateCalculatorViewModel.h"
 #include "GraphingCalculator/GraphingCalculatorViewModel.h"
 #include "UnitConverterViewModel.h"
+#include "FinanceCalculatorViewModel.h"
 
 namespace CalculatorApp
 {
@@ -23,6 +24,7 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_RW(StandardCalculatorViewModel ^, CalculatorViewModel);
             OBSERVABLE_PROPERTY_RW(DateCalculatorViewModel ^, DateCalcViewModel);
             OBSERVABLE_PROPERTY_RW(GraphingCalculatorViewModel ^, GraphingCalcViewModel);
+            OBSERVABLE_PROPERTY_RW(FinanceCalculatorViewModel ^, FinanceCalcViewModel);
             OBSERVABLE_PROPERTY_RW(UnitConverterViewModel ^, ConverterViewModel);
             OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode);
             OBSERVABLE_PROPERTY_R(bool, IsAlwaysOnTop);

src/CalcViewModel/CalcViewModel.vcxproj

@@ -322,6 +322,7 @@
     <ClInclude Include="DataLoaders\UnitConverterDataConstants.h" />
     <ClInclude Include="DataLoaders\UnitConverterDataLoader.h" />
     <ClInclude Include="DateCalculatorViewModel.h" />
+    <ClInclude Include="FinanceCalculatorViewModel.h" />
     <ClInclude Include="GraphingCalculatorEnums.h" />
     <ClInclude Include="GraphingCalculator\EquationViewModel.h" />
     <ClInclude Include="GraphingCalculator\GraphingCalculatorViewModel.h" />
@@ -356,6 +357,7 @@
     <ClCompile Include="DataLoaders\CurrencyHttpClient.cpp" />
     <ClCompile Include="DataLoaders\UnitConverterDataLoader.cpp" />
     <ClCompile Include="DateCalculatorViewModel.cpp" />
+    <ClCompile Include="FinanceCalculatorViewModel.cpp" />
     <ClCompile Include="GraphingCalculator\EquationViewModel.cpp" />
     <ClCompile Include="GraphingCalculator\GraphingCalculatorViewModel.cpp" />
     <ClCompile Include="GraphingCalculator\GraphingSettingsViewModel.cpp" />
@@ -405,6 +407,7 @@
   </Choose>
   <ItemGroup>
     <None Include="DataLoaders\DefaultFromToCurrency.json" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

src/CalcViewModel/CalcViewModel.vcxproj.filters

@@ -86,6 +86,7 @@
     <ClCompile Include="GraphingCalculator\GraphingSettingsViewModel.cpp">
       <Filter>GraphingCalculator</Filter>
     </ClCompile>
+    <ClCompile Include="FinanceCalculatorViewModel.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -199,6 +200,7 @@
     <ClInclude Include="Common\DelegateCommand.h">
       <Filter>Common</Filter>
     </ClInclude>
+    <ClInclude Include="FinanceCalculatorViewModel.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="DataLoaders\DefaultFromToCurrency.json">

src/CalcViewModel/Common/NavCategory.cpp

@@ -42,6 +42,7 @@ static constexpr int PRESSURE_ID = 14;
 static constexpr int ANGLE_ID = 15;
 static constexpr int CURRENCY_ID = 16;
 static constexpr int GRAPHING_ID = 17;
+static constexpr int FINANCE_ID = 18;
 // ^^^ THESE CONSTANTS SHOULD NEVER CHANGE ^^^
 
 wchar_t* towchar_t(int number)
@@ -169,6 +170,16 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
                                   towchar_t(currentIndex++),
                                   SUPPORTS_ALL,
                                   true },
+          NavCategoryInitializer{ ViewMode::Finance,
+                                  FINANCE_ID,
+                                  L"Finance",
+                                  L"FinanceCalculationMode",
+                                  L"\uEB0D",
+                                  CategoryGroupType::Calculator,
+                                  supportGraphingCalculator ? MyVirtualKey::Number6 : MyVirtualKey::Number5,
+                                  towchar_t(currentIndex++),
+                                  SUPPORTS_ALL,
+                                  true },
           NavCategoryInitializer{ ViewMode::Currency,
                                   CURRENCY_ID,
                                   L"Currency",
@@ -366,6 +377,11 @@ bool NavCategory::IsDateCalculatorViewMode(ViewMode mode)
     return mode == ViewMode::Date;
 }
 
+bool NavCategory::IsFinanceCalculatorViewMode(ViewMode mode)
+{
+    return mode == ViewMode::Finance;
+}
+
 bool NavCategory::IsConverterViewMode(ViewMode mode)
 {
     return IsModeInCategoryGroup(mode, CategoryGroupType::Converter);

src/CalcViewModel/Common/NavCategory.h

@@ -45,7 +45,8 @@ namespace CalculatorApp
             Pressure = 14,
             Angle = 15,
             Currency = 16,
-            Graphing = 17
+            Graphing = 17,
+            Finance = 18
         };
 
     public
@@ -137,6 +138,7 @@ namespace CalculatorApp
             static bool IsCalculatorViewMode(ViewMode mode);
             static bool IsGraphingCalculatorViewMode(ViewMode mode);
             static bool IsDateCalculatorViewMode(ViewMode mode);
+            static bool IsFinanceCalculatorViewMode(ViewMode mode);
             static bool IsConverterViewMode(ViewMode mode);
 
             static Platform::String ^ GetFriendlyName(ViewMode mode);

src/CalcViewModel/FinanceCalculatorViewModel.cpp

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "FinanceCalculatorViewModel.h"
+
+using namespace CalculatorApp;
+using namespace CalculatorApp::ViewModel;
+
+FinanceCalculatorViewModel::FinanceCalculatorViewModel()
+    : m_isCompoundMode(true)
+    , m_isSplitBill(false)
+{
+}

src/CalcViewModel/FinanceCalculatorViewModel.h

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "Common/Utils.h"
+
+namespace CalculatorApp
+{
+    namespace ViewModel
+    {
+        [Windows::UI::Xaml::Data::Bindable] public ref class FinanceCalculatorViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged
+        {
+        public:
+
+            FinanceCalculatorViewModel();
+
+            OBSERVABLE_OBJECT();
+            OBSERVABLE_PROPERTY_RW(bool, isCompoundMode);
+            OBSERVABLE_PROPERTY_RW(bool, isSplitBill);
+        };
+    }
+}

src/Calculator/Calculator.vcxproj

@@ -293,6 +293,9 @@
     <ClInclude Include="Views\CalculatorStandardOperators.xaml.h">
       <DependentUpon>Views\CalculatorStandardOperators.xaml</DependentUpon>
     </ClInclude>
+    <ClInclude Include="Views\FinanceCalculator.xaml.h">
+      <DependentUpon>Views\FinanceCalculator.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="Views\GraphingCalculator\EquationInputArea.xaml.h">
       <DependentUpon>Views\GraphingCalculator\EquationInputArea.xaml</DependentUpon>
     </ClInclude>
@@ -367,6 +370,9 @@
     </Page>
     <Page Include="Views\CalculatorStandardOperators.xaml" />
     <Page Include="Views\DelighterUnitStyles.xaml" />
+    <Page Include="Views\FinanceCalculator.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\GraphingCalculator\EquationInputArea.xaml" />
     <Page Include="Views\GraphingCalculator\GraphingCalculator.xaml" />
     <Page Include="Views\GraphingCalculator\GraphingSettings.xaml" />
@@ -461,6 +467,9 @@
     <ClCompile Include="Views\CalculatorStandardOperators.xaml.cpp">
       <DependentUpon>Views\CalculatorStandardOperators.xaml</DependentUpon>
     </ClCompile>
+    <ClCompile Include="Views\FinanceCalculator.xaml.cpp">
+      <DependentUpon>Views\FinanceCalculator.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="Views\GraphingCalculator\EquationInputArea.xaml.cpp">
       <DependentUpon>Views\GraphingCalculator\EquationInputArea.xaml</DependentUpon>
     </ClCompile>

src/Calculator/Calculator.vcxproj.filters

@@ -524,6 +524,9 @@
     <Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
       <Filter>Views\StateTriggers</Filter>
     </Page>
+    <Page Include="Views\FinanceCalculator.xaml">
+      <Filter>Views</Filter>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="Resources\en-US\CEngineStrings.resw">