Fixed issues in Android

Toolbar buttons not updating
Pushes into BottomTabActivity not always working
Modal not closing properly when back pressed

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

@@ -190,6 +190,16 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
         }
     }
 
+    public void updateStyles() {
+        try {
+            mToolbar.update(getCurrentScreen());
+            setNavigationStyle(getCurrentScreen());
+            mToolbar.setupToolbarButtonsAsync(getCurrentScreen());
+        } catch (Exception e) {
+            Log.w("RNNavigation", "Tried to update styles with no screen!");
+        }
+    }
+
     @Override
     protected void onPause() {
         super.onPause();

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

@@ -69,8 +69,15 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         setNavigationStyle(initialScreen);
     }
 
-    private void setupTabs(Bundle style) {
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if(mScreenStacks != null) {
+            updateStyles();
+        }
+    }
 
+    private void setupTabs(Bundle style) {
         mBottomNavigation.setForceTitlesDisplay(style.getBoolean(TAB_STYLE_INACTIVE_TITLES, DEFAULT_TAB_INACTIVE_TITLES));
         mBottomNavigation.setForceTint(true);
         mBottomNavigation.setDefaultBackgroundColor(getColor(style, TAB_STYLE_BAR_BG_COLOR, DEFAULT_TAB_BAR_BG_COLOR));
@@ -97,7 +104,12 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     @Override
     public void push(Screen screen) {
         super.push(screen);
-        mScreenStacks.get(mCurrentStackPosition).push(screen);
+        for (ScreenStack stack : mScreenStacks) {
+            if (stack.peek().navigatorId.equals(screen.navigatorId)) {
+                stack.push(screen);
+            }
+        }
+        updateStyles();
     }
 
     @Override
@@ -106,7 +118,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         for (ScreenStack stack: mScreenStacks) {
             if (stack.peek().navigatorId.equals(navigatorId)) {
                 Screen popped = stack.pop();
-                setNavigationStyle(getCurrentScreen());
+                updateStyles();
                 return popped;
             }
         }
@@ -136,8 +148,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         mContentFrame.removeAllViews();
         mContentFrame.addView(mScreenStacks.get(position), new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         mCurrentStackPosition = position;
-        mToolbar.setupToolbarButtonsAsync(getCurrentScreen());
-        setNavigationStyle(getCurrentScreen());
+        updateStyles();
     }
 
     private static class SetupTabsTask extends AsyncTask<Void, Void, Map<Screen, Drawable>> {
@@ -163,6 +174,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         @Override
         protected void onPostExecute(Map<Screen, Drawable> icons) {
             mActivity.setTabsWithIcons(mScreens, icons);
+            mActivity.updateStyles();
         }
     }
 

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

@@ -44,15 +44,14 @@ public class SingleScreenActivity extends BaseReactActivity {
     public void push(Screen screen) {
         super.push(screen);
         mScreenStack.push(screen);
+        updateStyles();
     }
 
     @Override
     public Screen pop(String navigatorId) {
         super.pop(navigatorId);
         Screen screen = mScreenStack.pop();
-        Screen currentScreen = getCurrentScreen();
-        setNavigationStyle(currentScreen);
-        mToolbar.update(currentScreen);
+        updateStyles();
         return screen;
     }
 

android/app/src/main/java/com/reactnativenavigation/modal/RnnModal.java

@@ -15,6 +15,7 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.controllers.ModalController;
 import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.utils.ContextProvider;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RctView;
@@ -59,6 +60,7 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
         }
+        setOnDismissListener(this);
     }
 
     public void push(Screen screen) {
@@ -69,7 +71,6 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
     public Screen pop() {
         Screen popped = mScreenStack.pop();
         if (mScreenStack.isEmpty()) {
-            ModalController.getInstance().remove();
             dismiss();
         }
         return popped;
@@ -77,16 +78,12 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
 
     @Override
     public void onBackPressed() {
-        if (mScreenStack.isEmpty()) {
-            ModalController.getInstance().remove();
-            super.onBackPressed();
-        } else {
-            mScreenStack.pop();
-        }
+        pop();
     }
 
     @Override
     public void onDismiss(DialogInterface dialog) {
         ModalController.getInstance().remove();
+        ContextProvider.getActivityContext().updateStyles();
     }
 }

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

@@ -12,6 +12,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.activities.BottomTabActivity;
+import com.reactnativenavigation.activities.RootActivity;
 import com.reactnativenavigation.activities.SingleScreenActivity;
 import com.reactnativenavigation.controllers.ModalController;
 import com.reactnativenavigation.core.objects.Screen;
@@ -51,6 +52,10 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
             intent.putExtras(extras);
             
             context.startActivity(intent);
+            //TODO add abstract isRoot() instead of instanceof?
+            if(ContextProvider.getActivityContext() instanceof RootActivity) {
+                context.overridePendingTransition(0, 0);
+            }
         }
     }
 
@@ -74,6 +79,9 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
             intent.putExtras(extras);
 
             context.startActivity(intent);
+            if(ContextProvider.getActivityContext() instanceof RootActivity) {
+                context.overridePendingTransition(0, 0);
+            }
         }
     }