From 9eb43451cd0873c0d12e8cf32c25ea75fbadc04a Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 16:27:44 -0400
Subject: [PATCH 01/16] Add basic fade in/fade out animations

---
 .../Controls/NotificationMessage.cs           |  5 ++++
 .../Controls/NotificationMessageContainer.cs  | 26 ++++++++++++++++++-
 .../INotificationMessage.cs                   |  6 +++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 8a44d21..6b1e7ec 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -145,6 +145,11 @@ public ObservableCollection<object> Buttons
             set => SetValue(ButtonsProperty, value);
         }
 
+        public UIElement AnimatableElement
+        {
+            get => this;
+        }
+
         /// <summary>
         /// The overlay content property.
         /// </summary>
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 706181f..0dc6e6b 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media.Animation;
 
 namespace Enterwell.Clients.Wpf.Notifications.Controls
 {
@@ -79,7 +80,16 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            this.Items?.Remove(args.Message);
+            var animation = new DoubleAnimation
+            {
+                To = 0,
+                BeginTime = TimeSpan.FromSeconds(0),
+                Duration = TimeSpan.FromSeconds(0.25),
+                FillBehavior = FillBehavior.Stop
+            };
+            animation.Completed += (s, a) => this.Items?.Remove(args.Message);
+
+            (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
         }
 
         /// <summary>
@@ -95,6 +105,20 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                     "Can't use both ItemsSource and Items collection at the same time.");
 
             this.Items?.Add(args.Message);
+            if (args.Message.AnimatableElement is UIElement)
+            {
+                (args.Message.AnimatableElement as UIElement).Opacity = 0;
+                var animation = new DoubleAnimation
+                {
+                    To = 1,
+                    BeginTime = TimeSpan.FromSeconds(0),
+                    Duration = TimeSpan.FromSeconds(0.25),
+                    FillBehavior = FillBehavior.Stop
+                };
+                animation.Completed += (s, a) => (args.Message.AnimatableElement as UIElement).Opacity = 1;
+
+                (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
+            }
         }
 
         /// <summary>
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
index 63c932e..bc91a3f 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
@@ -112,5 +112,11 @@ public interface INotificationMessage
         /// The text brush.
         /// </value>
         Brush Foreground { get; set; }
+
+        /// <summary>
+        /// Gets the animatable Message element for add/remove transitions.
+        /// Typically this is the whole Control object.
+        /// </summary>
+        UIElement AnimatableElement { get; }
     }
 }
\ No newline at end of file

From 18837e9fb90f329a3a2b28a5d5117791ee4aed99 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 16:35:19 -0400
Subject: [PATCH 02/16] Make animations optional

---
 .../Controls/NotificationMessage.cs           | 18 +++++++++++++
 .../Controls/NotificationMessageContainer.cs  | 27 ++++++++++++-------
 .../INotificationMessage.cs                   |  8 +++++-
 .../NotificationMessageBuilder.cs             |  9 +++++++
 .../NotificationMessageBuilderLinq.cs         | 15 +++++++++++
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 6b1e7ec..df0d75f 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -145,6 +145,18 @@ public ObservableCollection<object> Buttons
             set => SetValue(ButtonsProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets whether the message nimates.
+        /// </summary>
+        /// <value>
+        /// Whether or not the message animates.
+        /// </value>
+        public bool Animates
+        {
+            get => (bool)GetValue(AnimatesProperty);
+            set => SetValue(AnimatesProperty, value);
+        }
+
         public UIElement AnimatableElement
         {
             get => this;
@@ -286,6 +298,12 @@ private static void MessagePropertyChangesCallback(DependencyObject dependencyOb
         public static readonly DependencyProperty ButtonsProperty =
             DependencyProperty.Register("Buttons", typeof(ObservableCollection<object>), typeof(NotificationMessage), new PropertyMetadata(null));
 
+        /// <summary>
+        /// The animates property.
+        /// </summary>
+        public static readonly DependencyProperty AnimatesProperty =
+            DependencyProperty.Register("Animates", typeof(bool), typeof(NotificationMessage), new PropertyMetadata(false));
+
 
         /// <summary>
         /// Initializes the <see cref="NotificationMessage" /> class.
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 0dc6e6b..2c5e559 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -80,16 +80,23 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            var animation = new DoubleAnimation
+            if (args.Message.Animates && args.Message.AnimatableElement is UIElement)
             {
-                To = 0,
-                BeginTime = TimeSpan.FromSeconds(0),
-                Duration = TimeSpan.FromSeconds(0.25),
-                FillBehavior = FillBehavior.Stop
-            };
-            animation.Completed += (s, a) => this.Items?.Remove(args.Message);
+                var animation = new DoubleAnimation
+                {
+                    To = 0,
+                    BeginTime = TimeSpan.FromSeconds(0),
+                    Duration = TimeSpan.FromSeconds(0.25),
+                    FillBehavior = FillBehavior.Stop
+                };
+                animation.Completed += (s, a) => this.Items?.Remove(args.Message);
 
-            (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
+                (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
+            }
+            else
+            {
+                this.Items?.Remove(args.Message);
+            }
         }
 
         /// <summary>
@@ -105,7 +112,7 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                     "Can't use both ItemsSource and Items collection at the same time.");
 
             this.Items?.Add(args.Message);
-            if (args.Message.AnimatableElement is UIElement)
+            if (args.Message.Animates && args.Message.AnimatableElement is UIElement)
             {
                 (args.Message.AnimatableElement as UIElement).Opacity = 0;
                 var animation = new DoubleAnimation
@@ -117,7 +124,7 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                 };
                 animation.Completed += (s, a) => (args.Message.AnimatableElement as UIElement).Opacity = 1;
 
-                (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
+                (args.Message.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
             }
         }
 
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
index bc91a3f..72cbbee 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
@@ -113,9 +113,15 @@ public interface INotificationMessage
         /// </value>
         Brush Foreground { get; set; }
 
+        /// <summary>
+        /// Gets or sets whether the message animates in and out.
+        /// </summary>
+        bool Animates { get; set; }
+
         /// <summary>
         /// Gets the animatable Message element for add/remove transitions.
-        /// Typically this is the whole Control object.
+        /// Typically this is the whole Control object so that the entire
+        /// item can be animated.
         /// </summary>
         UIElement AnimatableElement { get; }
     }
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index 04dd4fc..8b9e3aa 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -109,6 +109,15 @@ public void SetForeground(Brush brush)
             this.Message.Foreground = brush;
         }
 
+        /// <summary>
+        /// Sets whether or not the message animates.
+        /// </summary>
+        /// <param name="animates"></param>
+        public void SetAnimates(bool animates)
+        {
+            this.Message.Animates = animates;
+        }
+
         /// <summary>
         /// Queues the message to manager.
         /// </summary>
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
index 1482c73..269fd3d 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -282,5 +282,20 @@ public static NotificationMessageBuilder Foreground(
 
             return builder;
         }
