Merge branch 'master' of https://github.com/Tyrrrz/MaterialDesignInXamlToolkit into Tyrrrz-master

Author: ButchersBoy

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

@@ -331,6 +331,7 @@
     <Compile Include="SnackbarMessageQueueItem.cs" />
     <Compile Include="Transitions\CircleWipe.cs" />
     <Compile Include="IHintProxy.cs" />
+    <Compile Include="Transitions\FadeWipe.cs" />
     <Compile Include="Transitions\IndexedItemOffsetMultiplierExtension.cs" />
     <Compile Include="Transitions\ITransitionEffect.cs" />
     <Compile Include="Transitions\ITransitionEffectSubject.cs" />
@@ -370,6 +371,7 @@
     <Compile Include="RippleAssist.cs" />
     <Compile Include="Ripple.cs" />
     <Compile Include="Transitions\IZIndexController.cs" />
+    <Compile Include="Transitions\SlideWipe.cs" />
     <Compile Include="Transitions\SlideOutWipe.cs" />
     <Compile Include="Transitions\TransitionAssist.cs" />
     <Compile Include="Transitions\TransitionEffect.cs" />

MaterialDesignThemes.Wpf/Transitions/FadeWipe.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Windows;
+using System.Windows.Media.Animation;
+
+namespace MaterialDesignThemes.Wpf.Transitions
+{
+    public class FadeWipe : ITransitionWipe
+    {
+        private readonly SineEase _sineEase = new SineEase();
+
+        /// <summary>
+        /// Duration of the animation
+        /// </summary>
+        public TimeSpan Duration { get; set; } = TimeSpan.FromSeconds(0.5);
+
+        public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point origin, IZIndexController zIndexController)
+        {
+            if (fromSlide == null) throw new ArgumentNullException(nameof(fromSlide));
+            if (toSlide == null) throw new ArgumentNullException(nameof(toSlide));
+            if (zIndexController == null) throw new ArgumentNullException(nameof(zIndexController));
+
+            // Set up time points
+            var zeroKeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero);
+            var endKeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(Duration.TotalSeconds/2));
+
+            // Old
+            var fromAnimation = new DoubleAnimationUsingKeyFrames();
+            fromAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(1, zeroKeyTime));
+            fromAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(0, endKeyTime, _sineEase));
+
+            // New
+            var toAnimation = new DoubleAnimationUsingKeyFrames();
+            toAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(0, zeroKeyTime));
+            toAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(1, endKeyTime, _sineEase));
+
+            // Preset
+            fromSlide.Opacity = 1;
+            toSlide.Opacity = 0;
+
+            // Animate
+            fromAnimation.Completed += (sender, args) => toSlide.BeginAnimation(UIElement.OpacityProperty, toAnimation);
+            fromSlide.BeginAnimation(UIElement.OpacityProperty, fromAnimation);
+
+            zIndexController.Stack(toSlide, fromSlide);
+        }
+    }
+}

MaterialDesignThemes.Wpf/Transitions/SlideWipe.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+
+namespace MaterialDesignThemes.Wpf.Transitions
+{
+    public class SlideWipe : ITransitionWipe
+    {
+        public enum SlideDirection { Left, Right, Up, Down }
+
+        private readonly SineEase _sineEase = new SineEase();
+
+        /// <summary>
+        /// Direction of the slide wipe
+        /// </summary>
+        public SlideDirection Direction { get; set; }
+
+        /// <summary>
+        /// Duration of the animation
+        /// </summary>
+        public TimeSpan Duration { get; set; } = TimeSpan.FromSeconds(0.5);
+
+        public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point origin, IZIndexController zIndexController)
+        {
+            if (fromSlide == null) throw new ArgumentNullException(nameof(fromSlide));
+            if (toSlide == null) throw new ArgumentNullException(nameof(toSlide));
+            if (zIndexController == null) throw new ArgumentNullException(nameof(zIndexController));
+
+            // Set up time points
+            var zeroKeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero);
+            var endKeyTime = KeyTime.FromTimeSpan(Duration);
+
+            // Set up coordinates
+            double fromStartX = 0, fromEndX = 0, toStartX = 0, toEndX = 0;
+            double fromStartY = 0, fromEndY = 0, toStartY = 0, toEndY = 0;
+
+            if (Direction == SlideDirection.Left)
+            {
+                fromEndX = -fromSlide.ActualWidth;
+                toStartX = toSlide.ActualWidth;
+            }
+            else if (Direction == SlideDirection.Right)
+            {
+                fromEndX = fromSlide.ActualWidth;
+                toStartX = -toSlide.ActualWidth;
+            }
+            else if (Direction == SlideDirection.Up)
+            {
+                fromEndY = -fromSlide.ActualHeight;
+                toStartY = toSlide.ActualHeight;
+            }
+            else if (Direction == SlideDirection.Down)
+            {
+                fromEndY = fromSlide.ActualHeight;
+                toStartY = -toSlide.ActualHeight;
+            }
+
+            // Old
+            fromSlide.RenderTransform = new TranslateTransform(fromStartX, fromStartY);
+            var fromXAnimation = new DoubleAnimationUsingKeyFrames();
+            fromXAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(fromStartX, zeroKeyTime));
+            fromXAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(fromEndX, endKeyTime, _sineEase));
+            var fromYAnimation = new DoubleAnimationUsingKeyFrames();
+            fromYAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(fromStartY, zeroKeyTime));
+            fromYAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(fromEndY, endKeyTime, _sineEase));
+
+            // New
+            toSlide.RenderTransform = new TranslateTransform(toStartX, toStartY);
+            var toXAnimation = new DoubleAnimationUsingKeyFrames();
+            toXAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(toStartX, zeroKeyTime));
+            toXAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(toEndX, endKeyTime, _sineEase));
+            var toYAnimation = new DoubleAnimationUsingKeyFrames();
+            toYAnimation.KeyFrames.Add(new LinearDoubleKeyFrame(toStartY, zeroKeyTime));
+            toYAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(toEndY, endKeyTime, _sineEase));
+
+            // Animate
+            fromSlide.RenderTransform.BeginAnimation(TranslateTransform.XProperty, fromXAnimation);
+            fromSlide.RenderTransform.BeginAnimation(TranslateTransform.YProperty, fromYAnimation);
+            toSlide.RenderTransform.BeginAnimation(TranslateTransform.XProperty, toXAnimation);
+            toSlide.RenderTransform.BeginAnimation(TranslateTransform.YProperty, toYAnimation);
+
+            zIndexController.Stack(toSlide, fromSlide);
+        }
+    }
+}