From e4e431a13ad9afd007a87b61affca4eeffb85a05 Mon Sep 17 00:00:00 2001 From: Han Zhang Date: Sat, 11 Jun 2022 00:17:12 +0800 Subject: [PATCH] Cleanup --- src/Calculator/App.xaml.cs | 2 - src/Calculator/Common/AppLifecycleLogger.cs | 2 - .../Common/KeyboardShortcutManager.cs | 6 +-- src/Calculator/Controls/CalculationResult.cs | 19 +-------- .../CalculationResultAutomationPeer.cs | 4 -- src/Calculator/Controls/CalculatorButton.cs | 11 +---- src/Calculator/Controls/EquationTextBox.cs | 2 - src/Calculator/Controls/FlipButtons.cs | 1 - src/Calculator/Controls/MathRichEditBox.cs | 6 +-- .../Controls/OperatorPanelButton.cs | 11 ----- .../Controls/OperatorPanelListView.cs | 10 +---- src/Calculator/Controls/OverflowTextBlock.cs | 16 ------- .../OverflowTextBlockAutomationPeer.cs | 4 -- src/Calculator/Controls/RadixButton.cs | 2 - .../Controls/SupplementaryItemsControl.cs | 13 +----- .../ExpressionItemTemplateSelector.cs | 1 - .../Converters/RadixToStringConverter.cs | 1 - src/Calculator/Properties/AssemblyInfo.cs | 1 - .../KeyGraphFeaturesTemplateSelector.cs | 2 - .../NavViewMenuItemTemplateSelector.cs | 1 - src/Calculator/Utils/DelegateCommandUtils.cs | 3 +- src/Calculator/Utils/ThemeHelper.cs | 6 +-- src/Calculator/Views/Calculator.xaml.cs | 23 ++-------- .../CalculatorProgrammerBitFlipPanel.xaml.cs | 12 +----- .../CalculatorProgrammerDisplayPanel.xaml.cs | 3 +- .../CalculatorProgrammerOperators.xaml.cs | 22 +--------- ...CalculatorProgrammerRadixOperators.xaml.cs | 15 +------ .../CalculatorScientificAngleButtons.xaml.cs | 22 +--------- .../CalculatorScientificOperators.xaml.cs | 18 -------- .../Views/CalculatorStandardOperators.xaml.cs | 14 ------- src/Calculator/Views/DateCalculator.xaml.cs | 17 -------- .../EquationInputArea.xaml.cs | 33 ++++++--------- .../EquationStylePanelControl.xaml.cs | 4 -- .../GraphingCalculator.xaml.cs | 20 ++------- .../GraphingCalculator/GraphingNumPad.xaml.cs | 10 ----- .../GraphingSettings.xaml.cs | 16 ------- .../KeyGraphFeaturesPanel.xaml.cs | 11 +---- src/Calculator/Views/HistoryList.xaml.cs | 3 -- src/Calculator/Views/MainPage.xaml.cs | 17 ++++---- src/Calculator/Views/Memory.xaml.cs | 3 -- src/Calculator/Views/MemoryListItem.xaml.cs | 3 +- src/Calculator/Views/NumberPad.xaml.cs | 1 - src/Calculator/Views/Settings.xaml.cs | 11 +---- .../Views/StateTriggers/ControlSizeTrigger.cs | 2 - .../Views/SupplementaryResults.xaml.cs | 3 +- src/Calculator/Views/TitleBar.xaml.cs | 6 +-- src/Calculator/Views/UnitConverter.xaml.cs | 2 - src/Calculator/WindowFrameService.cs | 1 - .../CalculatorResults.cs | 1 - src/CalculatorUITestFramework/HistoryItem.cs | 3 -- src/CalculatorUITestFramework/HistoryPanel.cs | 2 - src/CalculatorUITestFramework/MemoryItem.cs | 3 -- src/CalculatorUITestFramework/MemoryPanel.cs | 2 - .../NavigationMenu.cs | 2 +- .../ProgrammerCalculatorPage.cs | 1 - .../ProgrammerOperatorsPanel.cs | 7 +--- .../ScientificCalculatorPage.cs | 1 - .../ScientificOperatorsPanel.cs | 42 +++++++++---------- .../UnitConverterOperatorsPanel.cs | 3 -- .../UnitConverterPage.cs | 3 -- .../UnitConverterResults.cs | 2 - src/CalculatorUITestFramework/WinAppDriver.cs | 1 - .../WindowsElementExtensions.cs | 1 - .../CurrencyConverterFunctionalTests.cs | 2 - .../ScientificModeFunctionalTests.cs | 4 -- 65 files changed, 74 insertions(+), 422 deletions(-) diff --git a/src/Calculator/App.xaml.cs b/src/Calculator/App.xaml.cs index 6f40b325..b3fc15ef 100644 --- a/src/Calculator/App.xaml.cs +++ b/src/Calculator/App.xaml.cs @@ -6,8 +6,6 @@ // Declaration of the App class. // -using CalculatorApp.ViewModel.Common; -using CalculatorApp.ViewModel.Common.Automation; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/Calculator/Common/AppLifecycleLogger.cs b/src/Calculator/Common/AppLifecycleLogger.cs index dff96f33..bed26cd9 100644 --- a/src/Calculator/Common/AppLifecycleLogger.cs +++ b/src/Calculator/Common/AppLifecycleLogger.cs @@ -2,8 +2,6 @@ // Licensed under the MIT License. using System; - -using CalculatorApp.ViewModel.Common; using Windows.ApplicationModel; using Windows.ApplicationModel.Core; using Windows.Foundation.Diagnostics; diff --git a/src/Calculator/Common/KeyboardShortcutManager.cs b/src/Calculator/Common/KeyboardShortcutManager.cs index 1a9aa991..28b0a484 100644 --- a/src/Calculator/Common/KeyboardShortcutManager.cs +++ b/src/Calculator/Common/KeyboardShortcutManager.cs @@ -1,14 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics; using System.Linq; -using Windows.Foundation.Collections; using Windows.UI.Core; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; @@ -578,7 +574,7 @@ namespace CalculatorApp private static bool CanNavigateModeByShortcut(MUXC.NavigationView navView, object nvi , ApplicationViewModel vm, ViewMode toMode) { - if(nvi != null && nvi is NavCategory navCategory) + if (nvi != null && nvi is NavCategory navCategory) { return navCategory.IsEnabled && navView.Visibility == Visibility.Visible diff --git a/src/Calculator/Controls/CalculationResult.cs b/src/Calculator/Controls/CalculationResult.cs index 5dd577b4..9f89822f 100644 --- a/src/Calculator/Controls/CalculationResult.cs +++ b/src/Calculator/Controls/CalculationResult.cs @@ -2,26 +2,11 @@ // Licensed under the MIT License. using System; -using System.Collections.Generic; -using System.Threading.Tasks; using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Controls; -using CalculatorApp.ViewModel.Common; - -using Windows.Devices.Input; -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; -using System.Reflection; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Input; namespace CalculatorApp { diff --git a/src/Calculator/Controls/CalculationResultAutomationPeer.cs b/src/Calculator/Controls/CalculationResultAutomationPeer.cs index 36d1f37a..f44a2801 100644 --- a/src/Calculator/Controls/CalculationResultAutomationPeer.cs +++ b/src/Calculator/Controls/CalculationResultAutomationPeer.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; diff --git a/src/Calculator/Controls/CalculatorButton.cs b/src/Calculator/Controls/CalculatorButton.cs index 4ef323d5..77a0ece7 100644 --- a/src/Calculator/Controls/CalculatorButton.cs +++ b/src/Calculator/Controls/CalculatorButton.cs @@ -1,19 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Controls; -using CalculatorApp.ViewModel.Common; using Windows.System; using Windows.UI.Xaml; -using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Data; -using Windows.Foundation.Collections; -using Windows.Storage.Pickers; +using Windows.UI.Xaml.Input; namespace CalculatorApp { diff --git a/src/Calculator/Controls/EquationTextBox.cs b/src/Calculator/Controls/EquationTextBox.cs index ebf1bb64..9488b7f8 100644 --- a/src/Calculator/Controls/EquationTextBox.cs +++ b/src/Calculator/Controls/EquationTextBox.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; -using System; using Windows.UI.Text; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; diff --git a/src/Calculator/Controls/FlipButtons.cs b/src/Calculator/Controls/FlipButtons.cs index bc750210..64a73a97 100644 --- a/src/Calculator/Controls/FlipButtons.cs +++ b/src/Calculator/Controls/FlipButtons.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; diff --git a/src/Calculator/Controls/MathRichEditBox.cs b/src/Calculator/Controls/MathRichEditBox.cs index ce642790..8148f3e8 100644 --- a/src/Calculator/Controls/MathRichEditBox.cs +++ b/src/Calculator/Controls/MathRichEditBox.cs @@ -3,12 +3,12 @@ using System; using System.Runtime.InteropServices; +using Windows.ApplicationModel; using Windows.System; using Windows.UI.Core; using Windows.UI.Text; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; -using Windows.ApplicationModel; namespace CalculatorApp { @@ -86,14 +86,14 @@ namespace CalculatorApp { string packageName = Package.Current.Id.Name; - if(packageName == "Microsoft.WindowsCalculator.Dev") + if (packageName == "Microsoft.WindowsCalculator.Dev") { LimitedAccessFeatures.TryUnlockFeature( "com.microsoft.windows.richeditmath", "BeDD/jxKhz/yfVNA11t4uA==", // Microsoft.WindowsCalculator.Dev "8wekyb3d8bbwe has registered their use of com.microsoft.windows.richeditmath with Microsoft and agrees to the terms of use."); } - else if(packageName == "Microsoft.WindowsCalculator") + else if (packageName == "Microsoft.WindowsCalculator") { LimitedAccessFeatures.TryUnlockFeature( "com.microsoft.windows.richeditmath", diff --git a/src/Calculator/Controls/OperatorPanelButton.cs b/src/Calculator/Controls/OperatorPanelButton.cs index b6be9236..968ff90e 100644 --- a/src/Calculator/Controls/OperatorPanelButton.cs +++ b/src/Calculator/Controls/OperatorPanelButton.cs @@ -1,19 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; - -using Windows.Foundation; -using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media; -using CalculatorApp; -using CalculatorApp.Common; -using CalculatorApp.Controls; namespace CalculatorApp { diff --git a/src/Calculator/Controls/OperatorPanelListView.cs b/src/Calculator/Controls/OperatorPanelListView.cs index ac56cc65..faa970d1 100644 --- a/src/Calculator/Controls/OperatorPanelListView.cs +++ b/src/Calculator/Controls/OperatorPanelListView.cs @@ -1,18 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Controls; - -using Windows.Foundation; using Windows.Devices.Input; using Windows.UI.Xaml; -using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Input; namespace CalculatorApp { diff --git a/src/Calculator/Controls/OverflowTextBlock.cs b/src/Calculator/Controls/OverflowTextBlock.cs index 91ae38e9..1e986852 100644 --- a/src/Calculator/Controls/OverflowTextBlock.cs +++ b/src/Calculator/Controls/OverflowTextBlock.cs @@ -1,27 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Common; -using CalculatorApp.Controls; - -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.Devices.Input; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using Windows.ApplicationModel.Store; namespace CalculatorApp { diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cs b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cs index 0b9d1300..ad3af016 100644 --- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cs +++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; using Windows.UI.Xaml.Automation.Peers; -using Windows.Foundation.Collections; namespace CalculatorApp { diff --git a/src/Calculator/Controls/RadixButton.cs b/src/Calculator/Controls/RadixButton.cs index 4f959c61..61ccdde9 100644 --- a/src/Calculator/Controls/RadixButton.cs +++ b/src/Calculator/Controls/RadixButton.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; - namespace CalculatorApp { namespace Controls diff --git a/src/Calculator/Controls/SupplementaryItemsControl.cs b/src/Calculator/Controls/SupplementaryItemsControl.cs index 6fc2b303..7e878e0f 100644 --- a/src/Calculator/Controls/SupplementaryItemsControl.cs +++ b/src/Calculator/Controls/SupplementaryItemsControl.cs @@ -1,22 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Controls; -using CalculatorApp.ViewModel; -using Windows.System; using Windows.UI.Xaml; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; - -using Windows.Foundation.Collections; +using Windows.UI.Xaml.Controls; namespace CalculatorApp { diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs index 772d9455..c18e48b9 100644 --- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs +++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; using System; using Windows.UI.Xaml; diff --git a/src/Calculator/Converters/RadixToStringConverter.cs b/src/Calculator/Converters/RadixToStringConverter.cs index 959a0ac1..14364822 100644 --- a/src/Calculator/Converters/RadixToStringConverter.cs +++ b/src/Calculator/Converters/RadixToStringConverter.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; using System; namespace CalculatorApp diff --git a/src/Calculator/Properties/AssemblyInfo.cs b/src/Calculator/Properties/AssemblyInfo.cs index d267cc81..7bc54277 100644 --- a/src/Calculator/Properties/AssemblyInfo.cs +++ b/src/Calculator/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs b/src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs index ebf67527..1993ac9f 100644 --- a/src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs +++ b/src/Calculator/Selectors/KeyGraphFeaturesTemplateSelector.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel; - using Windows.UI.Xaml; namespace CalculatorApp diff --git a/src/Calculator/Selectors/NavViewMenuItemTemplateSelector.cs b/src/Calculator/Selectors/NavViewMenuItemTemplateSelector.cs index a5e9a81a..a7073b14 100644 --- a/src/Calculator/Selectors/NavViewMenuItemTemplateSelector.cs +++ b/src/Calculator/Selectors/NavViewMenuItemTemplateSelector.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using CalculatorApp.ViewModel.Common; using System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/src/Calculator/Utils/DelegateCommandUtils.cs b/src/Calculator/Utils/DelegateCommandUtils.cs index 89a93467..3984d970 100644 --- a/src/Calculator/Utils/DelegateCommandUtils.cs +++ b/src/Calculator/Utils/DelegateCommandUtils.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using System; -using CalculatorApp.ViewModel.Common; namespace CalculatorApp.Utils { @@ -15,7 +14,7 @@ namespace CalculatorApp.Utils return new DelegateCommand(param => { TTarget thatTarget = weakTarget.Target as TTarget; - if(null != thatTarget) + if (null != thatTarget) { handler.Invoke(thatTarget, param); } diff --git a/src/Calculator/Utils/ThemeHelper.cs b/src/Calculator/Utils/ThemeHelper.cs index c17a60a5..8a00924d 100644 --- a/src/Calculator/Utils/ThemeHelper.cs +++ b/src/Calculator/Utils/ThemeHelper.cs @@ -4,8 +4,6 @@ using System; using System.Reflection; using Windows.Storage; -using Windows.UI; -using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; @@ -72,12 +70,12 @@ namespace CalculatorApp.Utils { Frame rootFrame = Window.Current.Content as Frame; long token = rootFrame.RegisterPropertyChangedCallback(Frame.RequestedThemeProperty, callback); - return new ThemeChangedCallbackToken{ RootFrame = new WeakReference(rootFrame), Token = token }; + return new ThemeChangedCallbackToken { RootFrame = new WeakReference(rootFrame), Token = token }; } public static void UnregisterAppThemeChangedCallback(ThemeChangedCallbackToken callbackToken) { - if(callbackToken.RootFrame.IsAlive) + if (callbackToken.RootFrame.IsAlive) { Frame rootFrame = callbackToken.RootFrame.Target as Frame; rootFrame.UnregisterPropertyChangedCallback(Frame.RequestedThemeProperty, callbackToken.Token); diff --git a/src/Calculator/Views/Calculator.xaml.cs b/src/Calculator/Views/Calculator.xaml.cs index 34ff3433..942968d4 100644 --- a/src/Calculator/Views/Calculator.xaml.cs +++ b/src/Calculator/Views/Calculator.xaml.cs @@ -1,33 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Converters; -using CalculatorApp.Controls; using CalculatorApp.Utils; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - +using System; using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.Globalization.NumberFormatting; -using Windows.System; using Windows.UI.Core; +using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; -using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using Windows.System.Threading; -using Windows.UI.ViewManagement; namespace CalculatorApp { @@ -247,7 +231,8 @@ namespace CalculatorApp // Delay load things later when we get a chance. WeakReference weakThis = new WeakReference(this); _ = this.Dispatcher.RunAsync( - CoreDispatcherPriority.Normal, new DispatchedHandler(() => { + CoreDispatcherPriority.Normal, new DispatchedHandler(() => + { if (TraceLogger.GetInstance().IsWindowIdInLog(ApplicationView.GetApplicationViewIdForWindow(CoreWindow.GetForCurrentThread()))) { var refThis = weakThis.Target as Calculator; diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cs b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cs index 22642be8..5679a0bf 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cs +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cs @@ -8,20 +8,10 @@ // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; using CalculatorApp.Controls; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - +using System.Diagnostics; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; namespace CalculatorApp diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs index b1981671..76951fb0 100644 --- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs +++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs @@ -1,9 +1,8 @@ -using CalculatorApp.ViewModel.Common; +using CalculatorApp.Utils; using System.Diagnostics; using System.Windows.Input; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using CalculatorApp.Utils; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cs b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cs index 47f35a4e..2f81ee20 100644 --- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cs @@ -1,29 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; using CalculatorApp.Controls; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; -using Windows.Devices.Input; - -using Windows.Foundation; -using Windows.Foundation.Collections; +using System.Diagnostics; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using Windows.UI.Xaml.Automation; -using Windows.UI.Xaml.Automation.Peers; -using Windows.UI.ViewManagement; -using Windows.UI.Core; namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs index 419c4e5c..24ad686e 100644 --- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs @@ -1,21 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; - -using CalculatorApp; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using CalculatorApp.Common; -using Windows.UI.Xaml.Media; namespace CalculatorApp { @@ -39,7 +26,7 @@ namespace CalculatorApp get => m_isErrorVisualState; set { - if(m_isErrorVisualState != value) + if (m_isErrorVisualState != value) { m_isErrorVisualState = value; string newState = m_isErrorVisualState ? "ErrorLayout" : "NoErrorLayout"; diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs index 783aae1f..66767458 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs @@ -6,26 +6,8 @@ // Declaration of the CalculatorScientificAngleButtons class // -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; using CalculatorApp.Utils; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; -using Windows.UI.ViewManagement; -using Windows.UI.Core; namespace CalculatorApp { @@ -50,7 +32,7 @@ namespace CalculatorApp if (donotuse_ButtonPressed == null) { donotuse_ButtonPressed = DelegateCommandUtils.MakeDelegateCommand(this, - (that, param)=> + (that, param) => { that.OnAngleButtonPressed(param); }); @@ -65,7 +47,7 @@ namespace CalculatorApp get => m_isErrorVisualState; set { - if(m_isErrorVisualState != value) + if (m_isErrorVisualState != value) { m_isErrorVisualState = value; string newState = m_isErrorVisualState ? "ErrorFlyout" : "NoErrorFlyout"; diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs index d1e1fd97..fd78435c 100644 --- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs @@ -6,26 +6,8 @@ // Declaration of the CalculatorScientificOperators class // -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; using CalculatorApp.Common; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Core; -using Windows.UI.ViewManagement; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.cs b/src/Calculator/Views/CalculatorStandardOperators.xaml.cs index f03bc7af..e399afc9 100644 --- a/src/Calculator/Views/CalculatorStandardOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.cs @@ -6,21 +6,7 @@ // Declaration of the CalculatorStandardOperators class // -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; - -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace CalculatorApp { diff --git a/src/Calculator/Views/DateCalculator.xaml.cs b/src/Calculator/Views/DateCalculator.xaml.cs index 8d2539c0..1e5eb951 100644 --- a/src/Calculator/Views/DateCalculator.xaml.cs +++ b/src/Calculator/Views/DateCalculator.xaml.cs @@ -9,29 +9,12 @@ // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.Globalization; using Windows.Globalization.DateTimeFormatting; -using Windows.System.UserProfile; -using Windows.UI.Core; -using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace CalculatorApp { diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs index e57f6276..90ffb9c7 100644 --- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs @@ -1,29 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using Calculator.Utils; +using CalculatorApp.Controls; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.Common; -using CalculatorApp.ViewModel.Common; -using CalculatorApp.ViewModel.Common.Automation; -using GraphControl; -using CalculatorApp.ViewModel; -using CalculatorApp.Controls; -using Windows.Foundation; using Windows.System; using Windows.UI; using Windows.UI.Core; using Windows.UI.ViewManagement; using Windows.UI.Xaml; -using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; using Windows.UI.Xaml.Input; -using Calculator.Utils; +using Windows.UI.Xaml.Media; namespace CalculatorApp { @@ -355,13 +346,14 @@ namespace CalculatorApp { WeakReference weakThis = new WeakReference(this); - _ = this.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, new DispatchedHandler(() => { - var refThis = weakThis.Target as EquationInputArea; - if (refThis != null && refThis.m_isHighContrast == refThis.m_accessibilitySettings.HighContrast) - { - refThis.ReloadAvailableColors(false, false); - } - })); + _ = this.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, new DispatchedHandler(() => + { + var refThis = weakThis.Target as EquationInputArea; + if (refThis != null && refThis.m_isHighContrast == refThis.m_accessibilitySettings.HighContrast) + { + refThis.ReloadAvailableColors(false, false); + } + })); } private void EquationTextBox_RemoveButtonClicked(object sender, RoutedEventArgs e) @@ -594,7 +586,8 @@ namespace CalculatorApp { TimeSpan timeSpan = new TimeSpan(10000000); // 1 tick = 100 nanoseconds, and 10000000 ticks = 1 second. DispatcherTimerDelayer delayer = new DispatcherTimerDelayer(timeSpan); - delayer.Action += new EventHandler((object s, object arg) => { + delayer.Action += new EventHandler((object s, object arg) => + { CalculatorApp.ViewModel.Common.TraceLogger.GetInstance().LogVariableChanged("Slider", name); variableSliders.Remove(name); }); diff --git a/src/Calculator/Views/GraphingCalculator/EquationStylePanelControl.xaml.cs b/src/Calculator/Views/GraphingCalculator/EquationStylePanelControl.xaml.cs index 347e292d..e9c6c4fb 100644 --- a/src/Calculator/Views/GraphingCalculator/EquationStylePanelControl.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/EquationStylePanelControl.xaml.cs @@ -1,8 +1,4 @@ -using CalculatorApp.ViewModel.Common; -using GraphControl; -using System; using System.Collections.Generic; -using System.Linq; using Windows.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs index 385ca755..2a8e7bed 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs @@ -1,38 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; using CalculatorApp.Common; -using CalculatorApp.ViewModel.Common; -using CalculatorApp.ViewModel.Common.Automation; using CalculatorApp.Controls; using CalculatorApp.Utils; -using CalculatorApp.ViewModel; -using GraphControl; +using System; using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.Resources; using Windows.Foundation; using Windows.Foundation.Collections; using Windows.Storage; -using Windows.Storage.Streams; using Windows.System; using Windows.UI.Core; -using Windows.UI.Input; using Windows.UI.ViewManagement; using Windows.UI.Xaml; -using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Media.Imaging; -using Windows.UI.Popups; namespace CalculatorApp { @@ -755,7 +740,8 @@ namespace CalculatorApp private void OnColorValuesChanged(UISettings sender, object args) { WeakReference weakThis = new WeakReference(this); - _ = this.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, new DispatchedHandler(() => { + _ = this.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, new DispatchedHandler(() => + { GraphingCalculator refThis = weakThis.Target as GraphingCalculator; if (refThis != null && IsMatchAppTheme) { diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs index 6e391601..743da012 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cs @@ -3,20 +3,10 @@ using System; using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.ViewModel.Common; - -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace CalculatorApp { diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs index 7b28dbbd..ba8b5b6a 100644 --- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml.cs @@ -3,28 +3,12 @@ // Declaration of the MyUserControl class // -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; //using Graphing; -using GraphControl; -using CalculatorApp; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; - -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.Storage; using Windows.System; using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; namespace CalculatorApp { diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs index 4c0f6598..ec49f869 100644 --- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs +++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs @@ -1,17 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Diagnostics; -using CalculatorApp; -using CalculatorApp.ViewModel; - -using Windows.UI; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; using System.ComponentModel; +using Windows.UI.Xaml; namespace CalculatorApp { diff --git a/src/Calculator/Views/HistoryList.xaml.cs b/src/Calculator/Views/HistoryList.xaml.cs index a473e561..69ecaaaa 100644 --- a/src/Calculator/Views/HistoryList.xaml.cs +++ b/src/Calculator/Views/HistoryList.xaml.cs @@ -1,6 +1,3 @@ -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; -using System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using MUXC = Microsoft.UI.Xaml.Controls; diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs index d8b5f249..6fba8ebf 100644 --- a/src/Calculator/Views/MainPage.xaml.cs +++ b/src/Calculator/Views/MainPage.xaml.cs @@ -1,8 +1,5 @@ using CalculatorApp.Common; using CalculatorApp.Converters; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; -using CalculatorApp.ViewModel.Common.Automation; using System; using System.Collections.Generic; using System.ComponentModel; @@ -49,9 +46,9 @@ namespace CalculatorApp m_model.PropertyChanged += OnAppPropertyChanged; m_accessibilitySettings = new AccessibilitySettings(); - if(Utilities.GetIntegratedDisplaySize(out var sizeInInches)) + if (Utilities.GetIntegratedDisplaySize(out var sizeInInches)) { - if(sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only + if (sizeInInches < 7.0) // If device's display size (diagonal length) is less than 7 inches then keep the calc always in Portrait mode only { DisplayInformation.AutoRotationPreferences = DisplayOrientations.Portrait | DisplayOrientations.PortraitFlipped; } @@ -150,7 +147,7 @@ namespace CalculatorApp { var graphCategory = (NavCategory)NavViewCategoriesSource.Find(x => { - if(x is NavCategory category) + if (x is NavCategory category) { return category.ViewMode == ViewMode.Graphing; } @@ -166,10 +163,10 @@ namespace CalculatorApp private List ExpandNavViewCategoryGroups(IEnumerable groups) { var result = new List(); - foreach(var group in groups) + foreach (var group in groups) { result.Add(group); - foreach(var category in group.Categories) + foreach (var category in group.Categories) { result.Add(category); } @@ -179,7 +176,7 @@ namespace CalculatorApp private void UpdatePopupSize(Windows.UI.Core.WindowSizeChangedEventArgs e) { - if(PopupContent != null) + if (PopupContent != null) { PopupContent.Width = e.Size.Width; PopupContent.Height = e.Size.Height; @@ -359,7 +356,7 @@ namespace CalculatorApp private void OnNavSelectionChanged(object sender, MUXC.NavigationViewSelectionChangedEventArgs e) { - if(e.IsSettingsSelected) + if (e.IsSettingsSelected) { ShowSettingsPopup(); return; diff --git a/src/Calculator/Views/Memory.xaml.cs b/src/Calculator/Views/Memory.xaml.cs index 4af2a8d7..7ee8b655 100644 --- a/src/Calculator/Views/Memory.xaml.cs +++ b/src/Calculator/Views/Memory.xaml.cs @@ -1,6 +1,3 @@ -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; -using System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/src/Calculator/Views/MemoryListItem.xaml.cs b/src/Calculator/Views/MemoryListItem.xaml.cs index 39cb0e7c..f9a7f319 100644 --- a/src/Calculator/Views/MemoryListItem.xaml.cs +++ b/src/Calculator/Views/MemoryListItem.xaml.cs @@ -1,5 +1,4 @@ -using System; -using Windows.UI.Xaml; +using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 diff --git a/src/Calculator/Views/NumberPad.xaml.cs b/src/Calculator/Views/NumberPad.xaml.cs index c4efe33b..0ac3ac1c 100644 --- a/src/Calculator/Views/NumberPad.xaml.cs +++ b/src/Calculator/Views/NumberPad.xaml.cs @@ -1,4 +1,3 @@ -using CalculatorApp.ViewModel.Common; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/src/Calculator/Views/Settings.xaml.cs b/src/Calculator/Views/Settings.xaml.cs index 196ee4c3..37c20e2e 100644 --- a/src/Calculator/Views/Settings.xaml.cs +++ b/src/Calculator/Views/Settings.xaml.cs @@ -1,21 +1,14 @@ using CalculatorApp.Utils; -using CalculatorApp.ViewModel.Common; using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel; -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.System; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using CalculatorApp.ViewModel.Common.Automation; using Windows.UI.Core; +using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Automation.Provider; +using Windows.UI.Xaml.Controls; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 diff --git a/src/Calculator/Views/StateTriggers/ControlSizeTrigger.cs b/src/Calculator/Views/StateTriggers/ControlSizeTrigger.cs index 0b3fc452..2cc55d52 100644 --- a/src/Calculator/Views/StateTriggers/ControlSizeTrigger.cs +++ b/src/Calculator/Views/StateTriggers/ControlSizeTrigger.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using System; - using Windows.Foundation; using Windows.UI.Xaml; diff --git a/src/Calculator/Views/SupplementaryResults.xaml.cs b/src/Calculator/Views/SupplementaryResults.xaml.cs index 680ecf4a..ce83cfc0 100644 --- a/src/Calculator/Views/SupplementaryResults.xaml.cs +++ b/src/Calculator/Views/SupplementaryResults.xaml.cs @@ -1,5 +1,4 @@ -using CalculatorApp.ViewModel; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using Windows.UI.Xaml; diff --git a/src/Calculator/Views/TitleBar.xaml.cs b/src/Calculator/Views/TitleBar.xaml.cs index ced0518a..6b8f0925 100644 --- a/src/Calculator/Views/TitleBar.xaml.cs +++ b/src/Calculator/Views/TitleBar.xaml.cs @@ -1,4 +1,3 @@ -using CalculatorApp.ViewModel.Common; using Windows.ApplicationModel.Core; using Windows.System.Profile; using Windows.UI.Core; @@ -89,7 +88,7 @@ namespace CalculatorApp private void RootFrame_RequestedThemeChanged(DependencyObject sender, DependencyProperty dp) { - if(Frame.RequestedThemeProperty == dp) + if (Frame.RequestedThemeProperty == dp) { _ = Dispatcher.RunAsync(CoreDispatcherPriority.Normal, new DispatchedHandler(() => { SetTitleBarControlColors(); })); } @@ -280,7 +279,8 @@ namespace CalculatorApp public static readonly DependencyProperty BackButtonSpaceReservedProperty = DependencyProperty.Register( nameof(BackButtonSpaceReserved), typeof(bool), typeof(TitleBar), - new PropertyMetadata(false, new PropertyChangedCallback((sender, args)=> { + new PropertyMetadata(false, new PropertyChangedCallback((sender, args) => + { var self = sender as TitleBar; VisualStateManager.GoToState( self, (bool)args.NewValue ? self.BackButtonVisible.Name : self.BackButtonCollapsed.Name, true); diff --git a/src/Calculator/Views/UnitConverter.xaml.cs b/src/Calculator/Views/UnitConverter.xaml.cs index a7873728..afb6a4b3 100644 --- a/src/Calculator/Views/UnitConverter.xaml.cs +++ b/src/Calculator/Views/UnitConverter.xaml.cs @@ -1,7 +1,5 @@ using CalculatorApp.Common; using CalculatorApp.Controls; -using CalculatorApp.ViewModel; -using CalculatorApp.ViewModel.Common; using System; using System.ComponentModel; using System.Diagnostics; diff --git a/src/Calculator/WindowFrameService.cs b/src/Calculator/WindowFrameService.cs index a36e5f12..ed425dd5 100644 --- a/src/Calculator/WindowFrameService.cs +++ b/src/Calculator/WindowFrameService.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using CalculatorApp.Common; -using CalculatorApp.ViewModel.Common; using System; using System.Collections.Generic; using System.Data; diff --git a/src/CalculatorUITestFramework/CalculatorResults.cs b/src/CalculatorUITestFramework/CalculatorResults.cs index bef7a423..a2c23ada 100644 --- a/src/CalculatorUITestFramework/CalculatorResults.cs +++ b/src/CalculatorUITestFramework/CalculatorResults.cs @@ -3,7 +3,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium.Windows; using System; -using OpenQA.Selenium.Interactions; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/HistoryItem.cs b/src/CalculatorUITestFramework/HistoryItem.cs index 6faabf15..2d4c4245 100644 --- a/src/CalculatorUITestFramework/HistoryItem.cs +++ b/src/CalculatorUITestFramework/HistoryItem.cs @@ -2,9 +2,6 @@ // Licensed under the MIT License. using OpenQA.Selenium.Appium; -using System; -using System.Collections.Generic; -using System.Text; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/HistoryPanel.cs b/src/CalculatorUITestFramework/HistoryPanel.cs index 849c1f31..ff794180 100644 --- a/src/CalculatorUITestFramework/HistoryPanel.cs +++ b/src/CalculatorUITestFramework/HistoryPanel.cs @@ -2,11 +2,9 @@ // Licensed under the MIT License. using OpenQA.Selenium; -using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Drawing; using System.Linq; diff --git a/src/CalculatorUITestFramework/MemoryItem.cs b/src/CalculatorUITestFramework/MemoryItem.cs index 2f6838ff..7a1a93c0 100644 --- a/src/CalculatorUITestFramework/MemoryItem.cs +++ b/src/CalculatorUITestFramework/MemoryItem.cs @@ -2,9 +2,6 @@ // Licensed under the MIT License. using OpenQA.Selenium.Appium; -using System; -using System.Collections.Generic; -using System.Text; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/MemoryPanel.cs b/src/CalculatorUITestFramework/MemoryPanel.cs index e8cc3f80..3b202b61 100644 --- a/src/CalculatorUITestFramework/MemoryPanel.cs +++ b/src/CalculatorUITestFramework/MemoryPanel.cs @@ -3,11 +3,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium; -using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Windows; using OpenQA.Selenium.Interactions; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Drawing; using System.Linq; diff --git a/src/CalculatorUITestFramework/NavigationMenu.cs b/src/CalculatorUITestFramework/NavigationMenu.cs index fcfb8c62..8c2c732a 100644 --- a/src/CalculatorUITestFramework/NavigationMenu.cs +++ b/src/CalculatorUITestFramework/NavigationMenu.cs @@ -44,7 +44,7 @@ namespace CalculatorUITestFramework switch (mode) { case CalculatorMode.StandardCalculator: - modeAccessibilityId = "Standard"; + modeAccessibilityId = "Standard"; break; case CalculatorMode.ScientificCalculator: modeAccessibilityId = "Scientific"; diff --git a/src/CalculatorUITestFramework/ProgrammerCalculatorPage.cs b/src/CalculatorUITestFramework/ProgrammerCalculatorPage.cs index 451b6639..862643c2 100644 --- a/src/CalculatorUITestFramework/ProgrammerCalculatorPage.cs +++ b/src/CalculatorUITestFramework/ProgrammerCalculatorPage.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium.Windows; namespace CalculatorUITestFramework diff --git a/src/CalculatorUITestFramework/ProgrammerOperatorsPanel.cs b/src/CalculatorUITestFramework/ProgrammerOperatorsPanel.cs index 1e23a44e..60aa92ca 100644 --- a/src/CalculatorUITestFramework/ProgrammerOperatorsPanel.cs +++ b/src/CalculatorUITestFramework/ProgrammerOperatorsPanel.cs @@ -3,11 +3,6 @@ using OpenQA.Selenium; using OpenQA.Selenium.Appium.Windows; -using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Runtime.InteropServices.ComTypes; -using System; -using System.Diagnostics; namespace CalculatorUITestFramework { @@ -192,7 +187,7 @@ namespace CalculatorUITestFramework else { throw new NotFoundException("Could not find word size buttons in page source"); - } + } } public void ResetNumberSystem() { diff --git a/src/CalculatorUITestFramework/ScientificCalculatorPage.cs b/src/CalculatorUITestFramework/ScientificCalculatorPage.cs index 28943e5c..fa6e1d48 100644 --- a/src/CalculatorUITestFramework/ScientificCalculatorPage.cs +++ b/src/CalculatorUITestFramework/ScientificCalculatorPage.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium.Windows; namespace CalculatorUITestFramework diff --git a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs b/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs index 0971ddda..b259ee12 100644 --- a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs +++ b/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs @@ -3,11 +3,7 @@ using OpenQA.Selenium; using OpenQA.Selenium.Appium.Windows; -using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Runtime.InteropServices.ComTypes; using System; -using System.Diagnostics; namespace CalculatorUITestFramework { @@ -112,25 +108,25 @@ namespace CalculatorUITestFramework public void SetAngleOperator(AngleOperatorState value) { //set the desired string value for the button - string desiredId; - switch (value) - { - case AngleOperatorState.Degrees: - desiredId = "degButton"; - break; - case AngleOperatorState.Gradians: - desiredId = "gradButton"; - break; - case AngleOperatorState.Radians: - desiredId = "radButton"; - break; - default: - throw new NotImplementedException(); - } - while (this.DegRadGradButton.GetAttribute("AutomationId") != desiredId) - { - this.DegRadGradButton.Click(); - } + string desiredId; + switch (value) + { + case AngleOperatorState.Degrees: + desiredId = "degButton"; + break; + case AngleOperatorState.Gradians: + desiredId = "gradButton"; + break; + case AngleOperatorState.Radians: + desiredId = "radButton"; + break; + default: + throw new NotImplementedException(); + } + while (this.DegRadGradButton.GetAttribute("AutomationId") != desiredId) + { + this.DegRadGradButton.Click(); + } } public void ResetFEButton(FEButtonState value) diff --git a/src/CalculatorUITestFramework/UnitConverterOperatorsPanel.cs b/src/CalculatorUITestFramework/UnitConverterOperatorsPanel.cs index 83d83224..b00b4c8c 100644 --- a/src/CalculatorUITestFramework/UnitConverterOperatorsPanel.cs +++ b/src/CalculatorUITestFramework/UnitConverterOperatorsPanel.cs @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using OpenQA.Selenium.Appium.Windows; -using System; -using System.Collections.Generic; -using System.Text; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/UnitConverterPage.cs b/src/CalculatorUITestFramework/UnitConverterPage.cs index 516cf898..2bad0b0b 100644 --- a/src/CalculatorUITestFramework/UnitConverterPage.cs +++ b/src/CalculatorUITestFramework/UnitConverterPage.cs @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. using OpenQA.Selenium.Appium.Windows; -using System; -using System.Collections.Generic; -using System.Text; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/UnitConverterResults.cs b/src/CalculatorUITestFramework/UnitConverterResults.cs index 474fb9bd..4b3c4227 100644 --- a/src/CalculatorUITestFramework/UnitConverterResults.cs +++ b/src/CalculatorUITestFramework/UnitConverterResults.cs @@ -2,8 +2,6 @@ // Licensed under the MIT License. using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium.Windows; -using System; -using OpenQA.Selenium.Interactions; using System.Text.RegularExpressions; namespace CalculatorUITestFramework diff --git a/src/CalculatorUITestFramework/WinAppDriver.cs b/src/CalculatorUITestFramework/WinAppDriver.cs index df1e83be..2842e3c3 100644 --- a/src/CalculatorUITestFramework/WinAppDriver.cs +++ b/src/CalculatorUITestFramework/WinAppDriver.cs @@ -5,7 +5,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Windows; using System; -using System.Diagnostics; namespace CalculatorUITestFramework { diff --git a/src/CalculatorUITestFramework/WindowsElementExtensions.cs b/src/CalculatorUITestFramework/WindowsElementExtensions.cs index a1937727..e0a52c66 100644 --- a/src/CalculatorUITestFramework/WindowsElementExtensions.cs +++ b/src/CalculatorUITestFramework/WindowsElementExtensions.cs @@ -4,7 +4,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.Logging; using OpenQA.Selenium.Appium.Windows; -using System; using System.Diagnostics; using System.Threading; diff --git a/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs b/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs index e102c3c4..787a909f 100644 --- a/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs +++ b/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs @@ -2,8 +2,6 @@ // Licensed under the MIT License. using CalculatorUITestFramework; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OpenQA.Selenium; -using System; namespace CalculatorUITests { diff --git a/src/CalculatorUITests/ScientificModeFunctionalTests.cs b/src/CalculatorUITests/ScientificModeFunctionalTests.cs index eaccc1ee..59351a44 100644 --- a/src/CalculatorUITests/ScientificModeFunctionalTests.cs +++ b/src/CalculatorUITests/ScientificModeFunctionalTests.cs @@ -3,10 +3,6 @@ using CalculatorUITestFramework; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OpenQA.Selenium; -using OpenQA.Selenium.Appium.Windows; -using System; -using System.Collections.Generic; namespace CalculatorUITests {