+
+        /// <summary>
+        /// Sets whether or not the message animates.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="animates">Whether or not the message should animate.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder Animates(
+            this NotificationMessageBuilder builder,
+            bool animates)
+        {
+            builder.SetAnimates(animates);
+
+            return builder;
+        }
     }
 }
\ No newline at end of file

From d75b9f4301c87f7cd8fa551ba12ce4a1aa2f7bb5 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 16:36:45 -0400
Subject: [PATCH 03/16] Update demo

---
 Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml    | 2 +-
 Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
index 2845ecb..be81c4d 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml
@@ -82,7 +82,7 @@
                 VerticalAlignment="Top"
                 Background="#1751C3"
                 Click="ButtonBaseInfoDelayOnClick"
-                Content="Info message with delayed dismiss (5s)"
+                Content="Animated info message with delayed dismiss (5s)"
                 Style="{StaticResource NotificationMessageButtonStyle}" />
 
         </StackPanel>
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
index 089c783..028bfa1 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
@@ -78,6 +78,7 @@ private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
             this.Manager
                 .CreateMessage()
                 .Accent("#1751C3")
+                .Animates(true)
                 .Background("#333")
                 .HasBadge("Info")
                 .HasMessage("Update will be installed on next application restart. This message will be dismissed after 5 seconds.")

From b777e5e553ad6c7fef015457877b7eaf2ec12a01 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 16:41:43 -0400
Subject: [PATCH 04/16] Allow configuring of animation duration

---
 .../MainWindow.xaml.cs                        |  1 +
 .../Controls/NotificationMessage.cs           | 23 ++++++++++++++++++-
 .../Controls/NotificationMessageContainer.cs  |  4 ++--
 .../INotificationMessage.cs                   |  5 ++++
 .../NotificationMessageBuilder.cs             |  9 ++++++++
 .../NotificationMessageBuilderLinq.cs         | 15 ++++++++++++
 6 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
index 028bfa1..8c546e6 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
@@ -79,6 +79,7 @@ private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
                 .CreateMessage()
                 .Accent("#1751C3")
                 .Animates(true)
+                .AnimationDuration(2)
                 .Background("#333")
                 .HasBadge("Info")
                 .HasMessage("Update will be installed on next application restart. This message will be dismissed after 5 seconds.")
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index df0d75f..7f85c1e 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -146,7 +146,7 @@ public ObservableCollection<object> Buttons
         }
 
         /// <summary>
-        /// Gets or sets whether the message nimates.
+        /// Gets or sets whether the message animates.
         /// </summary>
         /// <value>
         /// Whether or not the message animates.
@@ -157,6 +157,21 @@ public bool Animates
             set => SetValue(AnimatesProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets how long the message animates in seconds.
+        /// </summary>
+        /// <value>
+        /// How long the message animates in seconds.
+        /// </value>
+        public double AnimationDuration
+        {
+            get => (double)GetValue(AnimationDurationProperty);
+            set => SetValue(AnimationDurationProperty, value);
+        }
+
+        /// <summary>
+        /// The animatable element (used for show/hide animations).
+        /// </summary>
         public UIElement AnimatableElement
         {
             get => this;
@@ -304,6 +319,12 @@ private static void MessagePropertyChangesCallback(DependencyObject dependencyOb
         public static readonly DependencyProperty AnimatesProperty =
             DependencyProperty.Register("Animates", typeof(bool), typeof(NotificationMessage), new PropertyMetadata(false));
 
+        /// <summary>
+        /// The animation duration property (in seconds).
+        /// </summary>
+        public static readonly DependencyProperty AnimationDurationProperty =
+            DependencyProperty.Register("AnimationDuration", typeof(double), typeof(NotificationMessage), new PropertyMetadata(0.25));
+
 
         /// <summary>
         /// Initializes the <see cref="NotificationMessage" /> class.
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 2c5e559..0ca8c55 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -86,7 +86,7 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 {
                     To = 0,
                     BeginTime = TimeSpan.FromSeconds(0),
-                    Duration = TimeSpan.FromSeconds(0.25),
+                    Duration = TimeSpan.FromSeconds(args.Message.AnimationDuration),
                     FillBehavior = FillBehavior.Stop
                 };
                 animation.Completed += (s, a) => this.Items?.Remove(args.Message);
@@ -119,7 +119,7 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                 {
                     To = 1,
                     BeginTime = TimeSpan.FromSeconds(0),
-                    Duration = TimeSpan.FromSeconds(0.25),
+                    Duration = TimeSpan.FromSeconds(args.Message.AnimationDuration),
                     FillBehavior = FillBehavior.Stop
                 };
                 animation.Completed += (s, a) => (args.Message.AnimatableElement as UIElement).Opacity = 1;
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
index 72cbbee..f1d5881 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
@@ -118,6 +118,11 @@ public interface INotificationMessage
         /// </summary>
         bool Animates { get; set; }
 
+        /// <summary>
+        /// Gets or sets the animation duration.
+        /// </summary>
+        double AnimationDuration { get; set; }
+
         /// <summary>
         /// Gets the animatable Message element for add/remove transitions.
         /// Typically this is the whole Control object so that the entire
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index 8b9e3aa..cf4f8bf 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -118,6 +118,15 @@ public void SetAnimates(bool animates)
             this.Message.Animates = animates;
         }
 
+        /// <summary>
+        /// Sets the duration for the animation in seconds.
+        /// </summary>
+        /// <param name="animates"></param>
+        public void SetAnimationDuration(double duration)
+        {
+            this.Message.AnimationDuration = duration;
+        }
+
         /// <summary>
         /// Queues the message to manager.
         /// </summary>
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
index 269fd3d..20b834a 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -297,5 +297,20 @@ public static NotificationMessageBuilder Animates(
 
             return builder;
         }
+
+        /// <summary>
+        /// Sets how long the message animates in seconds.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">How long the message should animate in seconds.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationDuration(
+            this NotificationMessageBuilder builder,
+            double duration)
+        {
+            builder.SetAnimationDuration(duration);
+
+            return builder;
+        }
     }
 }
\ No newline at end of file

From f2ec9e1e9026f02b4203b717690c368c502d1c8d Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 17:15:54 -0400
Subject: [PATCH 05/16] Tweak message layout to fix animation issues

---
 .../Themes/Generic.xaml                       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml b/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
index 81332dd..24c2e1b 100644
--- a/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
+++ b/Enterwell.Clients.Wpf.Notifications/Themes/Generic.xaml
@@ -185,19 +185,6 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:NotificationMessageContainer}">
                     <Grid>
