Skip to content

Fix options not working for Core #2491

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.

Sign up for GitHub

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

Merged
TheCodeTraveler merged 7 commits into from
Feb 4, 2025
Merged

Fix options not working for Core #2491

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5156725
Fix options not working for Core
ne0rrmatrix Feb 4, 2025
1db0e9d
Merge branch 'main' into FixOptions
ne0rrmatrix Feb 4, 2025
762e4ee
Update AppBuilderExtensions.shared.cs
TheCodeTraveler Feb 4, 2025
ca99578
Add Unit Tests
TheCodeTraveler Feb 4, 2025
5808042
Restore default Options after each test
TheCodeTraveler Feb 4, 2025
c06fe8c
Add `event EventHandler ShouldUseStatusBarBehaviorOnAndroidModalPageO…
TheCodeTraveler Feb 4, 2025
aaf2a40
`dotnet format`
TheCodeTraveler Feb 4, 2025
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
7 changes: 4 additions & 3 deletions src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
/// <returns><see cref="MauiAppBuilder"/> initialized for <see cref="CommunityToolkit.Maui"/></returns>
public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder, Action<Options>? options = null)
{
// Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
builder.UseMauiCommunityToolkitCore(null);

// Invokes options for both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
options?.Invoke(new Options(builder));

// Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
// Be sure to call `.UseMauiCommunityToolkitCore(null)` after `options.Invoke(new Options(builder))` to ensure `CommunityToolkit.Maui.Core.Options` have already been set
builder.UseMauiCommunityToolkitCore(null);

builder.Services.AddSingleton<IPopupService, PopupService>();

builder.ConfigureMauiHandlers(static h =>
Expand All @@ -42,7 +43,7 @@
Popup.RemapForControls();

#if ANDROID
NavigationBar.RemapForControls();

Check warning on line 46 in src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs

View workflow job for this annotation

GitHub Actions / Build Library (macos-15) 

This call site is reachable on: 'Android' 21.0 and later, 'iOS' 15.0 and later, 'maccatalyst' 15.0 and later, 'Tizen' 6.5 and later, 'Windows' 10.0.17763 and later. 'NavigationBar.RemapForControls()' is only supported on: 'Android' 23.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416)
#endif
return builder;
}
Expand Down
Loading