rhodes 2.2.3 → 2.2.4.beta.1

data/platform/iphone/Classes/Signature/SignatureView.m

@@ -116,8 +116,11 @@
 
 - (UIImage*)makeUIImage {
 	
-	CGRect bound_box = CGPathGetBoundingBox(mPath);
-	CGRect rect = self.frame;
+	CGRect bound_box = self.bounds;
+	if (!CGPathIsEmpty(mPath)) {
+		bound_box = CGPathGetBoundingBox(mPath);
+	}
+	CGRect rect = self.bounds;
 	if (rect.size.width < (bound_box.origin.x+bound_box.size.width)) {
 		rect.size.width = (bound_box.origin.x+bound_box.size.width)+2;
 	}
@@ -134,18 +137,21 @@
 	CGContextFillRect(context, rect);
 	
 	// draw signature
-	CGContextSetLineWidth(context, 3);
-	CGContextTranslateCTM (context, 0, rect.size.height);
-	CGContextScaleCTM(context, 1, -1);
-	CGContextBeginPath(context);
-	CGContextAddPath(context,mPath);
-	CGContextDrawPath(context, kCGPathStroke);
+	if (!CGPathIsEmpty(mPath)) {
+		CGContextSetLineWidth(context, 3);
+		CGContextTranslateCTM (context, 0, rect.size.height);
+		CGContextScaleCTM(context, 1, -1);
+		CGContextBeginPath(context);
+		CGContextAddPath(context,mPath);
+		CGContextDrawPath(context, kCGPathStroke);
+	}
 	
 	CGImageRef cg_image = CGBitmapContextCreateImage(context);
 	UIImage* ui_image = [[UIImage alloc] initWithCGImage:cg_image];// scale:1 orientation:UIImageOrientationDownMirrored];
-    [cg_image release];
+    
+	CGImageRelease(cg_image);
 
-	[context release];
+	CGContextRelease(context);
 	
 	return ui_image;
 }

data/platform/iphone/Classes/Signature/SignatureViewController.m

@@ -70,7 +70,9 @@
 	srect.origin.y = 0;
 	trect.origin.x = 0;
 	trect.origin.y = srect.origin.y+srect.size.height;
+	trect.size.width = srect.size.width;
 	toolbar.frame = trect;
+	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
 	
 	signatureView = [[SignatureView alloc] initWithFrame:CGRectZero];
 	signatureView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;

data/platform/iphone/Classes/SimpleMainView.h

@@ -37,4 +37,6 @@
 
 - (UIWebView*)getWebView:(int)tab_index;
 
++ (void) disableHiddenOnStart;
+
 @end

data/platform/iphone/Classes/SimpleMainView.m

@@ -63,6 +63,13 @@ int rho_sys_get_screen_height();
 @synthesize webView, toolbar, navbar, nativeViewType, nativeViewView;
 
 
+static BOOL makeHiddenUntilLoadContent = YES;
+
+
++ (void) disableHiddenOnStart {
+	makeHiddenUntilLoadContent = NO;
+}
+
 -(CGRect)getContentRect {
 	if (nativeViewView != nil) {
 		return nativeViewView.frame;
@@ -78,8 +85,36 @@ int rho_sys_get_screen_height();
 	webView.frame = rect;
 }
 
+- (UIBarButtonItem*)makeUIBarButtonWithCustomImage:(UIImage*)image name:(NSString*)name target:(id)target action:(SEL)action colored_icon:(BOOL)colored_icon {
+    UIBarButtonItem *btn = nil;
+	//load the image
+	if (image == nil) {
+		image = [UIImage imageNamed:name];
+	}
+	
+	if (!colored_icon) {
+		btn = [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:target action:action];
+		return btn;
+	}
+	
+	//create the button and assign the image
+	UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+	[button setImage:image forState:UIControlStateNormal];
+	[button addTarget:target action:action forControlEvents:UIControlEventTouchDown];	
+	
+	//set the frame of the button to the size of the image (see note below)
+	button.frame = CGRectMake(0, 0, image.size.width, image.size.height);
+	
+	//create a UIBarButtonItem with the button as a custom view
+	btn = [[UIBarButtonItem alloc] initWithCustomView:button];	
+	
+	btn.target = target;
+	btn.action = action;
+	
+	return btn;
+}
 
-- (UIBarButtonItem*)newButton:(NSString*)url label:(NSString*)label icon:(NSString*)icon {
+- (UIBarButtonItem*)newButton:(NSString*)url label:(NSString*)label icon:(NSString*)icon  colored_icon:(BOOL)colored_icon{
     UIImage *img = nil;
     if ([icon length] > 0) {
         NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
@@ -88,38 +123,24 @@ int rho_sys_get_screen_height();
     
     UIBarButtonItem *btn = nil;
     
+	
     if ([url compare:@"back"] == NSOrderedSame) {
-        btn = [[UIBarButtonItem alloc]
-               initWithImage:(img ? img : [UIImage imageNamed:@"back_btn.png"])
-               style:UIBarButtonItemStylePlain target:self
-               action:@selector(goBack:)];
+        btn = [self makeUIBarButtonWithCustomImage:img name:@"back_btn.png" target:self action:@selector(goBack:) colored_icon:colored_icon];
     }
     else if ([url compare:@"forward"] == NSOrderedSame) 
 	{
 		if ( !rho_conf_getBool("jqtouch_mode") )
-			btn = [[UIBarButtonItem alloc]
-			   initWithImage:(img ? img : [UIImage imageNamed:@"forward_btn.png"])
-               style:UIBarButtonItemStylePlain target:self
-               action:@selector(goForward:)];
+			btn = [self makeUIBarButtonWithCustomImage:img name:@"forward_btn.png" target:self action:@selector(goForward:) colored_icon:colored_icon];
     }
     else if ([url compare:@"home"] == NSOrderedSame) {
-        btn = [[UIBarButtonItem alloc]
-               initWithImage:(img ? img : [UIImage imageNamed:@"home_btn.png"])
-               style:UIBarButtonItemStylePlain target:self
-               action:@selector(goHome:)];
+        btn = [self makeUIBarButtonWithCustomImage:img name:@"home_btn.png" target:self action:@selector(goHome:) colored_icon:colored_icon];
     }
     else if ([url compare:@"options"] == NSOrderedSame) {
-        btn = [[UIBarButtonItem alloc]
-               initWithImage:(img ? img : [UIImage imageNamed:@"gears.png"])
-               style:UIBarButtonItemStylePlain target:self
-               action:@selector(goOptions:)];
+        btn = [self makeUIBarButtonWithCustomImage:img name:@"gears.png" target:self action:@selector(goOptions:) colored_icon:colored_icon];
     }
     else if ([url compare:@"refresh"] == NSOrderedSame) {
         if (img)
-            btn = [[UIBarButtonItem alloc]
-                   initWithImage:img
-                   style:UIBarButtonItemStylePlain target:self
-                   action:@selector(onRefresh:)];
+            btn = [self makeUIBarButtonWithCustomImage:img name:nil target:self action:@selector(onRefresh:) colored_icon:colored_icon];
         else
             btn = [[UIBarButtonItem alloc]
                    initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh
@@ -133,9 +154,7 @@ int rho_sys_get_screen_height();
     else {
         id action = [[RhoToolbarButtonItemAction alloc] init:url];
         if (img) {
-            btn = [[UIBarButtonItem alloc]
-                   initWithImage:img style:UIBarButtonItemStylePlain
-                   target:action action:@selector(onAction:)];
+            btn = [self makeUIBarButtonWithCustomImage:img name:nil target:action action:@selector(onAction:) colored_icon:colored_icon];
         }
         else if ([label length] > 0) {
             btn = [[UIBarButtonItem alloc]
@@ -148,7 +167,7 @@ int rho_sys_get_screen_height();
 }
 
 - (UIToolbar*)newToolbar:(NSArray*)items frame:(CGRect)mainFrame {
-    if ([items count] % 4 != 0) {
+    if ([items count] % 5 != 0) {
         RAWLOG_ERROR("Illegal arguments for createNewToolbar");
         return nil;
     }
@@ -170,13 +189,16 @@ int rho_sys_get_screen_height();
                               target:nil action:nil];
     
     NSMutableArray *btns = [NSMutableArray arrayWithCapacity:[items count]/4];
-    for(int i = 0, lim = [items count]/4; i < lim; i++) {
-        int index = i*4 - 1;
+    for(int i = 0, lim = [items count]/5; i < lim; i++) {
+        int index = i*5 - 1;
         NSString *label = (NSString*)[items objectAtIndex:++index];
         NSString *url = (NSString*)[items objectAtIndex:++index];
         NSString *icon = (NSString*)[items objectAtIndex:++index];
-        //NSString *reload = (NSString*)[items objectAtIndex:++index];
+        NSString *reload = (NSString*)[items objectAtIndex:++index];
+		NSString *colored_icon = (NSString*)[items objectAtIndex:++index];  
         
+		reload = nil;
+		
         if ([url length] == 0) {
             RAWLOG_ERROR("Illegal arguments for createNewToolbar");
             [tb release];
@@ -184,7 +206,7 @@ int rho_sys_get_screen_height();
             return nil;
         }
         
-        UIBarButtonItem *btn = [self newButton:url label:label icon:icon];
+        UIBarButtonItem *btn = [self newButton:url label:label icon:icon colored_icon:[colored_icon isEqualToString:@"true"]];
         
         if (btn) {
             [btns addObject:fixed];
@@ -248,13 +270,14 @@ int rho_sys_get_screen_height();
     w.scalesPageToFit = YES;
     w.userInteractionEnabled = YES;
     w.multipleTouchEnabled = YES;
-    w.autoresizesSubviews = YES;
     w.clipsToBounds = NO;
     w.dataDetectorTypes = UIDataDetectorTypeNone;
     w.delegate = self;
+    w.autoresizesSubviews = YES;
+    //w.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.tag = RHO_TAG_WEBVIEW;
-    
+	
     assert([w retainCount] == 1);
     return w;
 }
@@ -272,7 +295,7 @@ int rho_sys_get_screen_height();
     self.webView = nil;
     webView = w;
     assert(!webView || [webView retainCount] == 1);
-    if (!webView)
+	if (!webView)
         webView = [self newWebView:frame];
     assert(webView && [webView retainCount] == 1);
     
@@ -280,6 +303,9 @@ int rho_sys_get_screen_height();
     wFrame.origin.y = 0;
     webView.frame = wFrame;
     
+    webView.autoresizesSubviews = YES;
+    webView.autoresizingMask = /*UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin |*/ UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	
     [root addSubview:webView];
     assert([webView retainCount] == 2);
 
@@ -300,7 +326,15 @@ int rho_sys_get_screen_height();
 - (void)loadView {
     UIView* root = [[UIView alloc] init];
     root.frame = rootFrame;
+	if (makeHiddenUntilLoadContent) {
+		root.hidden = YES;
+	}
+    root.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    root.autoresizesSubviews = YES;
+	
+	
     self.view = root;
+	
     [root release];
     assert([root retainCount] == 1);
 }
@@ -408,6 +442,7 @@ int rho_sys_get_screen_height();
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items {
     CGRect frame = [[v view] frame];
+	frame.origin.x = 0;
     //UIWebView *w = (UIWebView*)[Rhodes subviewWithTag:RHO_TAG_WEBVIEW ofView:[v view]];
     UIWebView *w = [v detachWebView];
     id result = [self init:p webView:w frame:frame toolbar:items];
@@ -605,6 +640,7 @@ int rho_sys_get_screen_height();
 }
 
 - (void)navigate:(NSString *)url tab:(int)index {
+	[SimpleMainView disableHiddenOnStart];
     NSString *encodedUrl = [self encodeUrl:url];
 	NSString* cleared_url = [self processForNativeView:encodedUrl];
 	if (cleared_url == nil) {
@@ -619,6 +655,7 @@ int rho_sys_get_screen_height();
 }
 
 - (void)navigateRedirect:(NSString *)url tab:(int)index {
+	[SimpleMainView disableHiddenOnStart];
     NSString *encodedUrl = [self encodeUrl:url];
 	NSString* cleared_url = [self processForNativeView:encodedUrl];
 	if (cleared_url == nil) {
@@ -644,6 +681,12 @@ int rho_sys_get_screen_height();
 }
 
 - (void)executeJs:(NSString*)js tab:(int)index {
+	[SimpleMainView disableHiddenOnStart];
+	if (self.view.hidden) {
+		[[Rhodes sharedInstance] hideSplash];
+		self.view.hidden = NO;
+		[self.view.superview bringSubviewToFront:self.view];
+    }
     RAWLOG_INFO1("Executing JS: %s", [js UTF8String]);
     [webView stringByEvaluatingJavaScriptFromString:js];
 }
@@ -688,6 +731,8 @@ int rho_sys_get_screen_height();
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
     UINavigationBar *nb = [[UINavigationBar alloc] initWithFrame:CGRectZero];
     nb.tag = RHO_TAG_NAVBAR;
+	nb.autoresizesSubviews = YES;
+    nb.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     [nb sizeToFit];
     
     UINavigationItem *ni = [[UINavigationItem alloc] initWithTitle:title];
@@ -700,7 +745,7 @@ int rho_sys_get_screen_height();
         NSString *action = [btn objectAtIndex:0];
         NSString *label = [btn objectAtIndex:1];
         NSString *icon = [btn objectAtIndex:2];
-        UIBarButtonItem *button = [self newButton:action label:label icon:icon];
+        UIBarButtonItem *button = [self newButton:action label:label icon:icon colored_icon:NO];
         
         if (btn == left)
             [ni setLeftBarButtonItem:button];
@@ -734,8 +779,36 @@ int rho_sys_get_screen_height();
     NSURL *url = [request URL];
     if (!url)
         return NO;
-    if (![url.scheme isEqualToString:@"http"] && ![url.scheme isEqualToString:@"https"]) {
+    
+    BOOL external = NO;
+    
+    NSString *scheme = url.scheme;
+    if (![scheme isEqualToString:@"http"] && ![scheme isEqualToString:@"https"])
+        external = YES;
+    else {
+        NSString *ps = [url query];
+        NSArray *parameters = [ps componentsSeparatedByString:@"&"];
+        for (int i = 0, lim = [parameters count]; i < lim; ++i) {
+            NSString *param = [parameters objectAtIndex:i];
+            NSArray *nv = [param componentsSeparatedByString:@"="];
+            int size = [nv count];
+            if (size == 0 || size > 2)
+                continue;
+            NSString *name = [nv objectAtIndex:0];
+            NSString *value = nil;
+            if (size == 2)
+                value = [nv objectAtIndex:1];
+            
+            if ([name isEqualToString:@"rho_open_target"] && [value isEqualToString:@"_blank"]) {
+                external = YES;
+                break;
+            }
+        }
+    }
+    
+    if (external) {
         // This is not http url so try to open external application for it
+        RAWLOG_INFO1("Open url in external application: %s", [[url absoluteString] UTF8String]);
         [[UIApplication sharedApplication] openURL:url];
         return NO;
     }
@@ -763,7 +836,14 @@ int rho_sys_get_screen_height();
     NSURLCache *sharedCache = [[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil];
 	[NSURLCache setSharedURLCache:sharedCache];
 	[sharedCache release];
-    
+	
+	if (self.view.hidden) {
+		[[Rhodes sharedInstance] hideSplash];
+		self.view.hidden = NO;
+		[self.view.superview bringSubviewToFront:self.view];
+    }
+	
+	
     // TODO
     /*
      [self inactive];
@@ -789,6 +869,11 @@ int rho_sys_get_screen_height();
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     // TODO
+	if (self.view.hidden) {
+		[[Rhodes sharedInstance] hideSplash];
+		self.view.hidden = NO;
+		[self.view.superview bringSubviewToFront:self.view];
+    }
 }
 
 @end

data/platform/iphone/Classes/SplashViewController.h

@@ -9,6 +9,12 @@
 #import <UIKit/UIKit.h>
 #import "RhoViewController.h"
 
+
+@interface RhoSplashImageView : UIImageView {
+	
+}
+@end
+
 @interface SplashViewController : RhoViewController {
     IBOutlet UIImageView *splashView;
     
@@ -17,8 +23,9 @@
 }
 
 - (id)initWithParentView:(UIView*)v;
-- (void)showSplash:(NSString *)imagePath;
 - (void)hideSplash;
 - (void)bringToFront;
++ (NSString*)detectLoadingImage:(CGRect)myframe rotation_to_left:(BOOL*)rotation_to_left;
++ (BOOL)hasLoadingImage;
 
 @end

data/platform/iphone/Classes/SplashViewController.m

@@ -10,27 +10,100 @@
 
 #import "rho/common/SplashScreenImpl.h"
 
+
+@implementation RhoSplashImageView
+
+- (void)layoutSubviews
+{
+	[super layoutSubviews];
+	
+	CGRect frame = self.frame;
+	CGRect rect = self.bounds;
+
+	float scales = 1;
+#ifdef __IPHONE_4_0
+	if ( [[UIScreen mainScreen] respondsToSelector:@selector(scale)] ) {
+		scales = [[UIScreen mainScreen] scale];
+	}
+#endif
+	
+
+	BOOL is_need_left = NO;
+	
+	NSString* imagePath = [SplashViewController detectLoadingImage:rect rotation_to_left:&is_need_left];
+
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if (![fileManager fileExistsAtPath:imagePath])
+        return;
+    
+    UIImage *img = [[UIImage alloc] initWithContentsOfFile:imagePath];
+	
+    self.image = img;
+	
+	{
+		
+		float img_scale = 1;
+#ifdef __IPHONE_4_0
+		if ( [img respondsToSelector:@selector(scale)] ) {
+			img_scale = [img scale];
+		}
+#endif
+		
+		int image_width = (int)([img size].width*img_scale); 
+		int image_height = (int)([img size].height*img_scale);
+		
+		CGRect appFrame = [[UIScreen mainScreen] applicationFrame];
+		CGRect srcrnBounds = [[UIScreen mainScreen] bounds];
+		CGRect sbFrame = [[UIApplication sharedApplication] statusBarFrame];
+		
+		UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+		
+		int scrnWidth = 0;
+		int scrnHeight = 0;
+
+		if ((orientation == UIInterfaceOrientationPortrait) || (orientation == UIInterfaceOrientationPortraitUpsideDown)) {
+			scrnWidth = (int)(srcrnBounds.size.width*scales+0.5);
+			scrnHeight = (int)(srcrnBounds.size.height*scales+0.5);
+		}
+		else {
+			scrnWidth = (int)(srcrnBounds.size.height*scales+0.5);
+			scrnHeight = (int)(srcrnBounds.size.width*scales+0.5);
+		}
+		
+	
+		if ((image_width != scrnWidth) || (image_height != scrnHeight)) {
+			// scale to app frame
+			self.frame = appFrame;
+		}
+		else {
+			self.frame = srcrnBounds;
+		}
+	}
+}
+
+
+
+@end
+
+
+
+
 @implementation SplashViewController
 
 // Implement loadView to create a view hierarchy programmatically, without using a nib.
 - (id)initWithParentView:(UIView*)v {
+	self = [super init];
     parentView = v;
     CGRect frame = [[UIScreen mainScreen] bounds];
-    splashView = [[UIImageView alloc] initWithFrame:frame];
+    splashView = [[RhoSplashImageView alloc] initWithFrame:frame];
+	
+	splashView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	splashView.autoresizesSubviews = YES;
+	self.view = splashView;
     [parentView addSubview:splashView];
     return self;
 }
 
-- (void)showSplash:(NSString *)imagePath {
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    if (![fileManager fileExistsAtPath:imagePath])
-        return;
-    
-    UIImage *img = [[UIImage alloc] initWithContentsOfFile:imagePath];
-    splashView.image = img;
-    [parentView bringSubviewToFront:splashView];
-    rho_splash_screen_start();
-}
 
 - (void)hideSplash {
     rho_splash_screen_hide();
@@ -58,5 +131,154 @@
     [super dealloc];
 }
 
++ (NSString*)detectLoadingImage:(CGRect)myframe rotation_to_left:(BOOL*)rotation_to_left {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    
+	
+	NSString * result = nil;
+	
+    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+    
+	NSString *pngLoadingPath = [NSString stringWithFormat:@"%@/apps/app/loading.png", resourcePath];
+	NSString *pngDefaultPath = [NSString stringWithFormat:@"%@/Default.png", resourcePath];
+	NSString *pngDefault2xPath = [NSString stringWithFormat:@"%@/Default@2x.png", resourcePath];
+	NSString *pngDefaultPortraitPath = [NSString stringWithFormat:@"%@/Default-Portrait.png", resourcePath];
+	NSString *pngDefaultPortraitUpsideDownPath = [NSString stringWithFormat:@"%@/Default-PortraitUpsideDown.png", resourcePath];
+	NSString *pngDefaultLandscapePath = [NSString stringWithFormat:@"%@/Default-Landscape.png", resourcePath];
+	NSString *pngDefaultLandscapeLeftPath = [NSString stringWithFormat:@"%@/Default-LandscapeLeft.png", resourcePath];
+	NSString *pngDefaultLandscapeRightPath = [NSString stringWithFormat:@"%@/Default-LandscapeRight.png", resourcePath];
+
+	CGRect win_frame = [[[UIApplication sharedApplication] keyWindow] bounds];
+	
+	CGRect frame = myframe;
+	float scales = 1;//[[UIScreen mainScreen] scale];
+#ifdef __IPHONE_4_0
+	scales = [[UIScreen mainScreen] scale];
+#endif
+	
+	BOOL is_HiResolution = ((frame.size.width*scales) > 500);
+	BOOL is_iPad = NO;
+	
+	NSString *model = [[UIDevice currentDevice] model]; // "iPad ..."
+	if ([model hasPrefix:@"iPad"]) {
+		is_iPad = YES;
+	}
+	
+	UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	
+	if (is_iPad) {
+		if ([fileManager fileExistsAtPath:pngDefaultPath]) {
+			result = pngDefaultPath;
+		}
+		if ([fileManager fileExistsAtPath:pngDefault2xPath]) {
+			result = pngDefault2xPath;
+		}
+		if ((orientation == UIInterfaceOrientationPortrait) || (orientation == UIInterfaceOrientationPortraitUpsideDown) ) {
+			if ([fileManager fileExistsAtPath:pngDefaultPortraitPath]) {
+				result = pngDefaultPortraitPath;
+			}
+			if (orientation == UIInterfaceOrientationPortraitUpsideDown) {
+				if ([fileManager fileExistsAtPath:pngDefaultPortraitUpsideDownPath]) {
+					result = pngDefaultPortraitUpsideDownPath;
+				}
+			}
+		}
+		else {
+			*rotation_to_left = YES;
+			if ([fileManager fileExistsAtPath:pngDefaultLandscapePath]) {
+				result = pngDefaultLandscapePath;
+				*rotation_to_left = NO;
+			}
+			if (orientation == UIInterfaceOrientationLandscapeLeft) {
+				if ([fileManager fileExistsAtPath:pngDefaultLandscapeLeftPath]) {
+					result = pngDefaultLandscapeLeftPath;
+					*rotation_to_left = NO;
+				}
+			}
+			else {
+				if ([fileManager fileExistsAtPath:pngDefaultLandscapeRightPath]) {
+					result = pngDefaultLandscapeRightPath;
+					*rotation_to_left = NO;
+				}
+			}
+		}
+	}
+	else {
+		if ([fileManager fileExistsAtPath:pngDefaultPath]) {
+			result = pngDefaultPath;
+		}
+		if (is_HiResolution) {
+			if ([fileManager fileExistsAtPath:pngDefault2xPath]) {
+				result = pngDefault2xPath;
+			}
+		}
+	}
+	if (result == nil) {
+		if ([fileManager fileExistsAtPath:pngDefaultPath]) {
+			result = pngDefaultPath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefault2xPath]) {
+			result = pngDefault2xPath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefaultPortraitPath]) {
+			result = pngDefaultPortraitPath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefaultLandscapePath]) {
+			result = pngDefaultLandscapePath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefaultPortraitUpsideDownPath]) {
+			result = pngDefaultPortraitUpsideDownPath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefaultLandscapeLeftPath]) {
+			result = pngDefaultLandscapeLeftPath;
+		}
+		else if ([fileManager fileExistsAtPath:pngDefaultLandscapeRightPath]) {
+			result = pngDefaultLandscapeRightPath;
+		}
+	}
+
+	return result;
+}
+
++ (BOOL)hasLoadingImage {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+
+	//NSString *pngLoadingPath = [NSString stringWithFormat:@"%@/apps/app/loading.png", resourcePath];
+	NSString *pngDefaultPath = [NSString stringWithFormat:@"%@/Default.png", resourcePath];
+	NSString *pngDefault2xPath = [NSString stringWithFormat:@"%@/Default@2x.png", resourcePath];
+	NSString *pngDefaultPortraitPath = [NSString stringWithFormat:@"%@/Default-Portrait.png", resourcePath];
+	NSString *pngDefaultPortraitUpsideDownPath = [NSString stringWithFormat:@"%@/Default-PortraitUpsideDown.png", resourcePath];
+	NSString *pngDefaultLandscapePath = [NSString stringWithFormat:@"%@/Default-Landscape.png", resourcePath];
+	NSString *pngDefaultLandscapeLeftPath = [NSString stringWithFormat:@"%@/Default-LandscapeLeft.png", resourcePath];
+	NSString *pngDefaultLandscapeRightPath = [NSString stringWithFormat:@"%@/Default-LandscapeRight.png", resourcePath];
+	
+	return (
+			//([fileManager fileExistsAtPath:pngLoadingPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultPath]) ||
+			([fileManager fileExistsAtPath:pngDefault2xPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultPortraitPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultPortraitUpsideDownPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultLandscapeLeftPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultLandscapeRightPath]) ||
+			([fileManager fileExistsAtPath:pngDefaultLandscapePath])
+	);
+
+
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	BOOL is_iPad = NO;
+	
+	NSString *model = [[UIDevice currentDevice] model]; // "iPad ..."
+	if ([model hasPrefix:@"iPad"]) {
+		is_iPad = YES;
+	}
+	if (!is_iPad) {
+		return NO;
+	}
+ 	return YES;
+}
+
 
 @end