Use DialogFragment for Android modals by pictos · Pull Request #22869 · dotnet/maui

pictos · 2024-06-05T20:21:54Z

Description of Change

This should be merged on net9 branch, but since it's hard to make the .net9-preview don't mess-up with my env. I'm target .net8, when it gets approved this should rebased and re-target. I hope that @PureWeen can do this hard task for me xP.

Issues Fixed

Fixes #22587

PureWeen · 2024-06-05T21:22:26Z

/azp run

azure-pipelines · 2024-06-05T21:22:47Z

Azure Pipelines successfully started running 3 pipeline(s).

jsuarezruiz · 2024-06-06T06:29:57Z

Don't worry @pictos, we can retarget to net9.0.

PureWeen · 2024-06-08T01:51:03Z

Android UITests failing

The controls device tests are crashing.
I'm guessing the modal tests inside device tests will need to be adjusted somewhat to handle DialogFragments

pictos · 2024-06-10T14:33:43Z

will take a look on those this week

pictos · 2024-06-11T03:23:51Z

@PureWeen, not sure if all tests will run again, but I think that I fixed the issue. I was using the DialogFragment.ShowNow method and it was causing issues with the FragmentManager, changing it to DialogFragment.Show seems to fix the issue.

jsuarezruiz · 2024-06-11T13:38:13Z

/azp run

azure-pipelines · 2024-06-11T13:38:37Z

Azure Pipelines successfully started running 3 pipeline(s).

pictos · 2024-06-11T19:59:59Z

from the logs looks like the Appium couldn't find the element, but it navigates to the correct screen (at least locally), is that some Appium issue?

Failed AppDoesntCrashWhenReusingSameTitleView [16 s]
Error Message:
System.TimeoutException : Timed out waiting for element...
Stack Trace:
at UITest.Appium.HelperExtensions.Wait(Func1 query, Func2 satisfactory, String timeoutMessage, Nullable1 timeout, Nullable1 retryFrequency) in //src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 804
at UITest.Appium.HelperExtensions.WaitForAtLeastOne(Func1 query, String timeoutMessage, Nullable1 timeout, Nullable1 retryFrequency) in /_/src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 821 at UITest.Appium.HelperExtensions.WaitForElement(IApp app, String marked, String timeoutMessage, Nullable1 timeout, Nullable1 retryFrequency, Nullable1 postTimeout) in //src/TestUtils/src/UITest.Appium/HelperExtensions.cs:line 316
at Microsoft.Maui.TestCases.Tests.Issues.Issue16499.AppDoesntCrashWhenReusingSameTitleView() in /_/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16499.cs:line 19
at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)

PureWeen · 2024-06-24T15:08:54Z

/azp run

azure-pipelines · 2024-06-24T15:09:13Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-06-26T00:45:08Z

/rebase

PureWeen · 2024-06-26T00:46:33Z

/azp run

azure-pipelines · 2024-06-26T00:46:52Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-04T20:13:02Z

/rebase

PureWeen

These two tests fail for me locally

Maybe resolving them will fix the other exceptions?

mattleibow · 2024-07-05T08:05:48Z

/azp run

azure-pipelines · 2024-07-05T08:06:09Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-06T15:02:24Z

/azp run

azure-pipelines · 2024-07-06T15:02:45Z

Azure Pipelines successfully started running 3 pipeline(s).

jonathanpeppers · 2024-07-08T20:16:40Z

/azp run

PureWeen · 2024-07-18T18:17:08Z

/azp run

azure-pipelines · 2024-07-18T18:17:28Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-19T17:55:53Z

/azp run

azure-pipelines · 2024-07-19T17:56:14Z

Azure Pipelines successfully started running 3 pipeline(s).

add new shiny DialogFragment refactoring code to find and dismiss DialogFragment code cleanup delete ModalContainer to use only ModalFragment handle animation and add a map between page and dialogFragment We've back button enabled! After dismissing several demons summoned using obscure Android APIs, I was able to deal with the BackButtonPressed event add modal animations as anim.xml files using cleanup remowork PopModalPlatformAsync to work with dialogFragment remove tag final adjustments on DialogFragment change the ShowNow for Show to fix the issue Wait for animation to complete change local functions order fix build create window hooks for android (like iOS) clean up ModalFragment fields change Dictionary to ConditionalWeakTable clean up event animation refactor on Null notation remove comments - adjust back button - different back button code style remove unused prop. fix DontPushModalPagesWhenWindowIsDeactivated DeviceTest completes the task return back the way how modalManager handles android modals normilize animation duration Co-authored-by: Shane Neuville <shane94@hotmail.com> remove focusability code change how fragments are looked-up code style

PureWeen · 2024-07-22T18:44:34Z

/azp run

azure-pipelines · 2024-07-22T18:44:55Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-24T22:25:52Z

/azp run

azure-pipelines · 2024-07-24T22:26:11Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-24T22:30:14Z

