Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import com.reactnativenavigation.parse.Options;
import com.reactnativenavigation.parse.SideMenuOptions;
import com.reactnativenavigation.parse.params.Bool;
import com.reactnativenavigation.presentation.Presenter;
import com.reactnativenavigation.presentation.SideMenuPresenter;
import com.reactnativenavigation.utils.CommandListener;
Expand Down Expand Up @@ -103,14 +104,22 @@ public Options resolveCurrentOptions() {
return options;
}

//For onDrawerOpened and onDrawerClosed :
//Merge the options to the current state, if this happened due to a gesture we need to
//update the option state

@Override
public void onDrawerOpened(@NonNull View drawerView) {
(left != null && drawerView.equals(left.getView()) ? left : right).onViewAppeared();
ViewController view = this.getMatchingView(drawerView);
view.mergeOptions(this.getOptionsWithVisability(this.viewIsLeft(drawerView), true));
view.onViewAppeared();
}

@Override
public void onDrawerClosed(@NonNull View drawerView) {
(left != null && drawerView.equals(left.getView()) ? left : right).onViewDisappear();
ViewController view = this.getMatchingView(drawerView);
view.mergeOptions(this.getOptionsWithVisability(this.viewIsLeft(drawerView), false));
view.onViewDisappear();
}

@Override
Expand Down Expand Up @@ -154,6 +163,24 @@ private int getHeight(SideMenuOptions sideMenuOptions) {
return height;
}

private ViewController getMatchingView (View drawerView) {
return this.viewIsLeft(drawerView) ? left : right;
}

private boolean viewIsLeft (View drawerView) {
return (left != null && drawerView.equals(left.getView()));
}

private Options getOptionsWithVisability ( boolean isLeft, boolean visible ) {
Options options = new Options();
if (isLeft) {
options.sideMenuRootOptions.left.visible = new Bool(visible);
} else {
options.sideMenuRootOptions.right.visible = new Bool(visible);
}
return options;
}

@Override
public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {

Expand Down