pop

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

@@ -76,6 +76,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void pop(final ReadableMap params) {
+        NavigationCommandsHandler.pop(BundleConverter.toBundle(params));
     }
 
     @ReactMethod

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

@@ -109,4 +109,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     void push(ScreenParams params) {
         layout.push(params);
     }
+
+    void pop(ScreenParams params) {
+        layout.pop(params);
+    }
 }

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

@@ -43,4 +43,19 @@ public class NavigationCommandsHandler {
     static ActivityParams getActivityParams(Intent intent) {
         return ActivityParamsParser.parse(intent.getBundleExtra(NavigationCommandsHandler.ACTIVITY_PARAMS_BUNDLE));
     }
+
+    public static void pop(Bundle screenParams) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        final ScreenParams params = ScreenParamsParser.parse(screenParams);
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.pop(params);
+            }
+        });
+    }
 }

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

@@ -10,4 +10,6 @@ public interface Layout {
     void removeAllReactViews();
 
     void push(ScreenParams params);
+
+    void pop(ScreenParams params);
 }

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

@@ -28,7 +28,9 @@ public class ScreenStack extends FrameLayout {
     }
 
     public Screen pop() {
-        return stack.pop();
+        Screen popped = stack.pop();
+        removeView((View) popped);
+        return popped;
     }
 
     public void popToRoot() {

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

@@ -50,4 +50,9 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public void push(ScreenParams params) {
         stack.push(params);
     }
+
+    @Override
+    public void pop(ScreenParams params) {
+        stack.pop();
+    }
 }

src/deprecated/platformSpecificDeprecated.android.js

@@ -39,11 +39,21 @@ function navigatorPush(navigator, params) {
 
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
-  adapted = adaptNavigationParams(params);
+  adapted = adaptNavigationParams(adapted);
 
   newPlatformSpecific.push(adapted);
 }
 
+function navigatorPop(navigator, params) {
+  addNavigatorParams(params, navigator);
+
+  params.screenId = params.screen;
+  let adapted = adaptNavigationStyleToScreenStyle(params);
+  adapted = adaptNavigationParams(adapted);
+
+  newPlatformSpecific.pop(adapted);
+}
+
 function adaptNavigationStyleToScreenStyle(screen) {
   const navigatorStyle = screen.navigatorStyle;
   if (!navigatorStyle) {
@@ -118,11 +128,6 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
   //RctActivity.setNavigatorButtons(params);
 }
 
-function navigatorPop(navigator, params) {
-  //addNavigatorParams(params, navigator);
-  //RctActivity.navigatorPop(params);
-}
-
 function navigatorPopToRoot(navigator, params) {
   //RctActivity.navigatorPopToRoot({
   //  navigatorID: navigator.navigatorID,

src/platformSpecific.android.js

@@ -20,7 +20,12 @@ function push(screenParams) {
   NativeModules.NavigationReactModule.push(screenParams);
 }
 
+function pop(screenParams) {
+  NativeModules.NavigationReactModule.pop(screenParams);
+}
+
 module.exports = {
   startApp,
-  push
+  push,
+  pop
 };