fixing compile errors

android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,7 @@
     package="com.reactnativenavigation">
 
     <application>
-        <activity android:name="com.reactnativenavigation.activities.TabActivity" />
-        <activity android:name="com.reactnativenavigation.activities.BottomTabActivity"
-                  android:label=""/>
-        <activity android:name="com.reactnativenavigation.activities.SingleScreenActivity"
-                  android:label=""/>
+        <activity android:name=".controllers.NavigationActivity" />
     </application>
 
 </manifest>

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

@@ -26,7 +26,6 @@ public abstract class NavigationApplication extends Application implements Navig
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
-
     public Handler getMainHandler() {
         return handler;
     }

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

@@ -1,6 +1,13 @@
 package com.reactnativenavigation.controllers;
 
 public class ModalController {
+    public boolean onBackPressed() {
+        return false;
+    }
+
+    public void onDestroy() {
+
+    }
 
 //    private final Stack<RnnModal> modals = new Stack<>();
 //

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

@@ -1,32 +1,21 @@
 package com.reactnativenavigation.controllers;
 
 import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
-import com.facebook.react.ReactPackage;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.bridge.NavigationReactPackage;
-import com.reactnativenavigation.params.ActivityParams;
-import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ScreenLayout;
+import com.reactnativenavigation.params.ActivityParams;
+import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;
 
-import java.util.Arrays;
-import java.util.List;
-
-
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, NavigationReactInstance.OnJsDevReloadListener {
 
     public static final String PARAMS_BUNDLE = "PARAMS_BUNDLE";
@@ -37,6 +26,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
      * This is somewhat weird, and in the future either fully support multiple activities, OR a single activity with changing contentView ala ReactNative impl.
      */
     private static Activity currentActivity;
+    private ActivityParams activityParams;
     private ModalController modalController;
     private Layout layout = new Layout() {
         @Override
@@ -54,7 +44,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
         }
     };
-    private ActivityParams activityParams;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -89,7 +78,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     protected void onDestroy() {
-//        modalController.onDestroy();
+        modalController.onDestroy();
         layout.onDestroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {
@@ -109,9 +98,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onBackPressed() {
-//        if (modalController.onBackPressed()) {
-//            return;
-//        }
+        if (modalController.onBackPressed()) {
+            return;
+        }
         if (layout.onBackPressed()) {
             return;
         }

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

@@ -1,8 +1,16 @@
 package com.reactnativenavigation.controllers;
 
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
 
-public class SplashActivity extends AppCompatActivity {
-
+public abstract class SplashActivity extends AppCompatActivity {
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //TODO show fancy splash
+        Toast.makeText(this, "Loading navigation...", Toast.LENGTH_SHORT).show();
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java

@@ -10,7 +10,6 @@ import android.support.annotation.ColorInt;
 import android.view.Window;
 import android.widget.LinearLayout;
 
-import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -25,16 +24,14 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public class ScreenLayout extends LinearLayout implements ScrollDirectionListener.OnScrollChanged {
 
-    private final ReactInstanceManager reactInstanceManager;
     private final String screenId;
     private final Bundle passProps;
     private final List<TitleBarButtonParams> buttons;
     private ContentView contentView;
     private TopBar topBar;
 
-    public ScreenLayout(Context context, ReactInstanceManager reactInstanceManager, ScreenParams screenParams) {
+    public ScreenLayout(Context context, ScreenParams screenParams) {
         super(context);
-        this.reactInstanceManager = reactInstanceManager;
         screenId = screenParams.screenId;
         passProps = screenParams.passProps;
         buttons = screenParams.buttons;
@@ -56,7 +53,7 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     }
 
     private void addContentView() {
-        contentView = new ContentView(getContext(), reactInstanceManager, screenId, passProps, this);
+        contentView = new ContentView(getContext(), screenId, passProps, this);
         addView(contentView, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 

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

@@ -4,27 +4,25 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.ReactViewHacks;
 
 public class ContentView extends ReactRootView {
 
-    private final ReactInstanceManager reactInstanceManager;
     private final String screenId;
     private final Bundle passProps;
     private final ScrollDirectionListener.OnScrollChanged scrollListener;
 
-    public ContentView(Context context, ReactInstanceManager reactInstanceManager, String screenId, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
+    public ContentView(Context context, String screenId, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
         super(context);
-        this.reactInstanceManager = reactInstanceManager;
         this.screenId = screenId;
         this.passProps = passProps;
         this.scrollListener = scrollListener;
     }
 
     public void init() {
-        startReactApplication(reactInstanceManager, screenId, passProps);
+        startReactApplication(NavigationApplication.instance.getNavigationReactInstance().getReactInstanceManager(), screenId, passProps);
         new ScrollViewAttacher(this, scrollListener).attach();
     }