-
Notifications
You must be signed in to change notification settings - Fork 6k
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.
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
FlutterFragment predictive back #52302
Changes from 11 commits
89629fb
bf4e1ec
c396216
1ae637d
7cd3383
3733332
0d95e27
6d69cfc
c06300a
48765ee
c785e98
1ff7c32
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -290,7 +290,7 @@ private FragmentActivity getMockFragmentActivity() { | |
} | ||
|
||
@Test | ||
public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() { | ||
public void itDelegatesOnBackPressedWithSetFrameworkHandlesBack() { | ||
// We need to mock FlutterJNI to avoid triggering native code. | ||
FlutterJNI flutterJNI = mock(FlutterJNI.class); | ||
when(flutterJNI.isAttached()).thenReturn(true); | ||
|
@@ -301,6 +301,8 @@ public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() { | |
|
||
FlutterFragment fragment = | ||
FlutterFragment.withCachedEngine("my_cached_engine") | ||
// This enables the use of onBackPressedCallback, which is what | ||
// sends backs to the framework if setFrameworkHandlesBack is true. | ||
.shouldAutomaticallyHandleOnBackPressed(true) | ||
.build(); | ||
FragmentActivity activity = getMockFragmentActivity(); | ||
|
@@ -318,8 +320,15 @@ public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() { | |
TestDelegateFactory delegateFactory = new TestDelegateFactory(mockDelegate); | ||
fragment.setDelegateFactory(delegateFactory); | ||
|
||
// Calling onBackPressed now will still be handled by Android (the default), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. reading this test shouldn't the back pressed be handled by the framework because of the code on 306? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. My comment above should help explain this a bit. shouldAutomaticallyHandleOnBackPressed enables predictive back, while setFrameworkHandlesBack determines whether Android or the framework handle the back gesture. |
||
// until setFrameworkHandlesBack is set to true. | ||
activity.getOnBackPressedDispatcher().onBackPressed(); | ||
verify(mockDelegate, times(0)).onBackPressed(); | ||
|
||
// Setting setFrameworkHandlesBack to true means the delegate will receive | ||
// the back and Android won't handle it. | ||
fragment.setFrameworkHandlesBack(true); | ||
activity.onBackPressed(); | ||
verify(mockDelegate, times(1)).onBackPressed(); | ||
} | ||
|
||
|
@@ -361,10 +370,20 @@ public void handleOnBackPressed() { | |
TestDelegateFactory delegateFactory = new TestDelegateFactory(mockDelegate); | ||
fragment.setDelegateFactory(delegateFactory); | ||
|
||
assertTrue(callback.isEnabled()); | ||
|
||
assertTrue(fragment.popSystemNavigator()); | ||
|
||
verify(mockDelegate, never()).onBackPressed(); | ||
assertTrue(onBackPressedCalled.get()); | ||
assertTrue(callback.isEnabled()); | ||
|
||
callback.setEnabled(false); | ||
assertFalse(callback.isEnabled()); | ||
assertTrue(fragment.popSystemNavigator()); | ||
|
||
verify(mockDelegate, never()).onBackPressed(); | ||
assertFalse(callback.isEnabled()); | ||
} | ||
|
||
@Test | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You probably also need to update the implementation of
popSystemNavigator()
to restore the previous state of the callback-enablement, instead of unconditionally re-enabling it on line 1673.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@math1man Thanks for jumping back in here, I've been trying to catch back up on your comments from the last PR. Pushing a fix for that now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries. Honestly, I think besides this comment everything looks good. Happy to look into anything specific you might be concerned about though.