Skip to content

Commit d6a8e5e

Browse files
committed
Fix code style on MaterialDesignThemes.Wpf.Transitions files
1 parent 4dcd926 commit d6a8e5e

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

src/MaterialDesignThemes.Wpf/Transitions/CircleWipe.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System.Diagnostics;
21
using System.Windows.Media;
32
using System.Windows.Media.Animation;
43

@@ -17,6 +16,7 @@ public CircleWipe()
1716

1817
public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point origin, IZIndexController zIndexController)
1918
{
19+
#if NET462
2020
if (fromSlide == null)
2121
{
2222
throw new ArgumentNullException(nameof(fromSlide));
@@ -29,7 +29,11 @@ public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point o
2929
{
3030
throw new ArgumentNullException(nameof(zIndexController));
3131
}
32-
32+
#else
33+
ArgumentNullException.ThrowIfNull(fromSlide);
34+
ArgumentNullException.ThrowIfNull(toSlide);
35+
ArgumentNullException.ThrowIfNull(zIndexController);
36+
#endif
3337
double horizontalProportion = Math.Max(1.0 - origin.X, 1.0 * origin.X);
3438
double verticalProportion = Math.Max(1.0 - origin.Y, 1.0 * origin.Y);
3539
double radius = Math.Sqrt(Math.Pow(toSlide.ActualWidth * horizontalProportion, 2) + Math.Pow(toSlide.ActualHeight * verticalProportion, 2));

src/MaterialDesignThemes.Wpf/Transitions/FadeWipe.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public TimeSpan Duration
3030

3131
public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point origin, IZIndexController zIndexController)
3232
{
33+
#if NET462
3334
if (fromSlide is null)
3435
{
3536
throw new ArgumentNullException(nameof(fromSlide));
@@ -42,6 +43,11 @@ public void Wipe(TransitionerSlide fromSlide, TransitionerSlide toSlide, Point o
4243
{
4344
throw new ArgumentNullException(nameof(zIndexController));
4445
}
46+
#else
47+
ArgumentNullException.ThrowIfNull(fromSlide);
48+
ArgumentNullException.ThrowIfNull(toSlide);
49+
ArgumentNullException.ThrowIfNull(zIndexController);
50+
#endif
4551

4652
// Remove current animations and reset to base value
4753
double currentFromOpacity = fromSlide.Opacity;
@@ -73,8 +79,5 @@ private DoubleAnimationUsingKeyFrames SetupOpacityAnimation(double from, double
7379
return animation;
7480
}
7581

76-
private void CalculateEndKeyTime()
77-
{
78-
endKeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(Duration.TotalSeconds / 2));
79-
}
82+
private void CalculateEndKeyTime() => endKeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(Duration.TotalSeconds / 2));
8083
}

src/MaterialDesignThemes.Wpf/Transitions/IndexedItemOffsetMultiplierExtension.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,22 @@ namespace MaterialDesignThemes.Wpf.Transitions;
1010
/// time delayed according to position in a list, so cascading animations can occur.
1111
/// </remarks>
1212
[MarkupExtensionReturnType(typeof(TimeSpan))]
13-
public class IndexedItemOffsetMultiplierExtension : MarkupExtension
13+
public class IndexedItemOffsetMultiplierExtension(TimeSpan unit) : MarkupExtension
1414
{
15-
public IndexedItemOffsetMultiplierExtension(TimeSpan unit)
16-
{
17-
Unit = unit;
18-
}
19-
2015
[ConstructorArgument("unit")]
21-
public TimeSpan Unit { get; set; }
16+
public TimeSpan Unit { get; set; } = unit;
2217

2318
public override object ProvideValue(IServiceProvider serviceProvider)
2419
{
25-
var provideValueTarget = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
26-
if (provideValueTarget == null) return TimeSpan.Zero;
20+
if (serviceProvider.GetService(typeof(IProvideValueTarget)) is not IProvideValueTarget provideValueTarget)
21+
return TimeSpan.Zero;
2722

2823
if (provideValueTarget.TargetObject != null &&
2924
provideValueTarget.TargetObject.GetType().FullName == "System.Windows.SharedDp")
3025
//we are inside a template, return this, so we can re-evaluate later...
3126
return this;
3227

33-
var element = provideValueTarget?.TargetObject as DependencyObject;
34-
if (element == null) return TimeSpan.Zero;
28+
if (provideValueTarget?.TargetObject is not DependencyObject element) return TimeSpan.Zero;
3529

3630
var itemsControl = ItemsControl.ItemsControlFromItemContainer(element);
3731
if (itemsControl == null)
@@ -45,29 +39,28 @@ public override object ProvideValue(IServiceProvider serviceProvider)
4539
}
4640
if (itemsControl == null) return TimeSpan.Zero;
4741

48-
var isOwnContainer = itemsControl.IsItemItsOwnContainer(element);
42+
bool isOwnContainer = itemsControl.IsItemItsOwnContainer(element);
4943
var container = isOwnContainer
5044
? element
5145
: itemsControl.ItemContainerGenerator.ContainerFromItem(element);
5246
if (container == null)
5347
{
54-
var dataContext = (element as FrameworkElement)?.DataContext;
48+
object? dataContext = (element as FrameworkElement)?.DataContext;
5549
if (dataContext != null)
5650
container = itemsControl.ItemContainerGenerator.ContainerFromItem(dataContext);
5751
}
5852

5953
if (container == null) return TimeSpan.Zero;
6054

61-
var multiplier = itemsControl.ItemContainerGenerator.IndexFromContainer(container);
55+
int multiplier = itemsControl.ItemContainerGenerator.IndexFromContainer(container);
6256
if (multiplier == -1) //container generation may not have completed
6357
{
6458
multiplier = itemsControl.Items.IndexOf(element);
6559
}
6660

6761
if (multiplier == -1) //still not found, repeat now using data context
6862
{
69-
var frameworkElement = element as FrameworkElement;
70-
if (frameworkElement != null)
63+
if (element is FrameworkElement frameworkElement)
7164
{
7265
multiplier = itemsControl.Items.IndexOf(frameworkElement.DataContext);
7366
}

0 commit comments

Comments
 (0)