rhodes 1.5.5 → 2.0.0.beta1

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -11,7 +11,6 @@
 #import <CoreLocation/CoreLocation.h>
 #import "LocationController.h"
 #import "logging/RhoLog.h"
-#import "../Server/ServerHost.h"
 #include "rubyext/GeoLocation.h"
 
 #undef DEFAULT_LOGCATEGORY
@@ -201,8 +200,8 @@ _TimerCallBack(CFRunLoopTimerRef timer, void* context) {
 }
 
 void geo_update() {
-	[ [LocationController sharedInstance] performSelector:[[LocationController sharedInstance] onUpdateLocation] 
-        onThread:[ServerHost sharedInstance]->m_geoThread withObject:NULL waitUntilDone:NO];
+    LocationController *loc = [LocationController sharedInstance];
+    [loc performSelectorOnMainThread:[loc onUpdateLocation] withObject:nil waitUntilDone:NO];
 }
 
 double rho_geo_latitude() {

data/platform/iphone/Classes/LogOptionsController.m

@@ -23,7 +23,7 @@
 	[super dealloc];
 }
 
-- (UIToolbar *)createToolbar:(CGRect) frame
+- (UIToolbar *)newToolbar:(CGRect) frame
 {
 	UIToolbar* toolbar = [UIToolbar new];
 	toolbar.barStyle = UIBarStyleBlackOpaque;
@@ -59,6 +59,7 @@
 	[toolbar setItems:items animated:NO];
 	[saveItem release];
 	[cancelItem release];
+    [flexItem release];
 	
 	return toolbar;	
 }
@@ -136,7 +137,7 @@
 	[self.view setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
 	CGRect mainViewBounds = self.view.bounds;
 	
-	UIToolbar* toolbar = [self createToolbar:mainViewBounds];
+	UIToolbar* toolbar = [[self newToolbar:mainViewBounds] autorelease];
 	[self.view addSubview:toolbar];
 	
 	// create and configure the table view

data/platform/iphone/Classes/LogViewController.m

@@ -39,7 +39,7 @@ extern void rho_conf_send_log();
 	return textView;
 }
 
-- (UIToolbar *)createToolbar:(CGRect) frame
+- (UIToolbar *)newToolbar:(CGRect) frame
 {
 	UIToolbar* toolbar = [UIToolbar new];
 	toolbar.barStyle = UIBarStyleBlackOpaque;
@@ -86,6 +86,8 @@ extern void rho_conf_send_log();
 	[refreshItem release];
 	[settingsItem release];
 	[flexItem release];
+    [sendItem release];
+    [clearItem release];
 	
 	return toolbar;	
 }
@@ -96,7 +98,7 @@ extern void rho_conf_send_log();
 	self.view = [[UIView alloc] initWithFrame:frame];
 	CGRect mainViewBounds = self.view.bounds;	
 	
-	UIToolbar* toolbar = [self createToolbar:mainViewBounds];
+	UIToolbar* toolbar = [[self newToolbar:mainViewBounds] autorelease];
 	[self.view addSubview:toolbar];
 	
 	CGFloat toolbarHeight = [toolbar frame].size.height;

data/platform/iphone/Classes/MapView/GoogleGeocoder.m

@@ -19,7 +19,7 @@
 		annotation = nil;
 		if ( (element.coordinate.latitude==10000) ||
 			(element.coordinate.longitude==10000) ) {
-			NSString* address = [element street_address];
+			NSString* address = [element address];
 			if ( ([address length] > 0) && [self geocode:element]) {
 				annotation = element;
 			}
@@ -53,7 +53,7 @@
 	BOOL retvar = TRUE;
 	currentAnnotation = annotation;
 	NSMutableString *url = [[NSMutableString alloc] initWithString:kGeoCodeURL];
-	[url appendString:[annotation street_address]];
+	[url appendString:[annotation address]];
 	[url appendFormat:@"&output=xml"];
 	[url replaceOccurrencesOfString:@"ä" withString:@"ae" options:1 range:(NSRange){0,[url length]}];
 	[url replaceOccurrencesOfString:@"ö" withString:@"oe" options:1 range:(NSRange){0,[url length]}];
@@ -87,10 +87,10 @@
 }
 
 -(CLLocation *)stringCooridinatesToCLLocation{
-	NSArray *array = [[currentAnnotation coordinate_string] componentsSeparatedByString:@","];
+	NSArray *array = [[currentAnnotation coordinateString] componentsSeparatedByString:@","];
 	double longitude = [[array objectAtIndex:0] doubleValue];
 	double lattitude = [[array objectAtIndex:1] doubleValue];
-	CLLocation *location = [[CLLocation alloc] initWithLatitude:lattitude longitude:longitude];
+	CLLocation *location = [[[CLLocation alloc] initWithLatitude:lattitude longitude:longitude] autorelease];
 	[currentAnnotation setCoordinate:location.coordinate];
 	return location;
 }
