fixing android e2e

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java → android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -69,7 +69,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         if (ReactDevPermission.shouldAskPermission()) {
             ReactDevPermission.askPermission(this);
         } else {
-            host.getReactInstanceManager().createReactContextInBackground();
+            if (!host.getReactInstanceManager().hasStartedCreatingInitialContext()) {
+                host.getReactInstanceManager().createReactContextInBackground();
+            }
             host.getReactInstanceManager().onHostResume(this, this);
         }
     }
@@ -88,6 +90,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         if (host.getReactInstanceManager().hasStartedCreatingInitialContext()) {
             host.getReactInstanceManager().onHostDestroy(this);
         }
+        host.clear();
+        android.util.Log.d("DebuggingIsHell", "NavigationActivity:onDestroy() ");
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationApplication.java → android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.controllers;
+package com.reactnativenavigation;
 
 import android.app.Application;
 import android.os.Handler;
@@ -19,5 +19,9 @@ public abstract class NavigationApplication extends Application {
         handler.post(runnable);
     }
 
+    public void runOnUiThreadDelayed(Runnable runnable, long delayMillis) {
+        handler.postDelayed(runnable, delayMillis);
+    }
+
     public abstract boolean isDebug();
 }

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

@@ -10,8 +10,8 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.reactnativenavigation.controllers.NavigationActivity;
-import com.reactnativenavigation.controllers.NavigationApplication;
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.layout.StackLayout;
@@ -48,6 +48,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                                     @Override
                                     public View create(String id, String name) {
                                         ReactRootView rootView = new ReactRootView(getActivity());
+                                        rootView.setId(1234567);
                                         Bundle opts = new Bundle();
                                         opts.putString("id", id);
                                         rootView.startReactApplication(getActivity().getHost().getReactInstanceManager(), name, opts);

android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.java

@@ -5,7 +5,7 @@ import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.NavigationActivity;
 
 import java.util.Arrays;
 import java.util.Collections;

android/app/src/main/java/com/reactnativenavigation/react/ReactDevPermission.java

@@ -9,7 +9,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.facebook.react.common.ReactConstants;
-import com.reactnativenavigation.controllers.NavigationApplication;
+import com.reactnativenavigation.NavigationApplication;
 
 public class ReactDevPermission {
 

android/app/src/main/java/com/reactnativenavigation/utils/ReflectionUtils.java

@@ -0,0 +1,46 @@
+package com.reactnativenavigation.utils;
+
+import android.support.annotation.Nullable;
+
+import java.lang.reflect.Field;
+
+public class ReflectionUtils {
+
+    public static void setField(Object obj, String name, Object value) {
+        try {
+            Field field = getField(obj.getClass(), name);
+            if (field == null) {
+                return;
+            }
+            field.setAccessible(true);
+            field.set(obj, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Nullable
+    public static Object getDeclaredField(Object obj, String fieldName) {
+        try {
+            Field f = getField(obj.getClass(), fieldName);
+            if (f == null) {
+                return null;
+            }
+            f.setAccessible(true);
+            return f.get(obj);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static Field getField(Class clazz, String name) {
+        try {
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException nsfe) {
+            return getField(clazz.getSuperclass(), name);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

android/app/src/main/java/com/reactnativenavigation/utils/ViewIdGenerator.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.utils;
 
 import android.os.Build;
-import android.support.v4.view.ViewCompat;
 import android.view.View;
 
 import java.util.concurrent.atomic.AtomicInteger;

playground/android/app/src/androidTest/java/com/reactnativenavigation/playground/ApplicationLifecycleTest.java

@@ -1,21 +1,21 @@
 package com.reactnativenavigation.playground;
 
+import android.annotation.TargetApi;
 import android.provider.Settings;
 import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingResource;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiSelector;
 
-import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.controllers.NavigationActivity;
 import com.reactnativenavigation.views.NavigationSplashView;
 
+import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.espresso.Espresso.onView;
@@ -26,77 +26,98 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(AndroidJUnit4.class)
 @SdkSuppress(minSdkVersion = 23)
+@TargetApi(23)
+@FixMethodOrder(value = MethodSorters.NAME_ASCENDING)
 public class ApplicationLifecycleTest {
 
+    private ReactIdlingResource reactIdlingResource;
+
     @Rule
     public ActivityTestRule<MainActivity> rule = new ActivityTestRule<MainActivity>(MainActivity.class, false, false) {
         @Override
         protected void afterActivityLaunched() {
             super.afterActivityLaunched();
-            registerReactIdlingResource(rule.getActivity());
+            reactIdlingResource = new ReactIdlingResource(getActivity());
+            Espresso.registerIdlingResources(reactIdlingResource);
         }
-    };
 
-    private void registerReactIdlingResource(final NavigationActivity activity) {
-        Espresso.registerIdlingResources(new IdlingResource() {
-            @Override
-            public String getName() {
-                return "React Bridge";
-            }
-
-            @Override
-            public boolean isIdleNow() {
-                ReactNativeHost host = activity.getHost();
-                return host != null
-                        && host.hasInstance()
-                        && host.getReactInstanceManager().hasStartedCreatingInitialContext()
-                        && host.getReactInstanceManager().getCurrentReactContext() != null;
-            }
-
-            @Override
-            public void registerIdleTransitionCallback(final ResourceCallback callback) {
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        while (!isIdleNow()) {
-                            try {
-                                Thread.sleep(1000);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        callback.onTransitionToIdle();
-                    }
-                }).start();
-            }
-        });
-    }
+        @Override
+        protected void afterActivityFinished() {
+            super.afterActivityFinished();
+            Espresso.unregisterIdlingResources(reactIdlingResource);
+        }
+    };
 
     private void launchActivity() {
         rule.launchActivity(null);
     }
 
+    private UiDevice uiDevice() {
+        return UiDevice.getInstance(getInstrumentation());
+    }
+
     private void acceptOverlayPermissionIfNeeded() throws Exception {
         if (Settings.canDrawOverlays(getInstrumentation().getContext())) {
             return;
         }
-        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Playground")).click();
-        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Permit drawing over other apps")).click();
-        UiDevice.getInstance(getInstrumentation()).pressBack();
-        UiDevice.getInstance(getInstrumentation()).pressBack();
+        uiDevice().findObject(new UiSelector().text("Playground")).click();
+        uiDevice().findObject(new UiSelector().text("Permit drawing over other apps")).click();
+        uiDevice().pressBack();
+        uiDevice().pressBack();
     }
 
     @Test
-    public void acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
+    public void _1_acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
         launchActivity();
         acceptOverlayPermissionIfNeeded();
         onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
     }
 
     @Test
-    public void showsSplashOnStartup() throws Exception {
+    public void _2_showsSplashOnStartup() throws Exception {
         launchActivity();
         assertThat(rule.getActivity().getContentView()).isNotNull().isInstanceOf(NavigationSplashView.class);
         acceptOverlayPermissionIfNeeded();
     }
+
+    @Test
+    public void _3_relaunchFromBackground() throws Exception {
+        launchActivity();
+        acceptOverlayPermissionIfNeeded();
+        onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
+
+        uiDevice().pressHome();
+        uiDevice().pressRecentApps();
+        uiDevice().findObject(new UiSelector().text("Playground")).click();
+
+        onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
+    }
 }
+//    xdescribe('android application lifecycle', () => {
+////launch, pause, and resume
+//
+//        it('launch already running in background', () => {
+//        //
+//        });
+//
+//        it('launch after activity killed by system', () => {
+//        //
+//        });
+//
+//        it('launch and ask react overlay permissions', () => {
+//        //
+//        });
+//
+//        it('launch after reactContext killed by system', () => {
+//        //
+//        });
+//
+//        it('launch from push notification', () => {
+//        //
+//        });
+//
+//        it('launch from intent filter', () => {
+//        //
+//        });
+//        });
+

playground/android/app/src/androidTest/java/com/reactnativenavigation/playground/ReactIdlingResource.java

@@ -0,0 +1,75 @@
+package com.reactnativenavigation.playground;
+
+import android.support.test.espresso.IdlingResource;
+
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.NavigationApplication;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+class ReactIdlingResource implements IdlingResource, NotThreadSafeBridgeIdleDebugListener {
+    private final NavigationActivity activity;
+    private ResourceCallback callback;
+
+    ReactIdlingResource(NavigationActivity activity) {
+        android.util.Log.d("DebuggingIsHell", "------------------------------");
+        this.activity = activity;
+        NavigationApplication.instance.runOnUiThreadDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (!isIdleNow()) {
+                    NavigationApplication.instance.runOnUiThreadDelayed(this, 10);
+                }
+            }
+        }, 10);
+    }
+
+    private AtomicBoolean registered = new AtomicBoolean(false);
+    private AtomicBoolean bridgeIdle = new AtomicBoolean(false);
+
+    @Override
+    public String getName() {
+        return "ReactIdlingResource";
+    }
+
+    @Override
+    public boolean isIdleNow() {
+        ReactNativeHost host = activity.getHost();
+        boolean hasContext = host != null
+                && host.getReactInstanceManager() != null
+                && host.getReactInstanceManager().getCurrentReactContext() != null;
+        if (!hasContext) {
+            return false;
+        }
+
+        if (registered.compareAndSet(false, true)) {
+            host.getReactInstanceManager().getCurrentReactContext().getCatalystInstance().addBridgeIdleDebugListener(this);
+        }
+
+        boolean idle = bridgeIdle.get();
+        android.util.Log.d("DebuggingIsHell", "idle " + idle);
+        if (idle) {
+            callback.onTransitionToIdle();
+        }
+        return idle;
+    }
+
+    @Override
+    public void registerIdleTransitionCallback(final ResourceCallback callback) {
+        this.callback = callback;
+    }
+
+    @Override
+    public void onTransitionToBridgeIdle() {
+        android.util.Log.d("DebuggingIsHell", "IDLE");
+        bridgeIdle.set(true);
+    }
+
+    @Override
+    public void onTransitionToBridgeBusy() {
+        android.util.Log.d("DebuggingIsHell", "busy");
+        bridgeIdle.set(false);
+    }
+}

playground/android/app/src/main/java/com/reactnativenavigation/playground/MainActivity.java

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.playground;
 
-import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.NavigationActivity;
 
 public class MainActivity extends NavigationActivity {
 

playground/android/app/src/main/java/com/reactnativenavigation/playground/MainApplication.java

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.playground;
 
-import com.reactnativenavigation.controllers.NavigationApplication;
+import com.reactnativenavigation.NavigationApplication;
 
 public class MainApplication extends NavigationApplication {
 

playground/e2e/androidLifecycle.test.js

@@ -1,29 +0,0 @@
-xdescribe('android application lifecycle', () => {
-  it('normal launch', () => {
-    //
-  });
-
-  it('launch already running in background', () => {
-    //
-  });
-
-  it('launch after activity killed by system', () => {
-    //
-  });
-
-  it('launch and ask react overlay permissions', () => {
-    //
-  });
-
-  it('launch after reactContext killed by system', () => {
-    //
-  });
-
-  it('launch from push notification', () => {
-    //
-  });
-
-  it('launch from intent filter', () => {
-    //
-  });
-});