Initial ModalOptions implementation

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

@@ -0,0 +1,29 @@
+package com.reactnativenavigation.parse;
+
+import org.json.JSONObject;
+
+public class ModalOptions {
+
+    public static ModalOptions parse(JSONObject json) {
+        ModalOptions options = new ModalOptions();
+        if (json == null) return options;
+
+        options.presentationStyle = ModalPresentationStyle.fromString(json.optString("modalPresentationStyle"));
+
+        return options;
+    }
+
+    public ModalPresentationStyle presentationStyle = ModalPresentationStyle.Unspecified;
+
+    public void mergeWith(ModalOptions other) {
+        if (other.hasValue()) presentationStyle = other.presentationStyle;
+    }
+
+    private boolean hasValue() {
+        return presentationStyle != ModalPresentationStyle.Unspecified;
+    }
+
+    public void mergeWithDefault(ModalOptions defaultOptions) {
+        if (!hasValue()) presentationStyle = defaultOptions.presentationStyle;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.reactnativenavigation.parse;
+
+public enum ModalPresentationStyle {
+    Unspecified("unspecified"),
+    None("none"),
+    OverCurrentContext("overCurrentContext");
+
+    public String name;
+
+    ModalPresentationStyle(String name) {
+        this.name = name;
+    }
+
+    public static ModalPresentationStyle fromString(String name) {
+        switch (name) {
+            case "none":
+                return None;
+            case "overCurrentContext":
+                return OverCurrentContext;
+            default:
+                return Unspecified;
+        }
+    }
+}

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

@@ -33,6 +33,7 @@ public class Options {
         result.sideMenuRootOptions = SideMenuRootOptions.parse(json.optJSONObject("sideMenu"));
         result.animations = AnimationsOptions.parse(json.optJSONObject("animations"));
         result.screenBackgroundColor = ColorParser.parse(json, "screenBackgroundColor");
+        result.modal = ModalOptions.parse(json);
 
         return result.withDefaultOptions(defaultOptions);
     }
@@ -48,6 +49,7 @@ public class Options {
     @NonNull public AnimationsOptions animations = new AnimationsOptions();
     @NonNull public SideMenuRootOptions sideMenuRootOptions = new SideMenuRootOptions();
     @NonNull public Color screenBackgroundColor = new NullColor();
+    @NonNull public ModalOptions modal = new ModalOptions();
 
     void setTopTabIndex(int i) {
         topTabOptions.tabIndex = i;
@@ -67,6 +69,7 @@ public class Options {
         result.sideMenuRootOptions.mergeWith(sideMenuRootOptions);
         result.animations.mergeWith(animations);
         result.screenBackgroundColor = screenBackgroundColor;
+        result.modal.mergeWith(modal);
         return result;
     }
 
@@ -83,6 +86,7 @@ public class Options {
         result.animations.mergeWith(other.animations);
         result.sideMenuRootOptions.mergeWith(other.sideMenuRootOptions);
         if (other.screenBackgroundColor.hasValue()) result.screenBackgroundColor = other.screenBackgroundColor;
+        result.modal.mergeWith(other.modal);
         return result;
     }
 
@@ -97,6 +101,7 @@ public class Options {
         animations.mergeWithDefault(defaultOptions.animations);
         sideMenuRootOptions.mergeWithDefault(defaultOptions.sideMenuRootOptions);
         if (!screenBackgroundColor.hasValue()) screenBackgroundColor = defaultOptions.screenBackgroundColor;
+        modal.mergeWithDefault(defaultOptions.modal);
         return this;
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest2.java → lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
-public class ModalStackTest2 extends BaseTest {
+public class ModalStackTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
     private static final String MODAL_ID_2 = "modalId2";
     private static final String MODAL_ID_3 = "modalId3";