@@ -106,24 +106,16 @@
 }
 
 -(void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string {
+    string = [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    string = [string stringByReplacingOccurrencesOfString:@"\\n" withString:@""];
+    if ([string length] == 0)
+        return;
+    
 	if([theElement isEqualToString:@"address"])
-		if([string isEqualToString:@"\n"]){
-		}
-		else if([string isEqualToString:@"\t"]){
-		}
-		else{
-			[currentAnnotation setResolvedAddress:string];
-		}
+        [currentAnnotation setResolvedAddress:string];
 	
-	if([theElement isEqualToString:@"coordinates"]){
-		if([string isEqualToString:@"\n"]){
-		}
-		else if([string isEqualToString:@"\t"]){
-		}
-		else{
-			[currentAnnotation setCoordinateString:string];
-		}
-	}
+	if([theElement isEqualToString:@"coordinates"])
+        [currentAnnotation setCoordinateString:string];
 }
 
 -(void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName

data/platform/iphone/Classes/MapView/MapAnnotation.h

@@ -13,22 +13,18 @@
 
 
 @interface MapAnnotation : NSObject<MKAnnotation> {
-	NSString *_title, *_subtitle, *_street_address, *_url;
-	NSMutableString *_coordinate_string,*_resolved_address; 
+	NSString *title, *subtitle, *address, *url;
+	NSString *coordinateString,*resolvedAddress; 
 	CLLocationCoordinate2D coordinate;
 }
 
-- (void)setCoordinate:(CLLocationCoordinate2D)coordinate;
-- (void)setTitle:(NSString*)title;
-- (void)setSubtitle:(NSString*)subtitle;
-- (void)setAddress:(NSString*)street_address;
-- (NSString*)street_address;
-- (void)setCoordinateString:(NSString*)coordinate_string;
-- (NSString*)coordinate_string;
-- (void)setResolvedAddress:(NSString*)resolved_address;
-- (NSString*)resolved_address;
-- (void)setUrl:(NSString*)url;
-- (NSString*)url;
+@property (nonatomic,copy) NSString *title;
+@property (nonatomic,copy) NSString *subtitle;
+@property (nonatomic,copy) NSString *address;
+@property (nonatomic,copy) NSString *url;
+@property (nonatomic,copy) NSString *coordinateString;
+@property (nonatomic,copy) NSString *resolvedAddress;
+@property (nonatomic,assign) CLLocationCoordinate2D coordinate;
 
 @end
 

data/platform/iphone/Classes/MapView/MapAnnotation.m

@@ -12,82 +12,34 @@
 
 @implementation MapAnnotation
 
-@synthesize coordinate;
+@synthesize title, subtitle, address, url, coordinateString, resolvedAddress, coordinate;
 
 -(id) init {
 	[super init];
-	_title = [[NSString alloc] initWithFormat:@""];
-	_subtitle = [[NSString alloc] initWithFormat:@""];
-	_street_address = [[NSString alloc] initWithFormat:@""];
-	_coordinate_string = [[NSMutableString alloc] initWithFormat:@""]; 
-	_resolved_address = [[NSMutableString alloc] initWithFormat:@""];
-	_url = [[NSString alloc] initWithFormat:@""];
+	title = [[NSString alloc] initWithFormat:@""];
+	subtitle = [[NSString alloc] initWithFormat:@""];
+    address = [[NSString alloc] initWithFormat:@""];
+	coordinateString = [[NSMutableString alloc] initWithFormat:@""]; 
+	resolvedAddress = [[NSMutableString alloc] initWithFormat:@""];
+	url = [[NSString alloc] initWithFormat:@""];
 	return self;
 }
 
 -(void) dealloc {
-    [_title dealloc];
-    [_subtitle dealloc];
-    [_street_address dealloc];
-    [_coordinate_string dealloc];
-    [_resolved_address dealloc];
-    [_url dealloc];
+    [title release];
+    [subtitle release];
+    [address release];
+    [coordinateString release];
+    [resolvedAddress release];
+    [url release];
     [super dealloc];
 }
 
-- (void)setCoordinate:(CLLocationCoordinate2D)c {
-	coordinate = c;
-}
-
-- (void)setTitle:(NSString*)title {
-	_title = [title copy];
-}
-
-- (NSString *)title {
-	return _title;
-}
-
-- (void)setSubtitle:(NSString*)subtitle {
-	_subtitle = [subtitle copy];
-}
-
-- (NSString *)subtitle {
-	return _subtitle;
-}
-
-- (void)setAddress:(NSString*)street_address {
-	_street_address = [street_address copy];
-}
-
-- (NSString*)street_address {
-	return _street_address;
-}
-
-- (void)setCoordinateString:(NSString*)coordinate_string {
-	[_coordinate_string appendString:coordinate_string];
-}
-
-- (NSString*)coordinate_string {
-	return _coordinate_string;
-}
-
-- (void)setResolvedAddress:(NSString*)resolved_address {
-	[_resolved_address appendString:resolved_address];
-}
-
-
-- (NSString*)resolved_address {
-	return _resolved_address;
-}
-
-- (void)setUrl:(NSString*)url {
-    const char *surl = [url UTF8String];
+- (void)setUrl:(NSString*)u {
+    const char *surl = [u UTF8String];
     const char *norm_url = rho_http_normalizeurl(surl);
-    _url = [[NSString stringWithUTF8String:norm_url] copy];
-}
-
-- (NSString*)url {
-	return _url;
+    [url release];
+    url = [[NSString stringWithUTF8String:norm_url] copy];
 }
 
 @end

data/platform/iphone/Classes/MapView/MapViewController.h

@@ -26,18 +26,12 @@
 	MKCoordinateRegion region;
 	NSString *gapikey;  
 	//IBOutlet UISegmentedControl *mapType;
-@public
-	id  actionTarget;
-	SEL onNavigate;
-
 }
 
 // 
-@property (assign) id  actionTarget;
-@property (assign) SEL onNavigate;
 @property (copy) NSString* gapikey; 
 
-//- (IBAction)changeType:(id) sender;
++ (void)createMap:(rho_param*)params;
 - (void)setParams:(rho_param*)params;
 
 @end

data/platform/iphone/Classes/MapView/MapViewController.m

@@ -8,15 +8,37 @@
 
 #import "MapAnnotation.h"
 #import "MapViewController.h"
-#import "WebViewUrl.h"
+#import "Rhodes.h"
+
+#include "common/rhoparams.h"
+#include "logging/RhoLog.h"
 
-#import "logging/RhoLog.h"
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "MapView"
 
+@interface RhoCreateMapTask : NSObject {}
++ (void)run:(NSValue*)value;
+@end
+
+@implementation RhoCreateMapTask
++ (void)run:(NSValue*)value {
+    MapViewController* map = [[MapViewController alloc] init];
+    [map setParams:[value pointerValue]];
+    UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+    [window addSubview:map.view];
+    //[map release];
+}
+@end
+
 @implementation MapViewController
 
-@synthesize actionTarget,onNavigate,gapikey;
+@synthesize gapikey;
+
++ (void)createMap:(rho_param *)params {
+    id runnable = [RhoCreateMapTask class];
+    id arg = [NSValue valueWithPointer:params];
+    [Rhodes performOnUiThread:runnable arg:arg wait:NO];
+}
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
@@ -150,6 +172,7 @@
             if (subtitle) [annObj setSubtitle:subtitle];
             if (url) [annObj setUrl:url];
             [annotations addObject:annObj];
+            [annObj release];
         }
     }
     ggeoCoder = [[GoogleGeocoder alloc] initWithAnnotations:annotations apikey:gapikey];
@@ -190,6 +213,7 @@
 								   target:self action:@selector(close_clicked:)];
 	[toolbar setItems:[NSArray arrayWithObjects:closeButton,nil]];
 	[self.view addSubview:toolbar];
