From 4947072e378df7a22ceb5ac8ba111b4f5a8c2b67 Mon Sep 17 00:00:00 2001 From: tian-lt Date: Fri, 4 Jun 2021 00:32:08 +0800 Subject: [PATCH] resolve some warnings --- src/Calculator/App.xaml.cs | 3 --- .../Common/AlwaysSelectedCollectionView.cs | 6 +++++- src/Calculator/Controls/OverflowTextBlock.cs | 2 -- src/Calculator/EquationStylePanelControl.xaml.cs | 3 --- src/Calculator/Views/Calculator.xaml.cs | 2 -- .../CalculatorProgrammerRadixOperators.xaml.cs | 15 ++++++++++++++- .../CalculatorScientificAngleButtons.xaml.cs | 14 +++++++++++++- .../Views/CalculatorScientificOperators.xaml.cs | 1 - src/Calculator/Views/HistoryList.xaml.cs | 3 --- src/Calculator/Views/Memory.xaml.cs | 2 -- src/Calculator/Views/UnitConverter.xaml.cs | 10 +++++----- 11 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/Calculator/App.xaml.cs b/src/Calculator/App.xaml.cs index ac0006f2..d1345fcc 100644 --- a/src/Calculator/App.xaml.cs +++ b/src/Calculator/App.xaml.cs @@ -499,9 +499,6 @@ namespace CalculatorApp private Dictionary m_secondaryWindows = new Dictionary(); private int m_mainViewId; private bool m_preLaunched; - - // CSHARP_MIGRATION: TODO: check whether or not this field is in use. - private Windows.UI.Xaml.Controls.Primitives.Popup m_aboutPopup; } } diff --git a/src/Calculator/Common/AlwaysSelectedCollectionView.cs b/src/Calculator/Common/AlwaysSelectedCollectionView.cs index 5a89a8e0..0847a5ab 100644 --- a/src/Calculator/Common/AlwaysSelectedCollectionView.cs +++ b/src/Calculator/Common/AlwaysSelectedCollectionView.cs @@ -223,8 +223,12 @@ namespace CalculatorApp } public event EventHandler CurrentChanged; - public event CurrentChangingEventHandler CurrentChanging; // CSHARP_MIGRATION: TODO: check why this member is never being used. public event VectorChangedEventHandler VectorChanged; + public event CurrentChangingEventHandler CurrentChanging + { + add => throw new NotImplementedException(); + remove => throw new NotImplementedException(); + } IList m_source; int m_currentPosition; diff --git a/src/Calculator/Controls/OverflowTextBlock.cs b/src/Calculator/Controls/OverflowTextBlock.cs index 2d7ee443..3f69a751 100644 --- a/src/Calculator/Controls/OverflowTextBlock.cs +++ b/src/Calculator/Controls/OverflowTextBlock.cs @@ -38,7 +38,6 @@ namespace CalculatorApp public OverflowTextBlock() { m_isAccessibilityViewControl = false; - m_ignoreViewChanged = false; m_expressionContent = null; m_itemsControl = null; m_expressionContainer = null; @@ -322,7 +321,6 @@ namespace CalculatorApp private const double SCROLL_RATIO = 0.7; private bool m_isAccessibilityViewControl; - private bool m_ignoreViewChanged; private Windows.UI.Xaml.FrameworkElement m_expressionContent; private Windows.UI.Xaml.Controls.ItemsControl m_itemsControl; private Windows.UI.Xaml.Controls.ScrollViewer m_expressionContainer; diff --git a/src/Calculator/EquationStylePanelControl.xaml.cs b/src/Calculator/EquationStylePanelControl.xaml.cs index 39c4d0cb..f1f80f6f 100644 --- a/src/Calculator/EquationStylePanelControl.xaml.cs +++ b/src/Calculator/EquationStylePanelControl.xaml.cs @@ -107,14 +107,11 @@ namespace CalculatorApp { case EquationLineStyle.Dot: return resourceLoader.GetResourceString("dotLineStyleAutomationName"); - break; case EquationLineStyle.Dash: return resourceLoader.GetResourceString("dashLineStyleAutomationName"); - break; case EquationLineStyle.Solid: default: return resourceLoader.GetResourceString("solidLineStyleAutomationName"); - break; } } diff --git a/src/Calculator/Views/Calculator.xaml.cs b/src/Calculator/Views/Calculator.xaml.cs index 6abc1b01..34ff3433 100644 --- a/src/Calculator/Views/Calculator.xaml.cs +++ b/src/Calculator/Views/Calculator.xaml.cs @@ -629,7 +629,6 @@ namespace CalculatorApp } } - private Windows.UI.Xaml.Controls.ListView m_tokenList; private Windows.UI.Xaml.Controls.MenuFlyout m_displayFlyout; private bool m_doAnimate; private bool m_resultAnimate; @@ -646,7 +645,6 @@ namespace CalculatorApp private string m_dockPanelMemoryList; private Windows.UI.Xaml.Controls.PivotItem m_pivotItem; - private bool m_IsDigit = false; private Memory m_memory; private void HistoryFlyout_Opened(object sender, object args) diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs index 92ffd04f..419c4e5c 100644 --- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cs @@ -34,7 +34,20 @@ namespace CalculatorApp get { return (StandardCalculatorViewModel)this.DataContext; } } - public bool IsErrorVisualState { get; set; } + public bool IsErrorVisualState + { + get => m_isErrorVisualState; + set + { + if(m_isErrorVisualState != value) + { + m_isErrorVisualState = value; + string newState = m_isErrorVisualState ? "ErrorLayout" : "NoErrorLayout"; + VisualStateManager.GoToState(this, newState, false); + NumberPad.IsErrorVisualState = m_isErrorVisualState; + } + } + } public string ParenthesisCountToString(uint count) { diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs index ce4d228f..783aae1f 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs @@ -60,7 +60,19 @@ namespace CalculatorApp } private System.Windows.Input.ICommand donotuse_ButtonPressed; - public bool IsErrorVisualState { get; set; } + public bool IsErrorVisualState + { + get => m_isErrorVisualState; + set + { + if(m_isErrorVisualState != value) + { + m_isErrorVisualState = value; + string newState = m_isErrorVisualState ? "ErrorFlyout" : "NoErrorFlyout"; + VisualStateManager.GoToState(this, newState, false); + } + } + } private void OnAngleButtonPressed(object commandParameter) { diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs index d9d17143..d1e1fd97 100644 --- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cs +++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cs @@ -26,7 +26,6 @@ using Windows.UI.Xaml.Data; using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; -using Windows.UI.Core; namespace CalculatorApp { diff --git a/src/Calculator/Views/HistoryList.xaml.cs b/src/Calculator/Views/HistoryList.xaml.cs index ca111671..14faadd2 100644 --- a/src/Calculator/Views/HistoryList.xaml.cs +++ b/src/Calculator/Views/HistoryList.xaml.cs @@ -43,9 +43,6 @@ namespace CalculatorApp public static readonly DependencyProperty RowHeightProperty = DependencyProperty.Register(nameof(RowHeight), typeof(Windows.UI.Xaml.GridLength), typeof(HistoryList), new PropertyMetadata(default(Windows.UI.Xaml.GridLength))); - private Windows.Foundation.Rect m_visibleBounds; - private Windows.Foundation.Rect m_coreBounds; - private void ListView_ItemClick(object sender, ItemClickEventArgs e) { HistoryViewModel historyVM = (DataContext as HistoryViewModel); diff --git a/src/Calculator/Views/Memory.xaml.cs b/src/Calculator/Views/Memory.xaml.cs index 65b5ccca..4af2a8d7 100644 --- a/src/Calculator/Views/Memory.xaml.cs +++ b/src/Calculator/Views/Memory.xaml.cs @@ -49,8 +49,6 @@ namespace CalculatorApp } } - private Windows.Foundation.Rect m_visibleBounds; - private Windows.Foundation.Rect m_coreBounds; private bool m_isErrorVisualState = false; private void MemoryListItemClick(object sender, ItemClickEventArgs e) diff --git a/src/Calculator/Views/UnitConverter.xaml.cs b/src/Calculator/Views/UnitConverter.xaml.cs index febe9953..a5ca4668 100644 --- a/src/Calculator/Views/UnitConverter.xaml.cs +++ b/src/Calculator/Views/UnitConverter.xaml.cs @@ -48,7 +48,7 @@ namespace CalculatorApp get => this.m_FlowDirectionHorizontalAlignment; } - private Windows.UI.Xaml.HorizontalAlignment m_FlowDirectionHorizontalAlignment; + private Windows.UI.Xaml.HorizontalAlignment m_FlowDirectionHorizontalAlignment = default(HorizontalAlignment); public void AnimateConverter() { @@ -373,11 +373,11 @@ namespace CalculatorApp } private static Lazy uiSettings = new Lazy(true); - private Windows.UI.Xaml.FlowDirection m_layoutDirection; - private Windows.UI.Xaml.Controls.MenuFlyout m_resultsFlyout; + private Windows.UI.Xaml.FlowDirection m_layoutDirection = default(FlowDirection); + private Windows.UI.Xaml.Controls.MenuFlyout m_resultsFlyout = default(MenuFlyout); - private string m_chargesMayApplyText; - private string m_failedToRefreshText; + private string m_chargesMayApplyText = string.Empty; + private string m_failedToRefreshText = string.Empty; private bool m_meteredConnectionOverride;