Skip to content

[Android] Fix: Modal Animation Repeats When Returning from Background 3 #29702

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 8 commits into from
Jun 3, 2025
Merged

[Android] Fix: Modal Animation Repeats When Returning from Background 3 #29702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
637549b
fix
bhavanesh2001 Mar 20, 2025
cc9a50b
dispose listner once not needed
bhavanesh2001 Mar 20, 2025
c036568
Revert "dispose listner once not needed"
bhavanesh2001 Mar 20, 2025
1ece5db
call invalidate
bhavanesh2001 Mar 20, 2025
1c44e0d
add device test to check for leaks
bhavanesh2001 Mar 21, 2025
100240f
null check and remove strong references in callback
bhavanesh2001 Mar 24, 2025
721efd4
Throw if rootview is null before adding animation
bhavanesh2001 May 9, 2025
cfe310e
fix spelling mistake
bhavanesh2001 Jun 3, 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
48 changes: 26 additions & 22 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 @@ -305,11 +305,34 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup? container

_navigationRootManager = modalContext.GetNavigationRootManager();
_navigationRootManager.Connect(_modal, modalContext);

UpdateBackgroundColor();

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

if (IsAnimated)
{
_ = new GenericGlobalLayoutListener((listener,view) =>
{
listener.Invalidate();
if(view is not null)
{
var animation = AnimationUtils.LoadAnimation(view.Context, Resource.Animation.nav_modal_default_enter_anim)!;
view.StartAnimation(animation);
animation.AnimationEnd += OnAnimationEnded;
}
},_navigationRootManager.RootView);
}
return rootView;
}
void OnAnimationEnded(object? sender, AAnimation.AnimationEndEventArgs e)
{
if (sender is not AAnimation animation)
return;

animation.AnimationEnd -= OnAnimationEnded;
FireAnimationEnded();
}

public override void OnCreate(Bundle? savedInstanceState)
Expand All @@ -329,26 +352,7 @@ public override void OnStart()

int width = ViewGroup.LayoutParams.MatchParent;
int height = ViewGroup.LayoutParams.MatchParent;
dialog.Window.SetLayout(width, height);

if (IsAnimated)
{
var animation = AnimationUtils.LoadAnimation(_mauiWindowContext.Context, Resource.Animation.nav_modal_default_enter_anim)!;
View.StartAnimation(animation);

animation.AnimationEnd += OnAnimationEnded;
}

void OnAnimationEnded(object? sender, AAnimation.AnimationEndEventArgs e)
{
if (sender is not AAnimation animation)
{
return;
}

animation.AnimationEnd -= OnAnimationEnded;
FireAnimationEnded();
}
dialog.Window.SetLayout(width, height);
}

public override void OnDismiss(IDialogInterface dialog)
Expand Down
30 changes: 30 additions & 0 deletions src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,36 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(window, async handler =>
}
#endif

[Fact("Dont leak with Animation")]
public async Task ModalPageDontLeakWithAnimation()
{
SetupBuilder();
var references = new List<WeakReference>();


var page = new ContentPage();
var window = new Window(page);

await CreateHandlerAndAddToWindow<WindowHandlerStub>(window, async handler =>
{
var modalPage = new ContentPage
{
Content = new Label { Text = "Modal Content" }
};
await page.Navigation.PushModalAsync(modalPage,true);
await OnLoadedAsync(modalPage);

references.Add(new WeakReference(modalPage));
references.Add(new WeakReference(modalPage.Handler));
references.Add(new WeakReference(modalPage.Handler.PlatformView));

await page.Navigation.PopModalAsync();
await OnUnloadedAsync(modalPage);
});

await AssertionExtensions.WaitForGC(references.ToArray());
}

class PageTypes : IEnumerable<object[]>
{
public IEnumerator<object[]> GetEnumerator()
Expand Down