+    [closeButton release];
 	
 	CGRect rectMapArea = CGRectMake(0, 0, rootViewWidth, rootViewHeight - toolbarHeight);
 	mapView=[[MKMapView alloc] initWithFrame:rectMapArea];
@@ -221,17 +245,13 @@
 - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view 
     calloutAccessoryControlTapped:(UIControl *)control
 {
-	MapAnnotation *ann = (MapAnnotation*)[view annotation];
-	NSString* url = [ann url];
-	NSLog(@"Callout tapped... Url = %@\n", url);
-	if(actionTarget && [actionTarget respondsToSelector:onNavigate]) {
-		WebViewUrl *webViewUrl = [[[WebViewUrl alloc] init] autorelease];
-		webViewUrl.url = url;
-		webViewUrl.webViewIndex = 0;				
-		[actionTarget performSelector:onNavigate withObject:webViewUrl];
-		[self dismissModalViewControllerAnimated:YES]; 
-		self.view.hidden = YES;
-	}
+    MapAnnotation *ann = (MapAnnotation*)[view annotation];
+    NSString* url = [ann url];
+    NSLog(@"Callout tapped... Url = %@\n", url);
+    id<RhoMainView> mainView = [[Rhodes sharedInstance] mainView];
+    [mainView navigateRedirect:url tab:[mainView activeTab]];
+    [self dismissModalViewControllerAnimated:YES]; 
+    self.view.hidden = YES;
 }
 
 - (void) close_clicked:(id)sender {
@@ -269,24 +289,24 @@
 }*/
 
 - (void)reverseGeocoder:(MKReverseGeocoder *)geocoder didFailWithError:(NSError *)error{
-	NSLog(@"Reverse Geocoder Errored");
-	
+    NSLog(@"Reverse Geocoder Errored");
 }
 
 - (void)didFindAddress:(MapAnnotation*)annotation {
-	[mapView addAnnotation:annotation];
+    [mapView addAnnotation:annotation];
 }
 	
 - (void)reverseGeocoder:(MKReverseGeocoder *)geocoder didFindPlacemark:(MKPlacemark *)placemark{
-	NSLog(@"Reverse Geocoder completed");
-	//mPlacemark=placemark;
-	//[mapView addAnnotation:placemark];
+    NSLog(@"Reverse Geocoder completed");
+    //mPlacemark=placemark;
+    //[mapView addAnnotation:placemark];
 }
 
 - (MKAnnotationView *) mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnnotation>) annotation{
-	MKPinAnnotationView *annView=[[MKPinAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:@"currentloc"];
-	annView.animatesDrop = TRUE;
-	annView.canShowCallout = YES;
+    MKPinAnnotationView *annView = [[[MKPinAnnotationView alloc]
+                                     initWithAnnotation:annotation reuseIdentifier:@"currentloc"] autorelease];
+    annView.animatesDrop = TRUE;
+    annView.canShowCallout = YES;
     if ([annotation isKindOfClass:[MapAnnotation class]]) {
         MapAnnotation* ann = (MapAnnotation*)annotation;
         NSString* url = [ann url];
@@ -294,9 +314,15 @@
             [annView setRightCalloutAccessoryView:[UIButton buttonWithType:UIButtonTypeDetailDisclosure]];
         }
     }
-	return annView;
+    return annView;
 }
 
 @end
 
