diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp index 46855071..28b210ae 100644 --- a/src/CalcViewModel/ApplicationViewModel.cpp +++ b/src/CalcViewModel/ApplicationViewModel.cpp @@ -12,8 +12,8 @@ #include "DataLoaders/UnitConverterDataLoader.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::DataLoaders; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::DataLoaders; using namespace CalculatorApp::ViewModel; using namespace CalculationManager; using namespace Platform; diff --git a/src/CalcViewModel/ApplicationViewModel.h b/src/CalcViewModel/ApplicationViewModel.h index 7e4238d8..ab26c35f 100644 --- a/src/CalcViewModel/ApplicationViewModel.h +++ b/src/CalcViewModel/ApplicationViewModel.h @@ -17,14 +17,14 @@ namespace CalculatorApp public: ApplicationViewModel(); - void Initialize(CalculatorApp::Common::ViewMode mode); // Use for first init, use deserialize for rehydration + void Initialize(CalculatorApp::ViewModel::Common::ViewMode mode); // Use for first init, use deserialize for rehydration OBSERVABLE_OBJECT(); OBSERVABLE_PROPERTY_RW(StandardCalculatorViewModel ^, CalculatorViewModel); OBSERVABLE_PROPERTY_RW(DateCalculatorViewModel ^, DateCalcViewModel); OBSERVABLE_PROPERTY_RW(GraphingCalculatorViewModel ^, GraphingCalcViewModel); OBSERVABLE_PROPERTY_RW(UnitConverterViewModel ^, ConverterViewModel); - OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode); + OBSERVABLE_PROPERTY_RW(CalculatorApp::ViewModel::Common::ViewMode, PreviousMode); OBSERVABLE_PROPERTY_R(bool, IsAlwaysOnTop); OBSERVABLE_NAMED_PROPERTY_RW(Platform::String ^, CategoryName); @@ -34,14 +34,14 @@ namespace CalculatorApp COMMAND_FOR_METHOD(CopyCommand, ApplicationViewModel::OnCopyCommand); COMMAND_FOR_METHOD(PasteCommand, ApplicationViewModel::OnPasteCommand); - property CalculatorApp::Common::ViewMode Mode + property CalculatorApp::ViewModel::Common::ViewMode Mode { - CalculatorApp::Common::ViewMode get() + CalculatorApp::ViewModel::Common::ViewMode get() { return m_mode; } - void set(CalculatorApp::Common::ViewMode value); + void set(CalculatorApp::ViewModel::Common::ViewMode value); } static property Platform::String^ ModePropertyName { @@ -51,21 +51,21 @@ namespace CalculatorApp } } - property Windows::Foundation::Collections::IObservableVector^ Categories + property Windows::Foundation::Collections::IObservableVector^ Categories { - Windows::Foundation::Collections::IObservableVector^ get() + Windows::Foundation::Collections::IObservableVector^ get() { return m_categories; } - void set(Windows::Foundation::Collections::IObservableVector^ value); + void set(Windows::Foundation::Collections::IObservableVector^ value); } property Windows::UI::Xaml::Visibility ClearMemoryVisibility { Windows::UI::Xaml::Visibility get() { - return CalculatorApp::Common::NavCategory::IsCalculatorViewMode(Mode) ? Windows::UI::Xaml::Visibility::Visible + return CalculatorApp::ViewModel::Common::NavCategory::IsCalculatorViewMode(Mode) ? Windows::UI::Xaml::Visibility::Visible : Windows::UI::Xaml::Visibility::Collapsed; } } @@ -106,8 +106,8 @@ namespace CalculatorApp void SetMenuCategories(); - CalculatorApp::Common::ViewMode m_mode; - Windows::Foundation::Collections::IObservableVector ^ m_categories; + CalculatorApp::ViewModel::Common::ViewMode m_mode; + Windows::Foundation::Collections::IObservableVector ^ m_categories; Concurrency::task HandleToggleAlwaysOnTop(float width, float height); void SetDisplayNormalAlwaysOnTopOption(); }; diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj index dbab218f..db99377b 100644 --- a/src/CalcViewModel/CalcViewModel.vcxproj +++ b/src/CalcViewModel/CalcViewModel.vcxproj @@ -37,7 +37,7 @@ {812d1a7b-b8ac-49e4-8e6d-af5d59500d56} WindowsRuntimeComponent - CalculatorApp + CalculatorApp.ViewModel en-US 14.0 true diff --git a/src/CalcViewModel/Common/AppResourceProvider.cpp b/src/CalcViewModel/Common/AppResourceProvider.cpp index b843d55b..bc23e78b 100644 --- a/src/CalcViewModel/Common/AppResourceProvider.cpp +++ b/src/CalcViewModel/Common/AppResourceProvider.cpp @@ -7,6 +7,7 @@ using namespace Platform; using namespace Windows::ApplicationModel::Resources; using namespace CalculatorApp; +using namespace CalculatorApp::ViewModel::Common; AppResourceProvider::AppResourceProvider() { diff --git a/src/CalcViewModel/Common/AppResourceProvider.h b/src/CalcViewModel/Common/AppResourceProvider.h index be429a13..7af2e7fd 100644 --- a/src/CalcViewModel/Common/AppResourceProvider.h +++ b/src/CalcViewModel/Common/AppResourceProvider.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { public ref class AppResourceProvider sealed { diff --git a/src/CalcViewModel/Common/Automation/INarratorAnnouncementHost.h b/src/CalcViewModel/Common/Automation/INarratorAnnouncementHost.h index 9f947f41..7fccdaaf 100644 --- a/src/CalcViewModel/Common/Automation/INarratorAnnouncementHost.h +++ b/src/CalcViewModel/Common/Automation/INarratorAnnouncementHost.h @@ -9,7 +9,7 @@ // being used. Depending on the version of the OS the app is running on, // the app may need a host that uses LiveRegionChanged or RaiseNotification. -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { public interface class INarratorAnnouncementHost diff --git a/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp b/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp index 0df3a96c..e242411e 100644 --- a/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp +++ b/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "LiveRegionHost.h" -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace Windows::UI::Xaml::Automation; using namespace Windows::UI::Xaml::Automation::Peers; using namespace Windows::UI::Xaml::Controls; diff --git a/src/CalcViewModel/Common/Automation/LiveRegionHost.h b/src/CalcViewModel/Common/Automation/LiveRegionHost.h index fef7c714..66d41e44 100644 --- a/src/CalcViewModel/Common/Automation/LiveRegionHost.h +++ b/src/CalcViewModel/Common/Automation/LiveRegionHost.h @@ -9,7 +9,7 @@ // This event is unreliable and should be deprecated in favor of the new // RaiseNotification API in RS3. -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { // This class exists so that the app can run on RS2 and use LiveRegions // to host notifications on those builds. diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp index 271a4c24..9751c7dc 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp @@ -4,11 +4,11 @@ #include "pch.h" #include "NarratorAnnouncement.h" -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace Platform; using namespace Windows::UI::Xaml::Automation::Peers; -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { namespace CalculatorActivityIds { diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h index 385fea44..0855383b 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { public ref class NarratorAnnouncement sealed diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.cpp b/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.cpp index a103c7e7..6e8254b1 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.cpp +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.cpp @@ -6,7 +6,7 @@ #include "NotificationHost.h" #include "LiveRegionHost.h" -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace std; INarratorAnnouncementHost ^ NarratorAnnouncementHostFactory::s_hostProducer; diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.h b/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.h index 4b739a79..d6579617 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.h +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncementHostFactory.h @@ -9,7 +9,7 @@ // Depending on the version of the OS the app is running on, the factory will return // an announcement host appropriate for that version. -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { class NarratorAnnouncementHostFactory { diff --git a/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp b/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp index 89fa0c0b..4ac4600e 100644 --- a/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp +++ b/src/CalcViewModel/Common/Automation/NarratorNotifier.cpp @@ -6,7 +6,7 @@ #include "pch.h" #include "NarratorNotifier.h" -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace Platform; using namespace Windows::UI::Xaml; using namespace Windows::UI::Xaml::Automation; diff --git a/src/CalcViewModel/Common/Automation/NarratorNotifier.h b/src/CalcViewModel/Common/Automation/NarratorNotifier.h index 359bb09e..f3d82eaa 100644 --- a/src/CalcViewModel/Common/Automation/NarratorNotifier.h +++ b/src/CalcViewModel/Common/Automation/NarratorNotifier.h @@ -6,7 +6,7 @@ #pragma once #include "NarratorAnnouncement.h" -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { public ref class NarratorNotifier sealed : public Windows::UI::Xaml::DependencyObject diff --git a/src/CalcViewModel/Common/Automation/NotificationHost.cpp b/src/CalcViewModel/Common/Automation/NotificationHost.cpp index 92bf846e..d5bc1d45 100644 --- a/src/CalcViewModel/Common/Automation/NotificationHost.cpp +++ b/src/CalcViewModel/Common/Automation/NotificationHost.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "NotificationHost.h" -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace Windows::Foundation::Metadata; using namespace Windows::UI::Xaml::Automation; using namespace Windows::UI::Xaml::Automation::Peers; diff --git a/src/CalcViewModel/Common/Automation/NotificationHost.h b/src/CalcViewModel/Common/Automation/NotificationHost.h index d0a929c6..b0e86787 100644 --- a/src/CalcViewModel/Common/Automation/NotificationHost.h +++ b/src/CalcViewModel/Common/Automation/NotificationHost.h @@ -8,7 +8,7 @@ // This class announces NarratorAnnouncements using the RaiseNotification API // available in RS3. -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { public ref class NotificationHost sealed : public INarratorAnnouncementHost @@ -23,10 +23,10 @@ public private: static Windows::UI::Xaml::Automation::Peers::AutomationNotificationKind - GetWindowsNotificationKind(CalculatorApp::Common::Automation::AutomationNotificationKind customKindType); + GetWindowsNotificationKind(CalculatorApp::ViewModel::Common::Automation::AutomationNotificationKind customKindType); static Windows::UI::Xaml::Automation::Peers::AutomationNotificationProcessing - GetWindowsNotificationProcessing(CalculatorApp::Common::Automation::AutomationNotificationProcessing customProcessingType); + GetWindowsNotificationProcessing(CalculatorApp::ViewModel::Common::Automation::AutomationNotificationProcessing customProcessingType); private: Windows::UI::Xaml::UIElement ^ m_host; diff --git a/src/CalcViewModel/Common/BitLength.h b/src/CalcViewModel/Common/BitLength.h index 8c38e7e4..065bd25e 100644 --- a/src/CalcViewModel/Common/BitLength.h +++ b/src/CalcViewModel/Common/BitLength.h @@ -1,6 +1,6 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.cpp b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.cpp index 76c0d4c0..899af3ec 100644 --- a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.cpp +++ b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.cpp @@ -5,7 +5,8 @@ #include "CalculatorButtonPressedEventArgs.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel; +using namespace CalculatorApp::ViewModel::Common; using namespace Platform; NumbersAndOperatorsEnum CalculatorButtonPressedEventArgs::GetOperationFromCommandParameter(_In_ Object ^ commandParameter) diff --git a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h index 27624987..58192d41 100644 --- a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h +++ b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h @@ -6,7 +6,7 @@ #include "CalculatorButtonUser.h" #include "Utils.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { @@ -15,15 +15,15 @@ namespace CalculatorApp { public: PROPERTY_R(Platform::String ^, AuditoryFeedback); - PROPERTY_R(CalculatorApp::NumbersAndOperatorsEnum, Operation); + PROPERTY_R(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum, Operation); - CalculatorButtonPressedEventArgs(Platform::String ^ feedback, CalculatorApp::NumbersAndOperatorsEnum operation) + CalculatorButtonPressedEventArgs(Platform::String ^ feedback, CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum operation) : m_AuditoryFeedback(feedback) , m_Operation(operation) { } - static CalculatorApp::NumbersAndOperatorsEnum GetOperationFromCommandParameter(_In_ Platform::Object ^ commandParameter); + static CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum GetOperationFromCommandParameter(_In_ Platform::Object ^ commandParameter); static Platform::String ^ GetAuditoryFeedbackFromCommandParameter(_In_ Platform::Object ^ commandParameter); }; } diff --git a/src/CalcViewModel/Common/CalculatorButtonUser.h b/src/CalcViewModel/Common/CalculatorButtonUser.h index a7b72189..c2faefe2 100644 --- a/src/CalcViewModel/Common/CalculatorButtonUser.h +++ b/src/CalcViewModel/Common/CalculatorButtonUser.h @@ -5,12 +5,11 @@ #include "CalcManager/Command.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { namespace CM = CalculationManager; -public - enum class NumbersAndOperatorsEnum + public enum class NumbersAndOperatorsEnum { Zero = (int)CM::Command::Command0, One = (int)CM::Command::Command1, diff --git a/src/CalcViewModel/Common/CalculatorDisplay.cpp b/src/CalcViewModel/Common/CalculatorDisplay.cpp index 5cf8afbc..afd42a0c 100644 --- a/src/CalcViewModel/Common/CalculatorDisplay.cpp +++ b/src/CalcViewModel/Common/CalculatorDisplay.cpp @@ -8,143 +8,149 @@ #include "StandardCalculatorViewModel.h" using namespace CalculatorApp; +using namespace CalculatorApp::ViewModel; +using namespace CalculatorApp::ViewModel::Common; using namespace CalculationManager; using namespace Platform; using namespace std; -CalculatorDisplay::CalculatorDisplay() +namespace CalculatorApp::ViewModel::Common { -} - -void CalculatorDisplay::SetCallback(Platform::WeakReference callbackReference) -{ - m_callbackReference = callbackReference; -} - -void CalculatorDisplay::SetHistoryCallback(Platform::WeakReference callbackReference) -{ - m_historyCallbackReference = callbackReference; -} - -void CalculatorDisplay::SetPrimaryDisplay(_In_ const wstring& displayStringValue, _In_ bool isError) -{ - if (m_callbackReference) + CalculatorDisplay::CalculatorDisplay() { - if (auto calcVM = m_callbackReference.Resolve()) + } + + void CalculatorDisplay::SetCallback(Platform::WeakReference callbackReference) + { + m_callbackReference = callbackReference; + } + + void CalculatorDisplay::SetHistoryCallback(Platform::WeakReference callbackReference) + { + m_historyCallbackReference = callbackReference; + } + + void CalculatorDisplay::SetPrimaryDisplay(_In_ const wstring& displayStringValue, _In_ bool isError) + { + if (m_callbackReference) { - calcVM->SetPrimaryDisplay(StringReference(displayStringValue.c_str()), isError); + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->SetPrimaryDisplay(StringReference(displayStringValue.c_str()), isError); + } + } + } + + void CalculatorDisplay::SetParenthesisNumber(_In_ unsigned int parenthesisCount) + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->SetParenthesisCount(parenthesisCount); + } + } + } + + void CalculatorDisplay::OnNoRightParenAdded() + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->OnNoRightParenAdded(); + } + } + } + + void CalculatorDisplay::SetIsInError(bool isError) + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->IsInError = isError; + } + } + } + + void CalculatorDisplay::SetExpressionDisplay( + _Inout_ std::shared_ptr>> const& tokens, + _Inout_ std::shared_ptr>> const& commands) + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->SetExpressionDisplay(tokens, commands); + } + } + } + + void CalculatorDisplay::SetMemorizedNumbers(_In_ const vector& newMemorizedNumbers) + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->SetMemorizedNumbers(newMemorizedNumbers); + } + } + } + + void CalculatorDisplay::OnHistoryItemAdded(_In_ unsigned int addedItemIndex) + { + if (m_historyCallbackReference != nullptr) + { + if (auto historyVM = m_historyCallbackReference.Resolve()) + { + historyVM->OnHistoryItemAdded(addedItemIndex); + } + } + } + + void CalculatorDisplay::MaxDigitsReached() + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->OnMaxDigitsReached(); + } + } + } + + void CalculatorDisplay::BinaryOperatorReceived() + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->OnBinaryOperatorReceived(); + } + } + } + + void CalculatorDisplay::MemoryItemChanged(unsigned int indexOfMemory) + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->OnMemoryItemChanged(indexOfMemory); + } + } + } + + void CalculatorDisplay::InputChanged() + { + if (m_callbackReference != nullptr) + { + if (auto calcVM = m_callbackReference.Resolve()) + { + calcVM->OnInputChanged(); + } } } } -void CalculatorDisplay::SetParenthesisNumber(_In_ unsigned int parenthesisCount) -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->SetParenthesisCount(parenthesisCount); - } - } -} - -void CalculatorDisplay::OnNoRightParenAdded() -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->OnNoRightParenAdded(); - } - } -} - -void CalculatorDisplay::SetIsInError(bool isError) -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->IsInError = isError; - } - } -} - -void CalculatorDisplay::SetExpressionDisplay( - _Inout_ std::shared_ptr>> const& tokens, - _Inout_ std::shared_ptr>> const& commands) -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->SetExpressionDisplay(tokens, commands); - } - } -} - -void CalculatorDisplay::SetMemorizedNumbers(_In_ const vector& newMemorizedNumbers) -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->SetMemorizedNumbers(newMemorizedNumbers); - } - } -} - -void CalculatorDisplay::OnHistoryItemAdded(_In_ unsigned int addedItemIndex) -{ - if (m_historyCallbackReference != nullptr) - { - if (auto historyVM = m_historyCallbackReference.Resolve()) - { - historyVM->OnHistoryItemAdded(addedItemIndex); - } - } -} - -void CalculatorDisplay::MaxDigitsReached() -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->OnMaxDigitsReached(); - } - } -} - -void CalculatorDisplay::BinaryOperatorReceived() -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->OnBinaryOperatorReceived(); - } - } -} - -void CalculatorDisplay::MemoryItemChanged(unsigned int indexOfMemory) -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->OnMemoryItemChanged(indexOfMemory); - } - } -} - -void CalculatorDisplay::InputChanged() -{ - if (m_callbackReference != nullptr) - { - if (auto calcVM = m_callbackReference.Resolve()) - { - calcVM->OnInputChanged(); - } - } -} diff --git a/src/CalcViewModel/Common/CalculatorDisplay.h b/src/CalcViewModel/Common/CalculatorDisplay.h index 921260da..f6c45ae0 100644 --- a/src/CalcViewModel/Common/CalculatorDisplay.h +++ b/src/CalcViewModel/Common/CalculatorDisplay.h @@ -5,7 +5,7 @@ #include "CalcManager/Header Files/ICalcDisplay.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { // Callback interface to be implemented by the CalculatorManager class CalculatorDisplay : public ICalcDisplay diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp index 19326006..44ae1ac2 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.cpp +++ b/src/CalcViewModel/Common/CopyPasteManager.cpp @@ -9,7 +9,8 @@ using namespace std; using namespace concurrency; using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace Platform::Collections; using namespace Windows::Foundation; @@ -614,7 +615,7 @@ ULONG32 CopyPasteManager::ProgrammerOperandLength(Platform::String ^ operand, Nu Platform::String ^ CopyPasteManager::RemoveUnwantedCharsFromString(Platform::String ^ input) { constexpr wchar_t unWantedChars[] = { L' ', L',', L'"', 165, 164, 8373, 36, 8353, 8361, 8362, 8358, 8377, 163, 8364, 8234, 8235, 8236, 8237, 160 }; - input = CalculatorApp::Common::LocalizationSettings::GetInstance()->RemoveGroupSeparators(input); + input = CalculatorApp::ViewModel::Common::LocalizationSettings::GetInstance()->RemoveGroupSeparators(input); return ref new String(Utils::RemoveUnwantedCharsFromString(input->Data(), unWantedChars).c_str()); } diff --git a/src/CalcViewModel/Common/CopyPasteManager.h b/src/CalcViewModel/Common/CopyPasteManager.h index b8850d4c..a55084ae 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.h +++ b/src/CalcViewModel/Common/CopyPasteManager.h @@ -13,10 +13,9 @@ namespace CalculatorUnitTests class CopyPasteManagerTest; } -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { -public - value struct CopyPasteMaxOperandLengthAndValue + public value struct CopyPasteMaxOperandLengthAndValue { unsigned int maxLength; unsigned long long maxValue; @@ -26,9 +25,11 @@ public { public: static void CopyToClipboard(Platform::String ^ stringToCopy); - static Windows::Foundation::IAsyncOperation< - Platform::String - ^> ^ GetStringToPaste(CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, CalculatorApp::Common::NumberBase programmerNumberBase, CalculatorApp::Common::BitLength bitLengthType); + static Windows::Foundation::IAsyncOperation ^ GetStringToPaste( + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::CategoryGroupType modeType, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase, + CalculatorApp::ViewModel::Common::BitLength bitLengthType); static bool HasStringToPaste(); static bool IsErrorMessage(Platform::String ^ message); static property unsigned int MaxPasteableLength @@ -87,39 +88,39 @@ public static Platform::String ^ ValidatePasteExpression( Platform::String ^ pastedText, - CalculatorApp::Common::ViewMode mode, - CalculatorApp::Common::NumberBase programmerNumberBase, - CalculatorApp::Common::BitLength bitLengthType); + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase, + CalculatorApp::ViewModel::Common::BitLength bitLengthType); static Platform::String ^ ValidatePasteExpression( Platform::String ^ pastedText, - CalculatorApp::Common::ViewMode mode, - CalculatorApp::Common::CategoryGroupType modeType, - CalculatorApp::Common::NumberBase programmerNumberBase, - CalculatorApp::Common::BitLength bitLengthType); + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::CategoryGroupType modeType, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase, + CalculatorApp::ViewModel::Common::BitLength bitLengthType); static CopyPasteMaxOperandLengthAndValue GetMaxOperandLengthAndValue( - CalculatorApp::Common::ViewMode mode, - CalculatorApp::Common::CategoryGroupType modeType, - CalculatorApp::Common::NumberBase programmerNumberBase, - CalculatorApp::Common::BitLength bitLengthType); + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::CategoryGroupType modeType, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase, + CalculatorApp::ViewModel::Common::BitLength bitLengthType); static Windows::Foundation::Collections::IVector< - Platform::String ^> ^ ExtractOperands(Platform::String ^ pasteExpression, CalculatorApp::Common::ViewMode mode); + Platform::String ^> ^ ExtractOperands(Platform::String ^ pasteExpression, CalculatorApp::ViewModel::Common::ViewMode mode); static bool ExpressionRegExMatch( Windows::Foundation::Collections::IVector ^ operands, - CalculatorApp::Common::ViewMode mode, - CalculatorApp::Common::CategoryGroupType modeType, - CalculatorApp::Common::NumberBase programmerNumberBase, - CalculatorApp::Common::BitLength bitLengthType); + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::CategoryGroupType modeType, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase, + CalculatorApp::ViewModel::Common::BitLength bitLengthType); static Platform::String ^ SanitizeOperand(Platform::String ^ operand); static Platform::String ^ RemoveUnwantedCharsFromString(Platform::String ^ input); - static Platform::IBox ^ TryOperandToULL(Platform::String ^ operand, CalculatorApp::Common::NumberBase numberBase); + static Platform::IBox ^ TryOperandToULL(Platform::String ^ operand, CalculatorApp::ViewModel::Common::NumberBase numberBase); static ULONG32 StandardScientificOperandLength(Platform::String ^ operand); static ULONG32 OperandLength( Platform::String ^ operand, - CalculatorApp::Common::ViewMode mode, - CalculatorApp::Common::CategoryGroupType modeType, - CalculatorApp::Common::NumberBase programmerNumberBase); - static ULONG32 ProgrammerOperandLength(Platform::String ^ operand, CalculatorApp::Common::NumberBase numberBase); + CalculatorApp::ViewModel::Common::ViewMode mode, + CalculatorApp::ViewModel::Common::CategoryGroupType modeType, + CalculatorApp::ViewModel::Common::NumberBase programmerNumberBase); + static ULONG32 ProgrammerOperandLength(Platform::String ^ operand, CalculatorApp::ViewModel::Common::NumberBase numberBase); private: static constexpr size_t MaxStandardOperandLengthValue = 16; diff --git a/src/CalcViewModel/Common/DateCalculator.cpp b/src/CalcViewModel/Common/DateCalculator.cpp index 35df7231..0b417387 100644 --- a/src/CalcViewModel/Common/DateCalculator.cpp +++ b/src/CalcViewModel/Common/DateCalculator.cpp @@ -7,7 +7,7 @@ using namespace Platform; using namespace Windows::Foundation; using namespace Windows::Globalization; -using namespace CalculatorApp::Common::DateCalculation; +using namespace CalculatorApp::ViewModel::Common::DateCalculation; bool operator==(const DateDifference& l, const DateDifference& r) { diff --git a/src/CalcViewModel/Common/DateCalculator.h b/src/CalcViewModel/Common/DateCalculator.h index 7c9b6c4d..89275b1f 100644 --- a/src/CalcViewModel/Common/DateCalculator.h +++ b/src/CalcViewModel/Common/DateCalculator.h @@ -13,7 +13,7 @@ const int c_unitsOfDate = 4; // Units Year,Month,Week,Day const int c_unitsGreaterThanDays = 3; // Units Greater than Days (Year/Month/Week) 3 const int c_daysInWeek = 7; -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { @@ -68,4 +68,4 @@ namespace CalculatorApp } } -bool operator==(const CalculatorApp::Common::DateCalculation::DateDifference& l, const CalculatorApp::Common::DateCalculation::DateDifference& r); +bool operator==(const CalculatorApp::ViewModel::Common::DateCalculation::DateDifference& l, const CalculatorApp::ViewModel::Common::DateCalculation::DateDifference& r); diff --git a/src/CalcViewModel/Common/DelegateCommand.h b/src/CalcViewModel/Common/DelegateCommand.h index 6dbb49cc..6a0151a1 100644 --- a/src/CalcViewModel/Common/DelegateCommand.h +++ b/src/CalcViewModel/Common/DelegateCommand.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/DisplayExpressionToken.h b/src/CalcViewModel/Common/DisplayExpressionToken.h index 45b23c0d..86aed75f 100644 --- a/src/CalcViewModel/Common/DisplayExpressionToken.h +++ b/src/CalcViewModel/Common/DisplayExpressionToken.h @@ -5,7 +5,7 @@ #include "Utils.h" -namespace CalculatorApp::Common +namespace CalculatorApp::ViewModel::Common { public enum class TokenType diff --git a/src/CalcViewModel/Common/EngineResourceProvider.cpp b/src/CalcViewModel/Common/EngineResourceProvider.cpp index 2ad77835..ff274d1d 100644 --- a/src/CalcViewModel/Common/EngineResourceProvider.cpp +++ b/src/CalcViewModel/Common/EngineResourceProvider.cpp @@ -5,7 +5,7 @@ #include "EngineResourceProvider.h" #include "Common/LocalizationSettings.h" -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace Platform; using namespace Windows::ApplicationModel::Resources; using namespace std; diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h index f4620c5c..524b7a9b 100644 --- a/src/CalcViewModel/Common/EngineResourceProvider.h +++ b/src/CalcViewModel/Common/EngineResourceProvider.h @@ -5,7 +5,7 @@ #include "CalcManager/CalculatorResource.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { class EngineResourceProvider : public CalculationManager::IResourceProvider { diff --git a/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp b/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp index 509a1659..a91d2d35 100644 --- a/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp +++ b/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "ExpressionCommandDeserializer.h" -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace Windows::Storage::Streams; CommandDeserializer::CommandDeserializer(_In_ DataReader ^ dataReader) diff --git a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h index 833b6bf6..aed9afe2 100644 --- a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h +++ b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h @@ -5,7 +5,7 @@ #include "CalcManager/ExpressionCommand.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp index fb0cd83a..464bc023 100644 --- a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp +++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "Common/ExpressionCommandSerializer.h" -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace Windows::Storage::Streams; SerializeCommandVisitor::SerializeCommandVisitor(_In_ DataWriter ^ dataWriter) diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.h b/src/CalcViewModel/Common/ExpressionCommandSerializer.h index 23303fe7..d64b19b7 100644 --- a/src/CalcViewModel/Common/ExpressionCommandSerializer.h +++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.h @@ -5,7 +5,7 @@ #include "CalcManager/ExpressionCommand.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/LocalizationService.cpp b/src/CalcViewModel/Common/LocalizationService.cpp index 27bdfb1d..22bd494f 100644 --- a/src/CalcViewModel/Common/LocalizationService.cpp +++ b/src/CalcViewModel/Common/LocalizationService.cpp @@ -6,8 +6,9 @@ #include "LocalizationSettings.h" #include "AppResourceProvider.h" -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::LocalizationServiceProperties; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::LocalizationServiceProperties; +using namespace CalculatorApp::ViewModel; using namespace Concurrency; using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalcViewModel/Common/LocalizationService.h b/src/CalcViewModel/Common/LocalizationService.h index 4641acaf..ae7a513e 100644 --- a/src/CalcViewModel/Common/LocalizationService.h +++ b/src/CalcViewModel/Common/LocalizationService.h @@ -5,7 +5,7 @@ #include "Utils.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { @@ -98,6 +98,5 @@ namespace CalculatorApp double m_uiCaptionFontScaleFactorOverride; std::locale m_locale; }; - } } diff --git a/src/CalcViewModel/Common/LocalizationSettings.h b/src/CalcViewModel/Common/LocalizationSettings.h index 16b02b51..666d631c 100644 --- a/src/CalcViewModel/Common/LocalizationSettings.h +++ b/src/CalcViewModel/Common/LocalizationSettings.h @@ -6,7 +6,7 @@ #include -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/LocalizationStringUtil.h b/src/CalcViewModel/Common/LocalizationStringUtil.h index 73da6d0d..33aa482d 100644 --- a/src/CalcViewModel/Common/LocalizationStringUtil.h +++ b/src/CalcViewModel/Common/LocalizationStringUtil.h @@ -5,7 +5,7 @@ #include "AppResourceProvider.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/MyVirtualKey.h b/src/CalcViewModel/Common/MyVirtualKey.h index c530e816..071b4183 100644 --- a/src/CalcViewModel/Common/MyVirtualKey.h +++ b/src/CalcViewModel/Common/MyVirtualKey.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp index e8a93cec..9985da45 100644 --- a/src/CalcViewModel/Common/NavCategory.cpp +++ b/src/CalcViewModel/Common/NavCategory.cpp @@ -8,7 +8,8 @@ #include using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel; using namespace Concurrency; using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h index d786b5a2..74cfaeed 100644 --- a/src/CalcViewModel/Common/NavCategory.h +++ b/src/CalcViewModel/Common/NavCategory.h @@ -17,7 +17,7 @@ #include "Utils.h" #include "MyVirtualKey.h" -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/NetworkManager.cpp b/src/CalcViewModel/Common/NetworkManager.cpp index 8bf3835a..4f032d96 100644 --- a/src/CalcViewModel/Common/NetworkManager.cpp +++ b/src/CalcViewModel/Common/NetworkManager.cpp @@ -5,6 +5,8 @@ #include "NetworkManager.h" using namespace CalculatorApp; +using namespace CalculatorApp::ViewModel; +using namespace CalculatorApp::ViewModel::Common; using namespace Platform; using namespace Windows::Networking::Connectivity; diff --git a/src/CalcViewModel/Common/NetworkManager.h b/src/CalcViewModel/Common/NetworkManager.h index 51903d94..6bf7b7c1 100644 --- a/src/CalcViewModel/Common/NetworkManager.h +++ b/src/CalcViewModel/Common/NetworkManager.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { public enum class NetworkAccessBehavior diff --git a/src/CalcViewModel/Common/NumberBase.h b/src/CalcViewModel/Common/NumberBase.h index 4e15efa1..6efb323b 100644 --- a/src/CalcViewModel/Common/NumberBase.h +++ b/src/CalcViewModel/Common/NumberBase.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -namespace CalculatorApp::Common +namespace CalculatorApp::ViewModel::Common { public enum class NumberBase diff --git a/src/CalcViewModel/Common/RadixType.h b/src/CalcViewModel/Common/RadixType.h index e9b05414..de4bc8a8 100644 --- a/src/CalcViewModel/Common/RadixType.h +++ b/src/CalcViewModel/Common/RadixType.h @@ -3,7 +3,7 @@ #pragma once -namespace CalculatorApp +namespace CalculatorApp::ViewModel { namespace Common { diff --git a/src/CalcViewModel/Common/TraceLogger.cpp b/src/CalcViewModel/Common/TraceLogger.cpp index 53a8ec15..2bc1d972 100644 --- a/src/CalcViewModel/Common/TraceLogger.cpp +++ b/src/CalcViewModel/Common/TraceLogger.cpp @@ -7,7 +7,8 @@ #include "CalculatorButtonUser.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel; using namespace TraceLogging; using namespace Concurrency; using namespace std; diff --git a/src/CalcViewModel/Common/TraceLogger.h b/src/CalcViewModel/Common/TraceLogger.h index 9f3ca663..97710ff4 100644 --- a/src/CalcViewModel/Common/TraceLogger.h +++ b/src/CalcViewModel/Common/TraceLogger.h @@ -8,15 +8,15 @@ // A trace logging provider can only be instantiated and registered once per module. // This class implements a singleton model ensure that only one instance is created. -namespace CalculatorApp +namespace CalculatorApp::ViewModel::Common { struct ButtonLog { public: int count; - CalculatorApp::NumbersAndOperatorsEnum button; - CalculatorApp::Common::ViewMode mode; - ButtonLog(CalculatorApp::NumbersAndOperatorsEnum btn, CalculatorApp::Common::ViewMode vMode) + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum button; + CalculatorApp::ViewModel::Common::ViewMode mode; + ButtonLog(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum btn, CalculatorApp::ViewModel::Common::ViewMode vMode) { button = btn; mode = vMode; @@ -62,20 +62,20 @@ namespace CalculatorApp public: static TraceLogger ^ GetInstance(); - void LogModeChange(CalculatorApp::Common::ViewMode mode); - void LogHistoryItemLoad(CalculatorApp::Common::ViewMode mode, int historyListSize, int loadedIndex); - void LogMemoryItemLoad(CalculatorApp::Common::ViewMode mode, int memoryListSize, int loadedIndex); - void UpdateButtonUsage(CalculatorApp::NumbersAndOperatorsEnum button, CalculatorApp::Common::ViewMode mode); + void LogModeChange(CalculatorApp::ViewModel::Common::ViewMode mode); + void LogHistoryItemLoad(CalculatorApp::ViewModel::Common::ViewMode mode, int historyListSize, int loadedIndex); + void LogMemoryItemLoad(CalculatorApp::ViewModel::Common::ViewMode mode, int memoryListSize, int loadedIndex); + void UpdateButtonUsage(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum button, CalculatorApp::ViewModel::Common::ViewMode mode); void LogButtonUsage(); void LogDateCalculationModeUsed(bool AddSubtractMode); void UpdateWindowCount(uint64 windowCount); void DecreaseWindowCount(); bool IsWindowIdInLog(int windowId); - void LogVisualStateChanged(CalculatorApp::Common::ViewMode mode, Platform::String ^ state, bool isAlwaysOnTop); - void LogWindowCreated(CalculatorApp::Common::ViewMode mode, int windowId); - void LogConverterInputReceived(CalculatorApp::Common::ViewMode mode); + void LogVisualStateChanged(CalculatorApp::ViewModel::Common::ViewMode mode, Platform::String ^ state, bool isAlwaysOnTop); + void LogWindowCreated(CalculatorApp::ViewModel::Common::ViewMode mode, int windowId); + void LogConverterInputReceived(CalculatorApp::ViewModel::Common::ViewMode mode); void LogNavBarOpened(); - void LogError(CalculatorApp::Common::ViewMode mode, Platform::String ^ functionName, Platform::String ^ errorString); + void LogError(CalculatorApp::ViewModel::Common::ViewMode mode, Platform::String ^ functionName, Platform::String ^ errorString); void LogShowHideButtonClicked(bool isHideButton); void LogGraphButtonClicked(GraphButton buttonName, GraphButtonValue buttonValue); void LogGraphLineStyleChanged(LineStyleType style); @@ -83,12 +83,12 @@ namespace CalculatorApp void LogVariableSettingsChanged(Platform::String ^ setting); void LogGraphSettingsChanged(GraphSettingsType settingsType, Platform::String ^ settingValue); void LogGraphTheme(Platform::String ^ graphTheme); - // CSHARP_MIGRATION: TODO: - void LogPlatformException(CalculatorApp::Common::ViewMode mode, Platform::String ^ functionName, Platform::Exception ^ e); internal: - void LogStandardException(CalculatorApp::Common::ViewMode mode, std::wstring_view functionName, _In_ const std::exception& e); - void LogInputPasted(CalculatorApp::Common::ViewMode mode); + // CSHARP_MIGRATION: TODO: + void LogPlatformException(CalculatorApp::ViewModel::Common::ViewMode mode, Platform::String ^ functionName, Platform::Exception ^ e); + void LogStandardException(CalculatorApp::ViewModel::Common::ViewMode mode, std::wstring_view functionName, _In_ const std::exception& e); + void LogInputPasted(CalculatorApp::ViewModel::Common::ViewMode mode); private: // Create an instance of TraceLogger diff --git a/src/CalcViewModel/Common/Utils.cpp b/src/CalcViewModel/Common/Utils.cpp index 9fa35f16..34713a84 100644 --- a/src/CalcViewModel/Common/Utils.cpp +++ b/src/CalcViewModel/Common/Utils.cpp @@ -13,7 +13,7 @@ #include "CalcManager/NumberFormattingUtils.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace concurrency; using namespace Graphing::Renderer; using namespace Platform; @@ -179,7 +179,7 @@ bool operator!=(const Color& color1, const Color& color2) return !(color1 == color2); } -String^ CalculatorApp::Utilities::EscapeHtmlSpecialCharacters(String^ originalString) +String^ CalculatorApp::ViewModel::Common::Utilities::EscapeHtmlSpecialCharacters(String^ originalString) { // Construct a default special characters if not provided. const std::vector specialCharacters {L'&', L'\"', L'\'', L'<', L'>'}; @@ -236,14 +236,14 @@ String^ CalculatorApp::Utilities::EscapeHtmlSpecialCharacters(String^ originalSt return replaceCharacters ? replacementString : originalString; } -Platform::String^ CalculatorApp::Utilities::TrimTrailingZeros(Platform::String^ input) +Platform::String^ CalculatorApp::ViewModel::Common::Utilities::TrimTrailingZeros(Platform::String^ input) { std::wstring tmp(input->Data()); CalcManager::NumberFormattingUtils::TrimTrailingZeros(tmp); return ref new Platform::String(tmp.c_str()); } -bool CalculatorApp::Utilities::AreColorsEqual(Windows::UI::Color color1, Windows::UI::Color color2) +bool CalculatorApp::ViewModel::Common::Utilities::AreColorsEqual(Windows::UI::Color color1, Windows::UI::Color color2) { return Utils::AreColorsEqual(color1, color2); } @@ -251,7 +251,7 @@ bool CalculatorApp::Utilities::AreColorsEqual(Windows::UI::Color color1, Windows // This method calculates the luminance ratio between White and the given background color. // The luminance is calculate using the RGB values and does not use the A value. // White or Black is returned -SolidColorBrush ^ CalculatorApp::Utilities::GetContrastColor(Color backgroundColor) +SolidColorBrush ^ CalculatorApp::ViewModel::Common::Utilities::GetContrastColor(Color backgroundColor) { auto luminance = 0.2126 * backgroundColor.R + 0.7152 * backgroundColor.G + 0.0722 * backgroundColor.B; @@ -263,7 +263,7 @@ SolidColorBrush ^ CalculatorApp::Utilities::GetContrastColor(Color backgroundCol return static_cast(Application::Current->Resources->Lookup(L"BlackBrush")); } -int CalculatorApp::Utilities::GetWindowId() +int CalculatorApp::ViewModel::Common::Utilities::GetWindowId() { return Utils::GetWindowId(); } diff --git a/src/CalcViewModel/Common/Utils.h b/src/CalcViewModel/Common/Utils.h index 36a65b85..3fb5e9e2 100644 --- a/src/CalcViewModel/Common/Utils.h +++ b/src/CalcViewModel/Common/Utils.h @@ -174,8 +174,8 @@ public: { \ if (!donotuse_##p) \ { \ - donotuse_##p = ref new CalculatorApp::Common::DelegateCommand( \ - CalculatorApp::Common::MakeDelegateCommandHandler(this, &m) \ + donotuse_##p = ref new CalculatorApp::ViewModel::Common::DelegateCommand( \ + CalculatorApp::ViewModel::Common::MakeDelegateCommandHandler(this, &m) \ ); \ } \ return donotuse_##p; \ @@ -706,17 +706,19 @@ namespace CalculatorApp return to; } - // CSHARP_MIGRATION: TODO: Review below utils -public - ref class Utilities sealed + namespace ViewModel::Common { - public: - static Platform::String ^ EscapeHtmlSpecialCharacters(Platform::String ^ originalString); - static Platform::String^ TrimTrailingZeros(Platform::String^ input); - static bool AreColorsEqual(Windows::UI::Color color1, Windows::UI::Color color2); - static Windows::UI::Xaml::Media::SolidColorBrush ^ GetContrastColor(Windows::UI::Color backgroundColor); - static int GetWindowId(); - }; + // CSHARP_MIGRATION: TODO: Review below utils + public ref class Utilities sealed + { + public: + static Platform::String ^ EscapeHtmlSpecialCharacters(Platform::String ^ originalString); + static Platform::String^ TrimTrailingZeros(Platform::String^ input); + static bool AreColorsEqual(Windows::UI::Color color1, Windows::UI::Color color2); + static Windows::UI::Xaml::Media::SolidColorBrush ^ GetContrastColor(Windows::UI::Color backgroundColor); + static int GetWindowId(); + }; + } } // There's no standard definition of equality for Windows::UI::Color structs. diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp index f45972e9..f7b7b7fd 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp @@ -11,11 +11,11 @@ #include "UnitConverterDataConstants.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::LocalizationServiceProperties; -using namespace CalculatorApp::DataLoaders; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::LocalizationServiceProperties; +using namespace CalculatorApp::ViewModel::DataLoaders; using namespace CalculatorApp::ViewModel; -using namespace CalculatorApp::ViewModel::CurrencyDataLoaderConstants; +using namespace CalculatorApp::ViewModel::DataLoaders::CurrencyDataLoaderConstants; using namespace concurrency; using namespace Platform; using namespace std; @@ -69,7 +69,7 @@ static constexpr auto DEFAULT_TO_CURRENCY = L"EUR"; namespace CalculatorApp { - namespace ViewModel + namespace ViewModel::DataLoaders { namespace UnitConverterResourceKeys { diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h index 3216d63e..6ee878be 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h @@ -9,7 +9,7 @@ namespace CalculatorApp { - namespace ViewModel + namespace ViewModel::DataLoaders { public enum class CurrencyLoadStatus @@ -54,7 +54,9 @@ namespace CalculatorApp class CurrencyDataLoader : public UCM::IConverterDataLoader, public UCM::ICurrencyConverterDataLoader { public: - CurrencyDataLoader(_In_ std::unique_ptr client, const wchar_t* overrideLanguage = nullptr); + CurrencyDataLoader( + _In_ std::unique_ptr client, + const wchar_t* overrideLanguage = nullptr); ~CurrencyDataLoader(); bool LoadFinished(); @@ -82,7 +84,7 @@ namespace CalculatorApp std::future TryLoadDataFromWebOverrideAsync() override; // ICurrencyConverterDataLoader - void OnNetworkBehaviorChanged(CalculatorApp::NetworkAccessBehavior newBehavior); + void OnNetworkBehaviorChanged(CalculatorApp::ViewModel::Common::NetworkAccessBehavior newBehavior); private: void ResetLoadStatus(); @@ -112,7 +114,7 @@ namespace CalculatorApp private: Platform::String ^ m_responseLanguage; - std::unique_ptr m_client; + std::unique_ptr m_client; bool m_isRtlLanguage; @@ -130,8 +132,8 @@ namespace CalculatorApp CurrencyLoadStatus m_loadStatus; - CalculatorApp::NetworkManager ^ m_networkManager; - CalculatorApp::NetworkAccessBehavior m_networkAccessBehavior; + CalculatorApp::ViewModel::Common::NetworkManager ^ m_networkManager; + CalculatorApp::ViewModel::Common::NetworkAccessBehavior m_networkAccessBehavior; Windows::Foundation::EventRegistrationToken m_networkBehaviorToken; bool m_meteredOverrideSet; }; diff --git a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp index e9d42c6c..857fa427 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp +++ b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp @@ -10,7 +10,7 @@ #include "DataLoaderConstants.h" #endif -using namespace CalculatorApp::DataLoaders; +using namespace CalculatorApp::ViewModel::DataLoaders; using namespace Platform; using namespace std; using namespace Windows::Foundation; diff --git a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.h b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.h index cfd10e7d..8f667c7c 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.h +++ b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.h @@ -7,7 +7,7 @@ namespace CalculatorApp { - namespace DataLoaders + namespace ViewModel::DataLoaders { class CurrencyHttpClient : public ICurrencyHttpClient { diff --git a/src/CalcViewModel/DataLoaders/DataLoaderMockConstants.h b/src/CalcViewModel/DataLoaders/DataLoaderMockConstants.h index 02e7e349..a49fca5d 100644 --- a/src/CalcViewModel/DataLoaders/DataLoaderMockConstants.h +++ b/src/CalcViewModel/DataLoaders/DataLoaderMockConstants.h @@ -5,7 +5,7 @@ namespace CalculatorApp { - namespace DataLoaders + namespace ViewModel::DataLoaders { static constexpr auto sc_MetadataUriLocalizeFor = L"https://go.microsoft.com/fwlink/?linkid=2091028&localizeFor="; static constexpr auto sc_RatiosUriRelativeTo = L"https://go.microsoft.com/fwlink/?linkid=2091307&localCurrency="; diff --git a/src/CalcViewModel/DataLoaders/ICurrencyHttpClient.h b/src/CalcViewModel/DataLoaders/ICurrencyHttpClient.h index 69f23f52..84104b7b 100644 --- a/src/CalcViewModel/DataLoaders/ICurrencyHttpClient.h +++ b/src/CalcViewModel/DataLoaders/ICurrencyHttpClient.h @@ -5,7 +5,7 @@ namespace CalculatorApp { - namespace DataLoaders + namespace ViewModel::DataLoaders { class ICurrencyHttpClient { diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h index 0d22a14a..099b3b1f 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h @@ -3,7 +3,7 @@ namespace CalculatorApp { - namespace ViewModel + namespace ViewModel::Common { private enum UnitConverterUnits diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 601b0112..564bf314 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -7,8 +7,8 @@ #include "UnitConverterDataConstants.h" #include "CurrencyDataLoader.h" -using namespace CalculatorApp::Common; -using namespace CalculatorApp::DataLoaders; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::DataLoaders; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace std; diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h index 0011fdb6..beb5be63 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h @@ -8,7 +8,7 @@ namespace CalculatorApp { - namespace ViewModel + namespace ViewModel::Common { struct OrderedUnit : UnitConversionManager::Unit { @@ -34,7 +34,7 @@ namespace CalculatorApp struct UnitData { - CalculatorApp::Common::ViewMode categoryId; + CalculatorApp::ViewModel::Common::ViewMode categoryId; int unitId; double factor; }; @@ -45,7 +45,7 @@ namespace CalculatorApp { } ExplicitUnitConversionData( - CalculatorApp::Common::ViewMode categoryId, + CalculatorApp::ViewModel::Common::ViewMode categoryId, int parentUnitId, int unitId, double ratio, @@ -58,7 +58,7 @@ namespace CalculatorApp { } - CalculatorApp::Common::ViewMode categoryId; + CalculatorApp::ViewModel::Common::ViewMode categoryId; int parentUnitId; int unitId; }; @@ -79,10 +79,9 @@ namespace CalculatorApp // IConverterDataLoader void GetCategories(_In_ std::shared_ptr> categoriesList); - void GetUnits(_In_ std::unordered_map>& unitMap); - void GetConversionData(_In_ std::unordered_map>& categoryToUnitConversionMap); - void - GetExplicitConversionData(_In_ std::unordered_map>& unitToUnitConversionList); + void GetUnits(_In_ std::unordered_map>& unitMap); + void GetConversionData(_In_ std::unordered_map>& categoryToUnitConversionMap); + void GetExplicitConversionData(_In_ std::unordered_map>& unitToUnitConversionList); std::wstring GetLocalizedStringName(_In_ Platform::String ^ stringId); diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp index fb8eec09..ff8e0d9c 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.cpp +++ b/src/CalcViewModel/DateCalculatorViewModel.cpp @@ -10,8 +10,8 @@ #include "Common/CopyPasteManager.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::DateCalculation; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::DateCalculation; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalcViewModel/DateCalculatorViewModel.h b/src/CalcViewModel/DateCalculatorViewModel.h index 48573784..7d9ff0ab 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.h +++ b/src/CalcViewModel/DateCalculatorViewModel.h @@ -125,26 +125,26 @@ namespace CalculatorApp } } - property CalculatorApp::Common::DateCalculation::DateDifference DateDiffResult + property CalculatorApp::ViewModel::Common::DateCalculation::DateDifference DateDiffResult { - CalculatorApp::Common::DateCalculation::DateDifference get() + CalculatorApp::ViewModel::Common::DateCalculation::DateDifference get() { return m_dateDiffResult; } - void set(CalculatorApp::Common::DateCalculation::DateDifference value) + void set(CalculatorApp::ViewModel::Common::DateCalculation::DateDifference value) { m_dateDiffResult = value; UpdateDisplayResult(); } } - property CalculatorApp::Common::DateCalculation::DateDifference DateDiffResultInDays + property CalculatorApp::ViewModel::Common::DateCalculation::DateDifference DateDiffResultInDays { - CalculatorApp::Common::DateCalculation::DateDifference get() + CalculatorApp::ViewModel::Common::DateCalculation::DateDifference get() { return m_dateDiffResultInDays; } - void set(CalculatorApp::Common::DateCalculation::DateDifference value) + void set(CalculatorApp::ViewModel::Common::DateCalculation::DateDifference value) { m_dateDiffResultInDays = value; UpdateDisplayResult(); @@ -172,13 +172,13 @@ namespace CalculatorApp Windows::Foundation::DateTime m_toDate; Windows::Foundation::DateTime m_startDate; Windows::Foundation::DateTime m_dateResult; - CalculatorApp::Common::DateCalculation::DateDifference m_dateDiffResult; - CalculatorApp::Common::DateCalculation::DateDifference m_dateDiffResultInDays; + CalculatorApp::ViewModel::Common::DateCalculation::DateDifference m_dateDiffResult; + CalculatorApp::ViewModel::Common::DateCalculation::DateDifference m_dateDiffResultInDays; // Private members - CalculatorApp::Common::DateCalculation::DateCalculationEngine ^ m_dateCalcEngine; - CalculatorApp::Common::DateCalculation::DateUnit m_daysOutputFormat; - CalculatorApp::Common::DateCalculation::DateUnit m_allDateUnitsOutputFormat; + CalculatorApp::ViewModel::Common::DateCalculation::DateCalculationEngine ^ m_dateCalcEngine; + CalculatorApp::ViewModel::Common::DateCalculation::DateUnit m_daysOutputFormat; + CalculatorApp::ViewModel::Common::DateCalculation::DateUnit m_allDateUnitsOutputFormat; Windows::Globalization::DateTimeFormatting::DateTimeFormatter ^ m_dateTimeFormatter; std::wstring m_listSeparator; }; diff --git a/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp b/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp index b869776a..e7829c75 100644 --- a/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp +++ b/src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp @@ -6,7 +6,7 @@ #include "CalcViewModel\Common\LocalizationSettings.h" #include "CalcViewModel\GraphingCalculatorEnums.h" -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace Graphing; using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.cpp b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.cpp index 3c7de353..8bb0d7f8 100644 --- a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.cpp +++ b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.cpp @@ -6,6 +6,7 @@ #include using namespace CalculatorApp::ViewModel; +using namespace CalculatorApp::ViewModel::Common; using namespace CalcManager::NumberFormattingUtils; using namespace GraphControl; using namespace std; @@ -102,7 +103,7 @@ void GraphingSettingsViewModel::UpdateDisplayRange() m_Graph->SetDisplayRanges(m_XMinValue, m_XMaxValue, m_YMinValue, m_YMaxValue); - TraceLogger::GetInstance()->LogGraphSettingsChanged(GraphSettingsType::Grid, L""); + CalculatorApp::ViewModel::Common::TraceLogger::GetInstance()->LogGraphSettingsChanged(GraphSettingsType::Grid, L""); } bool GraphingSettingsViewModel::HasError() diff --git a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h index 6d6045c0..77f1dda1 100644 --- a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h +++ b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h @@ -232,7 +232,7 @@ namespace CalculatorApp::ViewModel RaisePropertyChanged(L"TrigModeDegrees"); RaisePropertyChanged(L"TrigModeGradians"); - TraceLogger::GetInstance()->LogGraphSettingsChanged(GraphSettingsType::TrigUnits, L"Radians"); + CalculatorApp::ViewModel::Common::TraceLogger::GetInstance()->LogGraphSettingsChanged(CalculatorApp::ViewModel::Common::GraphSettingsType::TrigUnits, L"Radians"); } } } @@ -253,7 +253,7 @@ namespace CalculatorApp::ViewModel RaisePropertyChanged(L"TrigModeRadians"); RaisePropertyChanged(L"TrigModeGradians"); - TraceLogger::GetInstance()->LogGraphSettingsChanged(GraphSettingsType::TrigUnits, L"Degrees"); + CalculatorApp::ViewModel::Common::TraceLogger::GetInstance()->LogGraphSettingsChanged(CalculatorApp::ViewModel::Common::GraphSettingsType::TrigUnits, L"Degrees"); } } } @@ -274,7 +274,7 @@ namespace CalculatorApp::ViewModel RaisePropertyChanged(L"TrigModeDegrees"); RaisePropertyChanged(L"TrigModeRadians"); - TraceLogger::GetInstance()->LogGraphSettingsChanged(GraphSettingsType::TrigUnits, L"Gradians"); + CalculatorApp::ViewModel::Common::TraceLogger::GetInstance()->LogGraphSettingsChanged(CalculatorApp::ViewModel::Common::GraphSettingsType::TrigUnits, L"Gradians"); } } } diff --git a/src/CalcViewModel/GraphingCalculator/VariableViewModel.h b/src/CalcViewModel/GraphingCalculator/VariableViewModel.h index 151499ec..6c15fba3 100644 --- a/src/CalcViewModel/GraphingCalculator/VariableViewModel.h +++ b/src/CalcViewModel/GraphingCalculator/VariableViewModel.h @@ -127,8 +127,8 @@ public { Platform::String ^ get() { - return CalculatorApp::Common::LocalizationStringUtil::GetLocalizedString( - CalculatorApp::AppResourceProvider::GetInstance()->GetResourceString(L"VariableListViewItem"), Name); + return CalculatorApp::ViewModel::Common::LocalizationStringUtil::GetLocalizedString( + CalculatorApp::ViewModel::Common::AppResourceProvider::GetInstance()->GetResourceString(L"VariableListViewItem"), Name); } } diff --git a/src/CalcViewModel/HistoryItemViewModel.cpp b/src/CalcViewModel/HistoryItemViewModel.cpp index 95775bb9..023ab643 100644 --- a/src/CalcViewModel/HistoryItemViewModel.cpp +++ b/src/CalcViewModel/HistoryItemViewModel.cpp @@ -5,7 +5,7 @@ #include "HistoryItemViewModel.h" #include "Common/LocalizationService.h" -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorApp::ViewModel; using namespace std; using namespace Platform; diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp index 29152e3b..0953486d 100644 --- a/src/CalcViewModel/HistoryViewModel.cpp +++ b/src/CalcViewModel/HistoryViewModel.cpp @@ -9,8 +9,8 @@ #include "StandardCalculatorViewModel.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace std; diff --git a/src/CalcViewModel/HistoryViewModel.h b/src/CalcViewModel/HistoryViewModel.h index da1c4026..a09360ed 100644 --- a/src/CalcViewModel/HistoryViewModel.h +++ b/src/CalcViewModel/HistoryViewModel.h @@ -28,7 +28,7 @@ namespace CalculatorApp OBSERVABLE_OBJECT(); OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector ^, Items); OBSERVABLE_PROPERTY_RW(bool, AreHistoryShortcutsEnabled); - OBSERVABLE_PROPERTY_R(CalculatorApp::Common::Automation::NarratorAnnouncement ^, HistoryAnnouncement); + OBSERVABLE_PROPERTY_R(CalculatorApp::ViewModel::Common::Automation::NarratorAnnouncement ^, HistoryAnnouncement); property int ItemsCount { int get() @@ -49,16 +49,16 @@ namespace CalculatorApp event HistoryItemClickedHandler ^ HistoryItemClicked; void ShowItem(_In_ CalculatorApp::ViewModel::HistoryItemViewModel ^ e); void DeleteItem(_In_ CalculatorApp::ViewModel::HistoryItemViewModel ^ e); - void ReloadHistory(_In_ CalculatorApp::Common::ViewMode currentMode); + void ReloadHistory(_In_ CalculatorApp::ViewModel::Common::ViewMode currentMode); internal : HistoryViewModel(_In_ CalculationManager::CalculatorManager* calculatorManager); - void SetCalculatorDisplay(CalculatorDisplay& calculatorDisplay); + void SetCalculatorDisplay(Common::CalculatorDisplay& calculatorDisplay); unsigned long long GetMaxItemSize(); private: CalculationManager::CalculatorManager* const m_calculatorManager; - CalculatorDisplay m_calculatorDisplay; + Common::CalculatorDisplay m_calculatorDisplay; CalculationManager::CalculatorMode m_currentMode; Platform::String ^ m_localizedHistoryCleared; Platform::String ^ m_localizedHistorySlotCleared; diff --git a/src/CalcViewModel/MemoryItemViewModel.cpp b/src/CalcViewModel/MemoryItemViewModel.cpp index b7d21649..9600e773 100644 --- a/src/CalcViewModel/MemoryItemViewModel.cpp +++ b/src/CalcViewModel/MemoryItemViewModel.cpp @@ -6,8 +6,8 @@ #include "StandardCalculatorViewModel.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace std; diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index 2521ec47..aaf6fb6d 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -10,8 +10,8 @@ #include "Common/TraceLogger.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::Automation; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::Automation; using namespace CalculatorApp::ViewModel; using namespace CalculationManager; using namespace concurrency; @@ -1718,7 +1718,7 @@ ViewMode StandardCalculatorViewModel::GetCalculatorMode() return ViewMode::Programmer; } -void StandardCalculatorViewModel::ValueBitLength::set(CalculatorApp::Common::BitLength value) +void StandardCalculatorViewModel::ValueBitLength::set(CalculatorApp::ViewModel::Common::BitLength value) { if (m_valueBitLength != value) { diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h index de5fb049..edae788d 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.h +++ b/src/CalcViewModel/StandardCalculatorViewModel.h @@ -29,7 +29,7 @@ namespace CalculatorApp public value struct ButtonInfo { - NumbersAndOperatorsEnum buttonId; + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum buttonId; bool canSendNegate; }; @@ -73,12 +73,12 @@ namespace CalculatorApp OBSERVABLE_PROPERTY_R(Platform::String ^, CalculationResultAutomationName); OBSERVABLE_PROPERTY_R(Platform::String ^, CalculationExpressionAutomationName); OBSERVABLE_PROPERTY_R(bool, IsShiftProgrammerChecked); - OBSERVABLE_PROPERTY_R(CalculatorApp::Common::NumberBase, CurrentRadixType); + OBSERVABLE_PROPERTY_R(CalculatorApp::ViewModel::Common::NumberBase, CurrentRadixType); OBSERVABLE_PROPERTY_R(bool, AreTokensUpdated); OBSERVABLE_PROPERTY_R(bool, AreAlwaysOnTopResultsUpdated); OBSERVABLE_PROPERTY_R(bool, AreProgrammerRadixOperatorsVisible); OBSERVABLE_PROPERTY_R(bool, IsInputEmpty); - OBSERVABLE_PROPERTY_R(CalculatorApp::Common::Automation::NarratorAnnouncement ^, Announcement); + OBSERVABLE_PROPERTY_R(CalculatorApp::ViewModel::Common::Automation::NarratorAnnouncement ^, Announcement); OBSERVABLE_PROPERTY_R(unsigned int, OpenParenthesisCount); COMMAND_FOR_METHOD(CopyCommand, StandardCalculatorViewModel::OnCopyCommand); @@ -111,13 +111,13 @@ namespace CalculatorApp static property Platform::String ^ IsBitFlipCheckedPropertyName { Platform::String ^ get() { return Platform::StringReference(L"IsBitFlipChecked"); } } - property CalculatorApp::Common::BitLength ValueBitLength + property CalculatorApp::ViewModel::Common::BitLength ValueBitLength { - CalculatorApp::Common::BitLength get() + CalculatorApp::ViewModel::Common::BitLength get() { return m_valueBitLength; } - void set(CalculatorApp::Common::BitLength value); + void set(CalculatorApp::ViewModel::Common::BitLength value); } property bool IsStandard @@ -253,10 +253,10 @@ namespace CalculatorApp void OnMemorySubtract(Platform::Object ^ memoryItemPosition); void OnMemoryClear(_In_ Platform::Object ^ memoryItemPosition); void SelectHistoryItem(HistoryItemViewModel ^ item); - void SwitchProgrammerModeBase(CalculatorApp::Common::NumberBase calculatorBase); + void SwitchProgrammerModeBase(CalculatorApp::ViewModel::Common::NumberBase calculatorBase); void SetBitshiftRadioButtonCheckedAnnouncement(Platform::String ^ announcement); void SetOpenParenthesisCountNarratorAnnouncement(); - void SwitchAngleType(NumbersAndOperatorsEnum num); + void SwitchAngleType(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum num); void FtoEButtonToggled(); internal: @@ -277,7 +277,7 @@ namespace CalculatorApp Platform::String ^ GetLocalizedStringFormat(Platform::String ^ format, Platform::String ^ displayValue); void OnPropertyChanged(Platform::String ^ propertyname); - void SetCalculatorType(CalculatorApp::Common::ViewMode targetState); + void SetCalculatorType(CalculatorApp::ViewModel::Common::ViewMode targetState); Platform::String ^ GetRawDisplayValue(); void Recalculate(bool fromHistory = false); @@ -290,7 +290,7 @@ namespace CalculatorApp { m_standardCalculatorManager.UpdateMaxIntDigits(); } - NumbersAndOperatorsEnum GetCurrentAngleType() + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum GetCurrentAngleType() { return m_CurrentAngleType; } @@ -307,12 +307,12 @@ namespace CalculatorApp _Inout_ std::shared_ptr>> const& tokens, _Inout_ std::shared_ptr>> const& commands); void SetTokens(_Inout_ std::shared_ptr>> const& tokens); - NumbersAndOperatorsEnum ConvertIntegerToNumbersAndOperatorsEnum(unsigned int parameter); - static RadixType GetRadixTypeFromNumberBase(CalculatorApp::Common::NumberBase base); - NumbersAndOperatorsEnum m_CurrentAngleType; + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum ConvertIntegerToNumbersAndOperatorsEnum(unsigned int parameter); + static RadixType GetRadixTypeFromNumberBase(CalculatorApp::ViewModel::Common::NumberBase base); + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum m_CurrentAngleType; wchar_t m_decimalSeparator; - CalculatorDisplay m_calculatorDisplay; - CalculatorApp::EngineResourceProvider m_resourceProvider; + CalculatorApp::ViewModel::Common::CalculatorDisplay m_calculatorDisplay; + CalculatorApp::ViewModel::Common::EngineResourceProvider m_resourceProvider; CalculationManager::CalculatorManager m_standardCalculatorManager; Platform::String ^ m_expressionAutomationNameFormat; Platform::String ^ m_localizedCalculationResultAutomationFormat; @@ -339,18 +339,18 @@ namespace CalculatorApp bool m_isRtlLanguage; bool m_operandUpdated; bool m_isLastOperationHistoryLoad; - CalculatorApp::Common::BitLength m_valueBitLength; + CalculatorApp::ViewModel::Common::BitLength m_valueBitLength; Platform::String ^ m_selectedExpressionLastData; Common::DisplayExpressionToken ^ m_selectedExpressionToken; Platform::String ^ LocalizeDisplayValue(_In_ std::wstring const& displayValue); Platform::String ^ CalculateNarratorDisplayValue(_In_ std::wstring const& displayValue, _In_ Platform::String ^ localizedDisplayValue); - CalculatorApp::Common::Automation::NarratorAnnouncement ^ GetDisplayUpdatedNarratorAnnouncement(); + CalculatorApp::ViewModel::Common::Automation::NarratorAnnouncement ^ GetDisplayUpdatedNarratorAnnouncement(); Platform::String ^ GetCalculatorExpressionAutomationName(); Platform::String ^ GetNarratorStringReadRawNumbers(_In_ Platform::String ^ localizedDisplayValue); - CalculationManager::Command ConvertToOperatorsEnum(NumbersAndOperatorsEnum operation); + CalculationManager::Command ConvertToOperatorsEnum(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum operation); void DisableButtons(CalculationManager::CommandType selectedExpressionCommandType); Platform::String ^ m_feedbackForButtonPress; @@ -371,9 +371,9 @@ namespace CalculatorApp void SaveEditedCommand(_In_ unsigned int index, _In_ CalculationManager::Command command); - CalculatorApp::Common::ViewMode GetCalculatorMode(); + CalculatorApp::ViewModel::Common::ViewMode GetCalculatorMode(); - friend class CalculatorDisplay; + friend class CalculatorApp::ViewModel::Common::CalculatorDisplay; friend class CalculatorUnitTests::MultiWindowUnitTests; }; } diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp index 7bedece5..17466237 100644 --- a/src/CalcViewModel/UnitConverterViewModel.cpp +++ b/src/CalcViewModel/UnitConverterViewModel.cpp @@ -15,9 +15,10 @@ #include "DataLoaders/UnitConverterDataLoader.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; -using namespace CalculatorApp::Common::Automation; using namespace CalculatorApp::ViewModel; +using namespace CalculatorApp::ViewModel::Common; +using namespace CalculatorApp::ViewModel::Common::Automation; +using namespace CalculatorApp::ViewModel::DataLoaders; using namespace concurrency; using namespace Platform; using namespace Platform::Collections; @@ -75,7 +76,7 @@ namespace StringReference SupplementaryVisibilityPropertyName(L"SupplementaryVisibility"); } -namespace CalculatorApp::ViewModel::UnitConverterResourceKeys +namespace CalculatorApp::ViewModel::DataLoaders::UnitConverterResourceKeys { StringReference ValueFromFormat(L"Format_ValueFrom"); StringReference ValueFromDecimalFormat(L"Format_ValueFrom_Decimal"); diff --git a/src/CalcViewModel/UnitConverterViewModel.h b/src/CalcViewModel/UnitConverterViewModel.h index cc6e3a9c..3e26f123 100644 --- a/src/CalcViewModel/UnitConverterViewModel.h +++ b/src/CalcViewModel/UnitConverterViewModel.h @@ -163,7 +163,7 @@ namespace CalculatorApp OBSERVABLE_OBJECT_CALLBACK(OnPropertyChanged); OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector ^, Categories); - OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, Mode); + OBSERVABLE_PROPERTY_RW(CalculatorApp::ViewModel::Common::ViewMode, Mode); OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector ^, Units); OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencySymbol1); OBSERVABLE_PROPERTY_RW(Unit ^, Unit1); @@ -178,7 +178,7 @@ namespace CalculatorApp OBSERVABLE_PROPERTY_RW(Platform::String ^, Value2AutomationName); OBSERVABLE_PROPERTY_RW(Platform::String ^, Unit1AutomationName); OBSERVABLE_PROPERTY_RW(Platform::String ^, Unit2AutomationName); - OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::Automation::NarratorAnnouncement ^, Announcement); + OBSERVABLE_PROPERTY_RW(CalculatorApp::ViewModel::Common::Automation::NarratorAnnouncement ^, Announcement); OBSERVABLE_PROPERTY_RW(bool, IsDecimalEnabled); OBSERVABLE_PROPERTY_RW(bool, IsDropDownOpen); OBSERVABLE_PROPERTY_RW(bool, IsDropDownEnabled); @@ -187,7 +187,7 @@ namespace CalculatorApp OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyRatioEquality); OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyRatioEqualityAutomationName); OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyTimestamp); - OBSERVABLE_NAMED_PROPERTY_RW(CalculatorApp::NetworkAccessBehavior, NetworkBehavior); + OBSERVABLE_NAMED_PROPERTY_RW(CalculatorApp::ViewModel::Common::NetworkAccessBehavior, NetworkBehavior); OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataLoadFailed); OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataIsWeekOld); @@ -205,7 +205,7 @@ namespace CalculatorApp if (value != nullptr) { auto currentCategory = value->GetModelCategory(); - IsCurrencyCurrentCategory = currentCategory.id == CalculatorApp::Common::NavCategory::Serialize(CalculatorApp::Common::ViewMode::Currency); + IsCurrencyCurrentCategory = currentCategory.id == CalculatorApp::ViewModel::Common::NavCategory::Serialize(CalculatorApp::ViewModel::Common::ViewMode::Currency); } RaisePropertyChanged("CurrentCategory"); } @@ -243,7 +243,7 @@ namespace CalculatorApp internal : void ResetView(); void PopulateData(); - NumbersAndOperatorsEnum MapCharacterToButtonId(const wchar_t ch, bool& canSendNegate); + CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum MapCharacterToButtonId(const wchar_t ch, bool& canSendNegate); void DisplayPasteError(); void OnCopyCommand(Platform::Object ^ parameter); @@ -277,7 +277,7 @@ namespace CalculatorApp void OnCurrencyDataLoadFinished(bool didLoad); void OnCurrencyTimestampUpdated(_In_ const std::wstring& timestamp, bool isWeekOld); - void OnNetworkBehaviorChanged(_In_ CalculatorApp::NetworkAccessBehavior newBehavior); + void OnNetworkBehaviorChanged(_In_ CalculatorApp::ViewModel::Common::NetworkAccessBehavior newBehavior); const std::wstring& GetValueFromUnlocalized() const { @@ -303,7 +303,7 @@ namespace CalculatorApp void OnCategoryChanged(Platform::Object ^ unused); void OnUnitChanged(Platform::Object ^ unused); void OnSwitchActive(Platform::Object ^ unused); - UnitConversionManager::Command CommandFromButtonId(CalculatorApp::NumbersAndOperatorsEnum button); + UnitConversionManager::Command CommandFromButtonId(CalculatorApp::ViewModel::Common::NumbersAndOperatorsEnum button); void SupplementaryResultsTimerTick(Windows::System::Threading::ThreadPoolTimer ^ timer); void SupplementaryResultsTimerCancel(Windows::System::Threading::ThreadPoolTimer ^ timer); void RefreshSupplementaryResults(); @@ -470,7 +470,7 @@ namespace CalculatorApp void NetworkBehaviorChanged(_In_ int newBehavior) override { - m_viewModel->OnNetworkBehaviorChanged(static_cast(newBehavior)); + m_viewModel->OnNetworkBehaviorChanged(static_cast(newBehavior)); } private: diff --git a/src/CalcViewModel/ViewState.cpp b/src/CalcViewModel/ViewState.cpp deleted file mode 100644 index 63a5d30e..00000000 --- a/src/CalcViewModel/ViewState.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include "pch.h" -#include "ViewState.h" - -namespace CalculatorApp -{ - namespace ViewState - { - Platform::StringReference Snap(L"Snap"); - Platform::StringReference DockedView(L"DockedView"); - - bool IsValidViewState(Platform::String ^ viewState) - { - return viewState->Equals(ViewState::Snap) || viewState->Equals(ViewState::DockedView); - } - } -} diff --git a/src/CalcViewModel/ViewState.h b/src/CalcViewModel/ViewState.h deleted file mode 100644 index 0a103d09..00000000 --- a/src/CalcViewModel/ViewState.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -namespace CalculatorApp -{ - namespace ViewState - { - extern Platform::StringReference Snap; - extern Platform::StringReference DockedView; - - bool IsValidViewState(Platform::String ^ viewState); - } -} diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h index da6ea470..6d4cd9c2 100644 --- a/src/CalcViewModel/pch.h +++ b/src/CalcViewModel/pch.h @@ -49,7 +49,7 @@ // Once the app switches to min version RS3, the namespaces can be removed. // TODO - MSFT 12735088 namespace StandardPeers = Windows::UI::Xaml::Automation::Peers; -namespace CalculatorApp::Common::Automation +namespace CalculatorApp::ViewModel::Common::Automation { } -namespace CustomPeers = CalculatorApp::Common::Automation; +namespace CustomPeers = CalculatorApp::ViewModel::Common::Automation; diff --git a/src/Calculator/AboutFlyout.xaml.cs b/src/Calculator/AboutFlyout.xaml.cs index e8d32514..34508206 100644 --- a/src/Calculator/AboutFlyout.xaml.cs +++ b/src/Calculator/AboutFlyout.xaml.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using System; using System.Diagnostics; using Windows.ApplicationModel; diff --git a/src/Calculator/App.xaml.cs b/src/Calculator/App.xaml.cs index 942a1ee2..bce8e909 100644 --- a/src/Calculator/App.xaml.cs +++ b/src/Calculator/App.xaml.cs @@ -6,8 +6,8 @@ // Declaration of the App class. // -using CalculatorApp.Common; -using CalculatorApp.Common.Automation; +using CalculatorApp.ViewModel.Common; +using CalculatorApp.ViewModel.Common.Automation; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Calculator/Common/KeyboardShortcuManager.cs b/src/Calculator/Common/KeyboardShortcuManager.cs index fc4e9104..aebc0447 100644 --- a/src/Calculator/Common/KeyboardShortcuManager.cs +++ b/src/Calculator/Common/KeyboardShortcuManager.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. using CalculatorApp.ViewModel; +using CalculatorApp.ViewModel.Common; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Calculator/Controls/CalculationResult.cs b/src/Calculator/Controls/CalculationResult.cs index 471662ee..5dd577b4 100644 --- a/src/Calculator/Controls/CalculationResult.cs +++ b/src/Calculator/Controls/CalculationResult.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Diagnostics; using CalculatorApp; using CalculatorApp.Controls; -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using Windows.Devices.Input; using Windows.Foundation; diff --git a/src/Calculator/Controls/CalculatorButton.cs b/src/Calculator/Controls/CalculatorButton.cs index fd90f79a..d24bafb7 100644 --- a/src/Calculator/Controls/CalculatorButton.cs +++ b/src/Calculator/Controls/CalculatorButton.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using System.Diagnostics; using CalculatorApp; -using CalculatorApp.Common; using CalculatorApp.Controls; +using CalculatorApp.ViewModel.Common; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; diff --git a/src/Calculator/Controls/EquationTextBox.cs b/src/Calculator/Controls/EquationTextBox.cs index c3da8e40..ebf1bb64 100644 --- a/src/Calculator/Controls/EquationTextBox.cs +++ b/src/Calculator/Controls/EquationTextBox.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using System; using Windows.UI.Text; using Windows.UI.Xaml; diff --git a/src/Calculator/Controls/FlipButtons.cs b/src/Calculator/Controls/FlipButtons.cs index 64a73a97..bc750210 100644 --- a/src/Calculator/Controls/FlipButtons.cs +++ b/src/Calculator/Controls/FlipButtons.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using CalculatorApp.ViewModel.Common; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; diff --git a/src/Calculator/Controls/RadixButton.cs b/src/Calculator/Controls/RadixButton.cs index 2ca8076d..4f959c61 100644 --- a/src/Calculator/Controls/RadixButton.cs +++ b/src/Calculator/Controls/RadixButton.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; namespace CalculatorApp { diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs index 1124445a..c2c3d55f 100644 --- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs +++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using System; using Windows.UI.Xaml; @@ -17,7 +17,7 @@ namespace CalculatorApp DisplayExpressionToken token = (item as DisplayExpressionToken); if (token != null) { - Common.TokenType type = token.Type; + CalculatorApp.ViewModel.Common.TokenType type = token.Type; switch (type) { diff --git a/src/Calculator/Converters/RadixToStringConverter.cs b/src/Calculator/Converters/RadixToStringConverter.cs index a5581f73..959a0ac1 100644 --- a/src/Calculator/Converters/RadixToStringConverter.cs +++ b/src/Calculator/Converters/RadixToStringConverter.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using System; namespace CalculatorApp diff --git a/src/Calculator/EquationStylePanelControl.xaml.cs b/src/Calculator/EquationStylePanelControl.xaml.cs index a18c7dc2..39c4d0cb 100644 --- a/src/Calculator/EquationStylePanelControl.xaml.cs +++ b/src/Calculator/EquationStylePanelControl.xaml.cs @@ -1,4 +1,5 @@ -using GraphControl; +using CalculatorApp.ViewModel.Common; +using GraphControl; using System; using System.Collections.Generic; using System.Linq; @@ -231,7 +232,7 @@ namespace CalculatorApp SelectedColor = brush.Color; } - TraceLogger.GetInstance().LogGraphLineStyleChanged(LineStyleType.Color); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphLineStyleChanged(LineStyleType.Color); } } @@ -276,7 +277,7 @@ namespace CalculatorApp if (oldStyle != newStyle) { SelectStyle(newStyle); - TraceLogger.GetInstance().LogGraphLineStyleChanged(LineStyleType.Pattern); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphLineStyleChanged(LineStyleType.Pattern); } } diff --git a/src/Calculator/Utils/DelegateCommandUtils.cs b/src/Calculator/Utils/DelegateCommandUtils.cs index d8e57aa3..89a93467 100644 --- a/src/Calculator/Utils/DelegateCommandUtils.cs +++ b/src/Calculator/Utils/DelegateCommandUtils.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using System; -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; namespace CalculatorApp.Utils { diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml index b08b5810..562ad756 100644 --- a/src/Calculator/Views/Calculator.xaml +++ b/src/Calculator/Views/Calculator.xaml @@ -1,8 +1,8 @@ ((object s, object arg) => { - TraceLogger.GetInstance().LogVariableChanged("Slider", name); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogVariableChanged("Slider", name); variableSliders.Remove(name); }); delayer.Start(); diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs index 5ac5053b..d9ebe597 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs @@ -7,7 +7,8 @@ using System.Threading.Tasks; using System.Diagnostics; using CalculatorApp; using CalculatorApp.Common; -using CalculatorApp.Common.Automation; +using CalculatorApp.ViewModel.Common; +using CalculatorApp.ViewModel.Common.Automation; using CalculatorApp.Controls; using CalculatorApp.Utils; using CalculatorApp.ViewModel; @@ -91,13 +92,13 @@ namespace CalculatorApp if (isMatchAppLocalSetting) { IsMatchAppTheme = true; - TraceLogger.GetInstance().LogGraphTheme("IsMatchAppTheme"); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphTheme("IsMatchAppTheme"); } } else { IsMatchAppTheme = false; - TraceLogger.GetInstance().LogGraphTheme("IsAlwaysLightTheme"); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphTheme("IsAlwaysLightTheme"); } } @@ -332,13 +333,13 @@ namespace CalculatorApp private void OnZoomInCommand(object parameter) { GraphingControl.ZoomFromCenter(zoomInScale); - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ZoomIn, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ZoomIn, GraphButtonValue.None); } private void OnZoomOutCommand(object parameter) { GraphingControl.ZoomFromCenter(zoomOutScale); - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ZoomOut, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ZoomOut, GraphButtonValue.None); } private void OnShareClick(object sender, RoutedEventArgs e) @@ -347,7 +348,7 @@ namespace CalculatorApp try { DataTransferManager.ShowShareUI(); - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.Share, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.Share, GraphButtonValue.None); } catch (System.Runtime.InteropServices.COMException ex) { @@ -640,7 +641,7 @@ namespace CalculatorApp KeyboardShortcutManager.IgnoreEscape(false); TracePointer.Visibility = Visibility.Visible; - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ActiveTracingChecked, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ActiveTracingChecked, GraphButtonValue.None); } private void ActiveTracing_Unchecked(object sender, RoutedEventArgs e) @@ -650,7 +651,7 @@ namespace CalculatorApp KeyboardShortcutManager.HonorEscape(); TracePointer.Visibility = Visibility.Collapsed; - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ActiveTracingUnchecked, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.ActiveTracingUnchecked, GraphButtonValue.None); } private void ActiveTracing_KeyUp(CoreWindow sender, KeyEventArgs args) @@ -677,7 +678,7 @@ namespace CalculatorApp private void GraphSettingsButton_Click(object sender, RoutedEventArgs e) { DisplayGraphSettings(); - TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.GraphSettings, GraphButtonValue.None); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked(GraphButton.GraphSettings, GraphButtonValue.None); } private void SwitchModeToggleButton_Toggled(object sender, RoutedEventArgs e) @@ -860,7 +861,7 @@ namespace CalculatorApp private void OnVisualStateChanged(object sender, VisualStateChangedEventArgs e) { - TraceLogger.GetInstance().LogVisualStateChanged(ViewMode.Graphing, e.NewState.Name, false); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogVisualStateChanged(ViewMode.Graphing, e.NewState.Name, false); } private void GraphViewButton_Click(object sender, RoutedEventArgs e) @@ -881,7 +882,7 @@ namespace CalculatorApp var announcement = CalculatorAnnouncement.GetGraphViewBestFitChangedAnnouncement(announcementText); narratorNotifier.Announce(announcement); - TraceLogger.GetInstance().LogGraphButtonClicked( + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphButtonClicked( GraphButton.GraphView, IsManualAdjustment ? GraphButtonValue.ManualAdjustment : GraphButtonValue.AutomaticBestFit); } diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs index 060f83f9..6e391601 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using System.Diagnostics; using CalculatorApp; -using CalculatorApp.Common; +using CalculatorApp.ViewModel.Common; using Windows.Foundation; using Windows.Foundation.Collections; @@ -131,7 +131,7 @@ namespace CalculatorApp if (mathRichEdit != null && sender != null) { var id = button.ButtonId; - TraceLogger.GetInstance().UpdateButtonUsage(id, CalculatorApp.Common.ViewMode.Graphing); + TraceLogger.GetInstance().UpdateButtonUsage(id, CalculatorApp.ViewModel.Common.ViewMode.Graphing); Tuple output = GraphingNumPad.GetButtonOutput(id); mathRichEdit.InsertText(output.Item1, output.Item2, output.Item3); } @@ -143,7 +143,7 @@ namespace CalculatorApp if (mathRichEdit != null) { mathRichEdit.SubmitEquation(CalculatorApp.Controls.EquationSubmissionSource.ENTER_KEY); - TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Submit, CalculatorApp.Common.ViewMode.Graphing); + TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Submit, CalculatorApp.ViewModel.Common.ViewMode.Graphing); } } @@ -161,7 +161,7 @@ namespace CalculatorApp mathRichEdit.SubmitEquation(CalculatorApp.Controls.EquationSubmissionSource.PROGRAMMATIC); } - TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Clear, CalculatorApp.Common.ViewMode.Graphing); + TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Clear, CalculatorApp.ViewModel.Common.ViewMode.Graphing); } } @@ -171,7 +171,7 @@ namespace CalculatorApp if (mathRichEdit != null) { mathRichEdit.BackSpace(); - TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Backspace, CalculatorApp.Common.ViewMode.Graphing); + TraceLogger.GetInstance().UpdateButtonUsage(NumbersAndOperatorsEnum.Backspace, CalculatorApp.ViewModel.Common.ViewMode.Graphing); } } diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs index 318151de..654ba213 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs @@ -12,6 +12,7 @@ using System.Diagnostics; using GraphControl; using CalculatorApp; using CalculatorApp.ViewModel; +using CalculatorApp.ViewModel.Common; using Windows.Foundation; using Windows.Foundation.Collections; @@ -130,7 +131,7 @@ namespace CalculatorApp ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings; localSettings.Values.Add("IsGraphThemeMatchApp", isMatchAppTheme); GraphThemeSettingChanged?.Invoke(this, isMatchAppTheme); - TraceLogger.GetInstance().LogGraphSettingsChanged(GraphSettingsType.Theme, propertyName); + CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogGraphSettingsChanged(GraphSettingsType.Theme, propertyName); } private bool m_IsMatchAppTheme; diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml index 948e48e4..45089fd2 100644 --- a/src/Calculator/Views/HistoryList.xaml +++ b/src/Calculator/Views/HistoryList.xaml @@ -1,7 +1,7 @@  + DependencyProperty.Register(nameof(CurrentRadixType), typeof(CalculatorApp.ViewModel.Common.NumberBase), typeof(NumberPad), new PropertyMetadata(CalculatorApp.ViewModel.Common.NumberBase.DecBase, (sender, args) => { var self = (NumberPad)sender; self.OnCurrentRadixTypePropertyChanged((NumberBase)args.OldValue, (NumberBase)args.NewValue); diff --git a/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs b/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs index 406e7ea1..b1981671 100644 --- a/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs +++ b/src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml.cs @@ -1,3 +1,4 @@ +using CalculatorApp.ViewModel.Common; using System.Diagnostics; using System.Windows.Input; using Windows.UI.Xaml; @@ -72,25 +73,25 @@ namespace CalculatorApp ByteButton.Visibility = Visibility.Collapsed; if (buttonId == "0") { - Model.ValueBitLength = Common.BitLength.BitLengthDWord; + Model.ValueBitLength = BitLength.BitLengthDWord; DwordButton.Visibility = Visibility.Visible; DwordButton.Focus(FocusState.Programmatic); } else if (buttonId == "1") { - Model.ValueBitLength = Common.BitLength.BitLengthWord; + Model.ValueBitLength = BitLength.BitLengthWord; WordButton.Visibility = Visibility.Visible; WordButton.Focus(FocusState.Programmatic); } else if (buttonId == "2") { - Model.ValueBitLength = Common.BitLength.BitLengthByte; + Model.ValueBitLength = BitLength.BitLengthByte; ByteButton.Visibility = Visibility.Visible; ByteButton.Focus(FocusState.Programmatic); } else if (buttonId == "3") { - Model.ValueBitLength = Common.BitLength.BitLengthQWord; + Model.ValueBitLength = BitLength.BitLengthQWord; QwordButton.Visibility = Visibility.Visible; QwordButton.Focus(FocusState.Programmatic); } diff --git a/src/Calculator/Views/TitleBar.xaml.cs b/src/Calculator/Views/TitleBar.xaml.cs index 078bf1e7..25bd4170 100644 --- a/src/Calculator/Views/TitleBar.xaml.cs +++ b/src/Calculator/Views/TitleBar.xaml.cs @@ -1,4 +1,5 @@ -using System; +using CalculatorApp.ViewModel.Common; +using System; using Windows.ApplicationModel.Core; using Windows.System.Profile; using Windows.UI; diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml index b7ca9b62..5a7314b0 100644 --- a/src/Calculator/Views/UnitConverter.xaml +++ b/src/Calculator/Views/UnitConverter.xaml @@ -1,7 +1,7 @@  -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorUnitTests; using namespace Platform; using namespace std; diff --git a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp index 664d2b8b..6fe91e5b 100644 --- a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp +++ b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp @@ -13,7 +13,7 @@ using namespace CalculationManager; using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp index c88e2310..7ca37f2a 100644 --- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp +++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp @@ -9,7 +9,7 @@ #include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h" using namespace CalculatorApp; -using namespace CalculatorApp::Common; +using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorApp::ViewModel; using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp index 8dbd5903..ecca9073 100644 --- a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp +++ b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp @@ -81,7 +81,7 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent Window::Current->Activate(); // Override the current locale to use English (US) to be compatible with all tests based on formatting - CalculatorApp::Common::LocalizationService::OverrideWithLanguage(L"en-US"); + CalculatorApp::ViewModel::Common::LocalizationService::OverrideWithLanguage(L"en-US"); Microsoft::VisualStudio::TestPlatform::TestExecutor::WinRTCore::UnitTestClient::Run(e->Arguments); }