remove locks

Author: vgromfeld

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind

@@ -153,7 +153,8 @@
                           <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        <ContentPresenter x:Name="PART_Presenter"
+                                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                           HorizontalContentAlignment="Stretch"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           VerticalContentAlignment="Center"
@@ -333,7 +334,8 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                <ContentPresenter x:Name="PART_Presenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                                   HorizontalContentAlignment="Stretch"
                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                   VerticalContentAlignment="Center"

Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs

@@ -28,5 +28,10 @@ public partial class InAppNotification
         /// Key of the UI Element that dismiss the control
         /// </summary>
         private const string DismissButtonPart = "PART_DismissButton";
+
+        /// <summary>
+        /// Key of the UI Element that will display the notification content.
+        /// </summary>
+        private const string ContentPresenterPart = "PART_Presenter";
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs

@@ -35,6 +35,19 @@ public partial class InAppNotification
         /// </summary>
         public event InAppNotificationClosedEventHandler Closed;
 
+        private static void AutomateTextNotification(AutomationPeer peer, string message)
+        {
+            if (peer != null)
+            {
+                peer.SetFocus();
+                peer.RaiseNotificationEvent(
+                    AutomationNotificationKind.Other,
+                    AutomationNotificationProcessing.ImportantMostRecent,
+                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
+                    Guid.NewGuid().ToString());
+            }
+        }
+
         private void DismissButton_Click(object sender, RoutedEventArgs e)
         {
             Dismiss(InAppNotificationDismissKind.User);
@@ -45,44 +58,37 @@ private void DismissTimer_Tick(object sender, object e)
             Dismiss(InAppNotificationDismissKind.Timeout);
         }
 
-        private void OpenAnimationTimer_Tick(object sender, object e)
+        private void OnCurrentStateChanged(object sender, VisualStateChangedEventArgs e)
         {
-            lock (_openAnimationTimer)
+            switch (e.NewState.Name)
             {
-                _openAnimationTimer.Stop();
-                Opened?.Invoke(this, EventArgs.Empty);
-                SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
-                if (ContentTemplateRoot != null)
-                {
-                    var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
-                    if (Content?.GetType() == typeof(string))
-                    {
-                        AutomateTextNotification(peer, Content.ToString());
-                    }
-                }
+                case StateContentVisible:
+                    OnNotificationVisible();
+                    break;
+                case StateContentCollapsed:
+                    OnNotificationCollapsed();
+                    break;
             }
         }
 
-        private void AutomateTextNotification(AutomationPeer peer, string message)
+        private void OnNotificationVisible()
         {
-            if (peer != null)
+            Opened?.Invoke(this, EventArgs.Empty);
+            SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
+            if (ContentTemplateRoot != null)
             {
-                peer.SetFocus();
-                peer.RaiseNotificationEvent(
-                    AutomationNotificationKind.Other,
-                    AutomationNotificationProcessing.ImportantMostRecent,
-                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
-                    Guid.NewGuid().ToString());
+                var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
+                if (Content?.GetType() == typeof(string))
+                {
+                    AutomateTextNotification(peer, Content.ToString());
+                }
             }
         }
 
-        private void ClosingAnimationTimer_Tick(object sender, object e)
+        private void OnNotificationCollapsed()
         {
-            lock (_closingAnimationTimer)
-            {
-                _closingAnimationTimer.Stop();
-                Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
-            }
+            Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
+            Visibility = Visibility.Collapsed;
         }
     }
 }