marketally/marketally.mopups
2
0
Fork 0
Code Issues Packages Releases Wiki

Update AndroidMopups.cs

Browse Source
This commit is contained in:
AnthonyNjuguna
2025-02-04 11:05:43 +00:00
parent 66f585d8c6
commit 17d094c1fb
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Mopups/Mopups.Maui/Platforms/Android/Impl/AndroidMopups.cs
View File

@@ -1,6 +1,9 @@
using Android.Views;
using Android.Widget;
using AndroidX.Activity;
using AndroidX.Fragment.App;
using AsyncAwaitBestPractices;
using Microsoft.Maui.Platform;
using Mopups.Interfaces;
using Mopups.Pages;
using Mopups.Services;
@@ -9,7 +12,7 @@ namespace Mopups.Droid.Implementation;
public class AndroidMopups : IPopupPlatform
{
private static FrameLayout? DecoreView => Platform.CurrentActivity?.Window?.DecorView as FrameLayout;
private static FrameLayout? DecoreView => GetTopFragmentDecorView();
public static bool SendBackPressed(Action? backPressedHandler = null)
{
@@ -44,13 +47,11 @@ public class AndroidMopups : IPopupPlatform
var handler = page.Handler ??= new PopupPageHandler(page.Parent.Handler.MauiContext);
var androidNativeView = handler.PlatformView as Android.Views.View;
var decoreView = Platform.CurrentActivity?.Window?.DecorView as FrameLayout;
decoreView?.AddView(androidNativeView);
DecoreView?.AddView(androidNativeView);
return PostAsync(androidNativeView);
}
public Task RemoveAsync(PopupPage page)
{
var renderer = IPopupPlatform.GetOrCreateHandler<PopupPageHandler>(page);
@@ -171,4 +172,28 @@ public class AndroidMopups : IPopupPlatform
return tcs.Task;
}
static FrameLayout? GetTopFragmentDecorView()
{
if (Platform.CurrentActivity is not ComponentActivity componentActivity)
{
return null;
}
var fragments = componentActivity.GetFragmentManager()?.Fragments;
if (fragments is null || !fragments.Any())
{
return Platform.CurrentActivity?.Window?.DecorView as FrameLayout;;
}
var topFragment = fragments[^1];
if (topFragment is DialogFragment dialogFragment)
{
return dialogFragment.Dialog?.Window?.DecorView as FrameLayout;
}
return topFragment.Activity?.Window?.DecorView as FrameLayout;
}
}