-                        <Border
-                            Margin="12,0,12,12"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Background="Black">
-                            <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="10"
-                                    Direction="270"
-                                    Opacity="0.3"
-                                    Color="Black" />
-                            </Border.Effect>
-                        </Border>
                         <Border
                             x:Name="ItemsBorder"
                             Margin="12,0,12,12"
@@ -205,7 +192,15 @@
                             Background="{TemplateBinding Background}"
                             SnapsToDevicePixels="true"
                             UseLayoutRounding="True">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <ItemsPresenter.Effect>
+                                    <DropShadowEffect
+                                        BlurRadius="10"
+                                        Direction="270"
+                                        Opacity="0.3"
+                                        Color="Black" />
+                                </ItemsPresenter.Effect>
+                            </ItemsPresenter>
                         </Border>
                     </Grid>
                 </ControlTemplate>

From e22d0ee13a8a17ae3a4ff75fffa2ced03b95c90d Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 20:50:47 -0400
Subject: [PATCH 06/16] Extract message animation items to separate interface

---
 .../Controls/NotificationMessage.cs           |  2 +-
 .../Controls/NotificationMessageContainer.cs  | 59 ++++++++++++-------
 .../INotificationMessage.cs                   | 17 ------
 .../INotificationMessageAnimation.cs          | 24 ++++++++
 4 files changed, 64 insertions(+), 38 deletions(-)
 create mode 100644 Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 7f85c1e..8797808 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -11,7 +11,7 @@ namespace Enterwell.Clients.Wpf.Notifications.Controls
     /// </summary>
     /// <seealso cref="INotificationMessage" />
     /// <seealso cref="Control" />
-    public class NotificationMessage : Control, INotificationMessage
+    public class NotificationMessage : Control, INotificationMessageAnimation
     {
         /// <summary>
         /// Gets or sets the content of the overlay.
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 0ca8c55..8c8d1d5 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -80,25 +80,38 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            if (args.Message.Animates && args.Message.AnimatableElement is UIElement)
+            if ((args.Message is INotificationMessageAnimation))
             {
-                var animation = new DoubleAnimation
+                var animatableMessage = args.Message as INotificationMessageAnimation;
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement is UIElement)
                 {
-                    To = 0,
-                    BeginTime = TimeSpan.FromSeconds(0),
-                    Duration = TimeSpan.FromSeconds(args.Message.AnimationDuration),
-                    FillBehavior = FillBehavior.Stop
-                };
-                animation.Completed += (s, a) => this.Items?.Remove(args.Message);
+                    var animation = new DoubleAnimation
+                    {
+                        To = 0,
+                        BeginTime = TimeSpan.FromSeconds(0),
+                        Duration = TimeSpan.FromSeconds(animatableMessage.AnimationDuration),
+                        FillBehavior = FillBehavior.Stop
+                    };
+                    animation.Completed += (s, a) => RemoveMessage(args.Message);
 
-                (args.Message.AnimatableElement as UIElement)?.BeginAnimation(UIElement.OpacityProperty, animation);
+                    (animatableMessage.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
+                }
+                else
+                {
+                    RemoveMessage(args.Message);
+                }
             }
             else
             {
-                this.Items?.Remove(args.Message);
+                RemoveMessage(args.Message);
             }
         }
 
+        private void RemoveMessage(INotificationMessage message)
+        {
+            this.Items?.Remove(message);
+        }
+
         /// <summary>
         /// Manager on message queued.
         /// </summary>
@@ -112,19 +125,25 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                     "Can't use both ItemsSource and Items collection at the same time.");
 
             this.Items?.Add(args.Message);
-            if (args.Message.Animates && args.Message.AnimatableElement is UIElement)
+
+            if ((args.Message is INotificationMessageAnimation))
             {
-                (args.Message.AnimatableElement as UIElement).Opacity = 0;
-                var animation = new DoubleAnimation
+                var animatableMessage = args.Message as INotificationMessageAnimation;
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement is UIElement)
                 {
-                    To = 1,
-                    BeginTime = TimeSpan.FromSeconds(0),
-                    Duration = TimeSpan.FromSeconds(args.Message.AnimationDuration),
-                    FillBehavior = FillBehavior.Stop
-                };
-                animation.Completed += (s, a) => (args.Message.AnimatableElement as UIElement).Opacity = 1;
 
-                (args.Message.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
+                    (animatableMessage.AnimatableElement as UIElement).Opacity = 0;
+                    var animation = new DoubleAnimation
+                    {
+                        To = 1,
+                        BeginTime = TimeSpan.FromSeconds(0),
+                        Duration = TimeSpan.FromSeconds(animatableMessage.AnimationDuration),
+                        FillBehavior = FillBehavior.Stop
+                    };
+                    animation.Completed += (s, a) => (animatableMessage.AnimatableElement as UIElement).Opacity = 1;
+
+                    (animatableMessage.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
+                }
             }
         }
 
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
index f1d5881..63c932e 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationMessage.cs
@@ -112,22 +112,5 @@ public interface INotificationMessage
         /// The text brush.
         /// </value>
         Brush Foreground { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether the message animates in and out.
-        /// </summary>
-        bool Animates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the animation duration.
-        /// </summary>
-        double AnimationDuration { get; set; }
-
-        /// <summary>
-        /// Gets the animatable Message element for add/remove transitions.
-        /// Typically this is the whole Control object so that the entire
-        /// item can be animated.
-        /// </summary>
-        UIElement AnimatableElement { get; }
     }
 }
\ No newline at end of file
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs
new file mode 100644
index 0000000..c8f25dc
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs
@@ -0,0 +1,24 @@
+using System.Windows;
+
+namespace Enterwell.Clients.Wpf.Notifications
+{
+    interface INotificationMessageAnimation : INotificationMessage
+    {
+        /// <summary>
+        /// Gets or sets whether the message animates in and out.
+        /// </summary>
+        bool Animates { get; set; }
+
+        /// <summary>
+        /// Gets or sets the animation duration.
+        /// </summary>
+        double AnimationDuration { get; set; }
+
+        /// <summary>
+        /// Gets the animatable Message element for add/remove transitions.
+        /// Typically this is the whole Control object so that the entire
+        /// item can be animated.
+        /// </summary>
+        UIElement AnimatableElement { get; }
+    }
+}

From 32a9e03c8373c9104036b8eee5382a258f0a3c03 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 20:52:47 -0400
Subject: [PATCH 07/16] Remove some unnecessary casting

---
 .../App.xaml                                     |  2 +-
 .../Controls/NotificationMessageContainer.cs     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
