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

[Android] FlyoutIsPresented property opens the Flyout #19807

Merged
merged 5 commits into from Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -76,6 +76,11 @@ protected override void OnAppearing()
AppShell!.FlyoutHeaderBehavior = (FlyoutHeaderBehavior)flyoutHeaderBehavior.SelectedIndex;
}

void OnToggleFlyoutIsPresented(object sender, EventArgs e)
{
AppShell!.FlyoutIsPresented = !AppShell!.FlyoutIsPresented;
}

void OnToggleFlyoutBackgroundColor(object sender, EventArgs e)
{
AppShell!.RemoveBinding(Shell.FlyoutBackgroundProperty);
Expand Down
Expand Up @@ -13,6 +13,10 @@
Text="Flyout Behavior"
Style="{StaticResource Headline}"/>
<Picker x:Name="flyoutBehavior" />
<Label
Text="FlyoutIsPresented"
Style="{StaticResource Headline}"/>
<Button Text="Toggle FlyoutIsPresented" x:Name="flyoutIsPresented" Clicked="OnToggleFlyoutIsPresented" />
<Label
Text="Flyout Background Color"
Style="{StaticResource Headline}"/>
Expand Down
Expand Up @@ -183,9 +183,10 @@ protected override bool DrawChild(Canvas canvas, AView child, long drawingTime)
canvas.DrawRect(0, 0, Width, Height, _scrimPaint);
}

if (!FlyoutFirstDrawPassFinished && _flyoutContent != null)
if (!FlyoutFirstDrawPassFinished && _flyoutContent is not null)
{
if (child == _flyoutContent?.AndroidView)
// If the AndroidView property which is the DrawerLayout is initialized at this point, the Flyout first draw pass finished.
if (_flyoutContent?.AndroidView is not null)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original condition is only true after opened the Drawer at least once. For this reason, in the issue the comments share that it works if the menu is opened with a gesture or with the hamburger button at least once but not using directly the FlyoutIsPresented property.
The FlyoutFirstDrawPassFinished property prevents opening the Drawer before it is initialized with a property change to avoid incorrect states, but at this point, if the DrawerLayout has been initialized and the contents drawn we should be able to initialize it.

FlyoutFirstDrawPassFinished = true;

if (this.IsDrawerOpen(_flyoutContent.AndroidView) != _shellContext.Shell.FlyoutIsPresented)
Expand Down
@@ -0,0 +1,35 @@
using AndroidX.DrawerLayout.Widget;
using Microsoft.Maui.Controls;
using System.Threading.Tasks;
using Xunit;

namespace Microsoft.Maui.DeviceTests
{
[Category(TestCategory.Shell)]
public partial class ShellTests
{
[Fact(DisplayName = "FlyoutIsPresented=true sets the visible status of the Shell Flyout.")]
public async Task FlyoutIsPresentedOpenDrawer()
{
await RunShellTest(shell =>
{
shell.FlyoutContent = new VerticalStackLayout() { new Label() { Text = "Flyout Content" } };
},
async (shell, handler) =>
{
// 1. Set FlyoutIsPresented=true to make the Shell Flyout visible.
shell.FlyoutIsPresented = true;

var dl = GetDrawerLayout(handler) as DrawerLayout;
Assert.NotNull(dl);

await AssertionExtensions.AssertEventually(() =>
{
// 2. Check that the Flyout has size.
var flyoutFrame = GetFlyoutFrame(handler);
return flyoutFrame.Width > 0 && flyoutFrame.Height > 0 && dl.IsOpen;
});
});
}
}
}