Skip to content

Commit 39ae3a8

Browse files
[create-pull-request] automated change
1 parent 05999a1 commit 39ae3a8

File tree

89 files changed

+654
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+654
-628
lines changed

src/Compatibility/Core/src/Windows/CollectionView/ItemsViewRenderer.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont
597597

598598
default:
599599
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
600-
};
600+
}
601+
;
601602
}
602603

603604
void OnScrollViewChanged(object sender, ScrollViewerViewChangedEventArgs e)

src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,8 @@ public override CGRect Frame
16421642
value.Width = (value.X - xSpace) + value.Width;
16431643
value.X = xSpace;
16441644
}
1645-
};
1645+
}
1646+
;
16461647

16471648
value.Height = ToolbarHeight;
16481649
}

src/Controls/src/BindingSourceGen/PathParser.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ private Result<List<IPathPart>> HandleBinaryExpression(BinaryExpressionSyntax as
142142
if (typeInfo == null)
143143
{
144144
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castTo.GetLocation()));
145-
};
145+
}
146+
;
146147

147148
leftResult.Value.Add(new Cast(typeInfo.CreateTypeDescription(_enabledNullable)));
148149

@@ -161,7 +162,8 @@ private Result<List<IPathPart>> HandleCastExpression(CastExpressionSyntax castEx
161162
if (typeInfo == null)
162163
{
163164
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castExpression.GetLocation()));
164-
};
165+
}
166+
;
165167

166168
result.Value.Add(new Cast(typeInfo.CreateTypeDescription(_enabledNullable)));
167169

src/Controls/src/Core/AppThemeBinding.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ void Set()
114114
}
115115
target.SetValueCore(_targetProperty, value, Internals.SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted, specificity);
116116
}
117-
};
117+
}
118+
;
118119
}
119120

120121
object _light;

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1996,7 +1996,8 @@ public override CGRect Frame
19961996
value.Width = (value.X - xSpace) + value.Width;
19971997
value.X = xSpace;
19981998
}
1999-
};
1999+
}
2000+
;
20002001

20012002
value.Height = ToolbarHeight;
20022003
}

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRendererBase.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ void RemoveAllButCurrent(Fragment skip)
393393

394394
trans ??= ChildFragmentManager.BeginTransactionEx();
395395
trans.Remove(f);
396-
};
396+
}
397+
;
397398

398399
trans?.CommitAllowingStateLossEx();
399400
}

src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont
583583

584584
default:
585585
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
586-
};
586+
}
587+
;
587588
}
588589

589590
async void ScrollToRequested(object sender, ScrollToRequestEventArgs args)

src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using Foundation;
6+
using Microsoft.Maui.Controls.Platform;
67
using ObjCRuntime;
78
using UIKit;
8-
using Microsoft.Maui.Controls.Platform;
99

1010
namespace Microsoft.Maui.Controls.Handlers.Items
1111
{

src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using CoreGraphics;
55
using Foundation;
66
using Microsoft.Maui.Controls.Internals;
7+
using Microsoft.Maui.Controls.Platform;
78
using Microsoft.Maui.Graphics;
89
using UIKit;
9-
using Microsoft.Maui.Controls.Platform;
1010

1111
namespace Microsoft.Maui.Controls.Handlers.Items
1212
{
@@ -203,7 +203,7 @@ public void Bind(DataTemplate template, object bindingContext, ItemsView itemsVi
203203
}
204204

205205
CurrentTemplate = itemTemplate;
206-
this.UpdateAccessibilityTraits(itemsView);
206+
this.UpdateAccessibilityTraits(itemsView);
207207
MarkAsBound();
208208
}
209209

src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private int GetTargetPosition()
300300
{
301301
return 0;
302302
}
303-
303+
304304
return ItemsView.ItemsUpdatingScrollMode switch
305305
{
306306
ItemsUpdatingScrollMode.KeepItemsInView => 0,

src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ static NSCollectionLayoutBoundarySupplementaryItem[] CreateSupplementaryItems(La
6262
scrollDirection == UICollectionViewScrollDirection.Vertical
6363
? NSRectAlignment.Top
6464
: NSRectAlignment.Leading));
65-
};
65+
}
66+
;
6667

6768
if (layoutHeaderFooterInfo.HasFooter)
6869
{

src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using Foundation;
6+
using Microsoft.Maui.Controls.Platform;
67
using ObjCRuntime;
78
using UIKit;
8-
using Microsoft.Maui.Controls.Platform;
99

1010
namespace Microsoft.Maui.Controls.Handlers.Items2
1111
{

src/Controls/src/Core/Handlers/Items2/iOS/StructuredItemsViewController2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void InvalidateLayoutIfItemsMeasureChanged()
195195
// We could then invalidate the layout for supplementary cell only `collectionView.IndexPathForCell(headerCell)` like we do on standard cells,
196196
// but that causes other cells to oddly collapse (see Issue25362 UITest), so in this case we have to stick with `InvalidateLayout`.
197197
var collectionView = CollectionView;
198-
198+
199199
if (ItemsView.Header is not null || ItemsView.HeaderTemplate is not null)
200200
{
201201
var visibleHeaders = collectionView.GetVisibleSupplementaryViews(UICollectionElementKindSectionKey.Header);

src/Controls/src/Core/Handlers/Items2/iOS/TemplatedCell2.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public override void PrepareForReuse()
134134

135135
public void Bind(DataTemplate template, object bindingContext, ItemsView itemsView)
136136
{
137-
var virtualView = PlatformHandler?.VirtualView as View ??
138-
template.CreateContent(bindingContext, itemsView) as View;
137+
var virtualView = PlatformHandler?.VirtualView as View ??
138+
template.CreateContent(bindingContext, itemsView) as View;
139139

140140
BindVirtualView(virtualView, bindingContext, itemsView, false);
141141
}

src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public static void UpdateToolbarDynamicOverflowEnabled(this MauiToolbar platform
8787

8888
private static void UpdateBackButtonVisibility(MauiToolbar platformToolbar, Toolbar toolbar)
8989
{
90-
platformToolbar.IsBackButtonVisible =
91-
toolbar.BackButtonVisible
92-
? NavigationViewBackButtonVisible.Visible
90+
platformToolbar.IsBackButtonVisible =
91+
toolbar.BackButtonVisible
92+
? NavigationViewBackButtonVisible.Visible
9393
: NavigationViewBackButtonVisible.Collapsed;
9494
}
9595
}

src/Controls/src/Core/Shell/ShellSection.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,8 @@ void WaitForRendererToGetRemoved(object s, EventArgs p)
694694
{
695695
sc.Page.PlatformEnabledChanged -= WaitForRendererToGetRemoved;
696696
base.OnChildRemoved(child, oldLogicalIndex);
697-
};
697+
}
698+
;
698699
}
699700
else
700701
{

src/Controls/tests/Core.UnitTests/BindingUnitTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,8 @@ void create()
12411241
proxies.Add(new WeakReference(listener));
12421242
}
12431243
Assert.NotEmpty(proxies); // Should be at least 1
1244-
};
1244+
}
1245+
;
12451246
create();
12461247

12471248
await Task.Yield();

src/Controls/tests/DeviceTests/Elements/Border/BorderTests.Windows.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ await AttachAndRun(border, (handler) =>
6161
await AssertColorAtPoint(border, expected, typeof(BorderHandler), cornerRadius, cornerRadius);
6262
}
6363

64-
[Fact]
65-
[Description("The IsVisible property of a Border should match with native IsVisible")]
64+
[Fact]
65+
[Description("The IsVisible property of a Border should match with native IsVisible")]
6666
public async Task VerifyBorderIsVisibleProperty()
6767
{
6868
var border = new Border();
@@ -73,9 +73,9 @@ public async Task VerifyBorderIsVisibleProperty()
7373
var nativeView = GetNativeBorder(handler);
7474
await InvokeOnMainThreadAsync(() =>
7575
{
76-
var isVisible = nativeView.Visibility == Microsoft.UI.Xaml.Visibility.Visible;
77-
Assert.Equal(expectedValue, isVisible);
78-
});
76+
var isVisible = nativeView.Visibility == Microsoft.UI.Xaml.Visibility.Visible;
77+
Assert.Equal(expectedValue, isVisible);
78+
});
7979
}
8080

