rhodes 2.0.2 → 2.0.3

data/platform/iphone/Classes/Rhodes.h

@@ -58,6 +58,8 @@
 - (void)playStart:(NSString*)fileName mediaType:(NSString*)type;
 - (void)playStop;
 
+- (void)hideSplash;
+
 - (void)setCookie:(NSString*)cookie forUrl:(NSString*)url;
 - (NSString*)cookie:(NSString*)url;
 

data/platform/iphone/Classes/Rhodes.m

@@ -113,6 +113,7 @@ static Rhodes *instance = NULL;
 }
 
 - (void)openMapLocation:(NSString*)query {
+	[self hideSplash];
     NSURL* url = [NSURL URLWithString:[@"http://maps.google.com/?" stringByAppendingString:query]];
     [[UIApplication sharedApplication] openURL:url];
 }
@@ -168,6 +169,7 @@ static Rhodes *instance = NULL;
 }
 
 - (void)chooseDateTime:(DateTime*)dateTime {
+	[self hideSplash];
     dateTimePickerDelegate.dateTime = dateTime;
     [dateTimePickerDelegate setPostUrl:dateTime.url];
     //[self normalizeUrl:dateTime.url]];
@@ -181,6 +183,7 @@ static Rhodes *instance = NULL;
 -(BOOL)startCameraPicker:(PickImageDelegate*)delegateObject 
                                 sourceType:(UIImagePickerControllerSourceType)type
 {
+	[self hideSplash];
 #ifndef __IPHONE_3_0
     if ( (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) || 
         (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) ||
@@ -242,16 +245,21 @@ static Rhodes *instance = NULL;
     return window;
 }
 
-- (void)setMainView:(id<RhoMainView,NSObject>)view {
-    if (mainView == view)
-        return;
-    
+- (void)hideSplash {
     if (splashViewController) {
         [splashViewController hideSplash];
         [splashViewController release];
         splashViewController = nil;
     }
+}
+
+- (void)setMainView:(id<RhoMainView,NSObject>)view {
+    if (mainView == view)
+        return;
+		
+	[self hideSplash];
     
+    [mainView.view removeFromSuperview];
     [mainView release];
     mainView = [view retain];
     [window addSubview:mainView.view];
@@ -277,6 +285,8 @@ static Rhodes *instance = NULL;
         NSError *err;
         NSString *data = [NSString stringWithContentsOfFile:htmPath encoding:NSUTF8StringEncoding error:&err];
         [mainView loadHTMLString:data];
+		rho_splash_screen_start();
+
     }
 }
 
@@ -297,12 +307,21 @@ static Rhodes *instance = NULL;
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
     
     window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    [window makeKeyAndVisible];
+	window.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	window.autoresizesSubviews = YES;
+
     
     mainView = nil;
     self.mainView = [[SimpleMainView alloc] initWithParentView:window frame:[Rhodes applicationFrame]];
+ 	mainView.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	mainView.view.autoresizesSubviews = YES;
+	
+    [window makeKeyAndVisible];
+
+	[window addSubview:mainView.view];
+
     [self showLoadingPage];
-    
+	
     cookies = [[NSMutableDictionary alloc] initWithCapacity:0];
     
     // Init controllers
@@ -359,14 +378,14 @@ static Rhodes *instance = NULL;
     
     NSDictionary *aps = [userInfo objectForKey:@"aps"];
     if (aps) {
-        NSString *alert = [aps objectForKey:@"alert"];
+        NSString *alert = [aps objectForKey:@"show_popup"];
         if (alert && [alert length] > 0) {
             NSLog(@"Push Alert: %@", alert);
             rho_param *p = rho_param_str((char*)[alert UTF8String]);
             [RhoAlert showPopup:p];
             rho_param_free(p);
         }
-        NSString *sound = [aps objectForKey:@"sound"];
+        NSString *sound = [aps objectForKey:@"play_file"];
         if (sound && [sound length] > 0) {
             NSLog(@"Sound file name: %@", sound);
             [RhoAlert playFile:[@"/public/alerts/" stringByAppendingPathComponent:sound] mediaType:NULL];

data/platform/iphone/Classes/SimpleMainView.h

@@ -10,17 +10,19 @@
 #import "RhoMainView.h"
 
 @interface SimpleMainView : UIViewController <RhoMainView, UIWebViewDelegate> {
-    UIView *parent;
-    UIView *root;
+
     UIWebView *webView;
     UIToolbar *toolbar;
     UINavigationBar *navbar;
 }
 
-@property (retain) UIView *root;
 
-- (id)initWithMainView:(id<RhoMainView>)v;
-- (id)initWithMainView:(id<RhoMainView>)v toolbar:(NSArray*)items;
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p;
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items;
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame;
 
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
+- (void)loadView;
+
 @end

data/platform/iphone/Classes/SimpleMainView.m

@@ -57,7 +57,6 @@
 
 @implementation SimpleMainView
 
-@synthesize root;
 
 - (UIBarButtonItem*)newButton:(NSString*)url label:(NSString*)label icon:(NSString*)icon {
     UIImage *img = nil;
@@ -132,7 +131,7 @@
     }
     
     UIToolbar *tb = [UIToolbar new];
-    tb.barStyle = UIBarStyleBlackOpaque;
+    tb.barStyle = UIBarStyleBlack;//Opaque;
     
     [tb sizeToFit];
     
@@ -177,6 +176,10 @@
     
     tb.hidden = NO;
     tb.userInteractionEnabled = YES;
+    tb.autoresizesSubviews = YES;
+    tb.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+ 	
+	
     return tb;
 }
 
@@ -199,13 +202,18 @@
         return;
     
     CGRect wFrame = webView.frame;
+	wFrame.size.height += wFrame.origin.y;
+	wFrame.origin.y = 0;
     
     [toolbar removeFromSuperview];
     toolbar = [self newToolbar:items frame:wFrame];
     toolbar.tag = RHO_TAG_TOOLBAR;
+    UIView* root = self.view;
     [root addSubview:toolbar];
+	[toolbar release];
     
     CGRect tbFrame = toolbar.frame;
+	wFrame = webView.frame;
     wFrame.size.height -= tbFrame.size.height;
     webView.frame = wFrame;
 }
@@ -218,35 +226,145 @@
     w.autoresizesSubviews = YES;
     w.clipsToBounds = NO;
     w.dataDetectorTypes = UIDataDetectorTypeNone;
-    w.delegate = self;
+    //w.delegate = self;
+    w.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     w.tag = RHO_TAG_WEBVIEW;
     
     return w;
 }
 
 - (id)init:(UIView*)p webView:(UIWebView*)w frame:(CGRect)frame toolbar:(NSArray*)items {
-    parent = p;
-    
-    root = [[UIView alloc] initWithFrame:frame];
+	[self init];
+	
+    UIView* root = self.view;
+    root.frame = frame;
     root.userInteractionEnabled = YES;
-    
+ 	root.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	root.autoresizesSubviews = YES;
+   
     [webView removeFromSuperview];
     webView = w;
     if (!webView)
         webView = [self newWebView:frame];
     [root addSubview:webView];
-    CGRect wFrame = frame;
+    [webView release];
+	CGRect wFrame = frame;
     wFrame.origin.y = 0;
     webView.frame = wFrame;
     
     [self addToolbar:items];
     navbar = nil;
     
-    self.view = root;
-    
     return self;
 }
 
+
+ - (void)loadView {
+	 UIView* content = [[UIView alloc] init];
+	 //content.backgroundColor = [UIColor redColor];
+	 self.view = content;
+	 [content release];
+	 
+}
+
+
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	if ([self interfaceOrientation] == fromInterfaceOrientation) {
+		return;
+	}
+	int width = rho_sys_get_screen_width();
+	int height = rho_sys_get_screen_height();
+	// send after rotate message
+	//CGRect wFrame = [webView frame];
+	int angle = 0;
+	switch (fromInterfaceOrientation) {
+		case UIInterfaceOrientationPortrait: {
+			switch ([self interfaceOrientation]) {
+				case UIInterfaceOrientationLandscapeLeft: {
+					angle = 90;
+				}
+					break;
+				case UIInterfaceOrientationPortraitUpsideDown: {
+					angle = 180;
+				}
+					break;
+				case UIInterfaceOrientationLandscapeRight: {
+					angle = -90;
+				}
+					break;
+			}
+		}
+		break;
+		case UIInterfaceOrientationLandscapeLeft: {
+			switch ([self interfaceOrientation]) {
+				case UIInterfaceOrientationPortrait: {
+					angle = -90;
+				}
+					break;
+				case UIInterfaceOrientationPortraitUpsideDown: {
+					angle = 90;
+				}
+					break;
+				case UIInterfaceOrientationLandscapeRight: {
+					angle = 180;
+				}
+					break;
+			}
+		}
+		break;
+		case UIInterfaceOrientationPortraitUpsideDown: {
+			switch ([self interfaceOrientation]) {
+				case UIInterfaceOrientationPortrait: {
+					angle = 180;
+				}
+					break;
+				case UIInterfaceOrientationLandscapeLeft: {
+					angle = -90;
+				}
+					break;
+				case UIInterfaceOrientationLandscapeRight: {
+					angle = 90;
+				}
+					break;
+			}
+		}
+		break;
+		case UIInterfaceOrientationLandscapeRight: {
+			switch ([self interfaceOrientation]) {
+				case UIInterfaceOrientationPortrait: {
+					angle = 90;
+				}
+					break;
+				case UIInterfaceOrientationLandscapeLeft: {
+					angle = 180;
+				}
+					break;
+				case UIInterfaceOrientationPortraitUpsideDown: {
+					angle = -90;
+				}
+					break;
+			}
+		}
+		break;
+	}
+	if (([self interfaceOrientation] == UIInterfaceOrientationLandscapeLeft) || ([self interfaceOrientation] == UIInterfaceOrientationLandscapeRight)) {
+		int t = width;
+		width = height;
+		height = t;
+	}
+	//rho_rhodesapp_callScreenRotationCallback((int)wFrame.size.width, (int)wFrame.size.height, angle);
+	rho_rhodesapp_callScreenRotationCallback(width, height, angle);
+}
+
+
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	// custom rotation code based on interfaceOrientation here...
+	return YES;
+}
+
+
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame toolbar:(NSArray*)items {
     return [self init:p webView:nil frame:frame toolbar:items];
 }
@@ -255,22 +373,21 @@
     return [self initWithParentView:p frame:frame toolbar:nil];
 }
 
-- (id)initWithMainView:(id<RhoMainView>)v {
-    return [self initWithMainView:v toolbar:nil];
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p {
+    return [self initWithMainView:v parent:p toolbar:nil];
 }
 
-- (id)initWithMainView:(id<RhoMainView>)v toolbar:(NSArray*)items {
-    UIView *p = [v parent];
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items {
     CGRect frame = [[v view] frame];
     //UIWebView *w = (UIWebView*)[Rhodes subviewWithTag:RHO_TAG_WEBVIEW ofView:[v view]];
     UIWebView *w = [v detachWebView];
-    return [self init:p webView:w frame:frame toolbar:items];
+    id result = [self init:p webView:w frame:frame toolbar:items];
+
 }
 
 - (void)didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
-    
     // Release any cached data, images, etc that aren't in use.
 }
 
@@ -279,8 +396,9 @@
 }
 
 - (void)dealloc {
-    [root removeFromSuperview];
-    [root release];
+    //UIView* root = self.view;
+    //[root removeFromSuperview];
+    //[root release];
     [super dealloc];
 }
 
@@ -308,15 +426,6 @@
     [self reload:0];
 }
 
-// RhoMainView implementation
-
-- (UIView*)view {
-    return root;
-}
-
-- (UIView*)parent {
-    return parent;
-}
 
 - (UIWebView*)detachWebView {
     UIWebView *w = [webView retain];
@@ -384,6 +493,23 @@
     return 0;
 }
 
