| 
				
			 | 
			
			
				@@ -122,7 +122,7 @@ public class ScreenStack { 
			 | 
		
	
		
			
			| 
				122
			 | 
			
				122
			 | 
			
			
				                                           @Nullable final Screen.OnDisplayListener onDisplay) { 
			 | 
		
	
		
			
			| 
				123
			 | 
			
				123
			 | 
			
			
				         nextScreen.setVisibility(View.INVISIBLE); 
			 | 
		
	
		
			
			| 
				124
			 | 
			
				124
			 | 
			
			
				         addScreen(nextScreen, layoutParams); 
			 | 
		
	
		
			
			| 
				125
			 | 
			
				
			 | 
			
			
				-        NavigationApplication.instance.getEventEmitter().sendWillDisappearEvent(previousScreen.screenParams, NavigationType.Push); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				125
			 | 
			
			
				+        NavigationApplication.instance.getEventEmitter().sendWillDisappearEvent(previousScreen.getScreenParams(), NavigationType.Push); 
			 | 
		
	
		
			
			| 
				126
			 | 
			
				126
			 | 
			
			
				         nextScreen.setOnDisplayListener(new Screen.OnDisplayListener() { 
			 | 
		
	
		
			
			| 
				127
			 | 
			
				127
			 | 
			
			
				             @Override 
			 | 
		
	
		
			
			| 
				128
			 | 
			
				128
			 | 
			
			
				             public void onDisplay() { 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -130,7 +130,7 @@ public class ScreenStack { 
			 | 
		
	
		
			
			| 
				130
			 | 
			
				130
			 | 
			
			
				                     @Override 
			 | 
		
	
		
			
			| 
				131
			 | 
			
				131
			 | 
			
			
				                     public void run() { 
			 | 
		
	
		
			
			| 
				132
			 | 
			
				132
			 | 
			
			
				                         if (onDisplay != null) onDisplay.onDisplay(); 
			 | 
		
	
		
			
			| 
				133
			 | 
			
				
			 | 
			
			
				-                        NavigationApplication.instance.getEventEmitter().sendDidDisappearEvent(previousScreen.screenParams, NavigationType.Push); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				133
			 | 
			
			
				+                        NavigationApplication.instance.getEventEmitter().sendDidDisappearEvent(previousScreen.getScreenParams(), NavigationType.Push); 
			 | 
		
	
		
			
			| 
				134
			 | 
			
				134
			 | 
			
			
				                         parent.removeView(previousScreen); 
			 | 
		
	
		
			
			| 
				135
			 | 
			
				135
			 | 
			
			
				                     } 
			 | 
		
	
		
			
			| 
				136
			 | 
			
				136
			 | 
			
			
				                 }, NavigationType.Push); 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -208,13 +208,13 @@ public class ScreenStack { 
			 | 
		
	
		
			
			| 
				208
			 | 
			
				208
			 | 
			
			
				     } 
			 | 
		
	
		
			
			| 
				209
			 | 
			
				209
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				210
			 | 
			
				210
			 | 
			
			
				     private void hideScreen(boolean animated, final Screen toRemove, final Screen previous) { 
			 | 
		
	
		
			
			| 
				211
			 | 
			
				
			 | 
			
			
				-        NavigationApplication.instance.getEventEmitter().sendWillAppearEvent(previous.screenParams, NavigationType.Pop); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				211
			 | 
			
			
				+        NavigationApplication.instance.getEventEmitter().sendWillAppearEvent(previous.getScreenParams(), NavigationType.Pop); 
			 | 
		
	
		
			
			| 
				212
			 | 
			
				212
			 | 
			
			
				         Runnable onAnimationEnd = new Runnable() { 
			 | 
		
	
		
			
			| 
				213
			 | 
			
				213
			 | 
			
			
				             @Override 
			 | 
		
	
		
			
			| 
				214
			 | 
			
				214
			 | 
			
			
				             public void run() { 
			 | 
		
	
		
			
			| 
				215
			 | 
			
				215
			 | 
			
			
				                 toRemove.destroy(); 
			 | 
		
	
		
			
			| 
				216
			 | 
			
				216
			 | 
			
			
				                 parent.removeView(toRemove); 
			 | 
		
	
		
			
			| 
				217
			 | 
			
				
			 | 
			
			
				-                NavigationApplication.instance.getEventEmitter().sendDidAppearEvent(previous.screenParams, NavigationType.Pop); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				217
			 | 
			
			
				+                NavigationApplication.instance.getEventEmitter().sendDidAppearEvent(previous.getScreenParams(), NavigationType.Pop); 
			 | 
		
	
		
			
			| 
				218
			 | 
			
				218
			 | 
			
			
				             } 
			 | 
		
	
		
			
			| 
				219
			 | 
			
				219
			 | 
			
			
				         }; 
			 | 
		
	
		
			
			| 
				220
			 | 
			
				220
			 | 
			
			
				         if (animated) { 
			 |