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

Clean up #3

Browse source
This commit is contained in:
Eric Tian 2021-03-05 20:53:14 -08:00
commit 7beb4aea2c
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/App.xaml.cpp
View file

@ -71,7 +71,9 @@ App::App()
this->Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); this->Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
// Reset restartApp and currentTheme
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", nullptr); Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", nullptr);
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"currentTheme", nullptr);
auto value = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting"); auto value = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting");
auto DefaultTheme = ref new Windows::UI::ViewManagement::UISettings(); auto DefaultTheme = ref new Windows::UI::ViewManagement::UISettings();

31
src/Calculator/SettingsPage.xaml.cpp
View file

@ -30,8 +30,10 @@ SettingsPage::SettingsPage()
auto resourceLoader = AppResourceProvider::GetInstance(); auto resourceLoader = AppResourceProvider::GetInstance();
auto themevalue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting"); auto themevalue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"themeSetting");
auto restartValue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"restartApp"); auto restartValue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"restartApp");
auto currentThemeValue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"CurrentTheme");
String ^ colorSetting = safe_cast<String ^>(themevalue); String ^ colorSetting = safe_cast<String ^>(themevalue);
String ^ restartApp = safe_cast<String ^>(restartValue); String ^ restartApp = safe_cast<String ^>(restartValue);
String ^ currentTheme = safe_cast<String ^>(currentThemeValue);
InitializeComponent(); InitializeComponent();
@ -45,23 +47,35 @@ SettingsPage::SettingsPage()
if (colorSetting == L"Light") if (colorSetting == L"Light")
{ {
SettingsLightTheme->IsChecked = true; SettingsLightTheme->IsChecked = true;
m_currentTheme = "Light"; if (currentTheme == nullptr)
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"CurrentTheme", L"Light");
}
} }
else if (colorSetting == L"Dark") else if (colorSetting == L"Dark")
{ {
SettingsDarkTheme->IsChecked = true; SettingsDarkTheme->IsChecked = true;
m_currentTheme = "Dark"; if (currentTheme == nullptr)
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"CurrentTheme", L"Dark");
}
} }
else if (colorSetting == L"System") else if (colorSetting == L"System")
{ {
SettingsSystemTheme->IsChecked = true; SettingsSystemTheme->IsChecked = true;
m_currentTheme = "System"; if (currentTheme == nullptr)
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"CurrentTheme", L"System");
}
} }
} }
else else
{ {
SettingsSystemTheme->IsChecked = true; SettingsSystemTheme->IsChecked = true;
m_currentTheme = "System"; if (currentTheme == nullptr)
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"CurrentTheme", L"System");
}
} }
if (restartValue != nullptr) if (restartValue != nullptr)
@ -98,7 +112,7 @@ void SettingsPage::SetDefaultFocus()
void SettingsPage::InitializeContributeTextBlock() void SettingsPage::InitializeContributeTextBlock()
{ {
auto resourceLoader = AppResourceProvider::GetInstance(); auto resourceLoader = AppResourceProvider::GetInstance();
std::wstring contributeHyperlinkText = resourceLoader->GetResourceString(L"SettingsContribute")->Data(); std::wstring contributeHyperlinkText = resourceLoader->GetResourceString("SettingsContribute")->Data();
// The resource string has '%HL%' wrapped around 'GitHub' // The resource string has '%HL%' wrapped around 'GitHub'
// Break the string and assign pieces appropriately. // Break the string and assign pieces appropriately.
@ -139,7 +153,7 @@ void SettingsPage::BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml:
void SettingsPage::SetVersionString() void SettingsPage::SetVersionString()
{ {
PackageVersion version = Package::Current->Id->Version; PackageVersion version = Package::Current->Id->Version;
String ^ appName = AppResourceProvider::GetInstance()->GetResourceString(L"AppName"); String ^ appName = AppResourceProvider::GetInstance()->GetResourceString("AppName");
SettingsVersion->Text = appName + L" " + version.Major + L"." + version.Minor + L"." + version.Build + L"." + version.Revision; SettingsVersion->Text = appName + L" " + version.Major + L"." + version.Minor + L"." + version.Build + L"." + version.Revision;
} }
@ -170,10 +184,13 @@ void SettingsPage::SettingsFeedbackButtonClick(_In_ Object ^ sender, _In_ Routed
void SettingsPage::ThemeChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e) void SettingsPage::ThemeChecked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
{ {
auto resourceLoader = AppResourceProvider::GetInstance(); auto resourceLoader = AppResourceProvider::GetInstance();
auto currentThemeValue = Windows::Storage::ApplicationData::Current->LocalSettings->Values->Lookup(L"CurrentTheme");
RadioButton ^ radioButton = safe_cast<RadioButton ^>(sender); RadioButton ^ radioButton = safe_cast<RadioButton ^>(sender);
String ^ tag = radioButton->Tag->ToString(); String ^ tag = radioButton->Tag->ToString();
String ^ currentTheme = safe_cast<String ^>(currentThemeValue);
if (m_currentTheme == tag) // Only display the restart app notice if the theme selected is not the current theme.
if (currentTheme == tag)
{ {
SettingsRestartApp->Visibility = ::Visibility::Collapsed; SettingsRestartApp->Visibility = ::Visibility::Collapsed;
} }

1
src/Calculator/SettingsPage.xaml.h
View file

@ -19,7 +19,6 @@ namespace CalculatorApp
virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e) override; virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e) override;
private: private:
Platform::String ^ m_currentTheme;
void SetDefaultFocus(); void SetDefaultFocus();
void InitializeContributeTextBlock(); void InitializeContributeTextBlock();
void BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); void BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);