Skip to content
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 @@ -597,7 +597,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont

default:
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
};
}
;
}

void OnScrollViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,8 @@ public override CGRect Frame
value.Width = (value.X - xSpace) + value.Width;
value.X = xSpace;
}
};
}
;

value.Height = ToolbarHeight;
}
Expand Down
6 changes: 4 additions & 2 deletions src/Controls/src/BindingSourceGen/PathParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ private Result<List<IPathPart>> HandleBinaryExpression(BinaryExpressionSyntax as
if (typeInfo == null)
{
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castTo.GetLocation()));
};
}
;

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

Expand All @@ -161,7 +162,8 @@ private Result<List<IPathPart>> HandleCastExpression(CastExpressionSyntax castEx
if (typeInfo == null)
{
return Result<List<IPathPart>>.Failure(DiagnosticsFactory.UnableToResolvePath(castExpression.GetLocation()));
};
}
;

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

Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/AppThemeBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ void Set()
}
target.SetValueCore(_targetProperty, value, Internals.SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted, specificity);
}
};
}
;
}

object _light;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,8 @@ public override CGRect Frame
value.Width = (value.X - xSpace) + value.Width;
value.X = xSpace;
}
};
}
;

value.Height = ToolbarHeight;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ void RemoveAllButCurrent(Fragment skip)

trans ??= ChildFragmentManager.BeginTransactionEx();
trans.Remove(f);
};
}
;

trans?.CommitAllowingStateLossEx();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,8 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont

default:
return elementBounds.Left < containerBounds.Right && elementBounds.Right > containerBounds.Left;
};
}
;
}

async void ScrollToRequested(object sender, ScrollToRequestEventArgs args)
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ static NSCollectionLayoutBoundarySupplementaryItem[] CreateSupplementaryItems(La
scrollDirection == UICollectionViewScrollDirection.Vertical
? NSRectAlignment.Top
: NSRectAlignment.Leading));
};
}
;

if (layoutHeaderFooterInfo.HasFooter)
{
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/src/Core/Shell/ShellSection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,8 @@ void WaitForRendererToGetRemoved(object s, EventArgs p)
{
sc.Page.PlatformEnabledChanged -= WaitForRendererToGetRemoved;
base.OnChildRemoved(child, oldLogicalIndex);
};
}
;
}
else
{
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/tests/Core.UnitTests/BindingUnitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,8 @@ void create()
proxies.Add(new WeakReference(listener));
}
Assert.NotEmpty(proxies); // Should be at least 1
};
}
;
create();

await Task.Yield();
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/Core.UnitTests/VisualElementTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public void WidthAndHeightRequestPropagateToHandler()
Assert.Equal(2, heightMapperCalled);
Assert.Equal(2, widthMapperCalled);
}

[Fact]
public void ShouldPropagateVisibilityToChildren()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public async Task ContentSizeExpandsToViewport()
static CoreGraphics.CGSize getViewportSize(UIScrollView scrollView)
{
return scrollView.AdjustedContentInset.InsetRect(scrollView.Bounds).Size;
};
}
;

var scrollViewHandler = await InvokeOnMainThreadAsync(() =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ public async Task MovingBetweenMultiplePagesWithNestedNavigationPages(bool botto
{
Title = title
};
};
}
;

var tabbedPage = CreateBasicTabbedPage(bottomTabs, isSmoothScrollEnabled, pages);

Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/TestCases.HostApp/Issues/Issue2354.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace Maui.Controls.Sample.Issues
{

[Issue(IssueTracker.Github, 2354, "ListView, ImageCell and disabled source cache and same image url", PlatformAffected.iOS | PlatformAffected.Android , isInternetRequired: true)]
[Issue(IssueTracker.Github, 2354, "ListView, ImageCell and disabled source cache and same image url", PlatformAffected.iOS | PlatformAffected.Android, isInternetRequired: true)]
public class Issue2354 : TestContentPage
{
protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ContentPage CreateContentPage()

page.Content = layout;
return page;
};
}
;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class CarouselViewUITests : UITest
{
const string CarouselViewGallery = "CarouselView Gallery";

public CarouselViewUITests(TestDevice device): base(device)
public CarouselViewUITests(TestDevice device) : base(device)
{
}

Expand Down Expand Up @@ -69,7 +69,7 @@ public void CarouselViewGoToPreviousCurrentItem()
CheckLabelValue("lblSelected", previousIndex);
}