8181
ContentPanel GetNativeBorder(BorderHandler borderHandler) =>

src/Controls/tests/DeviceTests/Elements/Border/BorderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ await InvokeOnMainThreadAsync(() =>
259259

260260
await AssertionExtensions.WaitForGC(handlerReference, platformViewReference);
261261
}
262-
262+
263263
[Fact(DisplayName = "Border With Stroke Shape And Name Does Not Leak")]
264264
public async Task DoesNotLeakWithStrokeShape()
265265
{

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.Android.cs

+74-74
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
namespace Microsoft.Maui.DeviceTests
1111
{
12-
public partial class BoxViewTests
13-
{
14-
MauiShapeView GetNativeBoxView(ShapeViewHandler boxViewViewHandler) =>
15-
boxViewViewHandler.PlatformView;
12+
public partial class BoxViewTests
13+
{
14+
MauiShapeView GetNativeBoxView(ShapeViewHandler boxViewViewHandler) =>
15+
boxViewViewHandler.PlatformView;
1616

1717
Task<float> GetPlatformOpacity(ShapeViewHandler handler)
1818
{
@@ -22,81 +22,81 @@ Task<float> GetPlatformOpacity(ShapeViewHandler handler)
2222
return nativeView.Alpha;
2323
});
2424
}
25-
26-
[Fact]
27-
[Description("The ScaleX property of a BoxView should match with native ScaleX")]
28-
public async Task ScaleXConsistent()
29-
{
30-
var boxView = new BoxView() { ScaleX = 0.45f };
31-
var expected = boxView.ScaleX;
32-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
33-
var platformBoxView = GetNativeBoxView(handler);
34-
var platformScaleX = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleX);
35-
Assert.Equal(expected, platformScaleX);
36-
}
3725

38-
[Fact]
39-
[Description("The ScaleY property of a BoxView should match with native ScaleY")]
40-
public async Task ScaleYConsistent()
41-
{
42-
var boxView = new BoxView() { ScaleY = 1.23f };
43-
var expected = boxView.ScaleY;
44-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
45-
var platformBoxView = GetNativeBoxView(handler);
46-
var platformScaleY = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleY);
47-
Assert.Equal(expected, platformScaleY);
48-
}
26+
[Fact]
27+
[Description("The ScaleX property of a BoxView should match with native ScaleX")]
28+
public async Task ScaleXConsistent()
29+
{
30+
var boxView = new BoxView() { ScaleX = 0.45f };
31+
var expected = boxView.ScaleX;
32+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
33+
var platformBoxView = GetNativeBoxView(handler);
34+
var platformScaleX = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleX);
35+
Assert.Equal(expected, platformScaleX);
36+
}
37+
38+
[Fact]
39+
[Description("The ScaleY property of a BoxView should match with native ScaleY")]
40+
public async Task ScaleYConsistent()
41+
{
42+
var boxView = new BoxView() { ScaleY = 1.23f };
43+
var expected = boxView.ScaleY;
44+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
45+
var platformBoxView = GetNativeBoxView(handler);
46+
var platformScaleY = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleY);
47+
Assert.Equal(expected, platformScaleY);
48+
}
49+
50+
[Fact]
51+
[Description("The Scale property of a BoxView should match with native Scale")]
52+
public async Task ScaleConsistent()
53+
{
54+
var boxView = new BoxView() { Scale = 2.0f };
55+
var expected = boxView.Scale;
56+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
57+
var platformBoxView = GetNativeBoxView(handler);
58+
var platformScaleX = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleX);
59+
var platformScaleY = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleY);
60+
Assert.Equal(expected, platformScaleX);
61+
Assert.Equal(expected, platformScaleY);
62+
}
4963