index 81d92c6..d4d6d02 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
@@ -13,7 +13,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <!--  Accent and AppTheme setting  -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <Style BasedOn="{StaticResource {x:Type ProgressBar}}" TargetType="{x:Type ProgressBar}" />
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 8c8d1d5..6b81a0d 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -80,10 +80,10 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            if ((args.Message is INotificationMessageAnimation))
+            if (args.Message is INotificationMessageAnimation)
             {
                 var animatableMessage = args.Message as INotificationMessageAnimation;
-                if (animatableMessage.Animates && animatableMessage.AnimatableElement is UIElement)
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
                 {
                     var animation = new DoubleAnimation
                     {
@@ -94,7 +94,7 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                     };
                     animation.Completed += (s, a) => RemoveMessage(args.Message);
 
-                    (animatableMessage.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
+                    animatableMessage.AnimatableElement.BeginAnimation(UIElement.OpacityProperty, animation);
                 }
                 else
                 {
@@ -126,13 +126,13 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
 
             this.Items?.Add(args.Message);
 
-            if ((args.Message is INotificationMessageAnimation))
+            if (args.Message is INotificationMessageAnimation)
             {
                 var animatableMessage = args.Message as INotificationMessageAnimation;
-                if (animatableMessage.Animates && animatableMessage.AnimatableElement is UIElement)
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
                 {
 
-                    (animatableMessage.AnimatableElement as UIElement).Opacity = 0;
+                    animatableMessage.AnimatableElement.Opacity = 0;
                     var animation = new DoubleAnimation
                     {
                         To = 1,
@@ -140,9 +140,9 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
                         Duration = TimeSpan.FromSeconds(animatableMessage.AnimationDuration),
                         FillBehavior = FillBehavior.Stop
                     };
-                    animation.Completed += (s, a) => (animatableMessage.AnimatableElement as UIElement).Opacity = 1;
+                    animation.Completed += (s, a) => animatableMessage.AnimatableElement.Opacity = 1;
 
-                    (animatableMessage.AnimatableElement as UIElement).BeginAnimation(UIElement.OpacityProperty, animation);
+                    animatableMessage.AnimatableElement.BeginAnimation(UIElement.OpacityProperty, animation);
                 }
             }
         }

From e82c03adf0b780a07e77ef5911a25a7565d4b9a6 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 20:53:12 -0400
Subject: [PATCH 08/16] Update csproj

---
 .../Enterwell.Clients.Wpf.Notifications.csproj                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
index c456114..d60da15 100644
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
+++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Controls\NotificationMessageButton.cs" />
     <Compile Include="Controls\NotificationMessageContainer.cs" />
     <Compile Include="INotificationMessage.cs" />
+    <Compile Include="INotificationMessageAnimation.cs" />
     <Compile Include="INotificationMessageButton.cs" />
     <Compile Include="INotificationMessageFactory.cs" />
     <Compile Include="INotificationMessageManager.cs" />

From 1a860bbec42fcb99e3c1c8d743c20c1ac975d310 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 21:01:08 -0400
Subject: [PATCH 09/16] Fix some issues in the message builder

---
 .../Controls/NotificationMessage.cs           |  2 +-
 .../Controls/NotificationMessageContainer.cs  |  8 +++----
 ...Enterwell.Clients.Wpf.Notifications.csproj |  2 +-
 .../INotificationMessageAnimation.cs          | 24 -------------------
 .../NotificationMessageBuilder.cs             | 10 ++++++--
 5 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 8797808..16838a8 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -11,7 +11,7 @@ namespace Enterwell.Clients.Wpf.Notifications.Controls
     /// </summary>
     /// <seealso cref="INotificationMessage" />
     /// <seealso cref="Control" />
-    public class NotificationMessage : Control, INotificationMessageAnimation
+    public class NotificationMessage : Control, INotificationMessage, INotificationAnimation
     {
         /// <summary>
         /// Gets or sets the content of the overlay.
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 6b81a0d..f0ef891 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -80,9 +80,9 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
                 throw new InvalidOperationException(
                     "Can't use both ItemsSource and Items collection at the same time.");
 
-            if (args.Message is INotificationMessageAnimation)
+            if (args.Message is INotificationAnimation)
             {
-                var animatableMessage = args.Message as INotificationMessageAnimation;
+                var animatableMessage = args.Message as INotificationAnimation;
                 if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
                 {
                     var animation = new DoubleAnimation
@@ -126,9 +126,9 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
 
             this.Items?.Add(args.Message);
 
-            if (args.Message is INotificationMessageAnimation)
+            if (args.Message is INotificationAnimation)
             {
-                var animatableMessage = args.Message as INotificationMessageAnimation;
+                var animatableMessage = args.Message as INotificationAnimation;
                 if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
                 {
 
diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
index d60da15..622097d 100644
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
+++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.csproj
@@ -58,7 +58,7 @@
     <Compile Include="Controls\NotificationMessageButton.cs" />
     <Compile Include="Controls\NotificationMessageContainer.cs" />
     <Compile Include="INotificationMessage.cs" />
-    <Compile Include="INotificationMessageAnimation.cs" />
+    <Compile Include="INotificationAnimation.cs" />
     <Compile Include="INotificationMessageButton.cs" />
     <Compile Include="INotificationMessageFactory.cs" />
     <Compile Include="INotificationMessageManager.cs" />
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs
deleted file mode 100644
index c8f25dc..0000000
--- a/Enterwell.Clients.Wpf.Notifications/INotificationMessageAnimation.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Windows;
-
-namespace Enterwell.Clients.Wpf.Notifications
-{
-    interface INotificationMessageAnimation : INotificationMessage
-    {
-        /// <summary>
-        /// Gets or sets whether the message animates in and out.
-        /// </summary>
-        bool Animates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the animation duration.
-        /// </summary>
-        double AnimationDuration { get; set; }
-
-        /// <summary>
-        /// Gets the animatable Message element for add/remove transitions.
-        /// Typically this is the whole Control object so that the entire
-        /// item can be animated.
-        /// </summary>
-        UIElement AnimatableElement { get; }
-    }
-}
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index cf4f8bf..4d42e6a 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -115,7 +115,10 @@ public void SetForeground(Brush brush)
         /// <param name="animates"></param>
         public void SetAnimates(bool animates)
         {
-            this.Message.Animates = animates;
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).Animates = animates;
+            }
         }
 
         /// <summary>
@@ -124,7 +127,10 @@ public void SetAnimates(bool animates)
         /// <param name="animates"></param>
         public void SetAnimationDuration(double duration)
         {
-            this.Message.AnimationDuration = duration;
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationDuration = duration;
+            }
         }
 
         /// <summary>

From 1681ce842953f2b1274d676117df69b068a9f391 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 21:26:13 -0400
Subject: [PATCH 10/16] Animation in/out to properties

---
 .../App.xaml                                  |   2 +-
 .../Controls/NotificationMessage.cs           | 103 ++++++++++++++++++
 .../Controls/NotificationMessageContainer.cs  |  31 ++----
 .../INotificationAnimation.cs                 |  45 ++++++++
 4 files changed, 157 insertions(+), 24 deletions(-)
 create mode 100644 Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs

diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
index d4d6d02..81d92c6 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/App.xaml
@@ -13,7 +13,7 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <!--  Accent and AppTheme setting  -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <Style BasedOn="{StaticResource {x:Type ProgressBar}}" TargetType="{x:Type ProgressBar}" />
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 16838a8..53f2878 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -3,6 +3,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 
 namespace Enterwell.Clients.Wpf.Notifications.Controls
 {
@@ -177,6 +178,84 @@ public UIElement AnimatableElement
             get => this;
         }
 
+        /// <summary>
+        /// The animation in.
+        /// </summary>
+        public AnimationTimeline AnimationIn
+        {
+            get
+            {
+                var animation = (AnimationTimeline)GetValue(AnimationInProperty);
+                if (animation != null)
+                {
+                    animation.Duration = TimeSpan.FromSeconds(AnimationDuration);
+                    return animation;
+                }
+                else
+                {
+                    var doubleAnimation = new DoubleAnimation
+                    {
+                        From = 0,
+                        To = 1,
+                        BeginTime = TimeSpan.FromSeconds(0),
+                        Duration = TimeSpan.FromSeconds(AnimationDuration),
+                        FillBehavior = FillBehavior.Stop
+                    };
+                    doubleAnimation.Completed += (s, a) => AnimatableElement.Opacity = 1;
+                    return doubleAnimation;
+                }
+            }
+            set => SetValue(AnimationInProperty, value);
+        }
+
+        /// <summary>
+        /// The animation out.
+        /// </summary>
+        public AnimationTimeline AnimationOut
+        {
+            get
+            {
+                var animation = (AnimationTimeline)GetValue(AnimationOutProperty);
+                if (animation != null)
+                {
+                    animation.Duration = TimeSpan.FromSeconds(AnimationDuration);
+                    return animation;
+                }
+                else
+                {
+                    return new DoubleAnimation
+                    {
+                        From = 1,
+                        To = 0,
+                        BeginTime = TimeSpan.FromSeconds(0),
+                        Duration = TimeSpan.FromSeconds(AnimationDuration),
+                        FillBehavior = FillBehavior.Stop
+                    };
+                }
+            }
+            set => SetValue(AnimationInProperty, value);
+        }
+
+        public DependencyProperty AnimationInDependencyProperty
+        {
+            get
+            {
+                var property = (DependencyProperty)GetValue(AnimationInDependencyPropProperty);
+                return property ?? UIElement.OpacityProperty;
+            }
+            set => SetValue(AnimationInDependencyPropProperty, value);
+        }
+
+        public DependencyProperty AnimationOutDependencyProperty
+        {
+            get
+            {
+                var property = (DependencyProperty)GetValue(AnimationOutDependencyPropProperty);
+                return property ?? UIElement.OpacityProperty;
+            }
+            set => SetValue(AnimationOutDependencyPropProperty, value);
+        }
+
         /// <summary>
         /// The overlay content property.
         /// </summary>
@@ -325,6 +404,30 @@ private static void MessagePropertyChangesCallback(DependencyObject dependencyOb
         public static readonly DependencyProperty AnimationDurationProperty =
             DependencyProperty.Register("AnimationDuration", typeof(double), typeof(NotificationMessage), new PropertyMetadata(0.25));
 
+        /// <summary>
+        /// The animation in property.
+        /// </summary>
+        public static readonly DependencyProperty AnimationInProperty =
+            DependencyProperty.Register("AnimationIn", typeof(AnimationTimeline), typeof(NotificationMessage), new PropertyMetadata(null));
+
+        /// <summary>
+        /// The animation out property.
+        /// </summary>
+        public static readonly DependencyProperty AnimationOutProperty =
+            DependencyProperty.Register("AnimationOut", typeof(AnimationTimeline), typeof(NotificationMessage), new PropertyMetadata(null));
+
+        /// <summary>
+        /// The animation in dependency property.
+        /// </summary>
+        public static readonly DependencyProperty AnimationInDependencyPropProperty =
+            DependencyProperty.Register("AnimationInDependencyProperty", typeof(DependencyProperty), typeof(NotificationMessage), new PropertyMetadata(null));
+
+        /// <summary>
+        /// The animation out dependency property.
+        /// </summary>
+        public static readonly DependencyProperty AnimationOutDependencyPropProperty =
+            DependencyProperty.Register("AnimationOutDependencyProperty", typeof(DependencyProperty), typeof(NotificationMessage), new PropertyMetadata(null));
+
 
         /// <summary>
         /// Initializes the <see cref="NotificationMessage" /> class.
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index f0ef891..4a4142f 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -83,18 +83,12 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
             if (args.Message is INotificationAnimation)
             {
                 var animatableMessage = args.Message as INotificationAnimation;
-                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
+                    && animatableMessage.AnimationOut != null && animatableMessage.AnimationOutDependencyProperty != null)
                 {
-                    var animation = new DoubleAnimation
-                    {
-                        To = 0,
-                        BeginTime = TimeSpan.FromSeconds(0),
-                        Duration = TimeSpan.FromSeconds(animatableMessage.AnimationDuration),
-                        FillBehavior = FillBehavior.Stop
-                    };
+                    var animation = animatableMessage.AnimationOut;
                     animation.Completed += (s, a) => RemoveMessage(args.Message);
-
-                    animatableMessage.AnimatableElement.BeginAnimation(UIElement.OpacityProperty, animation);
+                    animatableMessage.AnimatableElement.BeginAnimation(animatableMessage.AnimationOutDependencyProperty, animation);
                 }
                 else
                 {
@@ -129,20 +123,11 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
             if (args.Message is INotificationAnimation)
             {
                 var animatableMessage = args.Message as INotificationAnimation;
-                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null)
+                if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
+                    && animatableMessage.AnimationIn != null && animatableMessage.AnimationInDependencyProperty != null)
                 {
-
-                    animatableMessage.AnimatableElement.Opacity = 0;
-                    var animation = new DoubleAnimation
-                    {
-                        To = 1,
-                        BeginTime = TimeSpan.FromSeconds(0),
-                        Duration = TimeSpan.FromSeconds(animatableMessage.AnimationDuration),
-                        FillBehavior = FillBehavior.Stop
-                    };
-                    animation.Completed += (s, a) => animatableMessage.AnimatableElement.Opacity = 1;
-
-                    animatableMessage.AnimatableElement.BeginAnimation(UIElement.OpacityProperty, animation);
+                    var animation = animatableMessage.AnimationIn;
+                    animatableMessage.AnimatableElement.BeginAnimation(animatableMessage.AnimationInDependencyProperty, animation);
                 }
             }
         }
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
new file mode 100644
index 0000000..f347396
--- /dev/null
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
@@ -0,0 +1,45 @@
+using System.Windows;
+using System.Windows.Media.Animation;
+
+namespace Enterwell.Clients.Wpf.Notifications
+{
+    interface INotificationAnimation
+    {
+        /// <summary>
+        /// Gets or sets whether the item animates in and out.
+        /// </summary>
+        bool Animates { get; set; }
+
+        /// <summary>
+        /// Gets or sets the animation duration.
+        /// </summary>
+        double AnimationDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the animation in.
+        /// </summary>
+        AnimationTimeline AnimationIn { get; set; }
+
+        /// <summary>
+        /// Gets or sets the animation out.
+        /// </summary>
+        AnimationTimeline AnimationOut { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DependencyProperty for the animation in.
+        /// </summary>
+        DependencyProperty AnimationInDependencyProperty { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DependencyProperty for the animation out.
+        /// </summary>
+        DependencyProperty AnimationOutDependencyProperty { get; set; }
+
+        /// <summary>
+        /// Gets the animatable UIElement.
+        /// Typically this is the whole Control object so that the entire
+        /// item can be animated.
+        /// </summary>
+        UIElement AnimatableElement { get; }
+    }
+}

From 944f204c4871a8d329ab87e67139d38fedb73543 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 21:34:19 -0400
Subject: [PATCH 11/16] Add new INotificationAnimation items to the builders

---
 .../NotificationMessageBuilder.cs             | 50 +++++++++++++++
 .../NotificationMessageBuilderLinq.cs         | 62 +++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index 4d42e6a..8228829 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 
 namespace Enterwell.Clients.Wpf.Notifications
 {
@@ -133,6 +135,54 @@ public void SetAnimationDuration(double duration)
             }
         }
 
+        /// <summary>
+        /// Sets the animation in for the message.
+        /// </summary>
+        /// <param name="animation"></param>
+        public void SetAnimationIn(AnimationTimeline animation)
+        {
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationIn = animation;
+            }
+        }
+
+        /// <summary>
+        /// Sets the animation out for the message.
+        /// </summary>
+        /// <param name="animation"></param>
+        public void SetAnimationOut(AnimationTimeline animation)
+        {
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationOut = animation;
+            }
+        }
+
+        /// <summary>
+        /// Sets the animation in dependency property.
+        /// </summary>
+        /// <param name="property"></param>
+        public void SetAnimationInDependencyProperty(DependencyProperty property)
+        {
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationInDependencyProperty = property;
+            }
+        }
+
+        /// <summary>
+        /// Sets the animation out dependency property.
+        /// </summary>
+        /// <param name="property"></param>
+        public void SetAnimationOutDependencyProperty(DependencyProperty property)
+        {
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationOutDependencyProperty = property;
+            }
+        }
+
         /// <summary>
         /// Queues the message to manager.
         /// </summary>
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
index 20b834a..4e729ae 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Windows;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 
 namespace Enterwell.Clients.Wpf.Notifications
 {
@@ -312,5 +314,65 @@ public static NotificationMessageBuilder AnimationDuration(
 
             return builder;
         }
+
+        /// <summary>
+        /// Sets the animation in for the message.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">The message animation in.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationIn(
+            this NotificationMessageBuilder builder,
+            AnimationTimeline animation)
+        {
+            builder.SetAnimationIn(animation);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the animation out for the message.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">The message animation out.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationOut(
+            this NotificationMessageBuilder builder,
+            AnimationTimeline animation)
+        {
+            builder.SetAnimationOut(animation);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the animation in dependency property for the message.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">The animation in dependency property.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationInDependencyProperty(
+            this NotificationMessageBuilder builder,
+            DependencyProperty property)
+        {
+            builder.SetAnimationInDependencyProperty(property);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets the animation out dependency property for the message.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">The animation out dependency property.</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationOutDependencyProperty(
+            this NotificationMessageBuilder builder,
+            DependencyProperty property)
+        {
+            builder.SetAnimationOutDependencyProperty(property);
+
+            return builder;
+        }
     }
 }
\ No newline at end of file

From 940b6311dbb5b3e6f583cf44a07ea9e9f1ada328 Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 1 May 2018 21:47:00 -0400
Subject: [PATCH 12/16] Different animation in/out durations

---
 .../MainWindow.xaml.cs                        |  3 +-
 .../Controls/NotificationMessage.cs           | 42 +++++++++++++------
 .../INotificationAnimation.cs                 |  9 +++-
 .../NotificationMessageBuilder.cs             | 18 ++++++--
 .../NotificationMessageBuilderLinq.cs         | 23 ++++++++--
 5 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
index 8c546e6..040a017 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
@@ -79,7 +79,8 @@ private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
                 .CreateMessage()
                 .Accent("#1751C3")
                 .Animates(true)
-                .AnimationDuration(2)
+                .AnimationInDuration(0.75)
+                .AnimationOutDuration(2)
                 .Background("#333")
                 .HasBadge("Info")
                 .HasMessage("Update will be installed on next application restart. This message will be dismissed after 5 seconds.")
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index 53f2878..b311e24 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -159,15 +159,27 @@ public bool Animates
         }
 
         /// <summary>
-        /// Gets or sets how long the message animates in seconds.
+        /// Gets or sets how long the message animates in (in seconds).
         /// </summary>
         /// <value>
