From 876a7fe13ceca935b2569b62c3f883a04595fa8f Mon Sep 17 00:00:00 2001 From: Pepe Rivera Date: Tue, 23 Jun 2020 13:06:23 -0700 Subject: [PATCH] Remove preview tag from graphing mode (#1285) * Remove preview tag * Remove preview tag * fix bug --- src/CalcViewModel/ApplicationViewModel.cpp | 1 - src/CalcViewModel/ApplicationViewModel.h | 1 - src/CalcViewModel/Common/NavCategory.cpp | 69 +++++-------------- src/CalcViewModel/Common/NavCategory.h | 12 +--- src/Calculator/Calculator.vcxproj | 9 --- .../Controls/PreviewTagControl.xaml | 57 --------------- .../Controls/PreviewTagControl.xaml.cpp | 23 ------- .../Controls/PreviewTagControl.xaml.h | 16 ----- src/Calculator/Views/MainPage.xaml | 32 +++------ src/Calculator/Views/MainPage.xaml.cpp | 12 +--- 10 files changed, 33 insertions(+), 199 deletions(-) delete mode 100644 src/Calculator/Controls/PreviewTagControl.xaml delete mode 100644 src/Calculator/Controls/PreviewTagControl.xaml.cpp delete mode 100644 src/Calculator/Controls/PreviewTagControl.xaml.h diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp index 817147e..ee5f2fb 100644 --- a/src/CalcViewModel/ApplicationViewModel.cpp +++ b/src/CalcViewModel/ApplicationViewModel.cpp @@ -58,7 +58,6 @@ void ApplicationViewModel::Mode::set(ViewMode value) { PreviousMode = m_mode; m_mode = value; - IsModePreview = NavCategory::IsViewModePreview(m_mode); SetDisplayNormalAlwaysOnTopOption(); OnModeChanged(); RaisePropertyChanged(ModePropertyName); diff --git a/src/CalcViewModel/ApplicationViewModel.h b/src/CalcViewModel/ApplicationViewModel.h index e56e9a4..7e4238d 100644 --- a/src/CalcViewModel/ApplicationViewModel.h +++ b/src/CalcViewModel/ApplicationViewModel.h @@ -26,7 +26,6 @@ namespace CalculatorApp OBSERVABLE_PROPERTY_RW(UnitConverterViewModel ^, ConverterViewModel); OBSERVABLE_PROPERTY_RW(CalculatorApp::Common::ViewMode, PreviousMode); OBSERVABLE_PROPERTY_R(bool, IsAlwaysOnTop); - OBSERVABLE_PROPERTY_R(bool, IsModePreview); OBSERVABLE_NAMED_PROPERTY_RW(Platform::String ^, CategoryName); // Indicates whether calculator is currently in standard mode _and_ supports CompactOverlay _and_ is not in Always-on-Top mode diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp index 278ca79..d5769ae 100644 --- a/src/CalcViewModel/Common/NavCategory.cpp +++ b/src/CalcViewModel/Common/NavCategory.cpp @@ -118,8 +118,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::Number1, L"1", SUPPORTS_ALL, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Scientific, SCIENTIFIC_ID, L"Scientific", @@ -129,8 +128,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::Number2, L"2", SUPPORTS_ALL, - true, - false } }; + true } }; int currentIndex = 3; bool supportGraphingCalculator = IsGraphingModeAvailable(); @@ -146,8 +144,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::Number3, L"3", SUPPORTS_ALL, - isEnabled, - true }); + isEnabled }); ++currentIndex; } res.insert( @@ -161,8 +158,7 @@ static const list s_categoryManifest = [] { supportGraphingCalculator ? MyVirtualKey::Number4 : MyVirtualKey::Number3, towchar_t(currentIndex++), SUPPORTS_ALL, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Date, DATE_ID, L"Date", @@ -172,8 +168,7 @@ static const list s_categoryManifest = [] { supportGraphingCalculator ? MyVirtualKey::Number5 : MyVirtualKey::Number4, towchar_t(currentIndex++), SUPPORTS_ALL, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Currency, CURRENCY_ID, L"Currency", @@ -183,8 +178,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Volume, VOLUME_ID, L"Volume", @@ -194,8 +188,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Length, LENGTH_ID, L"Length", @@ -205,8 +198,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Weight, WEIGHT_ID, L"Weight and Mass", @@ -216,8 +208,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Temperature, TEMPERATURE_ID, L"Temperature", @@ -227,8 +218,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, SUPPORTS_NEGATIVE, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Energy, ENERGY_ID, L"Energy", @@ -238,8 +228,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Area, AREA_ID, L"Area", @@ -249,8 +238,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Speed, SPEED_ID, L"Speed", @@ -260,8 +248,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Time, TIME_ID, L"Time", @@ -271,8 +258,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Power, POWER_ID, L"Power", @@ -282,8 +268,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, SUPPORTS_NEGATIVE, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Data, DATA_ID, L"Data", @@ -293,8 +278,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Pressure, PRESSURE_ID, L"Pressure", @@ -304,8 +288,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, POSITIVE_ONLY, - true, - false }, + true }, NavCategoryInitializer{ ViewMode::Angle, ANGLE_ID, L"Angle", @@ -315,8 +298,7 @@ static const list s_categoryManifest = [] { MyVirtualKey::None, nullptr, SUPPORTS_NEGATIVE, - true, - false } }); + true } }); return res; }(); @@ -540,8 +522,7 @@ NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupIniti groupMode, categoryInitializer.viewMode, categoryInitializer.supportsNegative, - categoryInitializer.isEnabled, - categoryInitializer.isPreview)); + categoryInitializer.isEnabled)); } } } @@ -565,15 +546,3 @@ NavCategoryGroup ^ NavCategoryGroup::CreateConverterCategory() return ref new NavCategoryGroup( NavCategoryGroupInitializer{ CategoryGroupType::Converter, L"ConverterModeTextCaps", L"ConverterModeText", L"ConverterModePluralText" }); } - -bool NavCategory::IsViewModePreview(ViewMode mode) -{ - auto iter = - find_if(begin(s_categoryManifest), end(s_categoryManifest), [mode](const NavCategoryInitializer& initializer) { return initializer.viewMode == mode; }); - - if (iter != s_categoryManifest.end()) - { - return iter->isPreview; - } - return false; -} diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h index a850cee..a2edc99 100644 --- a/src/CalcViewModel/Common/NavCategory.h +++ b/src/CalcViewModel/Common/NavCategory.h @@ -69,8 +69,7 @@ namespace CalculatorApp MyVirtualKey vKey, wchar_t const* aKey, bool categorySupportsNegative, - bool enabled, - bool isPreview) + bool enabled) : viewMode(mode) , serializationId(id) , friendlyName(name) @@ -81,7 +80,6 @@ namespace CalculatorApp , accessKey(aKey) , supportsNegative(categorySupportsNegative) , isEnabled(enabled) - , isPreview(isPreview) { } @@ -95,7 +93,6 @@ namespace CalculatorApp const wchar_t* const accessKey; const bool supportsNegative; const bool isEnabled; - const bool isPreview; }; private @@ -126,7 +123,6 @@ namespace CalculatorApp PROPERTY_R(Platform::String ^, AccessKey); PROPERTY_R(bool, SupportsNegative); PROPERTY_R(bool, IsEnabled); - PROPERTY_R(bool, IsPreview); property Platform::String ^ AutomationId { Platform::String ^ get() { return m_Mode.ToString(); } } @@ -142,7 +138,7 @@ namespace CalculatorApp static bool IsGraphingCalculatorViewMode(ViewMode mode); static bool IsDateCalculatorViewMode(ViewMode mode); static bool IsConverterViewMode(ViewMode mode); - static bool IsViewModePreview(ViewMode mode); + static Platform::String ^ GetFriendlyName(ViewMode mode); static Platform::String ^ GetNameResourceKey(ViewMode mode); static CategoryGroupType GetGroupType(ViewMode mode); @@ -163,8 +159,7 @@ namespace CalculatorApp Platform::String ^ mode, ViewMode viewMode, bool supportsNegative, - bool isEnabled, - bool isPreview) + bool isEnabled) : m_Name(name) , m_AutomationName(automationName) , m_Glyph(glyph) @@ -173,7 +168,6 @@ namespace CalculatorApp , m_Mode(viewMode) , m_SupportsNegative(supportsNegative) , m_IsEnabled(isEnabled) - , m_IsPreview(isPreview) { } diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj index f32d574..4ac84f0 100644 --- a/src/Calculator/Calculator.vcxproj +++ b/src/Calculator/Calculator.vcxproj @@ -247,9 +247,6 @@ - - Controls\PreviewTagControl.xaml - @@ -350,9 +347,6 @@ Designer - - Designer - Designer @@ -415,9 +409,6 @@ - - Controls\PreviewTagControl.xaml - diff --git a/src/Calculator/Controls/PreviewTagControl.xaml b/src/Calculator/Controls/PreviewTagControl.xaml deleted file mode 100644 index f4e48b7..0000000 --- a/src/Calculator/Controls/PreviewTagControl.xaml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Calculator/Controls/PreviewTagControl.xaml.cpp b/src/Calculator/Controls/PreviewTagControl.xaml.cpp deleted file mode 100644 index bec82a6..0000000 --- a/src/Calculator/Controls/PreviewTagControl.xaml.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include "pch.h" -#include "PreviewTagControl.xaml.h" - -using namespace CalculatorApp; -using namespace CalculatorApp::Controls; -using namespace Platform; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Controls::Primitives; -using namespace Windows::UI::Xaml::Data; -using namespace Windows::UI::Xaml::Input; -using namespace Windows::UI::Xaml::Media; -using namespace Windows::UI::Xaml::Navigation; - -PreviewTagControl::PreviewTagControl() -{ - InitializeComponent(); -} diff --git a/src/Calculator/Controls/PreviewTagControl.xaml.h b/src/Calculator/Controls/PreviewTagControl.xaml.h deleted file mode 100644 index 5c73971..0000000 --- a/src/Calculator/Controls/PreviewTagControl.xaml.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -#include "Controls\PreviewTagControl.g.h" - -namespace CalculatorApp::Controls -{ - [Windows::Foundation::Metadata::WebHostHidden] - public ref class PreviewTagControl sealed - { - public: - PreviewTagControl(); - }; -} diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml index 345f665..07eef66 100644 --- a/src/Calculator/Views/MainPage.xaml +++ b/src/Calculator/Views/MainPage.xaml @@ -39,13 +39,6 @@ - - - - - - - @@ -128,20 +121,15 @@ - - - - + +