rhodes 2.2.3 → 2.2.4.beta.1

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

@@ -263,6 +263,28 @@ int rho_sys_set_sleeping(int sleeping)
     return ret;
 }
 
+void rho_sys_app_exit() {
+    exit(EXIT_SUCCESS);
+}
+void rho_sys_open_url(const char* url) ;
+void rho_sys_run_app(const char* appname, VALUE params) 
+{
+	rho_sys_open_url(appname);
+}
+
+void rho_sys_open_url(const char* url) 
+{
+	NSString* strUrl = [NSString stringWithUTF8String:url];
+	BOOL res = FALSE;
+	if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:strUrl]])
+		res = [[UIApplication sharedApplication] openURL:[NSURL URLWithString:strUrl]];
+	
+	if ( res)
+		RAWLOG_INFO("rho_sys_open_url suceeded.");	
+	else
+		RAWLOG_INFO("rho_sys_open_url faled.");	
+}
+
 extern VALUE rho_sys_has_network();
 
 // http://www.apple.com/iphone/specs.html

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -105,6 +105,9 @@
 
         //CGSize pickerSize = CGSizeMake(parentFrame.size.width, parentFrame.size.height/2);
         CGSize pickerSize = [pickerView sizeThatFits:pickerView.frame.size];
+		if (pickerSize.width < parentFrame.size.width) {
+			pickerSize.width = parentFrame.size.width;
+		}
         CGRect pickerFrame = CGRectMake(parentFrame.origin.x,
                                         parentFrame.origin.y + parentFrame.size.height - pickerSize.height,
                                         pickerSize.width,

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

@@ -15,7 +15,10 @@
 
 #include "ruby/ext/rho/rhoruby.h"
 
-@interface MapViewController : RhoViewController <MKReverseGeocoderDelegate,MKMapViewDelegate> {
+
+ 
+
+@interface MapViewController : RhoViewController <MKMapViewDelegate, MKReverseGeocoderDelegate> {
     MKMapView *mapView;
     MKReverseGeocoder *geoCoder;
     GoogleGeocoder* ggeoCoder;
@@ -28,13 +31,15 @@
     MKCoordinateRegion region;
     NSString *region_center;
     CLLocationDegrees region_radius;
-    NSString *gapikey;  
+    NSString *gapikey;
+	UIView* savedMainView;
     //IBOutlet UISegmentedControl *mapType;
 }
 
 // 
 @property (copy) NSString *region_center;
-@property (copy) NSString *gapikey; 
+@property (copy) NSString *gapikey;
+@property (nonatomic,retain) UIView *savedMainView;
 
 + (void)createMap:(rho_param*)params;
 + (void)closeMap;

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

@@ -9,6 +9,7 @@
 #import "MapAnnotation.h"
 #import "MapViewController.h"
 #import "Rhodes.h"
+#import "RhoMainView.h"
 
 #include "logging/RhoLog.h"
 #include "ruby/ext/rho/rhoruby.h"
@@ -18,6 +19,10 @@
 
 static MapViewController *mc = nil;
 
+
+
+
+
 @interface RhoCreateMapTask : NSObject {}
 + (void)run:(NSValue*)value;
 @end
@@ -31,7 +36,15 @@ static MapViewController *mc = nil;
     MapViewController* map = [[MapViewController alloc] init];
     [map setParams:[value pointerValue]];
     UIWindow *window = [[Rhodes sharedInstance] rootWindow];
-    [window addSubview:map.view];
+	map.view.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	map.view.autoresizesSubviews = YES;
+	
+	UIView* v = [[[Rhodes sharedInstance] mainView] view];
+	map.savedMainView = v;
+	[map.savedMainView retain];
+    [map.savedMainView removeFromSuperview];
+	//map.savedMainView.hidden = YES;
+	[window addSubview:map.view];
     
     mc = map;
 }
@@ -53,7 +66,7 @@ static MapViewController *mc = nil;
 
 @implementation MapViewController
 
-@synthesize region_center, gapikey;
+@synthesize region_center, gapikey, savedMainView;
 
 + (void)createMap:(rho_param *)params {
     id runnable = [RhoCreateMapTask class];
@@ -80,7 +93,21 @@ static MapViewController *mc = nil;
 
 - (void)close {
     [self dismissModalViewControllerAnimated:YES]; 
-	self.view.hidden = YES;
+    
+	UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+
+	CGRect frame = self.view.bounds;
+	
+	self.savedMainView.frame = frame;
+	
+
+	[window addSubview:self.savedMainView];
+	[window layoutSubviews];
+	[self.view removeFromSuperview];
+	//self.view.hidden = YES;
+
+	[self.savedMainView release];
+	self.savedMainView = nil;
 }
 
 - (void)setSettings:(rho_param*)p {
@@ -274,6 +301,7 @@ static MapViewController *mc = nil;
     rho_param_free(p);
 }
 
+
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -281,28 +309,49 @@ static MapViewController *mc = nil;
     //Initialize the toolbar
     toolbar = [[UIToolbar alloc] init];
     toolbar.barStyle = UIBarStyleBlack;
-    [toolbar sizeToFit];
-    CGFloat toolbarHeight = [toolbar frame].size.height;
-    CGRect rootViewBounds = self.view.bounds;
-    CGFloat rootViewHeight = CGRectGetHeight(rootViewBounds);
-    CGFloat rootViewWidth = CGRectGetWidth(rootViewBounds);
-    CGRect rectArea = CGRectMake(0, rootViewHeight - toolbarHeight, rootViewWidth, toolbarHeight);
-    [toolbar setFrame:rectArea];
     UIBarButtonItem *closeButton = [[UIBarButtonItem alloc]
                                initWithTitle:@"Close" style:UIBarButtonItemStyleBordered 
                                target:self action:@selector(close_clicked:)];
     [toolbar setItems:[NSArray arrayWithObjects:closeButton,nil]];
-    [self.view addSubview:toolbar];
+
+    [toolbar sizeToFit];
+	
+	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | 
+	UIViewAutoresizingFlexibleWidth;
+	toolbar.autoresizesSubviews = YES;
+	
+    CGFloat toolbarHeight = [toolbar frame].size.height;
+
+	//RhoMainView* rw = [[Rhodes sharedInstance] mainView];
+    CGRect rootViewBounds = [[[Rhodes sharedInstance] mainView] view].bounds;
+	
+	self.view.frame = rootViewBounds;
+	
+    CGFloat rootViewHeight = rootViewBounds.size.height;
+	//CGFloat rootViewHeight = CGRectGetHeight(rootViewBounds);
+    CGFloat rootViewWidth = CGRectGetWidth(rootViewBounds);
+    CGRect rectArea = CGRectMake(0, rootViewHeight - toolbarHeight, rootViewWidth, toolbarHeight);
+    toolbar.frame = rectArea;
+    
+	
+	[self.view addSubview:toolbar];
     [closeButton release];
     
     CGRect rectMapArea = CGRectMake(0, 0, rootViewWidth, rootViewHeight - toolbarHeight);
-    mapView=[[MKMapView alloc] initWithFrame:rectMapArea];
+    mapView =[[MKMapView alloc] initWithFrame:rectMapArea];
+	mapView.frame = rectMapArea;
     mapView.delegate=self;
 
     mapView.showsUserLocation=showsUserLocation;
     mapView.scrollEnabled=scrollEnabled;
     mapView.zoomEnabled=zoomEnabled;
     mapView.mapType=mapType;
+	
+    mapView.autoresizesSubviews = YES;
+    mapView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	
+	
+	
     
     /*Geocoder Stuff*/
     [ggeoCoder start];
@@ -318,6 +367,8 @@ static MapViewController *mc = nil;
     }
     
     [self.view insertSubview:mapView atIndex:0];
+	[self.view layoutSubviews];
+	
 }
 
 - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view 