/azp run

azure-pipelines · 2024-07-24T22:30:37Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-25T03:26:41Z

/azp run

azure-pipelines · 2024-07-25T03:27:00Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2024-07-25T07:14:13Z

Test failures are on iOS. This PR only has changes on Android

pictos requested a review from a team as a code owner June 5, 2024 20:21

pictos requested review from mattleibow and rmarinho June 5, 2024 20:21

dotnet-policy-service bot added the community ✨ Community Contribution label Jun 5, 2024

jsuarezruiz added platform/android area-controls-dialogalert DisplayAlert, dialog labels Jun 7, 2024

github-actions bot force-pushed the pj/dialog-fragment branch from 78b2542 to cdd005f Compare June 26, 2024 00:45

github-actions bot force-pushed the pj/dialog-fragment branch from cdd005f to 15c91f9 Compare July 4, 2024 20:13

PureWeen requested changes Jul 4, 2024

View reviewed changes

PureWeen mentioned this pull request Jul 5, 2024

Window.ModalPopping closes app when e.Cancel = true #23462

Closed

pictos force-pushed the pj/dialog-fragment branch 2 times, most recently from 10d9bdb to 2e24b4e Compare July 22, 2024 17:03

PureWeen force-pushed the pj/dialog-fragment branch from 2e24b4e to 31d5149 Compare July 22, 2024 18:44

PureWeen requested a review from a team as a code owner July 22, 2024 18:44

PureWeen changed the base branch from main to net9.0 July 22, 2024 18:44

pictos force-pushed the pj/dialog-fragment branch from b0e0640 to 31d5149 Compare July 25, 2024 01:18

pictos added 2 commits July 24, 2024 23:30

code cleanup

2dedb42

simplify the notification when modal is dismissed

5b70755

pictos force-pushed the pj/dialog-fragment branch from 3facb22 to 5b70755 Compare July 25, 2024 03:19

PureWeen approved these changes Jul 25, 2024

View reviewed changes

PureWeen merged commit 63c6576 into dotnet:net9.0 Jul 25, 2024

pictos mentioned this pull request Jul 28, 2024

dismiss the modal when IsAnimated is set to false #23879

Merged

samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Aug 2, 2024

Starchm mentioned this pull request Sep 3, 2024

[Android] WindowSoftInputModeAdjust.Resize causes focus to return to original page after resuming from sleep #24581

Closed

github-actions bot locked and limited conversation to collaborators Sep 13, 2024

pictos deleted the pj/dialog-fragment branch December 19, 2024 03:10

Conversation

pictos commented Jun 5, 2024

Description of Change

Issues Fixed

Uh oh!

PureWeen commented Jun 5, 2024

Uh oh!

azure-pipelines bot commented Jun 5, 2024

Uh oh!

jsuarezruiz commented Jun 6, 2024

Uh oh!

PureWeen commented Jun 8, 2024

Uh oh!

pictos commented Jun 10, 2024

Uh oh!

pictos commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jsuarezruiz commented Jun 11, 2024

Uh oh!

azure-pipelines bot commented Jun 11, 2024

Uh oh!

pictos commented Jun 11, 2024

Uh oh!

PureWeen commented Jun 24, 2024

Uh oh!

azure-pipelines bot commented Jun 24, 2024

Uh oh!

PureWeen commented Jun 26, 2024

Uh oh!

PureWeen commented Jun 26, 2024

Uh oh!

azure-pipelines bot commented Jun 26, 2024

Uh oh!

PureWeen commented Jul 4, 2024

Uh oh!

PureWeen left a comment

Choose a reason for hiding this comment

Uh oh!

mattleibow commented Jul 5, 2024

Uh oh!

azure-pipelines bot commented Jul 5, 2024

Uh oh!

PureWeen commented Jul 6, 2024

Uh oh!

azure-pipelines bot commented Jul 6, 2024

Uh oh!

jonathanpeppers commented Jul 8, 2024

Uh oh!

PureWeen commented Jul 18, 2024

Uh oh!

azure-pipelines bot commented Jul 18, 2024

Uh oh!

PureWeen commented Jul 19, 2024

Uh oh!

azure-pipelines bot commented Jul 19, 2024

Uh oh!

PureWeen commented Jul 22, 2024

Uh oh!

azure-pipelines bot commented Jul 22, 2024

Uh oh!

PureWeen commented Jul 24, 2024

Uh oh!

azure-pipelines bot commented Jul 24, 2024

Uh oh!

PureWeen commented Jul 24, 2024

Uh oh!

azure-pipelines bot commented Jul 24, 2024

Uh oh!

PureWeen commented Jul 25, 2024

Uh oh!

azure-pipelines bot commented Jul 25, 2024

Uh oh!

PureWeen commented Jul 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

pictos commented Jun 11, 2024 •

edited

Loading