github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some spacing issues after merge

Browse source
This commit is contained in:
rudyhuyn 2019-05-09 01:51:47 -07:00
commit c64c5340a4
4 changed files with 70 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/CalcViewModel/Common/LocalizationService.cpp
View file

@ -345,7 +345,7 @@ void LocalizationService::UpdateFontFamilyAndSize(DependencyObject ^ target)
// If successful, returns a formatter that respects the user's regional format settings, // If successful, returns a formatter that respects the user's regional format settings,
// as configured by running intl.cpl. // as configured by running intl.cpl.
DecimalFormatter^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter() const DecimalFormatter ^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter() const
{ {
IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers();
if (languageIdentifiers != nullptr) if (languageIdentifiers != nullptr)
@ -360,7 +360,7 @@ DecimalFormatter^ LocalizationService::GetRegionalSettingsAwareDecimalFormatter(
// as configured by running intl.cpl. // as configured by running intl.cpl.
// //
// This helper function creates a DateTimeFormatter with a TwentyFour hour clock // 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<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers();
if (languageIdentifiers == nullptr) if (languageIdentifiers == nullptr)
@ -373,8 +373,7 @@ DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatte
// If successful, returns a formatter that respects the user's regional format settings, // If successful, returns a formatter that respects the user's regional format settings,
// as configured by running intl.cpl. // as configured by running intl.cpl.
DateTimeFormatter DateTimeFormatter^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const
^ LocalizationService::GetRegionalSettingsAwareDateTimeFormatter(_In_ String ^ format, _In_ String ^ calendarIdentifier, _In_ String ^ clockIdentifier) const
{ {
IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers(); IIterable<String ^> ^ languageIdentifiers = LocalizationService::GetLanguageIdentifiers();
if (languageIdentifiers == nullptr) if (languageIdentifiers == nullptr)
@ -385,12 +384,12 @@ DateTimeFormatter
return ref new DateTimeFormatter(format, languageIdentifiers, GlobalizationPreferences::HomeGeographicRegion, calendarIdentifier, clockIdentifier); return ref new DateTimeFormatter(format, languageIdentifiers, GlobalizationPreferences::HomeGeographicRegion, calendarIdentifier, clockIdentifier);
} }
CurrencyFormatter^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatter() const CurrencyFormatter ^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatter() const
{ {
String ^ userCurrency = String ^ userCurrency =
(GlobalizationPreferences::Currencies->Size > 0) ? GlobalizationPreferences::Currencies->GetAt(0) : StringReference(DefaultCurrencyCode.data()); (GlobalizationPreferences::Currencies->Size > 0) ? GlobalizationPreferences::Currencies->GetAt(0) : StringReference(DefaultCurrencyCode.data());
IIterable<String^>^ languageIdentifiers = GetLanguageIdentifiers(); IIterable<String ^> ^ languageIdentifiers = GetLanguageIdentifiers();
if (languageIdentifiers == nullptr) if (languageIdentifiers == nullptr)
{ {
languageIdentifiers = ApplicationLanguages::Languages; languageIdentifiers = ApplicationLanguages::Languages;
@ -406,7 +405,6 @@ CurrencyFormatter^ LocalizationService::GetRegionalSettingsAwareCurrencyFormatte
IIterable<String ^> ^ LocalizationService::GetLanguageIdentifiers() const IIterable<String ^> ^ LocalizationService::GetLanguageIdentifiers() const
{ {
WCHAR currentLocale[LOCALE_NAME_MAX_LENGTH] = {}; WCHAR currentLocale[LOCALE_NAME_MAX_LENGTH] = {};
int result = GetUserDefaultLocaleName(currentLocale, LOCALE_NAME_MAX_LENGTH); int result = GetUserDefaultLocaleName(currentLocale, LOCALE_NAME_MAX_LENGTH);

90
src/CalcViewModel/Common/LocalizationService.h
View file

@ -30,64 +30,64 @@ namespace CalculatorApp
DEPENDENCY_PROPERTY_ATTACHED_WITH_DEFAULT_AND_CALLBACK(LanguageFontType, FontType, LanguageFontType::UIText); DEPENDENCY_PROPERTY_ATTACHED_WITH_DEFAULT_AND_CALLBACK(LanguageFontType, FontType, LanguageFontType::UIText);
DEPENDENCY_PROPERTY_ATTACHED_WITH_CALLBACK(double, FontSize); DEPENDENCY_PROPERTY_ATTACHED_WITH_CALLBACK(double, FontSize);
internal: internal:
static LocalizationService^ GetInstance(); static LocalizationService^ GetInstance();
static void OverrideWithLanguage(const wchar_t * const language); static void OverrideWithLanguage(const wchar_t * const language);
Windows::UI::Xaml::FlowDirection GetFlowDirection(); Windows::UI::Xaml::FlowDirection GetFlowDirection();
bool IsRtlLayout(); bool IsRtlLayout();
bool GetOverrideFontApiValues(); bool GetOverrideFontApiValues();
Platform::String ^ GetLanguage(); Platform::String ^ GetLanguage();
Windows::UI::Xaml::Media::FontFamily ^ GetLanguageFontFamilyForType(LanguageFontType fontType); Windows::UI::Xaml::Media::FontFamily ^ GetLanguageFontFamilyForType(LanguageFontType fontType);
Platform::String ^ GetFontFamilyOverride(); Platform::String ^ GetFontFamilyOverride();
Windows::UI::Text::FontWeight GetFontWeightOverride(); Windows::UI::Text::FontWeight GetFontWeightOverride();
double GetFontScaleFactorOverride(LanguageFontType fontType); double GetFontScaleFactorOverride(LanguageFontType fontType);
Windows::Globalization::NumberFormatting::DecimalFormatter^ GetRegionalSettingsAwareDecimalFormatter() 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) const;
Windows::Globalization::DateTimeFormatting::DateTimeFormatter^ GetRegionalSettingsAwareDateTimeFormatter( Windows::Globalization::DateTimeFormatting::DateTimeFormatter ^ GetRegionalSettingsAwareDateTimeFormatter(
_In_ Platform::String^ format, _In_ Platform::String ^ format,
_In_ Platform::String^ calendarIdentifier, _In_ Platform::String ^ calendarIdentifier,
_In_ Platform::String^ clockIdentifier) const; _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 ^ GetNarratorReadableToken(Platform::String ^ rawToken);
static Platform::String ^ GetNarratorReadableString(Platform::String ^ rawString); static Platform::String ^ GetNarratorReadableString(Platform::String ^ rawString);
private: private:
Windows::Globalization::Fonts::LanguageFont ^ GetLanguageFont(LanguageFontType fontType); Windows::Globalization::Fonts::LanguageFont ^ GetLanguageFont(LanguageFontType fontType);
Windows::UI::Text::FontWeight ParseFontWeight(Platform::String ^ fontWeight); Windows::UI::Text::FontWeight ParseFontWeight(Platform::String ^ fontWeight);
Windows::Foundation::Collections::IIterable<Platform::String^>^ GetLanguageIdentifiers() const; Windows::Foundation::Collections::IIterable<Platform::String ^> ^ GetLanguageIdentifiers() const;
// Attached property callbacks // Attached property callbacks
static void OnFontTypePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, LanguageFontType oldValue, LanguageFontType newValue); static void OnFontTypePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, LanguageFontType oldValue, LanguageFontType newValue);
static void OnFontWeightPropertyChanged( static void OnFontWeightPropertyChanged(
Windows::UI::Xaml::DependencyObject ^ target, Windows::UI::Xaml::DependencyObject ^ target,
Windows::UI::Text::FontWeight oldValue, Windows::UI::Text::FontWeight oldValue,
Windows::UI::Text::FontWeight newValue); Windows::UI::Text::FontWeight newValue);
static void OnFontSizePropertyChanged(Windows::UI::Xaml::DependencyObject ^ target, double oldValue, double 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<std::wstring, std::wstring> GetTokenToReadableNameMap(); static std::unordered_map<std::wstring, std::wstring> GetTokenToReadableNameMap();
private: private:
LocalizationService(const wchar_t * const overridedLanguage = nullptr); LocalizationService(const wchar_t * const overridedLanguage = nullptr);
static LocalizationService ^ s_singletonInstance; static LocalizationService ^ s_singletonInstance;
Windows::Globalization::Fonts::LanguageFontGroup^ m_fontGroup; Windows::Globalization::Fonts::LanguageFontGroup ^ m_fontGroup;
Platform::String^ m_language; Platform::String ^ m_language;
Windows::UI::Xaml::FlowDirection m_flowDirection; Windows::UI::Xaml::FlowDirection m_flowDirection;
bool m_overrideFontApiValues; bool m_overrideFontApiValues;
Platform::String^ m_fontFamilyOverride; Platform::String ^ m_fontFamilyOverride;
bool m_isLanguageOverrided; bool m_isLanguageOverrided;
Windows::UI::Text::FontWeight m_fontWeightOverride; Windows::UI::Text::FontWeight m_fontWeightOverride;
double m_uiTextFontScaleFactorOverride; double m_uiTextFontScaleFactorOverride;
double m_uiCaptionFontScaleFactorOverride; double m_uiCaptionFontScaleFactorOverride;
}; };
} }
} }

2
src/CalcViewModel/Common/LocalizationSettings.h
View file

@ -18,7 +18,7 @@ namespace CalculatorApp
int result = 0; int result = 0;
// Use DecimalFormatter as it respects the locale and the user setting // 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 = LocalizationService::GetInstance()->GetRegionalSettingsAwareDecimalFormatter();
formatter->FractionDigits = 0; formatter->FractionDigits = 0;
formatter->IsDecimalPointAlwaysDisplayed = false; formatter->IsDecimalPointAlwaysDisplayed = false;

41
src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp
View file

@ -205,8 +205,7 @@ namespace CalculatorUnitTests
TEST_METHOD(LoadFromCache_Fail_NoCacheKey) TEST_METHOD(LoadFromCache_Fail_NoCacheKey)
{ {
RemoveFromLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey); RemoveFromLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey);
CurrencyDataLoader loader(nullptr, L"en-US");
CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); bool didLoad = loader.TryLoadDataFromCacheAsync().get();
@ -224,7 +223,7 @@ TEST_METHOD(LoadFromCache_Fail_OlderThanADay)
dayOld.UniversalTime = now.UniversalTime - CurrencyDataLoaderConstants::DayDuration - 1; dayOld.UniversalTime = now.UniversalTime - CurrencyDataLoaderConstants::DayDuration - 1;
InsertToLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey, dayOld); InsertToLocalSettings(CurrencyDataLoaderConstants::CacheTimestampKey, dayOld);
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); bool didLoad = loader.TryLoadDataFromCacheAsync().get();
@ -243,7 +242,7 @@ TEST_METHOD(LoadFromCache_Fail_StaticDataFileDoesNotExist)
VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename)); VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename));
VERIFY_IS_TRUE(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename, CurrencyHttpClient::GetRawAllRatiosDataResponse())); 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(); 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(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename, CurrencyHttpClient::GetRawStaticDataResponse()));
VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename)); VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename));
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); 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(WriteToFileInLocalCacheFolder(CurrencyDataLoaderConstants::StaticDataFilename, CurrencyHttpClient::GetRawStaticDataResponse()));
VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename)); VERIFY_IS_TRUE(DeleteFileFromLocalCacheFolder(CurrencyDataLoaderConstants::AllRatiosDataFilename));
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); bool didLoad = loader.TryLoadDataFromCacheAsync().get();
@ -295,7 +294,7 @@ TEST_METHOD(LoadFromCache_Success)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromCacheAsync().get(); bool didLoad = loader.TryLoadDataFromCacheAsync().get();
@ -304,9 +303,9 @@ TEST_METHOD(LoadFromCache_Success)
VERIFY_IS_TRUE(loader.LoadedFromCache()); VERIFY_IS_TRUE(loader.LoadedFromCache());
} }
TEST_METHOD(LoadFromWeb_Fail_ClientIsNullptr) TEST_METHOD(LoadFromWeb_Fail_ClientIsNullptr)
{ {
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
bool didLoad = loader.TryLoadDataFromWebAsync().get(); bool didLoad = loader.TryLoadDataFromWebAsync().get();
@ -315,9 +314,9 @@ TEST_METHOD(LoadFromCache_Success)
VERIFY_IS_FALSE(loader.LoadedFromWeb()); VERIFY_IS_FALSE(loader.LoadedFromWeb());
} }
TEST_METHOD(LoadFromWeb_Fail_WebException) TEST_METHOD(LoadFromWeb_Fail_WebException)
{ {
CurrencyDataLoader loader(make_unique<MockCurrencyHttpClientThrowsException>(), L"en-US"); CurrencyDataLoader loader(make_unique<MockCurrencyHttpClientThrowsException>(), L"en-US");
bool didLoad = loader.TryLoadDataFromWebAsync().get(); bool didLoad = loader.TryLoadDataFromWebAsync().get();
@ -342,8 +341,7 @@ TEST_METHOD(LoadFromWeb_Success)
TEST_METHOD(Load_Success_LoadedFromCache) TEST_METHOD(Load_Success_LoadedFromCache)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US");
CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -391,8 +389,7 @@ TEST_CLASS(CurrencyConverterUnitTests){ const UCM::Unit GetUnit(const vector<UCM
TEST_METHOD(Loaded_LoadOrderedUnits) TEST_METHOD(Loaded_LoadOrderedUnits)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US");
CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -422,7 +419,7 @@ TEST_METHOD(Loaded_LoadOrderedRatios)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -455,7 +452,7 @@ TEST_METHOD(Loaded_GetCurrencySymbols_Valid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -484,7 +481,7 @@ TEST_METHOD(Loaded_GetCurrencySymbols_Invalid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -527,7 +524,7 @@ TEST_METHOD(Loaded_GetCurrencyRatioEquality_Valid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));
@ -556,7 +553,7 @@ TEST_METHOD(Loaded_GetCurrencyRatioEquality_Invalid)
{ {
StandardCacheSetup(); StandardCacheSetup();
CurrencyDataLoader loader(nullptr, L"en-US"); CurrencyDataLoader loader(nullptr, L"en-US");
auto data_loaded_event = task_completion_event<void>(); auto data_loaded_event = task_completion_event<void>();
loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event)); loader.SetViewModelCallback(make_shared<DataLoadedCallback>(data_loaded_event));