data/platform/iphone/Classes/NativeBar.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#define TOOLBAR_TYPE	0
-#define TABBAR_TYPE		1
-#define NOBAR_TYPE		2
+#define TOOLBAR_TYPE		0
+#define TABBAR_TYPE			1
+#define NOBAR_TYPE			2
+#define VTABBAR_TYPE		3

data/platform/iphone/Classes/NativeBar.m

@@ -10,6 +10,7 @@
 #import "Rhodes.h"
 #import "SimpleMainView.h"
 #import "TabbedMainView.h"
+#import "SplittedMainView.h"
 
 //#include "common/rhoparams.h"
 #include "logging/RhoLog.h"
@@ -63,11 +64,32 @@ static int started = 0;
 			}
 			started = 1;
 			break;
-		case TABBAR_TYPE:
+		case TABBAR_TYPE: {
 			view = [[TabbedMainView alloc] initWithMainView:mainView parent:w tabs:items];
 			started = 1;
 			[r setMainView:view];
 			[view release];
+		}
+			break;
+		case VTABBAR_TYPE: {
+			
+			BOOL is_iPad = NO;
+			{
+				NSString *model = [[UIDevice currentDevice] model]; // "iPad ..."
+				if ([model hasPrefix:@"iPad"]) {
+					is_iPad = YES;
+				}
+			}
+			if (is_iPad) {
+				view = [[SplittedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+			}
+			else {
+				view = [[TabbedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+			}
+			started = 1;
+			[r setMainView:view];
+			[view release];
+			}
 			break;
 		default:
 			RAWLOG_ERROR1("Unknown bar type passed: %d", type);
@@ -123,6 +145,7 @@ void create_nativebar(int bar_type, rho_param *p)
     
     int size = params->v.array->size;
     NSMutableArray *items = [NSMutableArray arrayWithCapacity:size];
+
     for (int i = 0; i < size; ++i) {
         rho_param *hash = params->v.array->value[i];
         if (hash->type != RHO_PARAM_HASH) {
@@ -134,6 +157,7 @@ void create_nativebar(int bar_type, rho_param *p)
         const char *action = NULL;
         const char *icon = NULL;
         const char *reload = NULL;
+        const char *colored_icon = NULL;
         
         for (int j = 0, lim = hash->v.hash->size; j < lim; ++j) {
             const char *name = hash->v.hash->name[j];
@@ -151,6 +175,8 @@ void create_nativebar(int bar_type, rho_param *p)
                 icon = value->v.string;
             else if (strcasecmp(name, "reload") == 0)
                 reload = value->v.string;
+            else if (strcasecmp(name, "colored_icon") == 0)
+                colored_icon = value->v.string;
         }
         
         if (label == NULL && bar_type == TOOLBAR_TYPE)
@@ -165,6 +191,7 @@ void create_nativebar(int bar_type, rho_param *p)
         [items addObject:[NSString stringWithUTF8String:action]];
         [items addObject:[NSString stringWithUTF8String:(icon ? icon : "")]];
         [items addObject:[NSString stringWithUTF8String:(reload ? reload : "false")]];
+        [items addObject:[NSString stringWithUTF8String:(colored_icon ? colored_icon : "false")]];
     }
     
     id runnable = [RhoNativeBarCreateTask class];

data/platform/iphone/Classes/Rhodes.m

@@ -9,6 +9,7 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
+#import "SplitView/SplittedMainView.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Rhodes"
@@ -302,46 +303,110 @@ static Rhodes *instance = NULL;
         [splashViewController hideSplash];
         [splashViewController release];
         splashViewController = nil;
+		
+		[window addSubview:mainView.view];
+		[window bringSubviewToFront:mainView.view];
     }
 }
 
 - (void)setMainView:(id<RhoMainView,NSObject>)view {
     if (mainView == view)
         return;
-		
-	[self hideSplash];
+
+	UIViewController* sv = mainView;
+	//[self hideSplash];
     
-    [mainView.view removeFromSuperview];
-    [mainView release];
+	// Special hack for solve problem with VerticalTabBar on iPad
+	// When we switch from VerticalTabBar to any View - autorotation is disabled and application switch to Portrait orientation
+	// But there are no problme on iPhone 4.1 and above
+	//I think this is special iPad 3.2 problem
+    BOOL isVerticalTab = NO;
+	if ([mainView isKindOfClass:[SplittedMainView class]]) {
+		BOOL is_iPad = NO;
+		
+		NSString *model = [[UIDevice currentDevice] model]; // "iPad ..."
+		if ([model hasPrefix:@"iPad"]) {
+			is_iPad = YES;
+		}
+		
+		isVerticalTab = is_iPad;
+	}
+	
+	CGRect main_frame = mainView.view.frame;
+	
+	UIWindow* www = window;
+	if (isVerticalTab) {
+		
+		window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+		window.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+		window.autoresizesSubviews = YES;
+		
+		//view.view.frame = main_frame;
+		mainView = nil;
+	}
+	else {
+		[mainView.view removeFromSuperview];
+		[mainView release];
+	}
+	
     mainView = [view retain];
     [window addSubview:mainView.view];
+	//[window bringSubviewToFront:mainView.view];
+	
+	if (isVerticalTab) {
+		[window makeKeyAndVisible];
+
+		[sv.view removeFromSuperview];
+		[sv release];
+		[www release];
+	}
+	[window layoutSubviews];
+	
 }
 
 - (id<RhoMainView,NSObject>)mainView {
     return mainView;
 }
 
-- (void) showLoadingPage 
+
+
+// make splash screen
+// return YES if SplashScreen maked 
+- (BOOL) showLoadingPagePre 
 {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     
     NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-    NSString *pngPath = [NSString stringWithFormat:@"%@/apps/app/loading.png", resourcePath];
     NSString *htmPath = [NSString stringWithFormat:@"%@/apps/app/loading.html", resourcePath];
     
-    if ([fileManager fileExistsAtPath:pngPath]) {
+    if ([SplashViewController hasLoadingImage]) {
         splashViewController = [[SplashViewController alloc] initWithParentView:window];
-        [splashViewController showSplash:pngPath];
     }
     else if ([fileManager fileExistsAtPath:htmPath]) {
         NSError *err;
         NSString *data = [NSString stringWithContentsOfFile:htmPath encoding:NSUTF8StringEncoding error:&err];
         [mainView loadHTMLString:data];
-		rho_splash_screen_start();
+    }
+	return [SplashViewController hasLoadingImage];
+}
 
+// execute rho_splash_screen_start(); - we can do it only after Rhodes initialization
+- (void) showLoadingPagePost
+{
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+    NSString *htmPath = [NSString stringWithFormat:@"%@/apps/app/loading.html", resourcePath];
+    
+    if (splashViewController != nil) {
+		rho_splash_screen_start();
+    }
+    else if ([fileManager fileExistsAtPath:htmPath]) {
+		rho_splash_screen_start();
+		
     }
 }
 
+
 - (void)doRhoActivate {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     @try {
@@ -374,7 +439,7 @@ static Rhodes *instance = NULL;
         rotationLocked = rho_conf_getBool("disable_screen_rotation");
         
         NSLog(@"Show loading page");
-        [self performSelectorOnMainThread:@selector(showLoadingPage) withObject:nil waitUntilDone:NO];
+        [self performSelectorOnMainThread:@selector(showLoadingPagePost) withObject:nil waitUntilDone:NO];
         
         NSLog(@"Start rhodes app");
         rho_rhodesapp_start();
@@ -388,7 +453,7 @@ static Rhodes *instance = NULL;
     NSLog(@"Rhodes starting application...");
     instance = self;
     application = [UIApplication sharedApplication];
-    rotationLocked = YES;
+    rotationLocked = NO;
     
     [NSThread setThreadPriority:1.0];
     
@@ -401,16 +466,22 @@ static Rhodes *instance = NULL;
     window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     window.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     window.autoresizesSubviews = YES;
-    
+	
     mainView = nil;
-    self.mainView = [[SimpleMainView alloc] initWithParentView:window frame:[Rhodes applicationFrame]];
+    mainView = [[SimpleMainView alloc] initWithParentView:window frame:[Rhodes applicationFrame]];
     mainView.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     mainView.view.autoresizesSubviews = YES;
     
+	BOOL is_splash_screen_maked = [self showLoadingPagePre];
+	
+	if (!is_splash_screen_maked) {
+		[window addSubview:mainView.view];
+	}
+	
     [window makeKeyAndVisible];
-    
-    [window addSubview:mainView.view];
-    
+	
+	CGRect rrr = [application statusBarFrame];
+	
     NSLog(@"Init cookies");
     cookies = [[NSMutableDictionary alloc] initWithCapacity:0];
     
@@ -689,7 +760,3 @@ void _rho_ext_syscall(PARAMS_WRAPPER* params) {
 void rho_conf_show_log() {
     [[Rhodes sharedInstance] showLog];
 }
-
-void rho_sys_app_exit() {
-    exit(EXIT_SUCCESS);
-}