Skip to content

Fix modal and Shell edge to edge scenarios #31221

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
merged 4 commits into from
Aug 20, 2025
Merged

Fix modal and Shell edge to edge scenarios #31221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb11d1f
Fix edge to edge for modal pages
PureWeen Aug 19, 2025
47298ee
- fix background on appbar layout
PureWeen Aug 19, 2025
ad07761
- fix a few more edge to edge shell cases
PureWeen Aug 19, 2025
b9bb244
- oops
PureWeen Aug 19, 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
3 changes: 1 addition & 2 deletions src/Controls/src/Core/Compatibility/Android/Resources/layout/flyoutcontent.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
android:id="@+id/flyoutcontent_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
app:elevation="0dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
android:theme="@style/MauiAppBarLayout" />

</microsoft.maui.controls.platform.compatibility.ShellFlyoutLayout>
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Compatibility/Android/Resources/layout/shellcontent.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:id="@+id/shellcontent.appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:theme="@style/MauiAppBarLayout"
>

</com.google.android.material.appbar.AppBarLayout>
Expand Down
4 changes: 4 additions & 0 deletions src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellContentFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Android.Views.Animations;
using AndroidX.AppCompat.Widget;
using AndroidX.CoordinatorLayout.Widget;
using AndroidX.Core.View;
using AndroidX.Fragment.App;
using Google.Android.Material.AppBar;
using AndroidAnimation = Android.Views.Animations.Animation;
Expand Down Expand Up @@ -142,6 +143,9 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
_toolbar = (AToolbar)shellToolbar.ToPlatform(shellContentMauiContext);

var appBar = _root.FindViewById<AppBarLayout>(Resource.Id.shellcontent_appbar);

ViewCompat.SetOnApplyWindowInsetsListener(appBar, new ShellSectionRenderer.WindowsListener());

appBar.AddView(_toolbar);
_viewhandler = _page.ToHandler(shellContentMauiContext);

Expand Down
3 changes: 3 additions & 0 deletions src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using AAnimation = Android.Views.Animations.Animation;
using AColor = Android.Graphics.Color;
using AView = Android.Views.View;
using AndroidX.Core.View;

namespace Microsoft.Maui.Controls.Platform
{
Expand Down Expand Up @@ -310,6 +311,8 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup? container

var rootView = _navigationRootManager?.RootView ??
throw new InvalidOperationException("Root view not initialized");

ViewCompat.SetOnApplyWindowInsetsListener(rootView, new WindowHandler.WindowsListener());

if (IsAnimated)
{
Expand Down
3 changes: 1 addition & 2 deletions src/Core/src/Platform/Android/Resources/Layout/navigationlayout.axml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
android:id="@+id/navigationlayout_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:theme="@style/MauiAppBarLayout"
>

<androidx.fragment.app.FragmentContainerView
Expand Down
7 changes: 0 additions & 7 deletions src/Core/src/Platform/Android/Resources/values-v35/styles.xml
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion src/Core/src/Platform/Android/Resources/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:actionMenuTextColor">@color/colorActionMenuTextColor</item>
<item name="appBarLayoutStyle">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="appBarLayoutStyle">@style/MauiAppBarLayout</item>
<item name="bottomNavigationViewStyle">@style/Widget.Design.BottomNavigationView</item>
<item name="materialButtonStyle">@style/MauiMaterialButton</item>
<item name="checkboxStyle">@style/MauiCheckBox</item>
<item name="android:textAllCaps">false</item>
<item name="alertDialogTheme">@style/MauiAlertDialogTheme</item>
<item name="materialAlertDialogTheme">@style/MauiAlertDialogTheme</item>
</style>
<style name="MauiAppBarLayout" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:background">?attr/colorPrimary</item>
</style>
<style name="Maui.MainTheme" parent="Maui.MainTheme.Base">
<!-- v35+ uses this to inject edge to edge opt out attribute value -->
</style>
Expand Down
Loading