Skip to content

Hide FlyoutIcon when FlyoutBehavior set to disabled#20087

Merged
PureWeen merged 8 commits into
dotnet:mainfrom
kubaflo:flyoutIcon-when-flyout-disabled-fix
Jul 17, 2024
Merged

Hide FlyoutIcon when FlyoutBehavior set to disabled#20087
PureWeen merged 8 commits into
dotnet:mainfrom
kubaflo:flyoutIcon-when-flyout-disabled-fix

Conversation

@kubaflo

@kubaflo kubaflo commented Jan 22, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description of Change

The restrictions have been added to make sure that the custom icon is displayed only when the flyoutBehavior is equal FlyoutBehavior.Flyout on Android and iOS

Issues Fixed

Fixes #9037

Screen.Recording.2024-01-26.at.17.19.37.mov

@kubaflo kubaflo requested a review from a team as a code owner January 22, 2024 23:36
@ghost ghost added the community ✨ Community Contribution label Jan 22, 2024
@ghost

ghost commented Jan 22, 2024

Copy link
Copy Markdown

Hey there @kubaflo! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

@kubaflo kubaflo mentioned this pull request Jan 22, 2024
Closed
@jfversluis jfversluis requested a review from PureWeen January 23, 2024 08:41
@jfversluis

jfversluis commented Jan 23, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jan 23, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@kubaflo kubaflo force-pushed the flyoutIcon-when-flyout-disabled-fix branch from 6b3326c to c431cdd Compare January 26, 2024 16:20
@samhouts samhouts added the area-controls-shell Shell Navigation, Routes, Tabs, Flyout label Jan 31, 2024
@dustin-wojciechowski

dustin-wojciechowski commented Apr 25, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Looks good, tested and working on Android and ios.

Noticed that this already worked on Windows and needed no change in this PR as well:
20087_part1
20087_part2

@dustin-wojciechowski

dustin-wojciechowski commented Apr 25, 2024

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

azure-pipelines Bot commented Apr 25, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@kubaflo

kubaflo commented Apr 25, 2024

Copy link
Copy Markdown
Contributor Author

Looks good, just noticing that no changes were needed for this to work on Windows 20087_part1 20087_part2

I unfortunately cannot say anything about the windows behavior because I don't have a windows device

@PureWeen

PureWeen commented Jun 1, 2024

Copy link
Copy Markdown
Member

/rebase

@PureWeen

PureWeen commented Jun 1, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jun 1, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

PureWeen
PureWeen requested changes Jun 1, 2024
View reviewed changes
Comment thread src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs Outdated
else if (String.IsNullOrWhiteSpace(text) && IsRootPage && _flyoutBehavior == FlyoutBehavior.Flyout)
{
icon = DrawHamburger();
if (image != null)

@PureWeen PureWeen Jun 1, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would it make sense to move all the code below this to a separate method?

And then before we call LoadImage we can just check the flyout behavior? If it's set to Flyout then we just call the separate method with a null icon?

With this path, it seems like we're going to be loading an image that we never use.

@kubaflo kubaflo force-pushed the flyoutIcon-when-flyout-disabled-fix branch from 4f435d6 to cd35b7b Compare June 1, 2024 23:55
PureWeen
PureWeen previously approved these changes Jun 2, 2024
View reviewed changes
@PureWeen

PureWeen commented Jun 2, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jun 2, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@PureWeen

PureWeen commented Jun 2, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jun 2, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@jsuarezruiz

jsuarezruiz commented Jun 10, 2024

Copy link
Copy Markdown
Contributor

Rebased and added pending UITest snapshots.

@jsuarezruiz

jsuarezruiz commented Jun 10, 2024

Copy link
Copy Markdown
Contributor

/azp run

jsuarezruiz
jsuarezruiz previously approved these changes Jun 13, 2024
View reviewed changes
PureWeen
PureWeen requested changes Jul 16, 2024
View reviewed changes
Comment thread src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20166.cs
@kubaflo kubaflo force-pushed the flyoutIcon-when-flyout-disabled-fix branch from 8187b05 to c9ebc82 Compare July 16, 2024 18:48
@kubaflo kubaflo requested a review from PureWeen July 16, 2024 18:50
@PureWeen

PureWeen commented Jul 16, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jul 16, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

PureWeen
PureWeen requested changes Jul 16, 2024
View reviewed changes
Comment thread src/Controls/tests/TestCases.HostApp/Issues/Issue20166.cs
@kubaflo kubaflo requested a review from PureWeen July 16, 2024 23:28
@PureWeen

PureWeen commented Jul 17, 2024

Copy link
Copy Markdown
Member

/azp run

@azure-pipelines

azure-pipelines Bot commented Jul 17, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@PureWeen PureWeen enabled auto-merge (squash) July 17, 2024 18:51
@PureWeen PureWeen disabled auto-merge July 17, 2024 23:44
@PureWeen

PureWeen commented Jul 17, 2024

Copy link
Copy Markdown
Member

Test failures are unrelated

@PureWeen PureWeen merged commit 1b7bfe3 into dotnet:main Jul 17, 2024
@samhouts samhouts added fixed-in-net9.0-nightly This may be available in a nightly release! fixed-in-8.0.80 and removed fixed-in-net9.0-nightly This may be available in a nightly release! labels Aug 2, 2024
@github-actions github-actions Bot locked and limited conversation to collaborators Sep 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@PureWeen PureWeen PureWeen approved these changes

@dustin-wojciechowski dustin-wojciechowski dustin-wojciechowski left review comments

@jfversluis jfversluis Awaiting requested review from jfversluis jfversluis was automatically assigned from dotnet/dotnet-maui-reviewers

@mattleibow mattleibow Awaiting requested review from mattleibow mattleibow was automatically assigned from dotnet/dotnet-maui-reviewers

+1 more reviewer

@jsuarezruiz jsuarezruiz jsuarezruiz left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-controls-shell Shell Navigation, Routes, Tabs, Flyout community ✨ Community Contribution fixed-in-8.0.80 fixed-in-net9.0-nightly This may be available in a nightly release!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Custom FlyoutIcon visible although FlyoutBehavior set to disabled on Android an IOS

6 participants

@kubaflo @jfversluis @dustin-wojciechowski @PureWeen @jsuarezruiz @samhouts