V2 overlay skeleton (#2097) (#2098)

* V2 overlay skeleton (#2097)

* skeleton

* basic test

* remove useless files

* remove useles files

* semicolon

* refactoring

* rm useless files

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/OverlayTest.java

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import android.support.test.uiautomator.By;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class OverlayTest extends BaseTest {
+
+	@Test
+	public void testOverlayAlertAppear() throws Exception {
+		elementByText("PUSH OPTIONS SCREEN").click();
+		elementByText("SHOW ALERT").click();
+		assertExists(By.text("test!"));
+		elementByText("OK").click();
+		assertExists(By.text("Static Title"));
+
+	}
+}

README.md

@@ -65,7 +65,7 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | resetTo             |   ✅        |	✅|
 | showModal              |  ✅        |	✅|
 | dismissModal           |     ✅       |	✅|
-| showOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	[Contribute](/docs/docs/CONTRIBUTING.md) |
+| showOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	WIP @cool04ek |
 | dismissOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	[Contribute](/docs/docs/CONTRIBUTING.md) |
 | customTransition            |   ✅        |	[Contribute](/docs/docs/CONTRIBUTING.md) |
 | Screen Visibility        | ✅     |✅|

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

@@ -0,0 +1,30 @@
+package com.reactnativenavigation.parse;
+
+
+import org.json.JSONObject;
+
+public class OverlayOptions {
+
+	public static OverlayOptions parse(JSONObject json) {
+		if (json == null) return new OverlayOptions();
+
+		OverlayOptions options = new OverlayOptions();
+
+		//TODO: parse
+		options.title = json.optString("title");
+		options.text = json.optString("text");
+
+		return options;
+	}
+
+	private String title = "";
+	private String text = "";
+
+	public String getText() {
+		return text;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.reactnativenavigation.presentation;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+import com.reactnativenavigation.viewcontrollers.overlay.AlertOverlay;
+import com.reactnativenavigation.viewcontrollers.overlay.CustomOverlay;
+import com.reactnativenavigation.viewcontrollers.overlay.FabOverlay;
+import com.reactnativenavigation.viewcontrollers.overlay.OverlayFabric;
+import com.reactnativenavigation.viewcontrollers.overlay.OverlayInterface;
+import com.reactnativenavigation.viewcontrollers.overlay.SnackbarOverlay;
+
+public class OverlayPresenter {
+
+	private OverlayInterface overlay;
+
+	public OverlayPresenter(Context context, String type, OverlayOptions options) {
+		this.overlay = OverlayFabric.create(type, context, options);
+	}
+
+
+	public void show() {
+		overlay.show();
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -13,6 +13,7 @@ import com.reactnativenavigation.parse.LayoutNode;
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.parse.JSONParser;
 import com.reactnativenavigation.parse.LayoutNodeParser;
+import com.reactnativenavigation.parse.OverlayOptions;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.viewcontrollers.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -130,6 +131,17 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		});
 	}
 
+	@ReactMethod
+	public void showOverlay(final String type, final ReadableMap options) {
+		final OverlayOptions overlayOptions = OverlayOptions.parse(JSONParser.parse(options));
+		handle(new Runnable() {
+			@Override
+			public void run() {
+				navigator().showOverlay(type, overlayOptions);
+			}
+		});
+	}
+
 	private NavigationActivity activity() {
 		return (NavigationActivity) getCurrentActivity();
 	}

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

@@ -6,6 +6,8 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.parse.OverlayOptions;
+import com.reactnativenavigation.presentation.OverlayPresenter;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import org.json.JSONObject;
@@ -126,4 +128,8 @@ public class Navigator extends ParentController {
 	public void dismissAllModals() {
 		modalStack.dismissAll();
 	}
+
+	public void showOverlay(String type, OverlayOptions options) {
+		new OverlayPresenter(getActivity(), type, options).show();
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/AlertOverlay.java

@@ -0,0 +1,35 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public class AlertOverlay implements OverlayInterface {
+
+	private AlertDialog dialog;
+
+	@Override
+	public AlertOverlay create(Context context, OverlayOptions options) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+		builder.setTitle(options.getTitle());
+		builder.setMessage(options.getText());
+		builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.dismiss();
+			}
+		});
+		dialog = builder.create();
+
+		return this;
+	}
+
+	@Override
+	public void show() {
+		dialog.show();
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/CustomOverlay.java

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public class CustomOverlay implements OverlayInterface {
+
+	@Override
+	public CustomOverlay create(Context context, OverlayOptions options) {
+		//TODO; implement
+		return this;
+	}
+
+	@Override
+	public void show() {
+		//TODO; implement
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/FabOverlay.java

@@ -0,0 +1,21 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public class FabOverlay implements OverlayInterface {
+
+
+	@Override
+	public FabOverlay create(Context context, OverlayOptions options) {
+		//TODO; implement
+		return this;
+	}
+
+	@Override
+	public void show() {
+		//TODO; implement
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayFabric.java

@@ -0,0 +1,38 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public class OverlayFabric {
+
+	private enum Overlay {
+		AlertDialog("alert", new AlertOverlay()),
+		Snackbar("snackbar", new SnackbarOverlay()),
+		Fab("fab", new FabOverlay()),
+		CustomDialog("custom", new CustomOverlay());
+
+		private String name;
+		private OverlayInterface overlayInstance;
+
+		Overlay(String name, OverlayInterface overlayInstance) {
+			this.name = name;
+			this.overlayInstance = overlayInstance;
+		}
+
+		public static Overlay create(String type) {
+			for (Overlay overlay : values()) {
+				if (overlay.name.equals(type)) {
+					return overlay;
+				}
+			}
+			return CustomDialog;
+		}
+	}
+
+	public static OverlayInterface create(String type, Context context, OverlayOptions options) {
+		return Overlay.create(type).overlayInstance.create(context, options);
+	}
+
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayInterface.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public interface OverlayInterface {
+	OverlayInterface create(Context context, OverlayOptions options);
+	void show();
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/SnackbarOverlay.java

@@ -0,0 +1,21 @@
+package com.reactnativenavigation.viewcontrollers.overlay;
+
+
+import android.content.Context;
+
+import com.reactnativenavigation.parse.OverlayOptions;
+
+public class SnackbarOverlay implements OverlayInterface {
+
+
+	@Override
+	public SnackbarOverlay create(Context context, OverlayOptions options) {
+		//TODO; implement
+		return this;
+	}
+
+	@Override
+	public void show() {
+		//TODO; implement
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/parse/OverlayOptionsTest.java

@@ -0,0 +1,34 @@
+package com.reactnativenavigation.parse;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+import static com.reactnativenavigation.parse.NavigationOptions.BooleanOptions.True;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class OverlayOptionsTest extends BaseTest {
+
+	@Test
+	public void parsesNullAsDefaultEmptyOptions() throws Exception {
+		assertThat(OverlayOptions.parse(null)).isNotNull();
+	}
+
+	@Test
+	public void parsesJson() throws Exception {
+		JSONObject json = new JSONObject();
+		json.put("title", "the title");
+		json.put("text", "the text");
+
+		OverlayOptions result = OverlayOptions.parse(json);
+		assertThat(result.getTitle()).isEqualTo("the title");
+		assertThat(result.getText()).isEqualTo("the text");
+	}
+
+	@Test
+	public void defaultEmptyOptions() throws Exception {
+		OverlayOptions uut = new OverlayOptions();
+		assertThat(uut.getTitle()).isEmpty();
+	}
+}

lib/src/Navigation.js

@@ -71,6 +71,10 @@ class Navigation {
   events() {
     return this.publicEventsRegistry;
   }
+
+  showOverlay(type, options) {
+    return this.commands.showOverlay(type, options);
+  }
 }
 
 const singleton = new Navigation();

lib/src/adapters/NativeCommandsSender.js

@@ -53,6 +53,11 @@ class NativeCommandsSender {
     this.nativeCommandsModule.switchToTab(containerId, tabIndex);
     return Promise.resolve(containerId);
   }
+
+  showOverlay(type, options) {
+    this.nativeCommandsModule.showOverlay(type, options);
+    return Promise.resolve(type);
+  }
 }
 
 module.exports = NativeCommandsSender;

lib/src/commands/Commands.js

@@ -58,6 +58,12 @@ class Commands {
   switchToTab(containerId, tabIndex) {
     return this.nativeCommandsSender.switchToTab(containerId, tabIndex);
   }
+
+  showOverlay(type, options) {
+    const input = _.cloneDeep(options);
+    OptionsProcessor.processOptions(input);
+    return this.nativeCommandsSender.showOverlay(type, input);
+  }
 }
 
 module.exports = Commands;

lib/src/commands/Commands.test.js

@@ -237,4 +237,12 @@ describe('Commands', () => {
       expect(result).toEqual('theContainerId');
     });
   });
+
+  describe('showOverlay', () => {
+    it('deep clones input to avoid mutation errors', () => {
+      const obj = { title: 'test' };
+      uut.showOverlay('alert', obj);
+      expect(mockCommandsSender.showOverlay.mock.calls[0][1]).not.toBe(obj);
+    });
+  });
 });

playground/src/containers/OptionsScreen.js

@@ -48,6 +48,7 @@ class OptionsScreen extends Component {
         <Button title="Show Top Bar" onPress={this.onClickShowTopBar} />
         <Button title="Hide Top Bar" onPress={this.onClickHideTopBar} />
         <Button title="scrollView Screen" onPress={this.onClickScrollViewScreen} />
+        <Button title="Show alert" onPress={this.onClickAlert} />
         <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
       </View>
     );
@@ -111,6 +112,12 @@ class OptionsScreen extends Component {
       animateTopBarHide: true
     });
   }
+
+  onClickAlert() {
+    Navigation.showOverlay('alert', {
+      text: 'test!'
+    });
+  }
 }
 
 const styles = {