Update toolbar with correct screen after modal dismiss

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

@@ -245,7 +245,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     protected abstract String getCurrentNavigatorId();
 
     @CallSuper
-    protected Screen getCurrentScreen() {
+    public Screen getCurrentScreen() {
         ModalController modalController = ModalController.getInstance();
         if (modalController.isModalDisplayed()) {
             RnnModal modal = modalController.get();

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

@@ -147,7 +147,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     }
 
     @Override
-    protected Screen getCurrentScreen() {
+    public Screen getCurrentScreen() {
         Screen currentScreen = super.getCurrentScreen();
         if (currentScreen != null) {
             return currentScreen;

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

@@ -28,7 +28,7 @@ public class RootActivity extends BaseReactActivity {
      // No need to implement stack interface since this activity is only used to start other
     // activities such as TabActivity or SingleScreenActivity.
     @Override
-    protected Screen getCurrentScreen() {
+    public Screen getCurrentScreen() {
         return null;
     }
 

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

@@ -78,7 +78,7 @@ public class SingleScreenActivity extends BaseReactActivity {
     }
 
     @Override
-    protected Screen getCurrentScreen() {
+    public Screen getCurrentScreen() {
         Screen currentScreen = super.getCurrentScreen();
         if (currentScreen != null) {
             return currentScreen;

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

@@ -81,7 +81,7 @@ public class TabActivity extends BaseReactActivity {
     }
 
     @Override
-    protected Screen getCurrentScreen() {
+    public Screen getCurrentScreen() {
         return mAdapter.peek(getCurrentNavigatorId());
     }
 

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

@@ -16,6 +16,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;
@@ -93,6 +94,11 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
     @Override
     public void onDismiss(DialogInterface dialog) {
         ModalController.getInstance().remove();
-        StyleHelper.updateStyles(mToolBar, getCurrentScreen());
+        // After modal is dismissed, update Toolbar with screen from parent activity or previously displayed modal
+        BaseReactActivity context = ContextProvider.getActivityContext();
+        if (context != null) {
+            Screen currentScreen = context.getCurrentScreen();
+            StyleHelper.updateStyles(mToolBar, currentScreen);
+        }
     }
 }