showModal android

AndroidE2E/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "com.reactnativenavigation.e2e.androide2e"
         minSdkVersion 18
@@ -16,10 +16,10 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
 
     androidTestCompile 'org.assertj:assertj-core:2.5.0'
-    androidTestCompile 'com.android.support:support-annotations:25.1.1'
+    androidTestCompile 'com.android.support:support-annotations:25.3.1'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

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

@@ -6,7 +6,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 public class ModalsTest extends BaseTest {
-	@Ignore
+
 	@Test
 	public void showModal() throws Exception {
 		launchTheApp();

AndroidE2E/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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

@@ -84,6 +84,18 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		});
 	}
 
+	@ReactMethod
+	public void showModal(final ReadableMap rawLayoutTree) {
+		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
+		handle(new Runnable() {
+			@Override
+			public void run() {
+				final ViewController viewController = newLayoutFactory().create(layoutTree);
+				navigator().showModal(viewController);
+			}
+		});
+	}
+
 	private NavigationActivity activity() {
 		return (NavigationActivity) getCurrentActivity();
 	}

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

@@ -1,15 +1,20 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import com.reactnativenavigation.R;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.Collection;
 import java.util.Collections;
 
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
 public class Navigator extends ParentController {
 
 	private ViewController root;
@@ -96,4 +101,11 @@ public class Navigator extends ParentController {
 			}
 		}
 	}
+
+	public void showModal(final ViewController viewController) {
+		viewController.getView().measure(makeMeasureSpec(getView().getWidth(), EXACTLY), makeMeasureSpec(getView().getHeight(), EXACTLY));
+		Dialog dialog = new Dialog(getActivity(), R.style.Modal);
+		dialog.setContentView(viewController.getView());
+		dialog.show();
+	}
 }

lib/android/app/src/main/res/anim/slide_up.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-    android:shareInterpolator="true">
+     android:duration="250"
+     android:interpolator="@android:anim/decelerate_interpolator"
+     android:shareInterpolator="true">
     <translate
-        android:fromYDelta="100%"
-        android:toYDelta="0"
-        android:duration="250"/>
+        android:fromYDelta="60%"
+        android:toYDelta="0"/>
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="1"/>
 </set>

lib/android/app/src/main/res/values/styles.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Modal" parent="@android:style/Theme.Translucent.NoTitleBar">
+    <style name="Modal" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/modalAnimations</item>
     </style>
 
     <style name="modalAnimations">
+        <item name="android:windowEnterAnimation">@anim/slide_up</item>
         <item name="android:windowExitAnimation">@anim/slide_down</item>
     </style>
 </resources>

playground/android/app/build.gradle

@@ -36,7 +36,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.facebook.react:react-native:+'
-    compile 'com.android.support:design:25.1.1'
-    compile "com.android.support:appcompat-v7:25.1.1"
+    compile 'com.android.support:design:25.3.1'
+    compile "com.android.support:appcompat-v7:25.3.1"
     compile project(':react-native-navigation')
 }

playground/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

scripts/env/installAndroidSDK.sh

@@ -17,13 +17,3 @@ curl --location https://dl.google.com/android/repository/sdk-tools-darwin-385939
 echo "Copying Android Licenses"
 mkdir -p "${ANDROID_HOME}"/licenses
 cp "$scriptdir/android-sdk-licenses/"* "${ANDROID_HOME}"/licenses
-
-# package="system-images;android-24;default;armeabi-v7a"
-# echo "Downloading emulator"
-# sdkmanager "emulator"
-# echo "Downloading $package"
-# sdkmanager "${package}"
-# echo "Creating avd"
-# echo no | avdmanager create avd --force --name "pixel" --abi "default/armeabi-v7a" --package "${package}" --device "pixel"
-# sleep 2
-# avdmanager list avd

scripts/test.e2e.android.js

@@ -2,6 +2,12 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
+const avdName = 'pixel';
+const sdk = 'android-24';
+const apis = 'default';
+const abi = 'armeabi-v7a';
+const packageName = `system-images;${sdk};${apis};${abi}`;
+
 const release = _.includes(process.argv, 'release');
 
 run();
@@ -9,12 +15,6 @@ run();
 function run() {
   if (process.env.CI) {
     console.log(`android e2e is disabled on CI`);
-    // try {
-    //   launchEmulator();
-    //   runTests();
-    // } finally {
-    //   killEmulators();
-    // }
   } else {
     runTests();
   }
@@ -26,9 +26,16 @@ function runTests() {
   exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
 }
 
+function installEmulator() {
+  exec.execSync(`sdkmanager "emulator"`);
+  exec.execSync(`sdkmanager "${packageName}"`);
+  exec.execSync(`echo no | avdmanager create avd --force --name "${avdName}" --abi "${apis}/${abi}" --package "${packageName}" --device "pixel"`);
+  exec.execSync(`avdmanager list avd`);
+}
+
 function launchEmulator() {
   console.log(`Launching Android Emulator`);
-  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -gpu host -no-audio @pixel`);
+  exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -gpu host -no-audio @${avdName}`);
   exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
 }