From c64c5340a4dba163304e4fa770218f748b910f2f Mon Sep 17 00:00:00 2001 From: rudyhuyn Date: Thu, 9 May 2019 01:51:47 -0700 Subject: [PATCH] fix some spacing issues after merge --- .../Common/LocalizationService.cpp | 12 ++- .../Common/LocalizationService.h | 90 +++++++++---------- .../Common/LocalizationSettings.h | 2 +- .../CurrencyConverterUnitTests.cpp | 41 ++++----- 4 files changed, 70 insertions(+), 75 deletions(-) diff --git a/src/CalcViewModel/Common/LocalizationService.cpp b/src/CalcViewModel/Common/LocalizationService.cpp index 36ee6e65..3a50e05f 100644 --- a/src/CalcViewModel/Common/LocalizationService.cpp +++ b/src/CalcViewModel/Common/LocalizationService.cpp @@ -345,7 +345,7 @@ void LocalizationService::UpdateFontFamilyAndSize(DependencyObject ^ target) // If successful, returns a formatter that respects the user's regional format settings, // as configured by running intl.cpl. -DecimalFormatter^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter() const +DecimalFormatter ^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter() const { IIterable ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); if (languageIdentifiers != nullptr) @@ -360,7 +360,7 @@ DecimalFormatter^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter( // as configured by running intl.cpl. // // This helper function creates a DateTimeFormatter with a TwentyFour hour clock -DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String^ format) const +DateTimeFormatter ^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String^ format) const { IIterable ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); if (languageIdentifiers == nullptr) @@ -373,8 +373,7 @@ DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatte // If successful, returns a formatter that respects the user's regional format settings, // as configured by running intl.cpl. -DateTimeFormatter - ^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const +DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const { IIterable ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); if (languageIdentifiers == nullptr) @@ -385,12 +384,12 @@ DateTimeFormatter return ref new DateTimeFormatter(format, languageIdentifiers, GlobalizationPreferences::HomeGeographicRegion, calendarIdentifier, clockIdentifier); } -CurrencyFormatter^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatter() const +CurrencyFormatter ^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatter() const { String ^ userCurrency = (GlobalizationPreferences::Currencies->Size > 0) ? GlobalizationPreferences::Currencies->GetAt(0) : StringReference(DefaultCurrencyCode.data()); - IIterable^ languageIdentifiers = GetLanguageIdentifiers(); + IIterable ^ languageIdentifiers = GetLanguageIdentifiers(); if (languageIdentifiers == nullptr) { languageIdentifiers = ApplicationLanguages::Languages; @@ -406,7 +405,6 @@ CurrencyFormatter^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatte IIterable ^ LocalizationService::GetLanguageIdentifiers() const { - WCHAR currentLocale[LOCALE_NAME_MAX_LENGTH] = {}; int result = GetUserDefaultLocaleName(currentLocale, LOCALE_NAME_MAX_LENGTH); diff --git a/src/CalcViewModel/Common/LocalizationService.h b/src/CalcViewModel/Common/LocalizationService.h index be06eba1..5a58ab2d 100644 --- a/src/CalcViewModel/Common/LocalizationService.h +++ b/src/CalcViewModel/Common/LocalizationService.h @@ -30,64 +30,64 @@ namespace CalculatorApp DEPENDENCY_PROPERTY_ATTACHED_WITH_DEFAULT_AND_CALLBACK(LanguageFontType, FontType, LanguageFontType::UIText); DEPENDENCY_PROPERTY_ATTACHED_WITH_CALLBACK(double, FontSize); - internal: - static LocalizationService^ GetInstance(); - static void OverrideWithLanguage(const wchar_t * const language); + internal: + static LocalizationService^ GetInstance(); + static void OverrideWithLanguage(const wchar_t * const language); - Windows::UI::Xaml::FlowDirection GetFlowDirection(); - bool IsRtlLayout(); - bool GetOverrideFontApiValues(); - Platform::String ^ GetLanguage(); - Windows::UI::Xaml::Media::FontFamily ^ GetLanguageFontFamilyForType(LanguageFontType fontType); - Platform::String ^ GetFontFamilyOverride(); - Windows::UI::Text::FontWeight GetFontWeightOverride(); - double GetFontScaleFactorOverride(LanguageFontType fontType); + Windows::UI::Xaml::FlowDirection GetFlowDirection(); + bool IsRtlLayout(); + bool GetOverrideFontApiValues(); + Platform::String ^ GetLanguage(); + Windows::UI::Xaml::Media::FontFamily ^ GetLanguageFontFamilyForType(LanguageFontType fontType); + Platform::String ^ GetFontFamilyOverride(); + Windows::UI::Text::FontWeight GetFontWeightOverride(); + double GetFontScaleFactorOverride(LanguageFontType fontType); - Windows::Globalization::NumberFormatting::DecimalFormatter^ GetRegionalSettingsAwareDecimalFormatter() const; - Windows::Globalization::DateTimeFormatting::DateTimeFormatter^ GetRegionalSettingsAwareDateTimeFormatter(_In_ Platform::String^ format) const; - Windows::Globalization::DateTimeFormatting::DateTimeFormatter^ GetRegionalSettingsAwareDateTimeFormatter( - _In_ Platform::String^ format, - _In_ Platform::String^ calendarIdentifier, - _In_ Platform::String^ clockIdentifier) const; + Windows::Globalization::NumberFormatting::DecimalFormatter ^ GetRegionalSettingsAwareDecimalFormatter() const; + Windows::Globalization::DateTimeFormatting::DateTimeFormatter ^ GetRegionalSettingsAwareDateTimeFormatter(_In_ Platform::String ^ format) const; + Windows::Globalization::DateTimeFormatting::DateTimeFormatter ^ GetRegionalSettingsAwareDateTimeFormatter( + _In_ Platform::String ^ format, + _In_ Platform::String ^ calendarIdentifier, + _In_ Platform::String ^ clockIdentifier) const; - Windows::Globalization::NumberFormatting::CurrencyFormatter^ GetRegionalSettingsAwareCurrencyFormatter() const; + Windows::Globalization::NumberFormatting::CurrencyFormatter ^ GetRegionalSettingsAwareCurrencyFormatter() const; - static Platform::String ^ GetNarratorReadableToken(Platform::String ^ rawToken); - static Platform::String ^ GetNarratorReadableString(Platform::String ^ rawString); + static Platform::String ^ GetNarratorReadableToken(Platform::String ^ rawToken); + static Platform::String ^ GetNarratorReadableString(Platform::String ^ rawString); - private: - Windows::Globalization::Fonts::LanguageFont ^ GetLanguageFont(LanguageFontType fontType); - Windows::UI::Text::FontWeight ParseFontWeight(Platform::String ^ fontWeight); + private: + Windows::Globalization::Fonts::LanguageFont ^ GetLanguageFont(LanguageFontType fontType); + Windows::UI::Text::FontWeight ParseFontWeight(Platform::String ^ fontWeight); - Windows::Foundation::Collections::IIterable^ GetLanguageIdentifiers() const; + Windows::Foundation::Collections::IIterable ^ GetLanguageIdentifiers() const; - // Attached property callbacks - static void OnFontTypePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, LanguageFontType oldValue, LanguageFontType newValue); - static void OnFontWeightPropertyChanged( - Windows::UI::Xaml::DependencyObject ^ target, - Windows::UI::Text::FontWeight oldValue, - Windows::UI::Text::FontWeight newValue); - static void OnFontSizePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, double oldValue, double newValue); + // Attached property callbacks + static void OnFontTypePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, LanguageFontType oldValue, LanguageFontType newValue); + static void OnFontWeightPropertyChanged( + Windows::UI::Xaml::DependencyObject ^ target, + Windows::UI::Text::FontWeight oldValue, + Windows::UI::Text::FontWeight newValue); + static void OnFontSizePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, double oldValue, double newValue); - static void UpdateFontFamilyAndSize(Windows::UI::Xaml::DependencyObject ^ target); + static void UpdateFontFamilyAndSize(Windows::UI::Xaml::DependencyObject ^ target); - static std::unordered_map GetTokenToReadableNameMap(); + static std::unordered_map GetTokenToReadableNameMap(); - private: - LocalizationService(const wchar_t * const overridedLanguage = nullptr); + private: + LocalizationService(const wchar_t * const overridedLanguage = nullptr); static LocalizationService ^ s_singletonInstance; - Windows::Globalization::Fonts::LanguageFontGroup^ m_fontGroup; - Platform::String^ m_language; - Windows::UI::Xaml::FlowDirection m_flowDirection; - bool m_overrideFontApiValues; - Platform::String^ m_fontFamilyOverride; - bool m_isLanguageOverrided; - Windows::UI::Text::FontWeight m_fontWeightOverride; - double m_uiTextFontScaleFactorOverride; - double m_uiCaptionFontScaleFactorOverride; - }; + Windows::Globalization::Fonts::LanguageFontGroup ^ m_fontGroup; + Platform::String ^ m_language; + Windows::UI::Xaml::FlowDirection m_flowDirection; + bool m_overrideFontApiValues; + Platform::String ^ m_fontFamilyOverride; + bool m_isLanguageOverrided; + Windows::UI::Text::FontWeight m_fontWeightOverride; + double m_uiTextFontScaleFactorOverride; + double m_uiCaptionFontScaleFactorOverride; + }; } } diff --git a/src/CalcViewModel/Common/LocalizationSettings.h b/src/CalcViewModel/Common/LocalizationSettings.h index 904ce357..addc0c39 100644 --- a/src/CalcViewModel/Common/LocalizationSettings.h +++ b/src/CalcViewModel/Common/LocalizationSettings.h @@ -18,7 +18,7 @@ namespace CalculatorApp int result = 0; // Use DecimalFormatter as it respects the locale and the user setting - Windows::Globalization::NumberFormatting::DecimalFormatter^ formatter; + Windows::Globalization::NumberFormatting::DecimalFormatter ^ formatter; formatter = LocalizationService::GetInstance()->GetRegionalSettingsAwareDecimalFormatter(); formatter->FractionDigits = 0; formatter->IsDecimalPointAlwaysDisplayed = false; diff --git a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp index d416054e..9b20184a 100644 --- a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp +++ b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp @@ -205,8 +205,7 @@ namespace CalculatorUnitTests TEST_METHOD(LoadFromCache_Fail_NoCacheKey) { RemoveFromLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey); - - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -224,7 +223,7 @@ TEST_METHOD(LoadFromCache_Fail_OlderThanADay) dayOld.UniversalTime = now.UniversalTime - CurrencyDataLoaderConstants::DayDuration - 1; InsertToLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey, dayOld); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -243,7 +242,7 @@ TEST_METHOD(LoadFromCache_Fail_StaticDataFileDoesNotExist) VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename)); VERIFY_IS_TRUE(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename, CurrencyHttpClient::GetRawAllRatiosDataResponse())); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -262,7 +261,7 @@ TEST_METHOD(LoadFromCache_Fail_AllRatiosDataFileDoesNotExist) VERIFY_IS_TRUE(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename, CurrencyHttpClient::GetRawStaticDataResponse())); VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename)); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -282,7 +281,7 @@ TEST_METHOD(LoadFromCache_Fail_ResponseLanguageChanged) VERIFY_IS_TRUE(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename, CurrencyHttpClient::GetRawStaticDataResponse())); VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename)); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -295,7 +294,7 @@ TEST_METHOD(LoadFromCache_Success) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromCacheAsync().get(); @@ -304,9 +303,9 @@ TEST_METHOD(LoadFromCache_Success) VERIFY_IS_TRUE(loader.LoadedFromCache()); } - TEST_METHOD(LoadFromWeb_Fail_ClientIsNullptr) - { - CurrencyDataLoader loader(nullptr, L"en-US"); +TEST_METHOD(LoadFromWeb_Fail_ClientIsNullptr) +{ + CurrencyDataLoader loader(nullptr, L"en-US"); bool didLoad = loader.TryLoadDataFromWebAsync().get(); @@ -315,9 +314,9 @@ TEST_METHOD(LoadFromCache_Success) VERIFY_IS_FALSE(loader.LoadedFromWeb()); } - TEST_METHOD(LoadFromWeb_Fail_WebException) - { - CurrencyDataLoader loader(make_unique(), L"en-US"); +TEST_METHOD(LoadFromWeb_Fail_WebException) +{ + CurrencyDataLoader loader(make_unique(), L"en-US"); bool didLoad = loader.TryLoadDataFromWebAsync().get(); @@ -342,8 +341,7 @@ TEST_METHOD(LoadFromWeb_Success) TEST_METHOD(Load_Success_LoadedFromCache) { StandardCacheSetup(); - - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -391,8 +389,7 @@ TEST_CLASS(CurrencyConverterUnitTests){ const UCM::Unit GetUnit(const vector(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -422,7 +419,7 @@ TEST_METHOD(Loaded_LoadOrderedRatios) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -455,7 +452,7 @@ TEST_METHOD(Loaded_GetCurrencySymbols_Valid) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -484,7 +481,7 @@ TEST_METHOD(Loaded_GetCurrencySymbols_Invalid) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -527,7 +524,7 @@ TEST_METHOD(Loaded_GetCurrencyRatioEquality_Valid) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event)); @@ -556,7 +553,7 @@ TEST_METHOD(Loaded_GetCurrencyRatioEquality_Invalid) { StandardCacheSetup(); - CurrencyDataLoader loader(nullptr, L"en-US"); + CurrencyDataLoader loader(nullptr, L"en-US"); auto data_loaded_event = task_completion_event(); loader.SetViewModelCallback(make_shared(data_loaded_event));