on activity resumed (#2370)

android/app/src/main/java/com/reactnativenavigation/bridge/EventEmitter.java

@@ -34,6 +34,10 @@ public class EventEmitter {
         sendGlobalScreenChangedEvent("didDisappear", params.timestamp, params.screenId, type);
     }
 
+    public void sendActivityResumed(String id) {
+        sendScreenChangedEventToJsScreen("onActivityResumed", id);
+    }
+
     private void sendScreenChangedEventToJsScreen(String eventId, String navigatorEventId) {
         WritableMap map = Arguments.createMap();
         map.putString("type", "ScreenChangedEvent");

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

@@ -107,6 +107,10 @@ class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenS
         return layout.getCurrentlyVisibleScreenId();
     }
 
+    String getCurrentlyVisibleEventId() {
+        return layout.getCurrentScreen().getNavigatorEventId();
+    }
+
     interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }

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

@@ -188,4 +188,8 @@ class ModalController implements ScreenStackContainer, Modal.OnModalDismissedLis
     String getCurrentlyVisibleScreenId() {
         return stack.peek().getCurrentlyVisibleScreenId();
     }
+
+    String getCurrentlyVisibleEventId() {
+        return stack.peek().getCurrentlyVisibleEventId();
+    }
 }

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

@@ -58,13 +58,14 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     private ActivityParams activityParams;
     private ModalController modalController;
     private Layout layout;
-    @Nullable private PermissionListener mPermissionListener;
+    @Nullable
+    private PermissionListener mPermissionListener;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-         if (!NavigationApplication.instance.getReactGateway().hasStartedCreatingContext() || 
-                getIntent() == null || 
+        if (!NavigationApplication.instance.getReactGateway().hasStartedCreatingContext() ||
+                getIntent() == null ||
                 getIntent().getBundleExtra("ACTIVITY_PARAMS_BUNDLE") == null) {
             SplashActivity.start(this);
             finish();
@@ -103,7 +104,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     private boolean hasBackgroundColor() {
         return AppStyle.appStyle.screenBackgroundColor != null &&
-               AppStyle.appStyle.screenBackgroundColor.hasColor();
+                AppStyle.appStyle.screenBackgroundColor.hasColor();
     }
 
     @Override
@@ -125,6 +126,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         NavigationApplication.instance.getActivityCallbacks().onActivityResumed(this);
         EventBus.instance.register(this);
         IntentDataHandler.onPostResume(getIntent());
+        NavigationApplication.instance.getEventEmitter().sendActivityResumed(getCurrentlyVisibleEventId());
     }
 
     @Override
@@ -458,4 +460,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public String getCurrentlyVisibleScreenId() {
         return modalController.isShowing() ? modalController.getCurrentlyVisibleScreenId() : layout.getCurrentlyVisibleScreenId();
     }
+
+    public String getCurrentlyVisibleEventId() {
+        return modalController.isShowing() ? modalController.getCurrentlyVisibleEventId() : layout.getCurrentScreen().getNavigatorEventId();
+    }
 }