-#endif
+#endif
+
+void mapview_create(rho_param *p) {
+#ifdef __IPHONE_3_0
+	[MapViewController createMap:rho_param_dup(p)];
+#endif	
+}

data/platform/iphone/Classes/NativeBar.h

@@ -12,15 +12,3 @@
 #define TOOLBAR_TYPE	0
 #define TABBAR_TYPE		1
 #define NOBAR_TYPE		2
-
-@interface NativeBar : NSObject 
-{
-@private
-	int barType;
-	NSArray* barItemDataArray;
-}
-
-@property(assign) int barType;
-@property(nonatomic, retain) NSArray* barItemDataArray;
-
-@end

data/platform/iphone/Classes/NativeBar.m

@@ -6,11 +6,130 @@
 //  Copyright 2009 Home. All rights reserved.
 //
 
+#include "common/rhoparams.h"
 #import "NativeBar.h"
+#import "Rhodes.h"
+#import "SimpleMainView.h"
+#import "TabbedMainView.h"
 
+#import "logging/RhoLog.h"
 
-@implementation NativeBar
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NativeBar"
 
-@synthesize barType, barItemDataArray;
+@interface RhoNativeBarCreateTask : NSObject {}
++ (void)run:(NSValue*)value :(NSArray*)items;
+@end
+
+@implementation RhoNativeBarCreateTask
++ (void)run:(NSValue*)value :(NSArray*)items {
+    int type;
+    [value getValue:&type];
+    
+    id view = nil;
+    
+    UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+    CGRect frame = [Rhodes applicationFrame];
+    
+    switch (type) {
+    case NOBAR_TYPE:
+        view = [[SimpleMainView alloc] initWithParentView:window frame:frame];
+        break;
+    case TOOLBAR_TYPE:
+        view = [[SimpleMainView alloc] initWithParentView:window frame:frame toolbar:items];
+        break;
+    case TABBAR_TYPE:
+        view = [[TabbedMainView alloc] initWithParentView:window frame:frame items:items];
+        break;
+    default:
+        RAWLOG_ERROR1("Unknown bar type passed: %d", type);
+        return;
+    }
+    
+    [Rhodes sharedInstance].mainView = view;
+    [view release];
+}
+@end
+
+@interface RhoNativeBarSwitchTabTask : NSObject {}
++ (void)run:(NSValue*)value;
+@end
 
