Browse Source

Perform pop command on stack associated with navigator

Guy Carmeli 7 years ago
parent
commit
59e9e4e684

+ 10
- 5
android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java View File

@@ -380,12 +380,17 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
380 380
 
381 381
     @Override
382 382
     public void pop(final ScreenParams params) {
383
-        getCurrentScreenStack().pop(params.animateScreenTransitions, params.timestamp, new ScreenStack.OnScreenPop() {
383
+        performOnStack(params.getNavigatorId(), new Task<ScreenStack>() {
384 384
             @Override
385
-            public void onScreenPopAnimationEnd() {
386
-                setBottomTabsStyleFromCurrentScreen();
387
-                alignSnackbarContainerWithBottomTabs((LayoutParams) snackbarAndFabContainer.getLayoutParams(), params.styleParams);
388
-                EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
385
+            public void run(ScreenStack stack) {
386
+            stack.pop(params.animateScreenTransitions, params.timestamp, new ScreenStack.OnScreenPop() {
387
+                    @Override
388
+                    public void onScreenPopAnimationEnd() {
389
+                        setBottomTabsStyleFromCurrentScreen();
390
+                        alignSnackbarContainerWithBottomTabs((LayoutParams) snackbarAndFabContainer.getLayoutParams(), params.styleParams);
391
+                        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
392
+                    }
393
+                });
389 394
             }
390 395
         });
391 396
     }