Close opened sideMenu on hardware back press

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -6,13 +6,14 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
 import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
 import com.reactnativenavigation.presentation.StackOptionsPresenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.SideMenuController;
+import com.reactnativenavigation.viewcontrollers.sidemenu.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
@@ -83,6 +84,7 @@ public class LayoutFactory {
                 childRegistry,
                 node.id,
                 parse(typefaceManager, node.getOptions()),
+                new SideMenuOptionsPresenter(),
                 new OptionsPresenter(activity, defaultOptions)
         );
 		ViewController childControllerCenter = null, childControllerLeft = null, childControllerRight = null;

lib/android/app/src/main/java/com/reactnativenavigation/presentation/SideMenuOptionsPresenter.java

@@ -9,7 +9,7 @@ public class SideMenuOptionsPresenter {
 
     private DrawerLayout sideMenu;
 
-    public SideMenuOptionsPresenter(DrawerLayout sideMenu) {
+    public void bindView(DrawerLayout sideMenu) {
         this.sideMenu = sideMenu;
     }
 
@@ -28,4 +28,16 @@ public class SideMenuOptionsPresenter {
             sideMenu.closeDrawer(Gravity.RIGHT);
         }
     }
+
+    public boolean handleBack() {
+        if (sideMenu.isDrawerOpen(Gravity.LEFT)) {
+            sideMenu.closeDrawer(Gravity.LEFT);
+            return true;
+        }
+        if (sideMenu.isDrawerOpen(Gravity.RIGHT)) {
+            sideMenu.closeDrawer(Gravity.RIGHT);
+            return true;
+        }
+        return false;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/SideMenuController.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.sidemenu;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -13,6 +13,10 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.SideMenuOptions;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
+import com.reactnativenavigation.utils.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ParentController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.Component;
 
 import java.util.ArrayList;
@@ -25,10 +29,12 @@ public class SideMenuController extends ParentController<DrawerLayout> {
 	private ViewController centerController;
 	private ViewController leftController;
 	private ViewController rightController;
+    private SideMenuOptionsPresenter presenter;
 
-	public SideMenuController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions, OptionsPresenter presenter) {
+    public SideMenuController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions, SideMenuOptionsPresenter sideMenuOptionsPresenter, OptionsPresenter presenter) {
 		super(activity, childRegistry, id, presenter, initialOptions);
-	}
+        this.presenter = sideMenuOptionsPresenter;
+    }
 
     @Override
     protected ViewController getCurrentChild() {
@@ -43,7 +49,9 @@ public class SideMenuController extends ParentController<DrawerLayout> {
     @NonNull
 	@Override
 	protected DrawerLayout createView() {
-        return new DrawerLayout(getActivity());
+        DrawerLayout sideMenu = new DrawerLayout(getActivity());
+        presenter.bindView(sideMenu);
+        return sideMenu;
 	}
 
     @Override
@@ -72,7 +80,7 @@ public class SideMenuController extends ParentController<DrawerLayout> {
     @Override
     public void mergeChildOptions(Options options, ViewController childController, Component child) {
         super.mergeChildOptions(options, childController, child);
-        new SideMenuOptionsPresenter(getView()).present(options.sideMenuRootOptions);
+        presenter.present(options.sideMenuRootOptions);
         performOnParentController(parentController ->
                 ((ParentController) parentController).mergeChildOptions(options.copy().clearSideMenuOptions(), childController, child)
         );
@@ -81,7 +89,12 @@ public class SideMenuController extends ParentController<DrawerLayout> {
     @Override
     public void mergeOptions(Options options) {
         super.mergeOptions(options);
-        new SideMenuOptionsPresenter(getView()).present(this.options.sideMenuRootOptions);
+        presenter.present(this.options.sideMenuRootOptions);
+    }
+
+    @Override
+    public boolean handleBack(CommandListener listener) {
+        return presenter.handleBack() || super.handleBack(listener);
     }
 
     public void setCenterController(ViewController centerController) {
@@ -104,7 +117,7 @@ public class SideMenuController extends ParentController<DrawerLayout> {
         getView().addView(controller.getView(), new LayoutParams(width, height, Gravity.RIGHT));
     }
 
-    protected int getWidth(SideMenuOptions sideMenuOptions) {
+    private int getWidth(SideMenuOptions sideMenuOptions) {
         int width = MATCH_PARENT;
         if (sideMenuOptions.width.hasValue()) {
             width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, sideMenuOptions.width.get(), Resources.getSystem().getDisplayMetrics());
@@ -112,7 +125,7 @@ public class SideMenuController extends ParentController<DrawerLayout> {
         return width;
     }
 
-    protected int getHeight(SideMenuOptions sideMenuOptions) {
+    private int getHeight(SideMenuOptions sideMenuOptions) {
         int height = MATCH_PARENT;
         if (sideMenuOptions.height.hasValue()) {
             height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, sideMenuOptions.height.get(), Resources.getSystem().getDisplayMetrics());

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/SideMenuControllerTest.java → lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.sidemenu;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -13,24 +13,36 @@ import com.reactnativenavigation.parse.SideMenuOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
+@SuppressWarnings("MagicNumber")
 public class SideMenuControllerTest extends BaseTest {
     private SideMenuController uut;
     private Activity activity;
     private ChildControllersRegistry childRegistry;
+    private SideMenuOptionsPresenter presenter;
 
     @Override
     public void beforeEach() {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
-        OptionsPresenter presenter = new OptionsPresenter(activity, new Options());
-        uut = new SideMenuController(activity, childRegistry, "sideMenu", new Options(), presenter);
+        presenter = spy(new SideMenuOptionsPresenter());
+        uut = new SideMenuController(activity, childRegistry, "sideMenu", new Options(), presenter, new OptionsPresenter(activity, new Options()));
+    }
+
+    @Test
+    public void createView_bindView() {
+        uut.ensureViewIsCreated();
+        verify(presenter).bindView(uut.getView());
     }
 
     @Test
@@ -125,4 +137,22 @@ public class SideMenuControllerTest extends BaseTest {
         assertThat(params.width).isEqualTo(widthInDp);
         assertThat(params.height).isEqualTo(heightInDp);
     }
+
+    @Test
+    public void handleBack_closesLeftMenu() {
+        uut.setLeftController(new SimpleComponentViewController(activity, childRegistry, "left", new Options()));
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
+
+        uut.mergeOptions(SideMenuTestHelper.LEFT_OPEN);
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
+    }
+
+    @Test
+    public void handleBack_closesRightMenu() {
+        uut.setRightController(new SimpleComponentViewController(activity, childRegistry, "right", new Options()));
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isFalse();
+
+        uut.mergeOptions(SideMenuTestHelper.RIGHT_OPEN);
+        assertThat(uut.handleBack(new CommandListenerAdapter())).isTrue();
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuTestHelper.java

@@ -0,0 +1,14 @@
+package com.reactnativenavigation.viewcontrollers.sidemenu;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+
+public class SideMenuTestHelper {
+    static final Options LEFT_OPEN = new Options();
+    static final Options RIGHT_OPEN = new Options();
+
+    static {
+        LEFT_OPEN.sideMenuRootOptions.left.visible = new Bool(true);
+        RIGHT_OPEN.sideMenuRootOptions.right.visible = new Bool(true);
+    }
+}