Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[housekeeping] Automated PR to fix formatting errors #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 2143, "Picker on windows phone", PlatformAffected.WinPhone)]
#if UITEST
#if UITEST
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
#endif
#endif
public class Issue2143 : ContentPage
{
public Issue2143()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 22246, "Entry in Grid nested in ViewCell isn't expanding", PlatformAffected.WinPhone, NavigationBehavior.PushModalAsync)]
#if UITEST
#if UITEST
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
#endif
#endif
public class Issue22246Bz : ContentPage
{
public Issue22246Bz()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 2615, "iOS Cell Reuse screws up when cells are both ViewCell with different children", PlatformAffected.iOS)]
#if UITEST
#if UITEST
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
#endif
#endif
public class Issue2615 : ContentPage
{
public Issue2615()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Github, 5555, "Memory leak when SwitchCell or EntryCell", PlatformAffected.iOS)]
#if UITEST
#if UITEST
[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.TableView)]
#endif
#endif
public class Issue5555 : TestContentPage
{
[Preserve(AllMembers = true)]
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/Maps/src/HandlerImpl/Polygon.Impl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public IEnumerator<Location> GetEnumerator()
{
return Geopath.GetEnumerator();
}

/// <summary>
/// Gets the index of a specified location object.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public override string ToString()
new GalleryPageFactory(() => new ImageButtonCoreGalleryPage(), "Image Button Gallery"),
new GalleryPageFactory(() => new ImageCoreGalleryPage(), "Image Gallery"),
new GalleryPageFactory(() => new KeyboardScrollingGridGallery(), "Keyboard Scrolling Gallery - Grid with Star Row"),
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles"),
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"),
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles"),
new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"),
new GalleryPageFactory(() => new KeyboardScrollingScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"),
new GalleryPageFactory(() => new KeyboardScrollingScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Small Titles"),
new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
new GalleryPageFactory(() => new ListViewCoreGalleryPage(), "ListView Gallery"),
new GalleryPageFactory(() => new PickerCoreGalleryPage(), "Picker Gallery"),
new GalleryPageFactory(() => new ProgressBarCoreGalleryPage(), "Progress Bar Gallery"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.Xaml;
using Microsoft.Maui.Platform;
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
using System;
using Microsoft.Maui.Controls.Xaml;
using Microsoft.Maui.Platform;

namespace Maui.Controls.Sample.Issues;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ protected override void Init()
AutomationId = "HardwareEnterKeyEntry"
};

Content =
new VerticalStackLayout()
{
Content =
new VerticalStackLayout()
{
new Label()
{
Text = "Focus entry and hit the Enter key on the hardware keyboard. A success label should appear."
},
entry
};

entry.Completed += (sender, args) =>
{
(Content as VerticalStackLayout)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.Xaml;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
using Microsoft.Maui.Controls.Xaml;
using Microsoft.Maui.Graphics;
using FlyoutPage = Microsoft.Maui.Controls.FlyoutPage;
using NavigationPage = Microsoft.Maui.Controls.NavigationPage;

namespace Maui.Controls.Sample.Issues;

Expand Down Expand Up @@ -97,7 +97,7 @@ async void NewFlyoutPagePressed(System.Object sender, System.EventArgs e)
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Colors.Transparent;
Expand All @@ -111,7 +111,7 @@ async void NewFlyoutPageTransparentPressed(System.Object sender, System.EventArg
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Colors.Transparent;
Expand All @@ -123,7 +123,7 @@ async void NewFlyoutPageTranslucentPressed(System.Object sender, System.EventArg
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.On<iOS>().EnableTranslucentNavigationBar();
Expand All @@ -135,7 +135,7 @@ async void NewFlyoutPageTransparentTranslucentPressed(System.Object sender, Syst
var detail = new NavigationPage(CreateMainPage(true, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Colors.Transparent;
Expand All @@ -148,7 +148,7 @@ async void NewFlyoutPageGridPressed(System.Object sender, System.EventArgs e)
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
await Navigation.PushModalAsync(flyoutPage);
Expand All @@ -159,7 +159,7 @@ async void NewFlyoutPageGridTransparentPressed(System.Object sender, System.Even
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Colors.Transparent;
Expand All @@ -171,7 +171,7 @@ async void NewFlyoutPageGridTranslucentPressed(System.Object sender, System.Even
var detail = new NavigationPage(CreateMainPage(false, _notTopOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.On<iOS>().EnableTranslucentNavigationBar();
Expand All @@ -182,15 +182,15 @@ async void NewFlyoutPageGridTransparentTranslucentPressed(System.Object sender,
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Colors.Transparent;
detail.On<iOS>().EnableTranslucentNavigationBar();
await Navigation.PushModalAsync(flyoutPage);
}

async void SemiTransparentNavigationPageBackgroundColorPressed(System.Object sender, System.EventArgs e)
async void SemiTransparentNavigationPageBackgroundColorPressed(System.Object sender, System.EventArgs e)
{
var mainPage = CreateMainPage(false, _topOfScreenText);
var navPage = new NavigationPage(mainPage)
Expand All @@ -217,7 +217,7 @@ async void SemiTransparentFlyoutPageBackgroundColorPressed(System.Object sender,
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackgroundColor = Color.FromRgba(100, 100, 100, 50);
Expand All @@ -230,18 +230,19 @@ async void SemiTransparentFlyoutPageBrushPressed(System.Object sender, System.Ev
var detail = new NavigationPage(CreateMainPage(false, _topOfScreenText));
var flyoutPage = new FlyoutPage()
{
Flyout = new ContentPage(){Title = "FlyoutPage"},
Flyout = new ContentPage() { Title = "FlyoutPage" },
Detail = detail
};
detail.BarBackground = Color.FromRgba(100, 100, 100, 50);
detail.On<iOS>().EnableTranslucentNavigationBar();
await Navigation.PushModalAsync(flyoutPage);
}

ContentPage CreateMainPage (bool useSafeArea, string expectedText)
ContentPage CreateMainPage(bool useSafeArea, string expectedText)
{
var mainPage = new ContentPage(){
AutomationId="PopupMainPage"
var mainPage = new ContentPage()
{
AutomationId = "PopupMainPage"
};
var grid = new Grid
{
Expand All @@ -253,21 +254,21 @@ ContentPage CreateMainPage (bool useSafeArea, string expectedText)
},
};

var button = new Button { Text = "Pop Page", AutomationId="PopPageButton" };
var button = new Button { Text = "Pop Page", AutomationId = "PopPageButton" };
button.Clicked += PopModalButtonClicked;

grid.Add (new BoxView { BackgroundColor = Colors.Green, AutomationId="TopBoxView" }, 0, 0 );
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 );
grid.Add (new Label { Text = expectedText }, 0, 1 );
grid.Add (button, 0, 2 );
grid.Add(new BoxView { BackgroundColor = Colors.Green, AutomationId = "TopBoxView" }, 0, 0);
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);
grid.Add(new Label { Text = expectedText }, 0, 1);
grid.Add(button, 0, 2);
grid.IgnoreSafeArea = true;

mainPage.Content = grid;
mainPage.On<iOS>().SetUseSafeArea(useSafeArea);
return mainPage;
}

async void PopModalButtonClicked (System.Object sender, System.EventArgs e)
async void PopModalButtonClicked(System.Object sender, System.EventArgs e)
{
await Navigation.PopModalAsync();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ namespace Maui.Controls.Sample.Issues
[Issue(IssueTracker.Github, 17610, "Cancelling Refresh With Slow Scroll Leaves Refresh Icon Visible", PlatformAffected.Android)]
public partial class Issue17610 : ContentPage
{
public IEnumerable ItemSource {get;set;}
public IEnumerable ItemSource { get; set; }

public Issue17610()
{
InitializeComponent();
ItemSource =
Enumerable.Range(0,17)
.Select(x => new { Text = $"Item {x}", AutomationId = $"Item{x}" })
.ToList();
ItemSource =
Enumerable.Range(0, 17)
.Select(x => new { Text = $"Item {x}", AutomationId = $"Item{x}" })
.ToList();

BindableLayout.SetItemsSource(vsl, ItemSource);
#if ANDROID

#if ANDROID
refreshView.HandlerChanged += (x,y) =>
{
if (refreshView.Handler.PlatformView is Microsoft.Maui.Platform.MauiSwipeRefreshLayout refresh)
// In order for the refresh view to have enough contrast to trigger the screen shot comparison code
// we need to set it to a color that will trigger above the threshold
refresh.SetProgressBackgroundColorSchemeResource(Android.Resource.Color.HoloRedDark);
};
#endif
#endif

}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ protected override void Init()
AutomationId = "Spin",
Text = "Spin",
};
button.Clicked += (s, e) =>
button.Clicked += (s, e) =>
{
circleView.Rotation = 180;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Maui.Controls.Sample.Issues
[Issue(IssueTracker.Github, 19379, "Not able to update CollectionView header", PlatformAffected.iOS)]
public partial class Issue19379 : ContentPage
{
int _initValue;
int _initValue;
IList<string> _itemList;
Issue19379CustomHeader _customHeader;

Expand Down Expand Up @@ -53,7 +53,7 @@ protected override void OnAppearing()
}



public IList<string> ItemList
{
get { return _itemList; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.Xaml;
using Microsoft.Maui.Graphics;
using System.Collections.Generic;

namespace Maui.Controls.Sample.Issues
{
Expand All @@ -29,14 +29,14 @@ public Issue19657()

class SampleCarouselItem1
{
public SampleCarouselItem1(string title, string description )
{
Title = title;
Description = description;
}
public SampleCarouselItem1(string title, string description)
{
Title = title;
Description = description;
}

public string Title { get; set; }
public string Description { get; set; }
public string Title { get; set; }
public string Description { get; set; }
public Color Color { get; set; }
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/Controls/samples/Controls.Sample.UITests/Issues/Issue20920.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ public class Issue20920 : TestContentPage
protected override void Init()
{
Content = new ScrollView()
{
Orientation = Microsoft.Maui.ScrollOrientation.Horizontal,
Content = new ScrollView()
{
Orientation = Microsoft.Maui.ScrollOrientation.Vertical,
Content = new Image()
{
Margin = 100,
AutomationId = "dotnet_bot",
Source = "dotnet_bot.png",
HeightRequest = 1000,
WidthRequest = 1000
}
}
};
{
Orientation = Microsoft.Maui.ScrollOrientation.Horizontal,
Content = new ScrollView()
{
Orientation = Microsoft.Maui.ScrollOrientation.Vertical,
Content = new Image()
{
Margin = 100,
AutomationId = "dotnet_bot",
Source = "dotnet_bot.png",
HeightRequest = 1000,
WidthRequest = 1000
}
}
};
}
}
}
Loading