Skip to content

Commit b9eb598

Browse files
NirmalKumarYuvarajPureWeen
authored andcommitted
updated changes
1 parent e3b6122 commit b9eb598

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,22 @@ public ModalFragment(IMauiContext mauiContext, Page modal)
240240
dialog.Window.SetSoftInputMode(attributes.SoftInputMode);
241241
}
242242

243-
// Configure translucent system bars for modal pages on Android API 36+
244-
if (OperatingSystem.IsAndroidVersionAtLeast(36) && Context?.GetActivity() is global::Android.App.Activity activity)
243+
// Configure translucent system bars for modal pages on Android API 30+
244+
if (OperatingSystem.IsAndroidVersionAtLeast(30) && Context?.GetActivity() is global::Android.App.Activity activity)
245245
{
246246
dialog.Window.ConfigureTranslucentSystemBars(activity);
247247
}
248+
else if (mainActivityWindow is not null)
249+
{
250+
// Fallback for API < 30: Apply legacy translucent behavior
251+
var navigationBarColor = mainActivityWindow.NavigationBarColor;
252+
var statusBarColor = mainActivityWindow.StatusBarColor;
253+
#pragma warning disable CA1422
254+
dialog.Window.SetNavigationBarColor(new AColor(navigationBarColor));
255+
dialog.Window.SetStatusBarColor(new AColor(statusBarColor));
256+
#pragma warning restore CA1422
257+
}
258+
248259

249260
return dialog;
250261
}

src/Core/src/Handlers/Window/WindowHandler.Android.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public partial class WindowHandler : ElementHandler<IWindow, Activity>
1818
protected override void ConnectHandler(Activity platformView)
1919
{
2020
base.ConnectHandler(platformView);
21-
if (OperatingSystem.IsAndroidVersionAtLeast(36))
21+
if (OperatingSystem.IsAndroidVersionAtLeast(30))
2222
{
23-
//Edge to Edge enabled for Android API 36+
23+
//Edge to Edge enabled for Android API 30+
2424
PlatformView.Window.ConfigureTranslucentSystemBars(PlatformView);
2525
}
2626
UpdateVirtualViewFrame(platformView);

src/Core/src/Platform/Android/WindowExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ internal static void ConfigureTranslucentSystemBars(this Window? window, Activit
5050
return;
5151
}
5252

53-
// Set appropriate system bar appearance for readability
53+
// Set appropriate system bar appearance for readability using API 30+ methods
5454
var windowInsetsController = WindowCompat.GetInsetsController(window, window.DecorView);
5555
if (windowInsetsController is not null)
5656
{

0 commit comments

Comments
 (0)