// Catalyst doesn't support orientation changes
// Catalyst doesn't support orientation changes
#if !MACCATALYST
[Test]
[Category(UITestCategories.CarouselView)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void EntryClearButtonColorShouldMatchTextColor()
App.WaitForElement("entry");
App.Tap("button");
#if ANDROID // Skip keyboard on Android to address CI flakiness, Keyboard is not needed validation.
Thread.Sleep(500); // Wait for the keyboard to appear
Thread.Sleep(500); // Wait for the keyboard to appear
if (App.IsKeyboardShown())
App.DismissKeyboard();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ public Issue20535(TestDevice device) : base(device) { }
public void SwitchTrackColorTest()
{
App.WaitForElement("WaitForStubControl");

// 1. Update the state of the Switch by updating the OnColor property.
// In this way, we validate the initial value but also the update.
App.Tap("UpdateOnColorSwitch");
App.WaitForElement("Update OnColor"); // Wait for the Thumb animation to complete

// 2. Verify the result.
VerifyScreenshot();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class Issue22914 : _IssuesUITest
const string ButtonId = "Tap1Button";

readonly string[] _expectedNullBackgroundColorIds = [ButtonId, "ContentView1", "Label1", "VerticalStackLayout1"];

public Issue22914(TestDevice device) : base(device)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ public void TapThenDoubleTap()
App.DoubleTap("TapLabel");

#if ANDROID
// In CI Double tap does not effective sometimes so retry once before failing to resolve the flakiness.
try
{
App.WaitForElement("Double");
}
catch(TimeoutException)
{
App.WaitForElement("Single");
App.DoubleTap("TapLabel");
}
// In CI Double tap does not effective sometimes so retry once before failing to resolve the flakiness.
try
{
App.WaitForElement("Double");
}
catch (TimeoutException)
{
App.WaitForElement("Single");
App.DoubleTap("TapLabel");
}
#endif
App.WaitForElement("Double");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace Microsoft.Maui.TestCases.Tests.Issues
{
public class Issue26328 : _IssuesUITest
{
{
public override string Issue => "SwipeView causes Java.Lang.IllegalArgumentException: Cannot add a null child view to a ViewGroup";

public Issue26328(TestDevice device)
Expand All @@ -19,7 +19,7 @@ public void NoCrashRemovingSwipeItems()
{
App.WaitForElement("TestCollectionView");

for(int i = 0; i < 10; i++)
for (int i = 0; i < 10; i++)
{
App.SwipeRightToLeft();
App.ScrollDown("TestCollectionView", ScrollStrategy.Gesture, swipePercentage: 0.2);
Expand Down
3 changes: 2 additions & 1 deletion src/Controls/tests/Xaml.UnitTests/MSBuild/MSBuildTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ void onData(object s, DataReceivedEventArgs e)
builder.AppendLine(e.Data);
Console.WriteLine(e.Data);
}
};
}
;

var ext = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "";
var dotnet = IOPath.Combine(testDirectory, "..", "..", "..", "..", "..", "..", "..", "bin", "dotnet", $"dotnet{ext}");
Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ TSize IMeasurable.Measure(double availableWidth, double availableHeight)
else
{
return new TSize(Math.Max(PixelSize + 10, availableWidth), PixelSize + 10);
};
}
;
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ TSize IMeasurable.Measure(double availableWidth, double availableHeight)
else
{
return new TSize(Math.Max(PixelSize + 10, availableWidth), PixelSize + 10);
};
}
;
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Platform/Android/ViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,8 @@ void ShowSoftInput()
}

view.ShowSoftInput();
};
}
;

view.Post(ShowSoftInput);
}
Expand Down
3 changes: 2 additions & 1 deletion src/Core/src/Platform/Windows/SliderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ void OnImageOpened(object sender, RoutedEventArgs e)

if (nativeSlider.Parent is FrameworkElement frameworkElement)
frameworkElement.InvalidateMeasure();
};
}
;
}

nativeSlider.ThumbImageSource = nativeThumbImageSource?.Value;
Expand Down
6 changes: 4 additions & 2 deletions src/Core/src/Platform/iOS/ViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,8 @@ void OnLoadedCheck(NSObservedChange? nSObservedChange = null)
uiView.BeginInvokeOnMainThread(() => OnLoadedCheck(null));
}
}
};
}
;

return disposable;
}
Expand Down Expand Up @@ -740,7 +741,8 @@ void UnLoadedCheck()
disposable = null;
action();
}
};
}
;

return disposable;
}
Expand Down