| 
				
			 | 
			
			
				@@ -59,7 +59,7 @@ public class ScreenParamsParser extends Parser { 
			 | 
		
	
		
			
			| 
				59
			 | 
			
				59
			 | 
			
			
				         result.animateScreenTransitions = new AnimationParser(params).parse(); 
			 | 
		
	
		
			
			| 
				60
			 | 
			
				60
			 | 
			
			
				         result.sharedElementsTransitions = getSharedElementsTransitions(params); 
			 | 
		
	
		
			
			| 
				61
			 | 
			
				61
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				62
			 | 
			
				
			 | 
			
			
				-        result.animationType = params.getString(ANIMATION_TYPE, AppStyle.appStyle.screenAnimationType); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				62
			 | 
			
			
				+        result.animationType = params.getString(ANIMATION_TYPE, AppStyle.appStyle == null ? "" : AppStyle.appStyle.screenAnimationType); 
			 | 
		
	
		
			
			| 
				63
			 | 
			
				63
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				64
			 | 
			
				64
			 | 
			
			
				         return result; 
			 | 
		
	
		
			
			| 
				65
			 | 
			
				65
			 | 
			
			
				     } 
			 |