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

Make unit converters stil working when users opened 'Currency' in offline mode (#1022)

Browse source
This commit is contained in:
Rudy Huyn 2020-02-25 16:34:18 -08:00 • committed by GitHub
parent dab258f3f0
commit c0cb14a8e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/CalcViewModel/UnitConverterViewModel.h
View file

@ -143,7 +143,6 @@ namespace CalculatorApp
OBSERVABLE_OBJECT_CALLBACK(OnPropertyChanged);
OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector<Category ^> ^, Categories);
OBSERVABLE_PROPERTY_RW(Category ^, CurrentCategory);
OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, Mode);
OBSERVABLE_PROPERTY_R(Windows::Foundation::Collections::IObservableVector<Unit ^> ^, Units);
OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencySymbol1);
@ -164,7 +163,7 @@ namespace CalculatorApp
OBSERVABLE_PROPERTY_RW(bool, IsDropDownOpen);
OBSERVABLE_PROPERTY_RW(bool, IsDropDownEnabled);
OBSERVABLE_NAMED_PROPERTY_RW(bool, IsCurrencyLoadingVisible);
OBSERVABLE_PROPERTY_RW(bool, IsCurrencyCurrentCategory);
OBSERVABLE_NAMED_PROPERTY_R(bool, IsCurrencyCurrentCategory);
OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyRatioEquality);
OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyRatioEqualityAutomationName);
OBSERVABLE_PROPERTY_RW(Platform::String ^, CurrencyTimestamp);
@ -172,6 +171,26 @@ namespace CalculatorApp
OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataLoadFailed);
OBSERVABLE_NAMED_PROPERTY_RW(bool, CurrencyDataIsWeekOld);
public:
property Category ^ CurrentCategory
{
Category ^ get() { return m_CurrentCategory; }
void set(Category ^ value)
{
if (m_CurrentCategory == value)
{
return;
}
m_CurrentCategory = value;
if (value != nullptr)
{
auto currentCategory = value->GetModelCategory();
IsCurrencyCurrentCategory = currentCategory.id == CalculatorApp::Common::NavCategory::Serialize(CalculatorApp::Common::ViewMode::Currency);
}
OnPropertyChanged("CurrentCategory");
}
}
property Windows::UI::Xaml::Visibility SupplementaryVisibility
{
Windows::UI::Xaml::Visibility get()
@ -321,7 +340,7 @@ namespace CalculatorApp
std::wstring m_lastAnnouncedFrom;
std::wstring m_lastAnnouncedTo;
Platform::String ^ m_lastAnnouncedConversionResult;
Category ^ m_CurrentCategory;
bool m_isCurrencyDataLoaded;
};