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

Match Catalyst Template to iOS for Shell Flyout Items #25056

Merged
merged 2 commits into from
Oct 3, 2024

Conversation

PureWeen
Copy link
Member

@PureWeen PureWeen commented Oct 2, 2024

Description of Change

When we added Catalyst during our move from XF to MAUI we forgot to include certain styles for Catalyst alongside iOS

Fixes

Before

image

After

image

@PureWeen PureWeen requested a review from a team as a code owner October 2, 2024 18:24
@PureWeen PureWeen requested review from jsuarezruiz, tj-devel709, davidortinau and rmarinho and removed request for jsuarezruiz and tj-devel709 October 2, 2024 18:24
rmarinho
rmarinho previously approved these changes Oct 2, 2024
@@ -537,6 +537,16 @@ internal static DataTemplate CreateDefaultFlyoutItemCell(string textBinding, str
return grid;
});
}

#if NETSTANDARD
sealed class OperatingSystem
Copy link
Member

Choose a reason for hiding this comment

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

Is this the right place for it? Do we need this in more places?

Copy link
Member Author

@PureWeen PureWeen Oct 3, 2024

Choose a reason for hiding this comment

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

Maybe? The problem I ran into putting this into a more general place is that you start to get errors about "OperatingSystem" is defined in multiple places. Unfortunately, NS has the System.OperatingSystem type it just doesn't have anything useful for us.

Another thought I had was to just call it OperatingSystemNS and then add a special using at the top, which did work.

Not sure the cleverest way to make this reusable.

Maybe we add our own internal static? MAUIOS that we can use generally?

@rmarinho rmarinho merged commit 6d1f2a4 into main Oct 3, 2024
97 checks passed
@rmarinho rmarinho deleted the fix_catalyst_flyout_template branch October 3, 2024 09:08
@samhouts samhouts added fixed-in-net9.0-nightly This may be available in a nightly release! fixed-in-net8.0-nightly This may be available in a nightly release! labels Oct 14, 2024
@PureWeen
Copy link
Member Author

/backport to release/9.0.1xx

Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/maui/actions/runs/11335293225

rmarinho pushed a commit that referenced this pull request Oct 16, 2024
* Match Catalyst Template to iOS

* - NS Fixes
@github-actions github-actions bot locked and limited conversation to collaborators Nov 16, 2024
@samhouts samhouts added fixed-in-9.0.12 and removed fixed-in-net9.0-nightly This may be available in a nightly release! fixed-in-net8.0-nightly This may be available in a nightly release! labels Dec 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants