| 
				
			 | 
			
			
				@@ -13,7 +13,7 @@ public class TopBarOptions implements DEFAULT_VALUES { 
			 | 
		
	
		
			
			| 
				13
			 | 
			
				13
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				14
			 | 
			
				14
			 | 
			
			
				 		options.title = json.optString("title", NO_VALUE); 
			 | 
		
	
		
			
			| 
				15
			 | 
			
				15
			 | 
			
			
				 		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR_VALUE); 
			 | 
		
	
		
			
			| 
				16
			 | 
			
				
			 | 
			
			
				-		options.textColor = json.optInt("textColor", NO_INT_VALUE); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				16
			 | 
			
			
				+		options.textColor = json.optInt("textColor", NO_COLOR_VALUE); 
			 | 
		
	
		
			
			| 
				17
			 | 
			
				17
			 | 
			
			
				 		options.textFontSize = (float) json.optDouble("textFontSize", NO_FLOAT_VALUE); 
			 | 
		
	
		
			
			| 
				18
			 | 
			
				18
			 | 
			
			
				 		options.textFontFamily = json.optString("textFontFamily", NO_VALUE); 
			 | 
		
	
		
			
			| 
				19
			 | 
			
				19
			 | 
			
			
				 		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden")); 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -36,7 +36,7 @@ public class TopBarOptions implements DEFAULT_VALUES { 
			 | 
		
	
		
			
			| 
				36
			 | 
			
				36
			 | 
			
			
				 		if (!NO_VALUE.equals(other.title)) title = other.title; 
			 | 
		
	
		
			
			| 
				37
			 | 
			
				37
			 | 
			
			
				 		if (other.backgroundColor != NO_COLOR_VALUE) 
			 | 
		
	
		
			
			| 
				38
			 | 
			
				38
			 | 
			
			
				 			backgroundColor = other.backgroundColor; 
			 | 
		
	
		
			
			| 
				39
			 | 
			
				
			 | 
			
			
				-		if (other.textColor != NO_INT_VALUE) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				39
			 | 
			
			
				+		if (other.textColor != NO_COLOR_VALUE) 
			 | 
		
	
		
			
			| 
				40
			 | 
			
				40
			 | 
			
			
				 			textColor = other.textColor; 
			 | 
		
	
		
			
			| 
				41
			 | 
			
				41
			 | 
			
			
				 		if (other.textFontSize != NO_FLOAT_VALUE) 
			 | 
		
	
		
			
			| 
				42
			 | 
			
				42
			 | 
			
			
				 			textFontSize = other.textFontSize; 
			 |