rhodes 2.2.6 → 2.3.0.beta.1

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -284,10 +284,10 @@ void rho_sys_app_uninstall(const char *appname) {
 	NSLog(@"ALERT: Uninstall of applications is unsupported on iOS platfrom !!!");	
 }
 
-
-
 void rho_sys_open_url(const char* url) 
 {
+    RAWLOG_INFO1("rho_sys_open_url: %s", url);	
+	
 	NSString* strUrl = [NSString stringWithUTF8String:url];
 	BOOL res = FALSE;
 	if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:strUrl]])
@@ -296,7 +296,11 @@ void rho_sys_open_url(const char* url)
 	if ( res)
 		RAWLOG_INFO("rho_sys_open_url suceeded.");	
 	else
-		RAWLOG_INFO("rho_sys_open_url faled.");	
+		RAWLOG_INFO("rho_sys_open_url failed.");	
+}
+
+void rho_sys_app_install(const char *url) {
+    rho_sys_open_url(url);
 }
 
 void rho_sys_run_app(const char* appname, VALUE params) 
@@ -313,6 +317,7 @@ void rho_sys_run_app(const char* appname, VALUE params)
 			}
 		//}
 	}
+	
 	rho_sys_open_url([app_name UTF8String]);
 }
 
@@ -387,9 +392,19 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 			bCal = 1;
 		*resValue = rho_ruby_create_boolean(bCal);
 		return 1;
+	} 
+	
+	/* "device_id" property used only for PUSH technology !
+	 else if (strcasecmp("device_id", szPropName) == 0) {
+		NSString* uuid = [[UIDevice currentDevice] uniqueIdentifier];
+        *resValue = rho_ruby_create_string([uuid UTF8String]);
+        return 1;
 	}
+	*/
+
 	
     /*
+	 [[UIDevice currentDevice] uniqueIdentifier]
     // Removed because it's possibly dangerous: Apple could reject application
     // used such approach from its AppStore
     else if (strcasecmp("phone_number", szPropName) == 0) {
@@ -537,4 +552,4 @@ int ExecuteAppManager(HttpContextRef context, RouteRef route) {
 	sprintf(err,"No [%s] controller found for App Manager", route->_model); 
 	HttpSendErrorToTheServer(context, 404, err);
 	return -1;
-}*/
+}*/

data/platform/iphone/Classes/DateTime.h

@@ -16,6 +16,8 @@
     long	  initialTime;
     int		  format;
     NSString* data;
+    long	  minTime;
+    long	  maxTime;
 }
 
 @property (nonatomic, retain) NSString* url;
@@ -23,5 +25,7 @@
 @property (assign) long initialTime;
 @property (assign) int format;
 @property (nonatomic, retain) NSString* data;
+@property (assign) long minTime;
+@property (assign) long maxTime;
 
 @end

data/platform/iphone/Classes/DateTime.m

@@ -11,6 +11,6 @@
 
 @implementation DateTime
 
-@synthesize url, title, initialTime, format, data;
+@synthesize url, title, initialTime, format, data, minTime, maxTime;
 
 @end

data/platform/iphone/Classes/DateTimePicker.m

@@ -9,7 +9,8 @@
 #import "DateTime.h"
 #import "Rhodes.h"
 