+@implementation RhoNativeBarSwitchTabTask
++ (void)run:(NSValue*)value {
+    int index;
+    [value getValue:&index];
+    [[[Rhodes sharedInstance] mainView] switchTab:index];
+}
 @end
+
+void create_nativebar(int bar_type, rho_param *p)
+{
+    if (p->type != RHO_PARAM_ARRAY) {
+        RAWLOG_ERROR("Unexpected parameter type for create_nativebar, should be Array");
+        return;
+    }
+    
+    int size = p->v.array->size;
+    NSMutableArray *items = [NSMutableArray arrayWithCapacity:size];
+    for (int i = 0; i < size; ++i) {
+        rho_param *hash = p->v.array->value[i];
+        if (hash->type != RHO_PARAM_HASH) {
+            RAWLOG_ERROR("Unexpected type of array item for create_nativebar, should be Hash");
+            return;
+        }
+        
+        const char *label = NULL;
+        const char *action = NULL;
+        const char *icon = NULL;
+        const char *reload = NULL;
+        
+        for (int j = 0, lim = hash->v.hash->size; j < lim; ++j) {
+            const char *name = hash->v.hash->name[j];
+            rho_param *value = hash->v.hash->value[j];
+            if (value->type != RHO_PARAM_STRING) {
+                RAWLOG_ERROR1("Unexpected '%s' type, should be String", name);
+                return;
+            }
+            
+            if (strcasecmp(name, "label") == 0)
+                label = value->v.string;
+            else if (strcasecmp(name, "action") == 0)
+                action = value->v.string;
+            else if (strcasecmp(name, "icon") == 0)
+                icon = value->v.string;
+            else if (strcasecmp(name, "reload") == 0)
+                reload = value->v.string;
+        }
+        
+        if (label == NULL && bar_type == TOOLBAR_TYPE)
+            label = "";
+        
+        if (label == NULL || action == NULL) {
+            RAWLOG_ERROR("Illegal argument for create_nativebar");
+            return;
+        }
+        
+        [items addObject:[NSString stringWithUTF8String:label]];
+        [items addObject:[NSString stringWithUTF8String:action]];
+        [items addObject:[NSString stringWithUTF8String:(icon ? icon : "")]];
+        [items addObject:[NSString stringWithUTF8String:(reload ? reload : "false")]];
+    }
+    
+    id runnable = [RhoNativeBarCreateTask class];
+    id arg1 = [NSValue valueWithBytes:&bar_type objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg1 arg:items wait:YES];
+}
+
+void remove_nativebar() {
+    int bar_type = NOBAR_TYPE;
+    id runnable = [RhoNativeBarCreateTask class];
+    id arg1 = [NSValue valueWithBytes:&bar_type objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg1 arg:nil wait:YES];
+}
+
+void nativebar_switch_tab(int index) {
+    id runnable = [RhoNativeBarSwitchTabTask class];
+    id arg = [NSValue valueWithBytes:&index objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg wait:YES];
+}