rhodes 2.3.2 → 2.4.0.beta.1

data/platform/iphone/Classes/NativeBar.h

@@ -18,6 +18,7 @@
 #define NATIVE_BAR_ITEMS							@"items"
 
 #define NATIVE_BAR_BACKGOUND_COLOR					@"bkg_color"
+#define NATIVE_BAR_ON_CHANGE_TAB_CALLBACK           @"on_change_tab_callback"
 
 #define NATIVE_BAR_ITEM_LABEL						@"label"
 #define NATIVE_BAR_ITEM_ACTION						@"action"

data/platform/iphone/Classes/NativeBar.m

@@ -136,6 +136,8 @@ void create_nativebar_innner(int bar_type, rho_param *p)
 
 	const char* background_color = NULL;
 	const char* background_color_enable = NULL;
+    
+    const char* on_change_tab_callback = NULL;
 	
 	rho_param *params = NULL;
     switch (p->type) {
@@ -151,7 +153,11 @@ void create_nativebar_innner(int bar_type, rho_param *p)
 					background_color = value->v.string;
 					background_color_enable = "true";
                 }
-				
+
+                if (strcasecmp(name, "on_change_tab_callback") == 0) {
+					on_change_tab_callback = value->v.string;
+                }
+                
                 if (strcasecmp(name, "buttons") == 0 || strcasecmp(name, "tabs") == 0) {
                     params = value;
                 }
@@ -268,9 +274,12 @@ void create_nativebar_innner(int bar_type, rho_param *p)
 		}
 		
 	}
