Update dependencies

Kinnara · May 14, 2020 · 2e24f4a · 2e24f4a
1 parent 36a4b01
commit 2e24f4a
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 27 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.9.0-preview.200505.0</Version>
+    <Version>0.9.0-preview.200515.2</Version>
     <Authors>Yimeng Wu</Authors>
     <Product>ModernWPF UI Library</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuBackRequestedEventArgs.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuBackRequestedEventArgs.cs
@@ -1,8 +1,11 @@
-namespace ModernWpf.MahApps.Controls
+using System;
+
+namespace ModernWpf.MahApps.Controls
 {
     /// <summary>
     /// Provides event data for the HamburgerMenuEx.BackRequested event.
     /// </summary>
+    [Obsolete]
     public sealed class HamburgerMenuBackRequestedEventArgs
     {
         internal HamburgerMenuBackRequestedEventArgs()

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuDisplayModeChangedEventArgs.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuDisplayModeChangedEventArgs.cs
@@ -1,10 +1,12 @@
 using MahApps.Metro.Controls;
+using System;
 
 namespace ModernWpf.MahApps.Controls
 {
     /// <summary>
     /// Provides event data for the HamburgerMenuEx.DisplayModeChanged event.
     /// </summary>
+    [Obsolete]
     public sealed class HamburgerMenuDisplayModeChangedEventArgs
     {
         internal HamburgerMenuDisplayModeChangedEventArgs(SplitViewDisplayMode displayMode)

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuEx.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuEx.cs
@@ -20,6 +20,7 @@ namespace ModernWpf.MahApps.Controls
     /// Represents a container that enables navigation of app content. It has a header,
     /// a view for the main content, and a menu pane for navigation commands.
     /// </summary>
+    [Obsolete]
     [TemplatePart(Name = c_navViewBackButton, Type = typeof(Button))]
     public class HamburgerMenuEx : HamburgerMenu
     {

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuSelectionChangedEventArgs.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuSelectionChangedEventArgs.cs
@@ -1,8 +1,11 @@
-namespace ModernWpf.MahApps.Controls
+using System;
+
+namespace ModernWpf.MahApps.Controls
 {
     /// <summary>
     /// Provides data for the HamburgerMenuEx.SelectionChanged event.
     /// </summary>
+    [Obsolete]
     public sealed class HamburgerMenuSelectionChangedEventArgs
     {
         /// <summary>

diff --git a/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuTitleBarPaddingConverter.cs b/ModernWpf.MahApps/HamburgerMenu/HamburgerMenuTitleBarPaddingConverter.cs
@@ -5,6 +5,7 @@
 
 namespace ModernWpf.MahApps.Controls
 {
+    [Obsolete]
     public class HamburgerMenuTitleBarPaddingConverter : IMultiValueConverter
     {
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)

diff --git a/ModernWpf.MahApps/ModernWpf.MahApps.csproj b/ModernWpf.MahApps/ModernWpf.MahApps.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0748" />
+    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0821" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ModernWpf.MahApps/TimePicker/SimpleTimePicker.cs b/ModernWpf.MahApps/TimePicker/SimpleTimePicker.cs
@@ -17,11 +17,14 @@ namespace ModernWpf.MahApps.Controls
     [ContentProperty(nameof(Header))]
     public class SimpleTimePicker : TimePicker
     {
+        private const string ElementPopup = "PART_Popup";
         private const string ElementAmPmSwitcher = "PART_AmPmSwitcher";
         private const string ElementHourPicker = "PART_HourPicker";
         private const string ElementMinutePicker = "PART_MinutePicker";
         private const string ElementSecondPicker = "PART_SecondPicker";
 
+        private Popup _popup;
+
         private DateTimeComponentSelector _ampmSwitcher;
         private DateTimeComponentSelector _hourInput;
         private DateTimeComponentSelector _minuteInput;
@@ -38,6 +41,7 @@ static SimpleTimePicker()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(SimpleTimePicker), new FrameworkPropertyMetadata(typeof(SimpleTimePicker)));
 
+            SelectedDateTimeProperty.OverrideMetadata(typeof(SimpleTimePicker), new FrameworkPropertyMetadata(OnSelectedDateTimeChanged));
             IsDropDownOpenProperty.OverrideMetadata(typeof(SimpleTimePicker), new FrameworkPropertyMetadata(OnIsDropDownOpenChanged));
         }
 
@@ -53,8 +57,8 @@ public SimpleTimePicker()
         /// <summary>
         /// Identifies the UseSystemFocusVisuals dependency property.
         /// </summary>
-         public static readonly DependencyProperty UseSystemFocusVisualsProperty =
-            FocusVisualHelper.UseSystemFocusVisualsProperty.AddOwner(typeof(SimpleTimePicker));
+        public static readonly DependencyProperty UseSystemFocusVisualsProperty =
+           FocusVisualHelper.UseSystemFocusVisualsProperty.AddOwner(typeof(SimpleTimePicker));
 
         /// <summary>
         /// Gets or sets a value that indicates whether the control uses focus visuals that
@@ -206,6 +210,9 @@ private IEnumerable<DateTimeComponentSelector> Selectors
         /// </summary>
         public override void OnApplyTemplate()
         {
+            UnSubscribeEvents();
+
+            _popup = GetTemplateChild(ElementPopup) as Popup;
             _hourInput = GetTemplateChild(ElementHourPicker) as DateTimeComponentSelector;
             _minuteInput = GetTemplateChild(ElementMinutePicker) as DateTimeComponentSelector;
             _secondInput = GetTemplateChild(ElementSecondPicker) as DateTimeComponentSelector;
@@ -219,6 +226,7 @@ public override void OnApplyTemplate()
 
             base.OnApplyTemplate();
 
+            SubscribeEvents();
             UpdateTextBlocks();
         }
 
@@ -230,13 +238,11 @@ protected override void OnIsKeyboardFocusWithinChanged(DependencyPropertyChanged
             }
         }
 
-        protected override void SubscribeEvents()
+        private void SubscribeEvents()
         {
-            base.SubscribeEvents();
-
-            if (Popup != null)
+            if (_popup != null)
             {
-                Popup.Opened += OnPopupOpened;
+                _popup.Opened += OnPopupOpened;
             }
 
             if (_acceptButton != null)
@@ -250,13 +256,11 @@ protected override void SubscribeEvents()
             }
         }
 
-        protected override void UnSubscribeEvents()
+        private void UnSubscribeEvents()
         {
-            base.UnSubscribeEvents();
-
-            if (Popup != null)
+            if (_popup != null)
             {
-                Popup.Opened -= OnPopupOpened;
+                _popup.Opened -= OnPopupOpened;
             }
 
             if (_acceptButton != null)
@@ -288,11 +292,10 @@ protected override void ApplyCulture()
             }
         }
 
-        protected override void OnSelectedTimeChanged(TimePickerBaseSelectionChangedEventArgs<DateTime?> e)
+        private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            base.OnSelectedTimeChanged(e);
-
-            UpdateTextBlocks();
+            var timePicker = (SimpleTimePicker)d;
+            timePicker.UpdateTextBlocks();
         }
 
         private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -389,9 +392,9 @@ private void OnPopupOpened(object sender, EventArgs e)
         private void ClosePopup()
         {
             SetCurrentValue(IsDropDownOpenProperty, false);
-            if (Popup != null && Popup.IsOpen)
+            if (_popup != null && _popup.IsOpen)
             {
-                Popup.IsOpen = false;
+                _popup.IsOpen = false;
             }
         }
 

diff --git a/samples/MahAppsSample/ControlPages/SimpleTimePickerPage.xaml.cs b/samples/MahAppsSample/ControlPages/SimpleTimePickerPage.xaml.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
 
 namespace MahAppsSample.ControlPages
 {
@@ -13,7 +12,7 @@ public SimpleTimePickerPage()
             InitializeComponent();
         }
 
-        private void TimePicker_SelectedDateTimeChanged(object sender, TimePickerBaseSelectionChangedEventArgs<DateTime?> e)
+        private void TimePicker_SelectedDateTimeChanged(object sender, RoutedPropertyChangedEventArgs<DateTime?> e)
         {
             Debug.WriteLine(e.NewValue?.ToShortTimeString() ?? "null");
         }

diff --git a/samples/MahAppsSample/MahAppsSample.csproj b/samples/MahAppsSample/MahAppsSample.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0748" />
+    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0821" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/ModernWpf.Test/ModernWpf.Test.csproj b/test/ModernWpf.Test/ModernWpf.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
     <PackageReference Include="coverlet.collector" Version="1.2.1">

diff --git a/test/ModernWpfTestApp/ModernWpfTestApp.csproj b/test/ModernWpfTestApp/ModernWpfTestApp.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
     <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />