Added back, getNavigatorID

android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java

@@ -191,8 +191,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
         super.onDestroy();
 
         // Destroy react instance manager only if there are no resumed react activities
-        Activity activity = ContextProvider.getActivityContext();
-        if (mReactInstanceManager != null && !(activity instanceof BaseReactActivity)) {
+        BaseReactActivity activity = ContextProvider.getActivityContext();
+        if (mReactInstanceManager != null ) {
             Log.i(TAG, "Destroying ReactInstanceManager");
             mReactInstanceManager.onDestroy();
         } else {
@@ -204,6 +204,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 
     public abstract Screen pop(String navID);
 
+    public abstract String getActiveNavigatorID();
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         mMenu = menu;
@@ -252,11 +254,13 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 
     @Override
     public void onBackPressed() {
-        if (mReactInstanceManager != null)
-            mReactInstanceManager.onBackPressed();
-        //TODO uncomment and add current navID
-         else //if(pop() == null)
-            super.onBackPressed();
+
+        if(pop(getActiveNavigatorID()) == null) {
+            if (mReactInstanceManager != null)
+                mReactInstanceManager.onBackPressed();
+            else
+                super.onBackPressed();
+        }
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/activities/RootActivity.java

@@ -65,4 +65,10 @@ public class RootActivity extends BaseReactActivity {
         return null;
         //TODO
     }
+
+    @Override
+    public String getActiveNavigatorID() {
+        return null;
+        //TODO
+    }
 }

android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java

@@ -18,6 +18,7 @@ public class SingleScreenActivity extends BaseReactActivity {
     private Toolbar mToolbar;
     private FrameLayout mContentFrame;
     private ScreenStack screenStack;
+    private String navID;
 
     @Override
     protected void handleOnCreate() {
@@ -28,6 +29,7 @@ public class SingleScreenActivity extends BaseReactActivity {
         mContentFrame = (FrameLayout) findViewById(R.id.contentFrame);
 
         Screen screen = (Screen) getIntent().getSerializableExtra(EXTRA_SCREEN);
+        navID = screen.navigatorId;
         setupToolbar(screen.title);
 
         screenStack = new ScreenStack(this);
@@ -48,4 +50,9 @@ public class SingleScreenActivity extends BaseReactActivity {
     public Screen pop(String navID) {
         return screenStack.pop();
     }
+
+    @Override
+    public String getActiveNavigatorID() {
+        return navID;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java

@@ -69,4 +69,9 @@ public class TabActivity extends BaseReactActivity {
         mToolbar.handleOnCreateOptionsMenuAsync();
         return ret;
     }
+
+    @Override
+    public String getActiveNavigatorID() {
+        return adapter.getNavID(mViewPager.getCurrentItem());
+    }
 }

android/app/src/main/java/com/reactnativenavigation/adapters/ViewPagerAdapter.java

@@ -13,6 +13,7 @@ import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.views.RnnToolBar;
 import com.reactnativenavigation.views.ScreenStack;
 
 import java.util.ArrayList;
@@ -28,23 +29,26 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     private BaseReactActivity mContext;
     private ViewPager mViewPager;
-    private Toolbar mToolbar;
+    private RnnToolBar mToolbar;
     private final ReactInstanceManager mReactInstanceManager;
     private final ArrayList<ScreenStack> screenStacks;
+    private final ArrayList<String> navIDs;
     private final Map<String, ScreenStack> stacksByNavId;
 
 
-    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, Toolbar toolbar,
+    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, RnnToolBar toolbar,
                             ArrayList<Screen> screens) {
         mContext = context;
         mViewPager = viewPager;
         mToolbar = toolbar;
         screenStacks = new ArrayList<>();
+        navIDs = new ArrayList<>();
         stacksByNavId  = new HashMap<>();
         for(Screen screen: screens){
             ScreenStack stack = new ScreenStack(context);
             stack.push(screen);
             screenStacks.add(stack);
+            navIDs.add(screen.navigatorId);
             stacksByNavId.put(screen.navigatorId, stack);
         }
         mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
@@ -100,7 +104,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
         Screen screen = screenStacks.get(position).peek();
         params.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
 
-//        mToolbar.setupToolbarButtonsAsync(mScreens.get(position));
+        mToolbar.setupToolbarButtonsAsync(screenStacks.get(position).peek());
 
         RctManager.getInstance().sendEvent(EVENT_ON_TAB_SELECTED, screen.navigatorEventId, params);
     }
@@ -114,4 +118,8 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
     public void onTabReselected(TabLayout.Tab tab) {
 
     }
+
+    public String getNavID(int position) {
+        return navIDs.get(position);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -34,6 +34,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startTabBasedApp(ReadableArray screens) {
+        Log.e("START", "NEW_TAB");
         Activity context = ContextProvider.getActivityContext();
         if (context != null && !context.isFinishing()) {
             Intent intent = new Intent(context, TabActivity.class);
@@ -54,6 +55,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startSingleScreenApp(ReadableMap screen) {
+        Log.e("START", "NEW_SINGLE");
         BaseReactActivity context = ContextProvider.getActivityContext();
         if (context != null && !context.isFinishing()) {
             Intent intent = new Intent(context, SingleScreenActivity.class);

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

@@ -11,7 +11,7 @@ import com.reactnativenavigation.core.objects.Screen;
 
 import java.util.Stack;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.*;
 
 public class ScreenStack extends FrameLayout {
 
@@ -37,22 +37,26 @@ public class ScreenStack extends FrameLayout {
 
     public void push(Screen screen){
         View oldView = null;
-        if(!stack.isEmpty())
+        if(!stack.isEmpty()) {
             oldView = stack.peek().view;
+        }
         RctView view = new RctView(reactActivity, mReactInstanceManager, screen);
         addView(view, MATCH_PARENT, MATCH_PARENT);
-        if(oldView!=null)
+        if(oldView!=null) {
             removeView(oldView);
+        }
         stack.push(new ScreenView(screen, view));
     }
 
     public Screen pop(){
         //TODO maybe return null if size is 1?
-        if(stack.isEmpty())
+        if(stack.isEmpty()) {
             return null;
+        }
         ScreenView popped = stack.pop();
-        if(!stack.isEmpty());
+        if(!stack.isEmpty()) {
             addView(stack.peek().view, 0);
+        }
         removeView(popped.view);
         return popped.screen;
     }