Skip to content

Commit 710f465

Browse files
[create-pull-request] automated change
1 parent 794f224 commit 710f465

File tree

121 files changed

+834
-792
lines changed

Some content is hidden

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

121 files changed

+834
-792
lines changed

src/Compatibility/ControlGallery/src/Issues.Shared/Issue2143.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
1010
{
1111
[Preserve(AllMembers = true)]
1212
[Issue(IssueTracker.Github, 2143, "Picker on windows phone", PlatformAffected.WinPhone)]
13-
#if UITEST
13+
#if UITEST
1414
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
15-
#endif
15+
#endif
1616
public class Issue2143 : ContentPage
1717
{
1818
public Issue2143()

src/Compatibility/ControlGallery/src/Issues.Shared/Issue22246_BZ.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
1111
{
1212
[Preserve(AllMembers = true)]
1313
[Issue(IssueTracker.Bugzilla, 22246, "Entry in Grid nested in ViewCell isn't expanding", PlatformAffected.WinPhone, NavigationBehavior.PushModalAsync)]
14-
#if UITEST
14+
#if UITEST
1515
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
16-
#endif
16+
#endif
1717
public class Issue22246Bz : ContentPage
1818
{
1919
public Issue22246Bz()

src/Compatibility/ControlGallery/src/Issues.Shared/Issue2615.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
66
{
77
[Preserve(AllMembers = true)]
88
[Issue(IssueTracker.Github, 2615, "iOS Cell Reuse screws up when cells are both ViewCell with different children", PlatformAffected.iOS)]
9-
#if UITEST
9+
#if UITEST
1010
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
11-
#endif
11+
#endif
1212
public class Issue2615 : ContentPage
1313
{
1414
public Issue2615()

src/Compatibility/ControlGallery/src/Issues.Shared/Issue5555.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
1313
{
1414
[Preserve(AllMembers = true)]
1515
[Issue(IssueTracker.Github, 5555, "Memory leak when SwitchCell or EntryCell", PlatformAffected.iOS)]
16-
#if UITEST
16+
#if UITEST
1717
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
18-
#endif
18+
#endif
1919
public class Issue5555 : TestContentPage
2020
{
2121
[Preserve(AllMembers = true)]

src/Controls/Maps/src/HandlerImpl/Polygon.Impl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public IEnumerator<Location> GetEnumerator()
8989
{
9090
return Geopath.GetEnumerator();
9191
}
92-
92+
9393
/// <summary>
9494
/// Gets the index of a specified location object.
9595
/// </summary>

src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public override string ToString()
6363
new GalleryPageFactory(() => new ImageButtonCoreGalleryPage(), "Image Button Gallery"),
6464
new GalleryPageFactory(() => new ImageCoreGalleryPage(), "Image Gallery"),
6565
new GalleryPageFactory(() => new KeyboardScrollingGridGallery(), "Keyboard Scrolling Gallery - Grid with Star Row"),
66-
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles"),
67-
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"),
66+
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles"),
67+
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"),
6868
new GalleryPageFactory(() => new KeyboardScrollingScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"),
6969
new GalleryPageFactory(() => new KeyboardScrollingScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Small Titles"),
70-
new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
70+
new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
7171
new GalleryPageFactory(() => new ListViewCoreGalleryPage(), "ListView Gallery"),
7272
new GalleryPageFactory(() => new PickerCoreGalleryPage(), "Picker Gallery"),
7373
new GalleryPageFactory(() => new ProgressBarCoreGalleryPage(), "Progress Bar Gallery"),

src/Controls/samples/Controls.Sample.UITests/Issues/Issue10947.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
using System;
12
using Microsoft.Maui.Controls;
2-
using Microsoft.Maui.Controls.Xaml;
3-
using Microsoft.Maui.Platform;
43
using Microsoft.Maui.Controls.PlatformConfiguration;
54
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
6-
using System;
5+
using Microsoft.Maui.Controls.Xaml;
6+
using Microsoft.Maui.Platform;
77

88
namespace Maui.Controls.Sample.Issues;
99

src/Controls/samples/Controls.Sample.UITests/Issues/Issue16386.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ protected override void Init()
1212
AutomationId = "HardwareEnterKeyEntry"
1313
};
1414

15-
Content =
16-
new VerticalStackLayout()
17-
{
15+
Content =
16+
new VerticalStackLayout()
17+
{
1818
new Label()
1919
{
2020
Text = "Focus entry and hit the Enter key on the hardware keyboard. A success label should appear."
2121
},
2222
entry
2323
};
24-
24+
2525
entry.Completed += (sender, args) =>
2626
{
2727
(Content as VerticalStackLayout)

src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml.cs

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using Microsoft.Maui.Controls;
2-
using Microsoft.Maui.Controls.Xaml;
3-
using Microsoft.Maui.Graphics;
42
using Microsoft.Maui.Controls.PlatformConfiguration;
53
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
6-
using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
4+
using Microsoft.Maui.Controls.Xaml;
5+
using Microsoft.Maui.Graphics;
76
using FlyoutPage = Microsoft.Maui.Controls.FlyoutPage;
7+
using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
88

99
namespace Maui.Controls.Sample.Issues;
1010

@@ -97,7 +97,7 @@ async void NewFlyoutPagePressed(System.Object sender, System.EventArgs e)
9797
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
9898
var flyoutPage = new FlyoutPage()
9999
{
100-
Flyout = new ContentPage(){Title = "FlyoutPage"},
100+
Flyout = new ContentPage() { Title = "FlyoutPage" },
101101
Detail = detail
102102
};
103103
detail.BarBackgroundColor = Colors.Transparent;
@@ -111,7 +111,7 @@ async void NewFlyoutPageTransparentPressed(System.Object sender, System.EventArg
111111
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
112112
var flyoutPage = new FlyoutPage()
113113
{
114-
Flyout = new ContentPage(){Title = "FlyoutPage"},
114+
Flyout = new ContentPage() { Title = "FlyoutPage" },
115115
Detail = detail
116116
};
117117
detail.BarBackgroundColor = Colors.Transparent;
@@ -123,7 +123,7 @@ async void NewFlyoutPageTranslucentPressed(System.Object sender, System.EventArg
123123
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
124124
var flyoutPage = new FlyoutPage()
125125
{
126-
Flyout = new ContentPage(){Title = "FlyoutPage"},
126+
Flyout = new ContentPage() { Title = "FlyoutPage" },
127127
Detail = detail
128128
};
129129
detail.On<iOS>().EnableTranslucentNavigationBar();
@@ -135,7 +135,7 @@ async void NewFlyoutPageTransparentTranslucentPressed(System.Object sender, Syst
135135
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
136136
var flyoutPage = new FlyoutPage()
137137
{
138-
Flyout = new ContentPage(){Title = "FlyoutPage"},
138+
Flyout = new ContentPage() { Title = "FlyoutPage" },
139139
Detail = detail
140140
};
141141
detail.BarBackgroundColor = Colors.Transparent;
@@ -148,7 +148,7 @@ async void NewFlyoutPageGridPressed(System.Object sender, System.EventArgs e)
148148
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
149149
var flyoutPage = new FlyoutPage()
150150
{
151-
Flyout = new ContentPage(){Title = "FlyoutPage"},
151+
Flyout = new ContentPage() { Title = "FlyoutPage" },
152152
Detail = detail
153153
};
154154
await Navigation.PushModalAsync(flyoutPage);
@@ -159,7 +159,7 @@ async void NewFlyoutPageGridTransparentPressed(System.Object sender, System.Even
159159
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
160160
var flyoutPage = new FlyoutPage()
161161
{
162-
Flyout = new ContentPage(){Title = "FlyoutPage"},
162+
Flyout = new ContentPage() { Title = "FlyoutPage" },
163163
Detail = detail
164164
};
165165
detail.BarBackgroundColor = Colors.Transparent;
@@ -171,7 +171,7 @@ async void NewFlyoutPageGridTranslucentPressed(System.Object sender, System.Even
171171
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
172172
var flyoutPage = new FlyoutPage()
173173
{
174-
Flyout = new ContentPage(){Title = "FlyoutPage"},
174+
Flyout = new ContentPage() { Title = "FlyoutPage" },
175175
Detail = detail
176176
};
177177
detail.On<iOS>().EnableTranslucentNavigationBar();
@@ -182,15 +182,15 @@ async void NewFlyoutPageGridTransparentTranslucentPressed(System.Object sender,
182182
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
183183
var flyoutPage = new FlyoutPage()
184184
{
185-
Flyout = new ContentPage(){Title = "FlyoutPage"},
185+
Flyout = new ContentPage() { Title = "FlyoutPage" },
186186
Detail = detail
187187
};
188188
detail.BarBackgroundColor = Colors.Transparent;
189189
detail.On<iOS>().EnableTranslucentNavigationBar();
190190
await Navigation.PushModalAsync(flyoutPage);
191191
}
192192

193-
async void SemiTransparentNavigationPageBackgroundColorPressed(System.Object sender, System.EventArgs e)
193+
async void SemiTransparentNavigationPageBackgroundColorPressed(System.Object sender, System.EventArgs e)
194194
{
195195
var mainPage = CreateMainPage(false, _topOfScreenText);
196196
var navPage = new NavigationPage(mainPage)
@@ -217,7 +217,7 @@ async void SemiTransparentFlyoutPageBackgroundColorPressed(System.Object sender,
217217
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
218218
var flyoutPage = new FlyoutPage()
219219
{
220-
Flyout = new ContentPage(){Title = "FlyoutPage"},
220+
Flyout = new ContentPage() { Title = "FlyoutPage" },
221221
Detail = detail
222222
};
223223
detail.BarBackgroundColor = Color.FromRgba(100, 100, 100, 50);
@@ -230,18 +230,19 @@ async void SemiTransparentFlyoutPageBrushPressed(System.Object sender, System.Ev
230230
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
231231
var flyoutPage = new FlyoutPage()
232232
{
233-
Flyout = new ContentPage(){Title = "FlyoutPage"},
233+
Flyout = new ContentPage() { Title = "FlyoutPage" },
234234
Detail = detail
235235
};
236236
detail.BarBackground = Color.FromRgba(100, 100, 100, 50);
237237
detail.On<iOS>().EnableTranslucentNavigationBar();
238238
await Navigation.PushModalAsync(flyoutPage);
239239
}
240240

241-
ContentPage CreateMainPage (bool useSafeArea, string expectedText)
241+
ContentPage CreateMainPage(bool useSafeArea, string expectedText)
242242
{
243-
var mainPage = new ContentPage(){
244-
AutomationId="PopupMainPage"
243+
var mainPage = new ContentPage()
244+
{
245+
AutomationId = "PopupMainPage"
245246
};
246247
var grid = new Grid
247248
{
@@ -253,21 +254,21 @@ ContentPage CreateMainPage (bool useSafeArea, string expectedText)
253254
},
254255
};
255256

256-
var button = new Button { Text = "Pop Page", AutomationId="PopPageButton" };
257+
var button = new Button { Text = "Pop Page", AutomationId = "PopPageButton" };
257258
button.Clicked += PopModalButtonClicked;
258259

259-
grid.Add (new BoxView { BackgroundColor = Colors.Green, AutomationId="TopBoxView" }, 0, 0 );
260-
grid.Add (new Label { TextColor = Colors.Black, Margin= new Microsoft.Maui.Thickness(0,60,0,0), HorizontalTextAlignment = Microsoft.Maui.TextAlignment.Center, Text="Can you see me?" }, 0, 0 );
261-
grid.Add (new Label { Text = expectedText }, 0, 1 );
262-
grid.Add (button, 0, 2 );
260+
grid.Add(new BoxView { BackgroundColor = Colors.Green, AutomationId = "TopBoxView" }, 0, 0);
261+
grid.Add(new Label { TextColor = Colors.Black, Margin = new Microsoft.Maui.Thickness(0, 60, 0, 0), HorizontalTextAlignment = Microsoft.Maui.TextAlignment.Center, Text = "Can you see me?" }, 0, 0);
262+
grid.Add(new Label { Text = expectedText }, 0, 1);
263+
grid.Add(button, 0, 2);
263264
grid.IgnoreSafeArea = true;
264265

265266
mainPage.Content = grid;
266267
mainPage.On<iOS>().SetUseSafeArea(useSafeArea);
267268
return mainPage;
268269
}
269270

270-
async void PopModalButtonClicked (System.Object sender, System.EventArgs e)
271+
async void PopModalButtonClicked(System.Object sender, System.EventArgs e)
271272
{
272273
await Navigation.PopModalAsync();
273274
}

src/Controls/samples/Controls.Sample.UITests/Issues/Issue17610.xaml.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ namespace Maui.Controls.Sample.Issues
1010
[Issue(IssueTracker.Github, 17610, "Cancelling Refresh With Slow Scroll Leaves Refresh Icon Visible", PlatformAffected.Android)]
1111
public partial class Issue17610 : ContentPage
1212
{
13-
public IEnumerable ItemSource {get;set;}
13+
public IEnumerable ItemSource { get; set; }
1414

1515
public Issue17610()
1616
{
1717
InitializeComponent();
18-
ItemSource =
19-
Enumerable.Range(0,17)
20-
.Select(x => new { Text = $"Item {x}", AutomationId = $"Item{x}" })
21-
.ToList();
22-
18+
ItemSource =
19+
Enumerable.Range(0, 17)
20+
.Select(x => new { Text = $"Item {x}", AutomationId = $"Item{x}" })
21+
.ToList();
22+
2323
BindableLayout.SetItemsSource(vsl, ItemSource);
24-
25-
#if ANDROID
24+
25+
#if ANDROID
2626
refreshView.HandlerChanged += (x,y) =>
2727
{
2828
if (refreshView.Handler.PlatformView is Microsoft.Maui.Platform.MauiSwipeRefreshLayout refresh)
2929
// In order for the refresh view to have enough contrast to trigger the screen shot comparison code
3030
// we need to set it to a color that will trigger above the threshold
3131
refresh.SetProgressBackgroundColorSchemeResource(Android.Resource.Color.HoloRedDark);
3232
};
33-
#endif
34-
33+
#endif
34+
3535
}
3636

3737

0 commit comments

Comments
 (0)