From ec4af4f395052623d9b8c351652c67356720b3df Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Fri, 18 May 2018 10:43:07 +0800 Subject: [PATCH] Fix extraneous empty lines. Fix Animation.cs braces --- src/Avalonia.Animation/Animation.cs | 5 ++++- src/Avalonia.Animation/Easing/BackEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/BounceEaseIn.cs | 1 - src/Avalonia.Animation/Easing/BounceEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/CircularEaseIn.cs | 1 - src/Avalonia.Animation/Easing/CircularEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/CubicEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/Easing.cs | 3 +-- src/Avalonia.Animation/Easing/EasingTypeConverter.cs | 1 - src/Avalonia.Animation/Easing/ElasticEaseIn.cs | 1 - src/Avalonia.Animation/Easing/ElasticEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/ElasticEaseOut.cs | 2 -- src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/LinearEasing.cs | 1 - src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/QuadraticEaseOut.cs | 1 - src/Avalonia.Animation/Easing/QuarticEaseIn.cs | 1 - src/Avalonia.Animation/Easing/QuarticEaseInOut.cs | 1 - src/Avalonia.Animation/Easing/QuarticEaseOut.cs | 1 - 19 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs index cd2c82a240..4301e8b3c0 100644 --- a/src/Avalonia.Animation/Animation.cs +++ b/src/Avalonia.Animation/Animation.cs @@ -63,7 +63,10 @@ namespace Avalonia.Animation /// public void Dispose() { - foreach (var sub in _subscription) sub.Dispose(); + foreach (var sub in _subscription) + { + sub.Dispose(); + } } /// diff --git a/src/Avalonia.Animation/Easing/BackEaseInOut.cs b/src/Avalonia.Animation/Easing/BackEaseInOut.cs index 1b4a128fd5..4844c2a0d1 100644 --- a/src/Avalonia.Animation/Easing/BackEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/BackEaseInOut.cs @@ -27,6 +27,5 @@ namespace Avalonia.Animation.Easings return 0.5d * (1d - f * (f * f - Math.Sin(f * Math.PI))) + 0.5d; } } - } } diff --git a/src/Avalonia.Animation/Easing/BounceEaseIn.cs b/src/Avalonia.Animation/Easing/BounceEaseIn.cs index 6ed6f3fe82..6aa6f171f5 100644 --- a/src/Avalonia.Animation/Easing/BounceEaseIn.cs +++ b/src/Avalonia.Animation/Easing/BounceEaseIn.cs @@ -17,6 +17,5 @@ namespace Avalonia.Animation.Easings { return 1 - BounceEaseUtils.Bounce(1 - progress); } - } } diff --git a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs b/src/Avalonia.Animation/Easing/BounceEaseInOut.cs index ed32b3df9d..b393a4e7c7 100644 --- a/src/Avalonia.Animation/Easing/BounceEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/BounceEaseInOut.cs @@ -24,6 +24,5 @@ namespace Avalonia.Animation.Easings return 0.5f * BounceEaseUtils.Bounce(p * 2 - 1) + 0.5f; } } - } } diff --git a/src/Avalonia.Animation/Easing/CircularEaseIn.cs b/src/Avalonia.Animation/Easing/CircularEaseIn.cs index 38d2c6fabc..1b22258099 100644 --- a/src/Avalonia.Animation/Easing/CircularEaseIn.cs +++ b/src/Avalonia.Animation/Easing/CircularEaseIn.cs @@ -17,6 +17,5 @@ namespace Avalonia.Animation.Easings { return 1d - Math.Sqrt(1d - p * p); } - } } diff --git a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs b/src/Avalonia.Animation/Easing/CircularEaseInOut.cs index e4f2a973d7..156b634d3e 100644 --- a/src/Avalonia.Animation/Easing/CircularEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/CircularEaseInOut.cs @@ -25,6 +25,5 @@ namespace Avalonia.Animation.Easings return 0.5d * (Math.Sqrt((3d - t) * (t - 1d)) + 1d); } } - } } diff --git a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs b/src/Avalonia.Animation/Easing/CubicEaseInOut.cs index 4714aabfd5..be4d46d180 100644 --- a/src/Avalonia.Animation/Easing/CubicEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/CubicEaseInOut.cs @@ -25,5 +25,4 @@ namespace Avalonia.Animation.Easings } } } - } diff --git a/src/Avalonia.Animation/Easing/Easing.cs b/src/Avalonia.Animation/Easing/Easing.cs index d93549e273..f126a0f302 100644 --- a/src/Avalonia.Animation/Easing/Easing.cs +++ b/src/Avalonia.Animation/Easing/Easing.cs @@ -34,7 +34,7 @@ namespace Avalonia.Animation.Easings { _easingTypes = new Dictionary(); - var derivedTypes = AppDomain.CurrentDomain.GetAssemblies() + var derivedTypes = AppDomain.CurrentDomain.GetAssemblies()z .SelectMany(p => p.GetTypes()) .Where(p => p.Namespace == s_thisType.Namespace) .Where(p => p.IsSubclassOf(s_thisType)) @@ -54,6 +54,5 @@ namespace Avalonia.Animation.Easings throw new FormatException($"Easing \"{e}\" was not found in {s_thisType.Namespace} namespace."); } } - } } diff --git a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs index 3705dbbba3..70ddfd2699 100644 --- a/src/Avalonia.Animation/Easing/EasingTypeConverter.cs +++ b/src/Avalonia.Animation/Easing/EasingTypeConverter.cs @@ -8,7 +8,6 @@ using System.Globalization; namespace Avalonia.Animation.Easings { - public class EasingTypeConverter : TypeConverter { public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) diff --git a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs b/src/Avalonia.Animation/Easing/ElasticEaseIn.cs index 3a44eca8da..0dea7b20a7 100644 --- a/src/Avalonia.Animation/Easing/ElasticEaseIn.cs +++ b/src/Avalonia.Animation/Easing/ElasticEaseIn.cs @@ -19,5 +19,4 @@ namespace Avalonia.Animation.Easings return Math.Sin(13d * EasingUtils.HALFPI * p) * Math.Pow(2d, 10d * (p - 1)); } } - } diff --git a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs b/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs index 026f8b9a42..b170cb2d6a 100644 --- a/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/ElasticEaseInOut.cs @@ -27,6 +27,5 @@ namespace Avalonia.Animation.Easings return 0.5d * (Math.Sin(-13d * EasingUtils.HALFPI * ((2d * p - 1d) + 1d)) * Math.Pow(2d, -10d * (2d * p - 1d)) + 2d); } } - } } diff --git a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs b/src/Avalonia.Animation/Easing/ElasticEaseOut.cs index fd8380ff39..31e31374a0 100644 --- a/src/Avalonia.Animation/Easing/ElasticEaseOut.cs +++ b/src/Avalonia.Animation/Easing/ElasticEaseOut.cs @@ -17,8 +17,6 @@ namespace Avalonia.Animation.Easings { double p = progress; return Math.Sin(-13d * EasingUtils.HALFPI * (p + 1)) * Math.Pow(2d, -10d * p) + 1d; - } - } } diff --git a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs b/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs index 5a85dbd657..64eb51e116 100644 --- a/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/ExponentialEaseInOut.cs @@ -25,6 +25,5 @@ namespace Avalonia.Animation.Easings return -0.5d * Math.Pow(2d, -20d * p + 10d) + 1d; } } - } } diff --git a/src/Avalonia.Animation/Easing/LinearEasing.cs b/src/Avalonia.Animation/Easing/LinearEasing.cs index 99278cb1f7..f7a90c0eef 100644 --- a/src/Avalonia.Animation/Easing/LinearEasing.cs +++ b/src/Avalonia.Animation/Easing/LinearEasing.cs @@ -14,5 +14,4 @@ namespace Avalonia.Animation.Easings return progress; } } - } diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs b/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs index 825dcd5cc9..16ba02cc20 100644 --- a/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/QuadraticEaseInOut.cs @@ -23,6 +23,5 @@ namespace Avalonia.Animation.Easings return p * (-2d * p + 4d) - 1d; } } - } } diff --git a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs b/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs index 58092677f0..5252b88cf3 100644 --- a/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs +++ b/src/Avalonia.Animation/Easing/QuadraticEaseOut.cs @@ -14,6 +14,5 @@ namespace Avalonia.Animation.Easings { return -(progress * (progress - 2d)); } - } } diff --git a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs b/src/Avalonia.Animation/Easing/QuarticEaseIn.cs index fe14571d8f..988fd1f7fb 100644 --- a/src/Avalonia.Animation/Easing/QuarticEaseIn.cs +++ b/src/Avalonia.Animation/Easing/QuarticEaseIn.cs @@ -15,6 +15,5 @@ namespace Avalonia.Animation.Easings double p2 = progress * progress; return p2 * p2; } - } } diff --git a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs b/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs index 4b66dae748..0ad908f6bb 100644 --- a/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs +++ b/src/Avalonia.Animation/Easing/QuarticEaseInOut.cs @@ -26,6 +26,5 @@ namespace Avalonia.Animation.Easings return -8d * f2 * f2 + 1d; } } - } } diff --git a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs b/src/Avalonia.Animation/Easing/QuarticEaseOut.cs index e3d3f28eb4..8499575653 100644 --- a/src/Avalonia.Animation/Easing/QuarticEaseOut.cs +++ b/src/Avalonia.Animation/Easing/QuarticEaseOut.cs @@ -16,6 +16,5 @@ namespace Avalonia.Animation.Easings double f2 = f * f; return -f2 * f2 + 1d; } - } }