-        /// How long the message animates in seconds.
+        /// How long the message animates in (in seconds).
         /// </value>
-        public double AnimationDuration
+        public double AnimationInDuration
         {
-            get => (double)GetValue(AnimationDurationProperty);
-            set => SetValue(AnimationDurationProperty, value);
+            get => (double)GetValue(AnimationInDurationProperty);
+            set => SetValue(AnimationInDurationProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets how long the message animates out (in seconds).
+        /// </summary>
+        /// <value>
+        /// How long the message animates out (in seconds).
+        /// </value>
+        public double AnimationOutDuration
+        {
+            get => (double)GetValue(AnimationOutDurationProperty);
+            set => SetValue(AnimationOutDurationProperty, value);
         }
 
         /// <summary>
@@ -188,7 +200,7 @@ public AnimationTimeline AnimationIn
                 var animation = (AnimationTimeline)GetValue(AnimationInProperty);
                 if (animation != null)
                 {
-                    animation.Duration = TimeSpan.FromSeconds(AnimationDuration);
+                    animation.Duration = TimeSpan.FromSeconds(AnimationInDuration);
                     return animation;
                 }
                 else
@@ -198,7 +210,7 @@ public AnimationTimeline AnimationIn
                         From = 0,
                         To = 1,
                         BeginTime = TimeSpan.FromSeconds(0),
-                        Duration = TimeSpan.FromSeconds(AnimationDuration),
+                        Duration = TimeSpan.FromSeconds(AnimationInDuration),
                         FillBehavior = FillBehavior.Stop
                     };
                     doubleAnimation.Completed += (s, a) => AnimatableElement.Opacity = 1;
@@ -218,7 +230,7 @@ public AnimationTimeline AnimationOut
                 var animation = (AnimationTimeline)GetValue(AnimationOutProperty);
                 if (animation != null)
                 {
-                    animation.Duration = TimeSpan.FromSeconds(AnimationDuration);
+                    animation.Duration = TimeSpan.FromSeconds(AnimationOutDuration);
                     return animation;
                 }
                 else
@@ -228,7 +240,7 @@ public AnimationTimeline AnimationOut
                         From = 1,
                         To = 0,
                         BeginTime = TimeSpan.FromSeconds(0),
-                        Duration = TimeSpan.FromSeconds(AnimationDuration),
+                        Duration = TimeSpan.FromSeconds(AnimationOutDuration),
                         FillBehavior = FillBehavior.Stop
                     };
                 }
@@ -399,10 +411,16 @@ private static void MessagePropertyChangesCallback(DependencyObject dependencyOb
             DependencyProperty.Register("Animates", typeof(bool), typeof(NotificationMessage), new PropertyMetadata(false));
 
         /// <summary>
-        /// The animation duration property (in seconds).
+        /// The animation in duration property (in seconds).
+        /// </summary>
+        public static readonly DependencyProperty AnimationInDurationProperty =
+            DependencyProperty.Register("AnimationInDuration", typeof(double), typeof(NotificationMessage), new PropertyMetadata(0.25));
+
+        /// <summary>
+        /// The animation out duration property (in seconds).
         /// </summary>
-        public static readonly DependencyProperty AnimationDurationProperty =
-            DependencyProperty.Register("AnimationDuration", typeof(double), typeof(NotificationMessage), new PropertyMetadata(0.25));
+        public static readonly DependencyProperty AnimationOutDurationProperty =
+            DependencyProperty.Register("AnimationOutDuration", typeof(double), typeof(NotificationMessage), new PropertyMetadata(0.25));
 
         /// <summary>
         /// The animation in property.
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
index f347396..4301a38 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
@@ -11,9 +11,14 @@ interface INotificationAnimation
         bool Animates { get; set; }
 
         /// <summary>
-        /// Gets or sets the animation duration.
+        /// Gets or sets the animation in duration (in seconds).
         /// </summary>
-        double AnimationDuration { get; set; }
+        double AnimationInDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the animation out duration (in seconds).
+        /// </summary>
+        double AnimationOutDuration { get; set; }
 
         /// <summary>
         /// Gets or sets the animation in.
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
index 8228829..d1e449a 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilder.cs
@@ -124,14 +124,26 @@ public void SetAnimates(bool animates)
         }
 
         /// <summary>
-        /// Sets the duration for the animation in seconds.
+        /// Sets the duration for the animation in (in seconds).
         /// </summary>
         /// <param name="animates"></param>
-        public void SetAnimationDuration(double duration)
+        public void SetAnimationInDuration(double duration)
         {
             if (this.Message is INotificationAnimation)
             {
-                ((INotificationAnimation)this.Message).AnimationDuration = duration;
+                ((INotificationAnimation)this.Message).AnimationInDuration = duration;
+            }
+        }
+
+        /// <summary>
+        /// Sets the duration for the animation out (in seconds).
+        /// </summary>
+        /// <param name="animates"></param>
+        public void SetAnimationOutDuration(double duration)
+        {
+            if (this.Message is INotificationAnimation)
+            {
+                ((INotificationAnimation)this.Message).AnimationOutDuration = duration;
             }
         }
 
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
index 4e729ae..c4f0e83 100644
--- a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
+++ b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -301,16 +301,31 @@ public static NotificationMessageBuilder Animates(
         }
 
         /// <summary>
-        /// Sets how long the message animates in seconds.
+        /// Sets how long the message animates in (in seconds).
         /// </summary>
         /// <param name="builder">The builder.</param>
-        /// <param name="duration">How long the message should animate in seconds.</param>
+        /// <param name="duration">How long the message should animate in (in seconds).</param>
         /// <returns></returns>
-        public static NotificationMessageBuilder AnimationDuration(
+        public static NotificationMessageBuilder AnimationInDuration(
             this NotificationMessageBuilder builder,
             double duration)
         {
-            builder.SetAnimationDuration(duration);
+            builder.SetAnimationInDuration(duration);
+
+            return builder;
+        }
+
+        /// <summary>
+        /// Sets how long the message animates out (in seconds).
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="duration">How long the message should animate out (in seconds).</param>
+        /// <returns></returns>
+        public static NotificationMessageBuilder AnimationOutDuration(
+            this NotificationMessageBuilder builder,
+            double duration)
+        {
+            builder.SetAnimationOutDuration(duration);
 
             return builder;
         }

From 8c46ecec3507ce9c70fb6706432d997b716e780e Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Wed, 2 May 2018 08:20:36 -0400
Subject: [PATCH 13/16] Add missing comments and `this` accessors

---
 .../Controls/NotificationMessage.cs                |  8 +++++++-
 .../Controls/NotificationMessageContainer.cs       | 14 +++++++-------
 .../INotificationAnimation.cs                      |  4 ++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index b311e24..b688dd2 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -183,7 +183,7 @@ public double AnimationOutDuration
         }
 
         /// <summary>
-        /// The animatable element (used for show/hide animations).
+        /// The animatable element used for show/hide animations.
         /// </summary>
         public UIElement AnimatableElement
         {
@@ -248,6 +248,9 @@ public AnimationTimeline AnimationOut
             set => SetValue(AnimationInProperty, value);
         }
 
+        /// <summary>
+        /// The dependency property on which to animate while animating in.
+        /// </summary>
         public DependencyProperty AnimationInDependencyProperty
         {
             get
@@ -258,6 +261,9 @@ public DependencyProperty AnimationInDependencyProperty
             set => SetValue(AnimationInDependencyPropProperty, value);
         }
 
+        /// <summary>
+        /// The dependency property on which to animate while animating out.
+        /// </summary>
         public DependencyProperty AnimationOutDependencyProperty
         {
             get
diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
index 4a4142f..9b97e2c 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessageContainer.cs
@@ -83,21 +83,21 @@ private void ManagerOnOnMessageDismissed(object sender, NotificationMessageManag
             if (args.Message is INotificationAnimation)
             {
                 var animatableMessage = args.Message as INotificationAnimation;
+                var animation = animatableMessage.AnimationOut;
                 if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
-                    && animatableMessage.AnimationOut != null && animatableMessage.AnimationOutDependencyProperty != null)
+                    && animation != null && animatableMessage.AnimationOutDependencyProperty != null)
                 {
-                    var animation = animatableMessage.AnimationOut;
-                    animation.Completed += (s, a) => RemoveMessage(args.Message);
+                    animation.Completed += (s, a) => this.RemoveMessage(args.Message);
                     animatableMessage.AnimatableElement.BeginAnimation(animatableMessage.AnimationOutDependencyProperty, animation);
                 }
                 else
                 {
-                    RemoveMessage(args.Message);
+                    this.RemoveMessage(args.Message);
                 }
             }
             else
             {
-                RemoveMessage(args.Message);
+                this.RemoveMessage(args.Message);
             }
         }
 
@@ -123,10 +123,10 @@ private void ManagerOnOnMessageQueued(object sender, NotificationMessageManagerE
             if (args.Message is INotificationAnimation)
             {
                 var animatableMessage = args.Message as INotificationAnimation;
+                var animation = animatableMessage.AnimationIn;
                 if (animatableMessage.Animates && animatableMessage.AnimatableElement != null
-                    && animatableMessage.AnimationIn != null && animatableMessage.AnimationInDependencyProperty != null)
+                    && animation != null && animatableMessage.AnimationInDependencyProperty != null)
                 {
-                    var animation = animatableMessage.AnimationIn;
                     animatableMessage.AnimatableElement.BeginAnimation(animatableMessage.AnimationInDependencyProperty, animation);
                 }
             }
diff --git a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
index 4301a38..2803df5 100644
--- a/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
+++ b/Enterwell.Clients.Wpf.Notifications/INotificationAnimation.cs
@@ -3,6 +3,10 @@
 
 namespace Enterwell.Clients.Wpf.Notifications
 {
+    /// <summary>
+    /// The animation properties for a notification message or some
+    /// other item.
+    /// </summary>
     interface INotificationAnimation
     {
         /// <summary>

From 59c788a76b2fa5ff4fd80e7dfc3599c7bbcbc27f Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Wed, 2 May 2018 11:15:18 -0400
Subject: [PATCH 14/16] Remove unneeded completed handler on default in
 animation

---
 .../Controls/NotificationMessage.cs                          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index b688dd2..aaca828 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -211,9 +211,8 @@ public AnimationTimeline AnimationIn
                         To = 1,
                         BeginTime = TimeSpan.FromSeconds(0),
                         Duration = TimeSpan.FromSeconds(AnimationInDuration),
-                        FillBehavior = FillBehavior.Stop
+                        FillBehavior = FillBehavior.HoldEnd
                     };
-                    doubleAnimation.Completed += (s, a) => AnimatableElement.Opacity = 1;
                     return doubleAnimation;
                 }
             }
@@ -241,7 +240,7 @@ public AnimationTimeline AnimationOut
                         To = 0,
                         BeginTime = TimeSpan.FromSeconds(0),
                         Duration = TimeSpan.FromSeconds(AnimationOutDuration),
-                        FillBehavior = FillBehavior.Stop
+                        FillBehavior = FillBehavior.HoldEnd
                     };
                 }
             }

From a1f5bb068f5d5362a44628a37d83a4318cafe5db Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Wed, 2 May 2018 13:17:01 -0400
Subject: [PATCH 15/16] Fix setting wrong value for animation out

---
 .../Controls/NotificationMessage.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
index aaca828..85dfba6 100644
--- a/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Controls/NotificationMessage.cs
@@ -244,7 +244,7 @@ public AnimationTimeline AnimationOut
                     };
                 }
             }
-            set => SetValue(AnimationInProperty, value);
+            set => SetValue(AnimationOutProperty, value);
         }
 
         /// <summary>

From c31a1a6812f3b5732cd5926f4049795608303d2c Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Thu, 3 May 2018 12:12:27 +0200
Subject: [PATCH 16/16] Release prep

---
 Changelog.md                                          |  6 +++++-
 .../MainWindow.xaml.cs                                |  9 +++++++--
 .../Enterwell.Clients.Wpf.Notifications.nuspec        |  2 +-
 .../Properties/AssemblyInfo.cs                        |  4 ++--
 Readme.md                                             | 11 +++++++++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4fbf7c9..e807daf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,9 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2018-05-03
+### Added
+- Added notification fade-out and fade-in animations.
+
 ## [1.2.0] - 2018-04-30
 ### Added
-  - Implemented support for setting custom text color with `Foreground` method.
+- Implemented support for setting custom text color with `Foreground` method.
 
 ## [1.1.0] - 2018-04-03
 ### Added
diff --git a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
index 040a017..5a15e12 100644
--- a/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
+++ b/Enterwell.Clients.Wpf.Notifications.Sample/MainWindow.xaml.cs
@@ -18,8 +18,7 @@ public partial class MainWindow
         /// </summary>
         public MainWindow()
         {
-            InitializeComponent();
-
+            this.InitializeComponent();
             this.DataContext = this;
         }
 
@@ -90,6 +89,12 @@ private void ButtonBaseInfoDelayOnClick(object sender, RoutedEventArgs e)
                 .Queue();
         }
 
+        /// <summary>
+        /// Gets the notification message manager.
+        /// </summary>
+        /// <value>
+        /// The notification message manager.
+        /// </value>
         public INotificationMessageManager Manager { get; } = new NotificationMessageManager();
     }
 }
diff --git a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec
index 61396b7..d7e1a1a 100644
--- a/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec
+++ b/Enterwell.Clients.Wpf.Notifications/Enterwell.Clients.Wpf.Notifications.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/Enterwell/Wpf.Notifications</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>Added support for setting custom text color with `Foreground` method.</releaseNotes>
+    <releaseNotes>Added notification fade-out and fade-in animations.</releaseNotes>
     <copyright>Copyright (c) Enterwell d.o.o. 2017-2018</copyright>
     <tags>wpf notifications</tags>
   </metadata>
diff --git a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
index 6c8aac3..ba522a6 100644
--- a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
+++ b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/Readme.md b/Readme.md
index 66cae8e..b31aaf8 100644
--- a/Readme.md
+++ b/Readme.md
@@ -77,6 +77,17 @@ manager.CreateMessage()
        .Queue();
 ```
 
+### Enable notification message animations (_opt-in feature_)
+
+```c#
+manager
+    ...
+    .Animates(true)
+    .AnimationInDuration(0.75)
+    .AnimationOutDuration(2)
+    ...
+```
+
 ## Advanced usage
 
 ### Custom control overlay notification