+- (void)addNavBar:(UINavigationBar*)navb {
+    [navbar removeFromSuperview];
+    navbar = navb;
+	navbar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+	navbar.autoresizesSubviews = YES;
+	
+	UIView* root = self.view;
+    [root addSubview:navbar];
+	[navbar release];
+    
+    CGRect nFrame = navbar.frame;
+    CGRect wFrame = webView.frame;
+    wFrame.origin.y += nFrame.size.height;
+    wFrame.size.height -= nFrame.size.height;
+    webView.frame = wFrame;
+}
+
 - (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
     [self removeNavBar];
     
@@ -411,15 +537,8 @@
     }
     
     [nb pushNavigationItem:ni animated:NO];
-    [navbar removeFromSuperview];
-    navbar = nb;
-    [root addSubview:navbar];
-    
-    CGRect nFrame = navbar.frame;
-    CGRect wFrame = webView.frame;
-    wFrame.origin.y += nFrame.size.height;
-    wFrame.size.height -= nFrame.size.height;
-    webView.frame = wFrame;
+	
+	[self addNavBar:nb];
 }
 
 - (void)removeNavBar {

data/platform/iphone/Classes/TabbedMainView.h

@@ -10,7 +10,6 @@
 #import "RhoMainView.h"
 
 @interface TabbedMainView : UIViewController<RhoMainView> {
-    UIView *parent;
     UITabBarController *tabbar;
     NSArray *tabbarData;
 }
@@ -18,8 +17,7 @@
 @property (nonatomic,retain) UITabBarController *tabbar;
 @property (nonatomic,retain) NSArray *tabbarData;
 
-//- (id)initWithParentView:(UIView*)v items:(NSArray*)items;
-//- (id)initWithParentView:(UIView*)v frame:(CGRect)frame items:(NSArray*)items;
-- (id)initWithMainView:(id<RhoMainView>)v tabs:(NSArray*)items;
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray*)items;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
 
 @end

data/platform/iphone/Classes/TabbedMainView.m

@@ -54,13 +54,16 @@
 
 @synthesize tabbar, tabbarData;
 
-//- (id)initWithParentView:(UIView *)v items:(NSArray *)items {
-//    return [self initWithParentView:v frame:v.frame items:items];
-//}
 
-//- (id)initWithParentView:(UIView *)v frame:(CGRect)frame items:(NSArray*)items {
-- (id)initWithMainView:(id<RhoMainView>)v tabs:(NSArray *)items {
-    parent = [v parent];
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	// custom rotation code based on interfaceOrientation here...
+	return YES;
+}
+
+
+- (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray *)items {
+    UIView* parent = p;
     
     CGRect frame = [[v view] frame];
     
@@ -132,8 +135,10 @@
 }
 
 - (void)dealloc {
-    [tabbar.view removeFromSuperview];
+    //[tabbar.view removeFromSuperview];
     [tabbarData release];
+	[tabbar release];
+	tabbar = nil;
     [super dealloc];
 }
 
@@ -151,9 +156,6 @@
     return tabbar.view;
 }
 
-- (UIView*)parent {
-    return parent;
-}
 
 - (UIWebView*)detachWebView {
     return [[self subView:[self activeTab]] detachWebView];