Skip to content
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

Jump to bottom

Expose when setNavigationRoot is called on RootPresenter #7586

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose when setNavigationRoot is called on RootPresenter #7586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
private PermissionListener mPermissionListener;

protected Navigator navigator;
protected RootPresenter rootPresenter;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
Expand All @@ -39,11 +40,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
return;
}
addDefaultSplashLayout();
rootPresenter = new RootPresenter();
navigator = new Navigator(this,
new ChildControllersRegistry(),
new ModalStack(this),
new OverlayManager(),
new RootPresenter()
rootPresenter
);
navigator.bindViews();
getReactGateway().onActivityCreated(this);
Expand Down
6 changes: 6 additions & 0 deletions ...src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/RootPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class RootPresenter {
private final RootAnimator animator;
private CoordinatorLayout rootLayout;
private final LayoutDirectionApplier layoutDirectionApplier;
private boolean setRootCalled = false;

public void setRootContainer(CoordinatorLayout rootLayout) {
this.rootLayout = rootLayout;
Expand All @@ -28,13 +29,18 @@ public RootPresenter() {
this(new RootAnimator(), new LayoutDirectionApplier());
}

public boolean setRootCalled() {
return setRootCalled;
}

@VisibleForTesting
public RootPresenter(RootAnimator animator, LayoutDirectionApplier layoutDirectionApplier) {
this.animator = animator;
this.layoutDirectionApplier = layoutDirectionApplier;
}

public void setRoot(ViewController appearingRoot, ViewController<?> disappearingRoot, Options defaultOptions, CommandListener listener, ReactInstanceManager reactInstanceManager) {
setRootCalled = true;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to move this into animateSetRootAndReportSuccess, right before the listener.onSuccess calls. And you'll need 2 lines of it, one in each block.

layoutDirectionApplier.apply(appearingRoot, defaultOptions, reactInstanceManager);
rootLayout.addView(appearingRoot.getView(), matchParentWithBehaviour(new BehaviourDelegate(appearingRoot)));
Options options = appearingRoot.resolveCurrentOptions(defaultOptions);
Expand Down