SideMenu visible android (#2782)

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

@@ -27,6 +27,7 @@ public class Options implements DEFAULT_VALUES {
         result.overlayOptions = OverlayOptions.parse(json.optJSONObject("overlay"));
         result.fabOptions = FabOptions.parse(json.optJSONObject("fab"));
         result.animationsOptions = AnimationsOptions.parse(json.optJSONObject("animations"));
+        result.sideMenuRootOptions = SideMenuRootOptions.parse(json.optJSONObject("sideMenu"));
 
         return result.withDefaultOptions(defaultOptions);
     }
@@ -39,6 +40,7 @@ public class Options implements DEFAULT_VALUES {
     @NonNull public OverlayOptions overlayOptions = new OverlayOptions();
     @NonNull public FabOptions fabOptions = new FabOptions();
     @NonNull public AnimationsOptions animationsOptions = new AnimationsOptions();
+    @NonNull public SideMenuRootOptions sideMenuRootOptions = new SideMenuRootOptions();
 
     void setTopTabIndex(int i) {
         topTabOptions.tabIndex = i;
@@ -55,6 +57,7 @@ public class Options implements DEFAULT_VALUES {
         result.overlayOptions = overlayOptions;
         result.fabOptions.mergeWith(fabOptions);
         result.animationsOptions.mergeWith(animationsOptions);
+        result.sideMenuRootOptions.mergeWith(sideMenuRootOptions);
         return result;
     }
 
@@ -68,6 +71,7 @@ public class Options implements DEFAULT_VALUES {
         result.bottomTabsOptions.mergeWith(other.bottomTabsOptions);
         result.fabOptions.mergeWith(other.fabOptions);
         result.animationsOptions.mergeWith(other.animationsOptions);
+        result.sideMenuRootOptions.mergeWith(other.sideMenuRootOptions);
         return result;
     }
 
@@ -79,6 +83,7 @@ public class Options implements DEFAULT_VALUES {
         bottomTabsOptions.mergeWithDefault(other.bottomTabsOptions);
         fabOptions.mergeWithDefault(other.fabOptions);
         animationsOptions.mergeWithDefault(other.animationsOptions);
+        sideMenuRootOptions.mergeWithDefault(other.sideMenuRootOptions);
         return this;
     }
 
@@ -106,4 +111,9 @@ public class Options implements DEFAULT_VALUES {
         bottomTabOptions = new BottomTabOptions();
         return this;
     }
+
+    public Options clearSideMenuOptions() {
+        sideMenuRootOptions = new SideMenuRootOptions();
+        return this;
+    }
 }

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

@@ -0,0 +1,25 @@
+package com.reactnativenavigation.parse;
+
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
+
+import org.json.JSONObject;
+
+public class SideMenuOptions {
+    public Bool visible = new NullBool();
+
+    public static SideMenuOptions parse(JSONObject json) {
+        SideMenuOptions options = new SideMenuOptions();
+        if (json == null) return options;
+
+        options.visible = BoolParser.parse(json, "visible");
+        return options;
+    }
+
+    public void mergeWith(SideMenuOptions other) {
+        if (other.visible.hasValue()) {
+            visible = other.visible;
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.reactnativenavigation.parse;
+
+import org.json.JSONObject;
+
+public class SideMenuRootOptions {
+    public SideMenuOptions left = new SideMenuOptions();
+    public SideMenuOptions right = new SideMenuOptions();
+
+    public static SideMenuRootOptions parse(JSONObject json) {
+        SideMenuRootOptions options = new SideMenuRootOptions();
+        if (json == null) return options;
+
+        options.left = SideMenuOptions.parse(json.optJSONObject("left"));
+        options.right = SideMenuOptions.parse(json.optJSONObject("right"));
+
+        return options;
+    }
+
+    public void mergeWith(SideMenuRootOptions other) {
+        left.mergeWith(other.left);
+        right.mergeWith(other.right);
+    }
+
+    public void mergeWithDefault(SideMenuRootOptions sideMenuRootOptions) {
+
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.reactnativenavigation.presentation;
+
+import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
+
+import com.reactnativenavigation.parse.SideMenuRootOptions;
+
+public class SideMenuOptionsPresenter {
+
+    private DrawerLayout sideMenu;
+
+    public SideMenuOptionsPresenter(DrawerLayout sideMenu) {
+        this.sideMenu = sideMenu;
+    }
+
+    public void present(SideMenuRootOptions options) {
+        if (options.left.visible.isTrue()) {
+            sideMenu.openDrawer(Gravity.LEFT);
+        }
+        if (options.right.visible.isTrue()) {
+            sideMenu.openDrawer(Gravity.RIGHT);
+        }
+    }
+}

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

@@ -5,9 +5,10 @@ import android.support.annotation.NonNull;
 import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
+import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
 import com.reactnativenavigation.views.ReactComponent;
 
 import java.util.ArrayList;
@@ -16,7 +17,7 @@ import java.util.Collection;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.ListPopupWindow.WRAP_CONTENT;
 
-public class SideMenuController extends ParentController {
+public class SideMenuController extends ParentController<DrawerLayout> implements NavigationOptionsListener {
 
 	private ViewController centerController;
 	private ViewController leftController;
@@ -28,7 +29,7 @@ public class SideMenuController extends ParentController {
 
 	@NonNull
 	@Override
-	protected ViewGroup createView() {
+	protected DrawerLayout createView() {
         return new DrawerLayout(getActivity());
 	}
 
@@ -55,6 +56,13 @@ public class SideMenuController extends ParentController {
         );
     }
 
+    @Override
+    public void mergeOptions(Options options) {
+        this.options = this.options.mergeWith(options);
+        new SideMenuOptionsPresenter(getView()).present(this.options.sideMenuRootOptions);
+        this.options = this.options.copy().clearSideMenuOptions();
+    }
+
     public void setCenterController(ViewController centerController) {
 		this.centerController = centerController;
 		View childView = centerController.getView();

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

@@ -0,0 +1,54 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.view.Gravity;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleComponentViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class SideMenuControllerTest extends BaseTest {
+    private SideMenuController uut;
+    private Activity activity;
+
+    @Override
+    public void beforeEach() {
+        activity = newActivity();
+        uut = new SideMenuController(activity, "sideMenu", new Options());
+    }
+
+    @Test
+    public void mergeOptions_openLeftSideMenu() throws Exception {
+        uut.setLeftController(new SimpleComponentViewController(activity, "left", new Options()));
+
+        Options options = new Options();
+        options.sideMenuRootOptions.left.visible = new Bool(true);
+        assertThat(uut.getView().isDrawerOpen(Gravity.LEFT)).isFalse();
+        uut.mergeOptions(options);
+        assertThat(uut.getView().isDrawerOpen(Gravity.LEFT)).isTrue();
+    }
+
+    @Test
+    public void mergeOptions_openRightSideMenu() throws Exception {
+        uut.setRightController(new SimpleComponentViewController(activity, "right", new Options()));
+
+        Options options = new Options();
+        options.sideMenuRootOptions.right.visible = new Bool(true);
+        assertThat(uut.getView().isDrawerOpen(Gravity.RIGHT)).isFalse();
+        uut.mergeOptions(options);
+        assertThat(uut.getView().isDrawerOpen(Gravity.RIGHT)).isTrue();
+    }
+
+    @Test
+    public void mergeOptions_optionsAreClearedAfterMerge() throws Exception {
+        Options initialOptions = uut.options;
+        Options options = new Options();
+        uut.mergeOptions(options);
+        assertThat(uut.options.sideMenuRootOptions).isNotEqualTo(initialOptions.sideMenuRootOptions);
+    }
+}