-	if (background_color != nil) {
+	if (background_color != NULL) {
 		[properties setObject:[NSString stringWithUTF8String:background_color] forKey:NATIVE_BAR_BACKGOUND_COLOR];	
 	}
+    if (on_change_tab_callback != NULL) {
+		[properties setObject:[NSString stringWithUTF8String:on_change_tab_callback] forKey:NATIVE_BAR_ON_CHANGE_TAB_CALLBACK];	
+    }
 	
     id runnable = [RhoNativeBarCreateTask class];
     id arg1 = [NSValue valueWithBytes:&bar_type objCType:@encode(int)];
@@ -358,6 +367,9 @@ void native_tabbar_set_tab_badge(int index,char *val) {
 	nativebar_set_tab_badge_innner(index, val);
 }
 
-
+int native_tabbar_get_current_tab() {
+    Rhodes *r = [Rhodes sharedInstance];
+    return [[r mainView] activeTab];
+}
 
 

data/platform/iphone/Classes/Phonebook/phonebook.m

@@ -76,10 +76,11 @@ static void _getAllPeople(LocalPhonebook* phonebook) {
 
 static void _addPropertyToHash(VALUE hash, const char* key, CFStringRef property) {
 	if (property) {
+        NSString* ns_property = (NSString*)property;
 		char buf[256];
-		snprintf(buf, sizeof(buf), "%s", CFStringGetCStringPtr(property, CFStringGetSystemEncoding()));
-		addStrToHash(hash, key, buf);
-		CFRelease(property);
+		snprintf(buf, sizeof(buf), "%s", [ns_property UTF8String]);
+        addStrToHash(hash, key, buf);
+        CFRelease(property);
 	}
 }
 
@@ -508,7 +509,7 @@ static void __updateMultiValueProperty(ABRecordRef record, ABPropertyID propId,
 }
 
 static void _updateMultiValueProperty(ABRecordRef record, ABPropertyID propId, CFStringRef label, const char* value) {
-	CFStringRef v = CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
+	CFStringRef v = (CFStringRef)[NSString stringWithUTF8String:value];//CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
 	__updateMultiValueProperty(record, propId, label, v);
 }
 
@@ -603,7 +604,7 @@ bool setAddressValue(void* record, const char* property, const char* value) {
 		return false;
 	}
 		
-	CFStringRef v = CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
+	CFStringRef v = (CFStringRef)[NSString stringWithUTF8String:value];//CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
 	ABMutableMultiValueRef mv = ABRecordCopyValue(record,kABPersonAddressProperty);
 	if (!mv) {
 		mv = ABMultiValueCreateMutable(kABMultiDictionaryPropertyType);
@@ -660,8 +661,7 @@ int setRecordValue(void* record, char* property, char* value) {
 	if (record && (value!=NULL) && strlen(value)) {
 		int prop = _getProperty(property);
 		if (prop >= 0) {
-			CFStringRef v = CFStringCreateWithCString(NULL, value, 
-													  CFStringGetSystemEncoding());
+			CFStringRef v = (CFStringRef)[NSString stringWithUTF8String:value];//CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
 			if (prop == kABPersonBirthdayProperty) {
 				NSDate *birthdate = string2date(v);
 				ABRecordSetValue(record, prop, birthdate, nil);
@@ -689,8 +689,7 @@ int setRecordValue(void* record, char* property, char* value) {
 						} else {
 							label = _getDatesLabel(property);
 							if (label) {
-								CFStringRef v = CFStringCreateWithCString(NULL, value, 
-																		  CFStringGetSystemEncoding());
+								CFStringRef v = (CFStringRef)[NSString stringWithUTF8String:value];//CFStringCreateWithCString(NULL, value, CFStringGetSystemEncoding());
 								NSDate *date = string2date(v);
 								__updateMultiValueProperty(record,kABPersonDateProperty,label,date);
 							}

data/platform/iphone/Classes/Rhodes.m

@@ -12,6 +12,7 @@
 //#include "common/app_build_configs.h"
 #import "SplitView/SplittedMainView.h"
 
+#include "common/app_build_capabilities.h"
 
 
 #undef DEFAULT_LOGCATEGORY
@@ -516,6 +517,11 @@ static Rhodes *instance = NULL;
     @finally {
         [pool release];
     }
+    
+    if (rho_conf_getBool("full_screen") != 0) {
+        [Rhodes setStatusBarHidden:YES];
+    }
+    
 }
 
 - (void)doStartUp {
@@ -530,6 +536,8 @@ static Rhodes *instance = NULL;
     [NSThread detachNewThreadSelector:@selector(doRhoInit) toTarget:self withObject:nil];
     
     NSLog(@"Init all windows");
+    
+    
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
     
     window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
@@ -548,7 +556,8 @@ static Rhodes *instance = NULL;
 	}
 	
     [window makeKeyAndVisible];
-	
+
+ 
 	CGRect rrr = [application statusBarFrame];
 	
     NSLog(@"Init cookies");
@@ -565,10 +574,12 @@ static Rhodes *instance = NULL;
     signatureDelegate = [[SignatureDelegate alloc] init];
     nvDelegate = [[NVDelegate alloc] init];
     
+#ifdef APP_BUILD_CAPABILITY_PUSH    
 #ifdef __IPHONE_3_0
     [[UIApplication sharedApplication] registerForRemoteNotificationTypes:
      (UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeAlert | UIRemoteNotificationTypeSound)];
-#endif
+#endif //__IPHONE_3_0
+#endif //APP_BUILD_CAPABILITY_PUSH    
     
 #ifdef __IPHONE_4_0
     eventStore = [[EKEventStore alloc] init];
@@ -745,6 +756,7 @@ static Rhodes *instance = NULL;
 			}
 		}
 	}	
+    
 	[self doStartUp];
 	[self processDoSync:launchOptions];
 
@@ -763,7 +775,11 @@ static Rhodes *instance = NULL;
 	[self doStartUp];
 } */
 
+
+#ifdef APP_BUILD_CAPABILITY_PUSH
+
 #ifdef __IPHONE_3_0
+
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
 	NSLog(@"Device token is %@", deviceToken);
@@ -775,7 +791,7 @@ static Rhodes *instance = NULL;
 	
 	char* szpin = strdup([stringBuffer cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 	RAWLOG_INFO1("device pin: %s\n", szpin);
-    
+
 	rho_clientregister_create(szpin);
 	free(szpin);
 }
@@ -789,7 +805,10 @@ static Rhodes *instance = NULL;
 {
 	[self processPushMessage:userInfo];
 }
-#endif
+
+#endif //__IPHONE_3_0
+
+#endif //APP_BUILD_CAPABILITY_PUSH
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     RAWLOG_INFO("Application did become active");
@@ -804,12 +823,15 @@ static Rhodes *instance = NULL;
 - (void)applicationWillResignActive:(UIApplication *)application {
     RAWLOG_INFO("Application will resign active");
     rho_rhodesapp_callAppActiveCallback(0);
+    rho_rhodesapp_canstartapp("", ", ");
     [self saveLastUsedTime];
 }
 
 #ifdef __IPHONE_4_0
 - (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Nothing right now
+    RAWLOG_INFO("Application go to background");
+    rho_rhodesapp_callUiDestroyedCallback();
+    rho_rhodesapp_canstartapp("", ", ");
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {
@@ -836,7 +858,29 @@ static Rhodes *instance = NULL;
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
 {
     if (!url) {  return NO; }
-	/*
+
+    NSBundle* mb = [NSBundle mainBundle];
+    NSDictionary* md = [mb infoDictionary];
+    NSArray* schemes = [md objectForKey:@"CFBundleURLTypes"];
+    NSDictionary* scheme = [schemes objectAtIndex:0];
+    NSArray* urls = [scheme objectForKey:@"CFBundleURLSchemes"];
+    NSString* url0 = [urls objectAtIndex:0];
+    
+    if ([[url scheme] isEqualToString:url0]) {
+        NSString *startparams = @"";
+        NSString *fullurl = [[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        
+        NSRange range = [fullurl rangeOfString:@":"];
+        if ((range.location > 0) && (range.length > 0)) {
+            startparams = [fullurl substringFromIndex:range.location + 1];
+        }
+
+        // set start params
+        rho_rhodesapp_canstartapp([startparams UTF8String], ", ");
+        return YES;
+    }
+    return NO;	
+    /*
     NSString *URLString = [url absoluteString];
     [[NSUserDefaults standardUserDefaults] setObject:URLString forKey:@"url"];
     [[NSUserDefaults standardUserDefaults] synchronize];

data/platform/iphone/Classes/SimpleMainView.m

@@ -397,7 +397,8 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
-	if ([[UIApplication sharedApplication] statusBarOrientation] == fromInterfaceOrientation) {
+    UIInterfaceOrientation current_orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	if (current_orientation == fromInterfaceOrientation) {
 		return;
 	}
 	int width = rho_sys_get_screen_width();
@@ -407,7 +408,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	int angle = 0;
 	switch (fromInterfaceOrientation) {
 		case UIInterfaceOrientationPortrait: {
-			switch ([self interfaceOrientation]) {
+			switch (current_orientation) {
 				case UIInterfaceOrientationLandscapeLeft: {
 					angle = 90;
 				}
@@ -424,7 +425,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		}
 		break;
 		case UIInterfaceOrientationLandscapeLeft: {
-			switch ([self interfaceOrientation]) {
+			switch (current_orientation) {
 				case UIInterfaceOrientationPortrait: {
 					angle = -90;
 				}
@@ -441,7 +442,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		}
 		break;
 		case UIInterfaceOrientationPortraitUpsideDown: {
-			switch ([self interfaceOrientation]) {
+			switch (current_orientation) {
 				case UIInterfaceOrientationPortrait: {
 					angle = 180;
 				}
@@ -458,7 +459,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		}
 		break;
 		case UIInterfaceOrientationLandscapeRight: {
-			switch ([self interfaceOrientation]) {
+			switch (current_orientation) {
 				case UIInterfaceOrientationPortrait: {
 					angle = 90;
 				}
@@ -475,7 +476,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		}
 		break;
 	}
-	if (([self interfaceOrientation] == UIInterfaceOrientationLandscapeLeft) || ([self interfaceOrientation] == UIInterfaceOrientationLandscapeRight)) {
+	if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
 		int t = width;
 		width = height;
 		height = t;

data/platform/iphone/Classes/SplitView/RightViewController.h

@@ -15,11 +15,12 @@
 	SplittedMainView* splittedView;
     NSArray *itemsData;
     int tabindex;	
-	
+    NSString* on_change_tab_callback;
 }
 
 @property (nonatomic,retain) NSArray *itemsData;
 @property (nonatomic,assign) int tabindex;
+@property (nonatomic,retain) NSString *on_change_tab_callback;
 
 - (id)initWithItems:(NSDictionary*)bar_info parent:(SplittedMainView*)parent;
 
@@ -50,5 +51,6 @@
 
 - (UIWebView*)getWebView:(int)tab_index;
 
+-(void)callCallback:(int)new_index;
 
 @end

data/platform/iphone/Classes/SplitView/RightViewController.m

@@ -66,7 +66,7 @@
 
 @implementation RightViewController
 
-@synthesize itemsData, tabindex;
+@synthesize itemsData, tabindex, on_change_tab_callback;
 
 - (id)initWithItems:(NSDictionary*)bar_info parent:(SplittedMainView*)parent {
 	self = [self initWithNibName:nil bundle:nil];
@@ -130,6 +130,7 @@
 		[self.view addSubview:v.view];
 		[self.view setNeedsLayout];
 		[v.view setNeedsDisplay];
+        [self callCallback:0];
 	}
 	
 	return self;
@@ -153,6 +154,17 @@
 }
 
 
+-(void)callCallback:(int)new_index {
+    // call callback
+    if (self.on_change_tab_callback != nil) {
+        NSString* strBody = @"&rho_callback=1";
+        strBody = [strBody stringByAppendingString:@"&tab_index="];
+        strBody = [strBody stringByAppendingString:[NSString stringWithFormat:@"%d",new_index]];
+        const char* cb = [self.on_change_tab_callback UTF8String];
+        const char* b = [strBody UTF8String];
+        rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+    }
+}
 
 - (SimpleMainView*) getSimpleView:(int)index {
 	if ((index < 0) || (index >= [self.itemsData count])) {
@@ -245,6 +257,7 @@
 	[cur_v.view removeFromSuperview];
 	[self.view addSubview:new_v.view];
 	[self.view setNeedsLayout];
+    [self callCallback:index];    
 }
 
 - (void)switchTab:(int)index {

data/platform/iphone/Classes/TabbedMainView.h

@@ -36,11 +36,13 @@
     RhoUITabBarController *tabbar;
     NSArray *tabbarData;
     int tabindex;
+    NSString* on_change_tab_callback;
 }
 
 @property (nonatomic,retain) RhoUITabBarController *tabbar;
 @property (nonatomic,retain) NSArray *tabbarData;
 @property (nonatomic,assign) int tabindex;
+@property (nonatomic,retain) NSString *on_change_tab_callback;
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info;
 
@@ -48,4 +50,6 @@
 
 - (void)onViewWillActivate:(RhoViewController*)view;
 
+-(void)callCallback:(int)new_index;
+
 @end

data/platform/iphone/Classes/TabbedMainView.m

@@ -230,7 +230,7 @@
 
 @implementation TabbedMainView
 
-@synthesize tabbar, tabbarData, tabindex;
+@synthesize tabbar, tabbarData, tabindex, on_change_tab_callback;
 
 
 
@@ -293,8 +293,12 @@
 	return resImage;
 }
 
-
-
+- (RhoTabBarData*)tabData:(int)index {
+	if ((index < 0) || (index >= [tabbarData count])) {
+		return nil;
+	}
+    return (RhoTabBarData*)[tabbarData objectAtIndex:index];
+}
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info {
 	[SimpleMainView disableHiddenOnStart];
@@ -305,6 +309,7 @@
 	NSDictionary* global_properties = (NSDictionary*)[bar_info objectForKey:NATIVE_BAR_PROPERTIES];
 	if (global_properties != nil) {
 		background_color = (NSString*)[global_properties objectForKey:NATIVE_BAR_BACKGOUND_COLOR];
+        self.on_change_tab_callback = (NSString*)[global_properties objectForKey:NATIVE_BAR_ON_CHANGE_TAB_CALLBACK];
 	}
 	
 	if (background_color != nil) {
@@ -459,7 +464,7 @@
         }
     }
     tabbar.viewControllers = views;
-    tabbar.customizableViewControllers = NO;
+    tabbar.customizableViewControllers = nil;
     tabbar.view.hidden = NO;
     tabbar.view.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
     tabbar.view.autoresizesSubviews = YES;
@@ -469,6 +474,9 @@
     
 	if (initUrl && is_load_initial_url) {
         [self navigateRedirect:initUrl tab:0];
+        RhoTabBarData *td = [self tabData:0];
+        td.loaded = YES;
+        [self callCallback:0];
     }
 	if (tab_to_initial_select >= 0) {
 		tabbar.selectedIndex = tab_to_initial_select;
@@ -504,13 +512,6 @@
     return (SimpleMainView*)[tabbar.viewControllers objectAtIndex:index];
 }
 
-- (RhoTabBarData*)tabData:(int)index {
-	if ((index < 0) || (index >= [tabbarData count])) {
-		return nil;
-	}
-    return (RhoTabBarData*)[tabbarData objectAtIndex:index];
-}
-
 // RhoMainView implementation
 
 - (UIView*)view {
@@ -577,30 +578,46 @@
 	int new_index = tabbar.selectedIndex;
     RhoTabBarData *td = [self tabData:new_index];
 	if (td != nil) {
-		if (tabindex != new_index) {
-			tabindex = new_index;
-			if (!td.loaded || td.reload) {
-				const char *s = [td.url UTF8String];
-				rho_rhodesapp_load_url(s);
-				td.loaded = YES;
-			}
-			[[[self subView:tabindex] view] setNeedsDisplay];
+		tabindex = new_index;
+		if (!td.loaded || td.reload) {
+			const char *s = [td.url UTF8String];
+			rho_rhodesapp_load_url(s);
+			td.loaded = YES;
 		}
+		[[[self subView:tabindex] view] setNeedsDisplay];
 	}
 }
 
+-(void)callCallback:(int)new_index {
+    // call callback
+    if (self.on_change_tab_callback != nil) {
+        NSString* strBody = @"&rho_callback=1";
+        strBody = [strBody stringByAppendingString:@"&tab_index="];
+        strBody = [strBody stringByAppendingString:[NSString stringWithFormat:@"%d",new_index]];
+        const char* cb = [self.on_change_tab_callback UTF8String];
+        const char* b = [strBody UTF8String];
+        rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+    }
+}
+
 
 - (void)onSwitchTab:(int)tab_index {
 	int new_index = tab_index;
     RhoTabBarData *td = [self tabData:new_index];
 	if (td != nil) {
-		tabindex = new_index;
-		if (!td.loaded || td.reload) {
-			const char *s = [td.url UTF8String];
-			rho_rhodesapp_load_url(s);
-			td.loaded = YES;
-		}
-		[[[self subView:tabindex] view] setNeedsDisplay];
+        BOOL real_change = tabindex != new_index;
+		//if (tabindex != new_index) {
+        tabindex = new_index;
+        if (!td.loaded || td.reload) {
+            const char *s = [td.url UTF8String];
+            rho_rhodesapp_load_url(s);
+            td.loaded = YES;
+        }
+        [[[self subView:tabindex] view] setNeedsDisplay];
+		//}
+		if (real_change) {
+            [self callCallback:new_index];
+        }
 	}
 }