Skip to content

[Android] Fix: Modal Animation Repeats When Returning from Background 2 #29557

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 7 commits into from
May 21, 2025
Merged

[Android] Fix: Modal Animation Repeats When Returning from Background 2 #29557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22216e3
[Android] clean up modalnavigationmanager
bhavanesh2001 May 16, 2025
87e2c0e
fix failing tests
bhavanesh2001 May 17, 2025
5771076
Handle animation while poping
bhavanesh2001 May 19, 2025
9a5e6f2
subscribe to event before showing dailog
bhavanesh2001 May 21, 2025
dd83634
change style's names
bhavanesh2001 May 21, 2025
97be5a3
apply new styles
bhavanesh2001 May 21, 2025
1484cb0
set result to tcs once dailog dismiss
bhavanesh2001 May 21, 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
Prev Previous commit
Next Next commit
Handle animation while poping
  • Loading branch information
@bhavanesh2001
bhavanesh2001 committed May 19, 2025
commit 5771076ec479a97c38a67b0e2eb113a1f32bb4f5
30 changes: 25 additions & 5 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 @@ -83,15 +83,35 @@ Task<Page> PopModalPlatformAsync(bool animated)
Page modal = CurrentPlatformModalPage;
_platformModalPages.Remove(modal);

TaskCompletionSource<Page> tcs = new();

var fragmentManager = WindowMauiContext.GetFragmentManager();

var dialogFragmentId = _modals.Pop();
var dialogFragment = (ModalFragment?)fragmentManager.FindFragmentByTag(dialogFragmentId);

if (dialogFragment is null)
{
tcs.TrySetResult(modal);
return tcs.Task;
}

dialogFragment?.Dismiss();

return Task.FromResult(modal);

if (animated)
{
dialogFragment.Dialog?.Window?.SetWindowAnimations(Resource.Style.dialog_exit_animation);
modal.Dispatcher.Dispatch(() =>
{
dialogFragment.Dismiss();
tcs.TrySetResult(modal);
});
}
else
{
dialogFragment.Dismiss();
tcs.TrySetResult(modal);
}

return tcs.Task;
}

// The CurrentPage doesn't represent the root of the platform hierarchy.
Expand Down Expand Up @@ -195,7 +215,7 @@ public ModalFragment(IMauiContext mauiContext, Page modal)

if (IsAnimated)
{
dialog.Window?.SetWindowAnimations(Resource.Style.dialog_animation);
dialog.Window?.SetWindowAnimations(Resource.Style.dialog_enter_animation);
}

return dialog;
Expand Down
4 changes: 3 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 @@ -102,8 +102,10 @@
<item name="scrollViewStyle">@style/scrollViewScrollBars</item>
</style>

<style name="dialog_animation" >
<style name="dialog_enter_animation" >
<item name="android:windowEnterAnimation">@anim/nav_modal_default_enter_anim</item>
</style>
<style name="dialog_exit_animation" >
<item name="android:windowExitAnimation">@anim/nav_modal_default_exit_anim</item>
</style>
</resources>
Loading