-void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
+
+void choose_datetime_with_range(char* callback, char* title, long initial_time, int format, char* data, long min_time, long max_time) {
     if (!rho_rhodesapp_check_mode())
         return;
     DateTime* dateTime = [[DateTime alloc] init];
@@ -18,6 +19,12 @@ void choose_datetime(char* callback, char* title, long initial_time, int format,
     dateTime.initialTime = initial_time;
     dateTime.format = format;
     dateTime.data = [NSString stringWithUTF8String:data];
+	dateTime.minTime = min_time;
+	dateTime.maxTime = max_time;
     [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(chooseDateTime:) withObject:dateTime waitUntilDone:YES];
     [dateTime release];
+}
+
+void choose_datetime(char* callback, char* title, long initial_time, int format, char* data) {
+    choose_datetime_with_range(callback, title, initial_time, format, data, 0, 0 );
 }

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -102,7 +102,13 @@
         if (self.dateTime.initialTime) {
             self.pickerView.date = [NSDate dateWithTimeIntervalSince1970:self.dateTime.initialTime];
         }
-
+		if (self.dateTime.minTime) {
+            self.pickerView.minimumDate = [NSDate dateWithTimeIntervalSince1970:self.dateTime.minTime];
+		}
+		if (self.dateTime.maxTime) {
+            self.pickerView.maximumDate = [NSDate dateWithTimeIntervalSince1970:self.dateTime.maxTime];
+		}
+		
         //CGSize pickerSize = CGSizeMake(parentFrame.size.width, parentFrame.size.height/2);
         CGSize pickerSize = [pickerView sizeThatFits:pickerView.frame.size];
 		if (pickerSize.width < parentFrame.size.width) {

data/platform/iphone/Classes/Event/Event.m

@@ -57,7 +57,7 @@ static VALUE dateToRuby(NSDate *date)
     
     [gregorian release];
     
-    VALUE rDate = rb_funcall(rb_cTime, rb_intern("utc"), 7, INT2FIX(year), INT2FIX(month), INT2FIX(day),
+    VALUE rDate = rb_funcall(rb_cTime, rb_intern("mktime"), 7, INT2FIX(year), INT2FIX(month), INT2FIX(day),
                              INT2FIX(hour), INT2FIX(minute), INT2FIX(second), INT2FIX(0));
     return rDate;
 }
@@ -74,7 +74,7 @@ static NSDate *dateFromRuby(VALUE rDate)
     if (!rb_equal(cDate, rb_cTime))
         rb_raise(rb_eArgError, "Wrong type of parameter: %s (Time expected)", rb_class2name(cDate));
     
-    ID id_gmtime = rb_intern("gmtime");
+    //ID id_gmtime = rb_intern("gmtime");
     ID id_year = rb_intern("year");
     ID id_month = rb_intern("month");
     ID id_day = rb_intern("day");

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

@@ -16,7 +16,7 @@
 #include "ruby/ext/rho/rhoruby.h"
 
 
- 
+#import "MapViewManager.h" 
 
 @interface MapViewController : RhoViewController <MKMapViewDelegate, MKReverseGeocoderDelegate> {
     MKMapView *mapView;
@@ -43,6 +43,9 @@
 
 + (void)createMap:(rho_param*)params;
 + (void)closeMap;
++ (BOOL)isStarted;
++ (double)centerLatitude;
++ (double)centerLongitude;
 
 - (void)setParams:(rho_param*)params;
 - (void)close;

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

@@ -42,10 +42,9 @@ static MapViewController *mc = nil;
 	UIView* v = [[[Rhodes sharedInstance] mainView] view];
 	map.savedMainView = v;
 	[map.savedMainView retain];
-	//[window layoutSubviews];
     [map.savedMainView removeFromSuperview];
-	//map.savedMainView.hidden = YES;
 	[window addSubview:map.view];
+    //window.autoresizesSubviews = YES;
 	//[window layoutSubviews];
     
     mc = map;
@@ -98,16 +97,9 @@ static MapViewController *mc = nil;
     
 	UIWindow *window = [[Rhodes sharedInstance] rootWindow];
 
-	//CGRect frame = self.view.bounds;
-	
-	//self.savedMainView.frame = frame;
-	
 
 	[window addSubview:self.savedMainView];
 	[self.view removeFromSuperview];
-	//[self.savedMainView layoutSubviews];
-	//[window layoutSubviews];
-	//self.view.hidden = YES;
 
 	[self.savedMainView release];
 	self.savedMainView = nil;
@@ -485,47 +477,15 @@ static MapViewController *mc = nil;
     return center;
 }
 
-@end
-
-#endif
-
-void mapview_create(rho_param *p) {
-    if (!rho_rhodesapp_check_mode())
-        return;
-#ifdef __IPHONE_3_0
-	[MapViewController createMap:rho_param_dup(p)];
-#endif	
++ (double)centerLatitude {
+	return [MapViewController center].latitude;
 }
 
-void mapview_close() {
-    if (!rho_rhodesapp_check_mode())
-        return;
-#ifdef __IPHONE_3_0
-    [MapViewController closeMap];
-#endif
++ (double)centerLongitude {
+	return [MapViewController center].longitude;
 }
 
-VALUE mapview_state_started() {
-#ifdef __IPHONE_3_0
-    BOOL started = [MapViewController isStarted];
-    return rho_ruby_create_boolean(started);
-#else
-    return 0;
-#endif
-}
 
-double mapview_state_center_lat() {
-#ifdef __IPHONE_3_0
-    return [MapViewController center].latitude;
-#else
-    return 0;
-#endif
-}
+@end
 
-double mapview_state_center_lon() {
-#ifdef __IPHONE_3_0
-    return [MapViewController center].longitude;
-#else
-    return 0;
 #endif
-}

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

@@ -0,0 +1,26 @@
+//
+//  Created by DmitryS .
+//  Copyright 2011 rhomobile, inc. All rights reserved.
+//
+#ifdef __IPHONE_3_0
+
+#endif
+
+#include "ruby/ext/rho/rhoruby.h"
+
+@protocol RhoMapViewProvider <NSObject>
+
+- (void)createMap:(rho_param*)params;
+- (void)closeMap;
+- (BOOL)isStarted;
+- (double)centerLatitude;
+- (double)centerLongitude;
+
+@end
+
+@interface RhoMapViewProvidersManager : NSObject {
+	
+}
++(void)registerMapViewProvider:(NSString*)name provider:(id)provider;
+
+@end

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

@@ -0,0 +1,172 @@
+//
+//  Created by DmitryS .
+//  Copyright 2011 rhomobile, inc. All rights reserved.
+//
+
+
+#import "MapAnnotation.h"
+#import "MapViewController.h"
+//#import "MapViewControllerESRI.h"
+#import "Rhodes.h"
+#import "RhoMainView.h"
+
+#include "logging/RhoLog.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+#import "MapViewManager.h"
+
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "MapViewCore"
+
+
+static NSMutableDictionary* map_providers = nil;
+
+@implementation RhoMapViewProvidersManager
+
+
++(void)registerMapViewProvider:(NSString*)name provider:(id)provider {
+	if (map_providers == nil) {
+		map_providers = [NSMutableDictionary dictionaryWithCapacity:5];
+	}
+	[map_providers setObject:provider forKey:name];
+}
+
+@end
+
+
+
+
+@interface MapEngine_Google : NSObject <RhoMapViewProvider>
+{
+}
+
+- (void)createMap:(rho_param*)params;
+- (void)closeMap;
+- (BOOL)isStarted;
+- (double)centerLatitude;
+- (double)centerLongitude;
+
+@end
+
+@implementation MapEngine_Google
+
+- (void)createMap:(rho_param*)params {
+	[MapViewController createMap:params];
+}
+
+- (void)closeMap {
+	[MapViewController closeMap];
+}
+
+- (BOOL)isStarted {
+	return [MapViewController isStarted];
+}
+
+- (double)centerLatitude {
+	return [MapViewController centerLatitude];
+}
+
+- (double)centerLongitude {
+	return [MapViewController centerLongitude];
+}
+
+@end
+
+
+
+
+static id<RhoMapViewProvider,NSObject> engine_p = nil;
+
+
+//extern void register_ESRI_mapViewProvider();
+//extern void Init_ESRI();
+
+void mapview_create(rho_param *p) {
+    if (!rho_rhodesapp_check_mode())
+        return;
+#ifdef __IPHONE_3_0
+	if (map_providers == nil) {
+		[RhoMapViewProvidersManager registerMapViewProvider:@"Google" provider:[[MapEngine_Google alloc] init]];
+	}
+	else {
+		if ([map_providers objectForKey:@"Google"] == nil) {
+			[RhoMapViewProvidersManager registerMapViewProvider:@"Google" provider:[[MapEngine_Google alloc] init]];
+		}
+	}
+	
+	NSString* engine = @"Google";
+    if (p && p->type == RHO_PARAM_HASH) {
+		rho_param *eng_p = NULL;
+        for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
+            char *name = p->v.hash->name[i];
+            rho_param *value = p->v.hash->value[i];
+            if (strcasecmp(name, "provider") == 0)
+                eng_p = value;
+        }
+		if (eng_p && eng_p->type == RHO_PARAM_STRING) {
+			engine = [NSString stringWithUTF8String:eng_p->v.string];
+		}
+    }
+	
+	id<RhoMapViewProvider,NSObject> eng_p = [map_providers objectForKey:engine];
+	if (eng_p != nil ) {
+		engine_p = eng_p;
+	}
+	/*
+	if ([engine compare:@"Google"] == NSOrderedSame) {
+		engine_p = [[MapEngine_Google alloc] init];
+	}
+	else if ([engine compare:@"ESRI"] == NSOrderedSame) {
+		engine_p = [[MapEngine_ESRI alloc] init];
+	}
+	*/
+	if (engine_p != nil) {
+		[engine_p createMap:rho_param_dup(p)];
+	}
+#endif	
+}
+
+void mapview_close() {
+    if (!rho_rhodesapp_check_mode())
+        return;
+#ifdef __IPHONE_3_0
+	if (engine_p != nil) {
+		[engine_p closeMap];
+	}
+#endif
+}
+
+VALUE mapview_state_started() {
+#ifdef __IPHONE_3_0
+    BOOL started = NO;
+	if (engine_p != nil) {
+		started = [engine_p isStarted];
+	}
+    return rho_ruby_create_boolean(started);
+#else
+    return 0;
+#endif
+}
+
+double mapview_state_center_lat() {
+#ifdef __IPHONE_3_0
+	if (engine_p != nil) {
+		return [engine_p centerLatitude];
+	}
+	return 0;
+#else
+    return 0;
+#endif
+}
+
+double mapview_state_center_lon() {
+#ifdef __IPHONE_3_0
+	if (engine_p != nil) {
+		return [engine_p centerLongitude];
+	}
+	return 0;
+#else
+    return 0;
+#endif
+}

data/platform/iphone/Classes/NativeBar.h

@@ -13,3 +13,37 @@
 #define TABBAR_TYPE			1
 #define NOBAR_TYPE			2
 #define VTABBAR_TYPE		3
+
+#define NATIVE_BAR_PROPERTIES					@"properties"
+#define NATIVE_BAR_ITEMS						@"items"
+
+#define NATIVE_BAR_BACKGOUND_COLOR				@"bkg_color"
+
+#define NATIVE_BAR_ITEM_LABEL					@"label"
+#define NATIVE_BAR_ITEM_ACTION					@"action"
+#define NATIVE_BAR_ITEM_ICON					@"icon"
+#define NATIVE_BAR_ITEM_RELOAD					@"reload"
+#define NATIVE_BAR_ITEM_COLORED_ICON			@"colored_icon"
+#define NATIVE_BAR_ITEM_SELECTED_COLOR			@"selected_color"
+#define NATIVE_BAR_ITEM_DISABLED				@"disabled"
+#define NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR	@"web_bkg_color"
+
+/*
+ 
+struture of data with Toolbar/TabBar description
+ 
+NSDictioanry
+  "properties" - NSDictionary
+                   "bkg_color" - NSString
+  "items" - NSArray
+			  NSDictionary
+                "label" - NSString
+                "action" - NSString
+                "icon" - NSString
+                "reload" - NSString
+                "colored_icon" - NSString
+                "selected_color" - NSString
+                "disabled" - NSString
+                "bkg_color" - NSString
+ 
+*/