50-
[Fact]
51-
[Description("The Scale property of a BoxView should match with native Scale")]
52-
public async Task ScaleConsistent()
53-
{
54-
var boxView = new BoxView() { Scale = 2.0f };
55-
var expected = boxView.Scale;
56-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
57-
var platformBoxView = GetNativeBoxView(handler);
58-
var platformScaleX = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleX);
59-
var platformScaleY = await InvokeOnMainThreadAsync(() => platformBoxView.ScaleY);
60-
Assert.Equal(expected, platformScaleX);
61-
Assert.Equal(expected, platformScaleY);
62-
}
64+
[Fact]
65+
[Description("The RotationX property of a BoxView should match with native RotationX")]
66+
public async Task RotationXConsistent()
67+
{
68+
var boxView = new BoxView() { RotationX = 33.0 };
69+
var expected = boxView.RotationX;
70+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
71+
var platformBoxView = GetNativeBoxView(handler);
72+
var platformRotationX = await InvokeOnMainThreadAsync(() => platformBoxView.RotationX);
73+
Assert.Equal(expected, platformRotationX);
74+
}
6375

64-
[Fact]
65-
[Description("The RotationX property of a BoxView should match with native RotationX")]
66-
public async Task RotationXConsistent()
67-
{
68-
var boxView = new BoxView() { RotationX = 33.0 };
69-
var expected = boxView.RotationX;
70-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
71-
var platformBoxView = GetNativeBoxView(handler);
72-
var platformRotationX = await InvokeOnMainThreadAsync(() => platformBoxView.RotationX);
73-
Assert.Equal(expected, platformRotationX);
74-
}
76+
[Fact]
77+
[Description("The RotationY property of a BoxView should match with native RotationY")]
78+
public async Task RotationYConsistent()
79+
{
80+
var boxView = new BoxView() { RotationY = 87.0 };
81+
var expected = boxView.RotationY;
82+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
83+
var platformBoxView = GetNativeBoxView(handler);
84+
var platformRotationY = await InvokeOnMainThreadAsync(() => platformBoxView.RotationY);
85+
Assert.Equal(expected, platformRotationY);
86+
}
7587

76-
[Fact]
77-
[Description("The RotationY property of a BoxView should match with native RotationY")]
78-
public async Task RotationYConsistent()
79-
{
80-
var boxView = new BoxView() { RotationY = 87.0 };
81-
var expected = boxView.RotationY;
82-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
83-
var platformBoxView = GetNativeBoxView(handler);
84-
var platformRotationY = await InvokeOnMainThreadAsync(() => platformBoxView.RotationY);
85-
Assert.Equal(expected, platformRotationY);
86-
}
88+
[Fact]
89+
[Description("The Rotation property of a BoxView should match with native Rotation")]
90+
public async Task RotationConsistent()
91+
{
92+
var boxView = new BoxView() { Rotation = 23.0 };
93+
var expected = boxView.Rotation;
94+
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
95+
var platformBoxView = GetNativeBoxView(handler);
96+
var platformRotation = await InvokeOnMainThreadAsync(() => platformBoxView.Rotation);
97+
Assert.Equal(expected, platformRotation);
98+
}
8799

88-
[Fact]
89-
[Description("The Rotation property of a BoxView should match with native Rotation")]
90-
public async Task RotationConsistent()
91-
{
92-
var boxView = new BoxView() { Rotation = 23.0 };
93-
var expected = boxView.Rotation;
94-
var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
95-
var platformBoxView = GetNativeBoxView(handler);
96-
var platformRotation = await InvokeOnMainThreadAsync(() => platformBoxView.Rotation);
97-
Assert.Equal(expected, platformRotation);
98-
}
99-
100100
Task<bool> GetPlatformIsVisible(ShapeViewHandler boxViewViewHandler)
101101
{
102102
return InvokeOnMainThreadAsync(() =>

0 commit comments

Comments
 (0)