android: better lifecycle, splash is the responsibility of the user

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

@@ -1,22 +1,14 @@
 package com.reactnativenavigation;
 
-import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.views.NavigationSplashView;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
     private View contentView;
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(new NavigationSplashView(this));
-    }
-
     @Override
     public void setContentView(View contentView) {
         super.setContentView(contentView);
@@ -32,8 +24,4 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public void invokeDefaultOnBackPressed() {
         onBackPressed();
     }
-
-    public long splashMinimumDuration() {
-        return 1000;
-    }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivityLifecycleHandler.java

@@ -9,123 +9,114 @@ import com.facebook.react.bridge.ReactContext;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 import com.reactnativenavigation.react.ReactDevPermission;
-import com.reactnativenavigation.utils.UiThread;
-import com.reactnativenavigation.views.NavigationSplashView;
 
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class NavigationActivityLifecycleHandler implements Application.ActivityLifecycleCallbacks {
-    private interface OnContextCreated {
-        void onContextCreated(long timeElapsed);
-    }
-
-    private final ReactInstanceManager reactInstanceManager;
-
-    public NavigationActivityLifecycleHandler(ReactInstanceManager reactInstanceManager) {
-        this.reactInstanceManager = reactInstanceManager;
-    }
-
-    @Override
-    public void onActivityCreated(final Activity activity, Bundle bundle) {
-    }
-
-    @Override
-    public void onActivityStarted(Activity activity) {
-    }
-
-    @Override
-    public void onActivityResumed(Activity activity) {
-        if (activity instanceof NavigationActivity) {
-            handleResumed((NavigationActivity) activity);
-        }
-    }
-
-    @Override
-    public void onActivityPaused(Activity activity) {
-        if (activity instanceof NavigationActivity) {
-            handlePaused((NavigationActivity) activity);
-        }
-    }
-
-    @Override
-    public void onActivityStopped(Activity activity) {
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-    }
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {
-        if (activity instanceof NavigationActivity) {
-            handleDestroyed((NavigationActivity) activity);
-        }
-    }
-
-    private void handleResumed(NavigationActivity activity) {
-        if (ReactDevPermission.shouldAskPermission()) {
-            ReactDevPermission.askPermission(activity);
-        } else {
-            reactInstanceManager.onHostResume(activity, activity);
-            prepareReactApp(activity);
-        }
-    }
-
-    private void prepareReactApp(final NavigationActivity activity) {
-        if (shouldCreateContext()) {
-            createReactContext(new OnContextCreated() {
-                @Override
-                public void onContextCreated(long timeElapsed) {
-                    emitAppLaunchedAfterDelay(activity.splashMinimumDuration() - timeElapsed);
-                }
-            });
-        } else if (waitingForAppLaunchedEvent(activity)) {
-            emitAppLaunchedAfterDelay(activity.splashMinimumDuration());
-        }
-    }
-
-    /**
-     * @return true if we are a newly created activity, but react context already exists
-     */
-    private boolean waitingForAppLaunchedEvent(NavigationActivity activity) {
-        return activity.getContentView() instanceof NavigationSplashView;
-    }
-
-
-    private void createReactContext(final OnContextCreated onContextCreated) {
-        final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
-        reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-            @Override
-            public void onReactContextInitialized(final ReactContext context) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                onContextCreated.onContextCreated(System.currentTimeMillis() - startTime.get());
-            }
-        });
-        reactInstanceManager.createReactContextInBackground();
-    }
-
-    private boolean shouldCreateContext() {
-        return !reactInstanceManager.hasStartedCreatingInitialContext();
-    }
-
-    private void handlePaused(NavigationActivity activity) {
-        if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-            reactInstanceManager.onHostPause(activity);
-        }
-    }
-
-    private void handleDestroyed(NavigationActivity activity) {
-        if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-            reactInstanceManager.onHostDestroy(activity);
-        }
-    }
-
-    private void emitAppLaunchedAfterDelay(long delay) {
-        UiThread.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).emitAppLaunched();
-            }
-        }, delay);
-    }
+	private final ReactInstanceManager reactInstanceManager;
+	private final AtomicBoolean appLaunchEmitted = new AtomicBoolean(false);
+
+	public NavigationActivityLifecycleHandler(ReactInstanceManager reactInstanceManager) {
+		this.reactInstanceManager = reactInstanceManager;
+	}
+
+	@Override
+	public void onActivityCreated(final Activity activity, Bundle bundle) {
+		if (activity instanceof NavigationActivity) {
+			handleCreated();
+		}
+	}
+
+	@Override
+	public void onActivityStarted(Activity activity) {
+	}
+
+	@Override
+	public void onActivityResumed(Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			handleResumed((NavigationActivity) activity);
+		}
+	}
+
+	@Override
+	public void onActivityPaused(Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			handlePaused((NavigationActivity) activity);
+		}
+	}
+
+	@Override
+	public void onActivityStopped(Activity activity) {
+	}
+
+	@Override
+	public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
+	}
+
+	@Override
+	public void onActivityDestroyed(Activity activity) {
+		if (activity instanceof NavigationActivity) {
+			handleDestroyed((NavigationActivity) activity);
+		}
+	}
+
+	private void handleCreated() {
+		appLaunchEmitted.set(false);
+	}
+
+	private void handleResumed(NavigationActivity activity) {
+		if (ReactDevPermission.shouldAskPermission()) {
+			ReactDevPermission.askPermission(activity);
+		} else {
+			reactInstanceManager.onHostResume(activity, activity);
+			prepareReactApp();
+		}
+	}
+
+	private void prepareReactApp() {
+		if (shouldCreateContext()) {
+			appLaunchEmitted.set(false);
+			createReactContext(new Runnable() {
+				@Override
+				public void run() {
+					emitAppLaunchedOnceIfNeeded();
+				}
+			});
+		} else {
+			emitAppLaunchedOnceIfNeeded();
+		}
+	}
+
+	private void emitAppLaunchedOnceIfNeeded() {
+		if (appLaunchEmitted.compareAndSet(false, true)) {
+			NavigationEventEmitter.emit(reactInstanceManager.getCurrentReactContext()).appLaunched();
+		}
+	}
+
+	private void createReactContext(final Runnable onComplete) {
+		reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
+			@Override
+			public void onReactContextInitialized(final ReactContext context) {
+				reactInstanceManager.removeReactInstanceEventListener(this);
+				onComplete.run();
+			}
+		});
+		reactInstanceManager.createReactContextInBackground();
+	}
+
+	private boolean shouldCreateContext() {
+		return !reactInstanceManager.hasStartedCreatingInitialContext();
+	}
+
+	private void handlePaused(NavigationActivity activity) {
+		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
+			reactInstanceManager.onHostPause(activity);
+		}
+	}
+
+	private void handleDestroyed(NavigationActivity activity) {
+		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
+			reactInstanceManager.onHostDestroy(activity);
+		}
+	}
 }

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

@@ -3,17 +3,22 @@ package com.reactnativenavigation.react;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
 public class NavigationEventEmitter {
 
-    private final DeviceEventManagerModule.RCTDeviceEventEmitter emitter;
+    public static NavigationEventEmitter emit(ReactContext context) {
+        return new NavigationEventEmitter(context);
+    }
+
+    private final RCTDeviceEventEmitter emitter;
 
-    public NavigationEventEmitter(ReactContext reactContext) {
-        this.emitter = reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+    private NavigationEventEmitter(ReactContext reactContext) {
+        this.emitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
     }
 
-    public void emitAppLaunched() {
+    public void appLaunched() {
         emit("RNN.appLaunched");
     }
 

android/app/src/main/java/com/reactnativenavigation/views/NavigationSplashView.java

@@ -1,17 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.content.Context;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-
-import com.reactnativenavigation.R;
-
-public class NavigationSplashView extends FrameLayout {
-    public NavigationSplashView(Context context) {
-        super(context);
-        ImageView image = new ImageView(context);
-        image.setImageResource(R.drawable.logo);
-        image.setContentDescription(getClass().getSimpleName());
-        addView(image);
-    }
-}

android/app/src/main/res/layout/new_root.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="new root :)"/>
-</RelativeLayout>

android/app/src/main/res/layout/splash.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="Splash :)"/>
-</RelativeLayout>

android/app/src/main/res/layout/tab_activity.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".activities.TabActivity">
-
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.reactnativenavigation.views.RnnToolBar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways" />
-
-        <com.reactnativenavigation.views.RnnTabLayout
-            android:id="@+id/tabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways" />
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</LinearLayout>

android/app/src/main/res/menu/search_item.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/toolbar_action_search"
-        android:title="Search"
-        android:icon="@drawable/search"
-        app:showAsAction="always|collapseActionView"
-        android:iconifiedByDefault="true"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
-</menu>

android/app/src/main/res/menu/stub.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-</menu>

android/app/src/test/java/com/reactnativenavigation/NavigationActivityTest.java

@@ -1,6 +1,6 @@
 package com.reactnativenavigation;
 
-import com.reactnativenavigation.views.NavigationSplashView;
+import android.view.View;
 
 import org.junit.Test;
 import org.robolectric.Robolectric;
@@ -9,8 +9,11 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class NavigationActivityTest extends BaseTest {
     @Test
-    public void showsSplashView() throws Exception {
+    public void holdsContentView() throws Exception {
         NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
-        assertThat(activity.getContentView()).isInstanceOf(NavigationSplashView.class);
+        assertThat(activity.getContentView()).isNull();
+        View view = new View(activity);
+        activity.setContentView(view);
+        assertThat(activity.getContentView()).isSameAs(view);
     }
 }