rhodes 2.2.6 → 2.3.0.beta.1

data/platform/iphone/Classes/NativeBar.m

@@ -22,11 +22,11 @@
 static int started = 0;
 
 @interface RhoNativeBarCreateTask : NSObject {}
-+ (void)run:(NSValue*)value :(NSArray*)items;
++ (void)run:(NSValue*)value :(NSDictionary*)parameters;
 @end
 
 @implementation RhoNativeBarCreateTask
-+ (void)run:(NSValue*)value :(NSArray*)items {
++ (void)run:(NSValue*)value :(NSDictionary*)parameters {
     int type;
     [value getValue:&type];
     
@@ -55,17 +55,17 @@ static int started = 0;
 			break;
 		case TOOLBAR_TYPE:
 			if (smv != nil) {
-				[smv addToolbar:items];
+				[smv addToolbar:parameters];
 			}
 			else {
-				view = [[SimpleMainView alloc] initWithMainView:mainView parent:w toolbar:items];
+				view = [[SimpleMainView alloc] initWithMainView:mainView parent:w bar_info:parameters];
 				[r setMainView:view];
 				[view release];
 			}
 			started = 1;
 			break;
 		case TABBAR_TYPE: {
-			view = [[TabbedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+			view = [[TabbedMainView alloc] initWithMainView:mainView parent:w bar_info:parameters];
 			started = 1;
 			[r setMainView:view];
 			[view release];
@@ -81,10 +81,10 @@ static int started = 0;
 				}
 			}
 			if (is_iPad) {
-				view = [[SplittedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+				view = [[SplittedMainView alloc] initWithMainView:mainView parent:w bar_info:parameters];
 			}
 			else {
-				view = [[TabbedMainView alloc] initWithMainView:mainView parent:w tabs:items];
+				view = [[TabbedMainView alloc] initWithMainView:mainView parent:w bar_info:parameters];
 			}
 			started = 1;
 			[r setMainView:view];
@@ -123,15 +123,20 @@ static int started = 0;
   [value getValue:&index];
   RAWLOG_INFO1("RhoNativeBarSetTabBadgeTask %d",index);
   RAWLOG_INFO1("RhoNativeBarSetTabBadgeTask %s",badge_val);
-  [[[Rhodes sharedInstance] mainView] setTabBadge:index val:badge_val];
+	//if ([[[Rhodes sharedInstance] mainView] respondsToSelector:@selector(setTabBadge::)]) 	
+	  [[[Rhodes sharedInstance] mainView] setTabBadge:index val:badge_val];
 }
 @end
 
-void create_nativebar(int bar_type, rho_param *p)
+void create_nativebar_innner(int bar_type, rho_param *p)
 {
     if (!rho_rhodesapp_check_mode())
         return;
-    rho_param *params = NULL;
+
+	const char* background_color = NULL;
+	const char* background_color_enable = NULL;
+	
+	rho_param *params = NULL;
     switch (p->type) {
         case RHO_PARAM_ARRAY:
             params = p;
@@ -141,7 +146,11 @@ void create_nativebar(int bar_type, rho_param *p)
                 const char *name = p->v.hash->name[i];
                 rho_param *value = p->v.hash->value[i];
                 
-                // TODO: implement color settings
+                if (strcasecmp(name, "background_color") == 0) {
+					background_color = value->v.string;
+					background_color_enable = "true";
+                }
+				
                 if (strcasecmp(name, "buttons") == 0 || strcasecmp(name, "tabs") == 0) {
                     params = value;
                 }
@@ -160,8 +169,16 @@ void create_nativebar(int bar_type, rho_param *p)
     }
     
     int size = params->v.array->size;
-    NSMutableArray *items = [NSMutableArray arrayWithCapacity:size];
 
+	NSMutableDictionary* main_properties = [NSMutableDictionary dictionaryWithCapacity:2];
+	
+	NSMutableDictionary* properties = [NSMutableDictionary dictionaryWithCapacity:1];
+	[main_properties setObject:properties forKey:NATIVE_BAR_PROPERTIES];
+	
+	NSMutableArray* items = [NSMutableArray arrayWithCapacity:size];
+	[main_properties setObject:items forKey:NATIVE_BAR_ITEMS];
+	
+	
     for (int i = 0; i < size; ++i) {
         rho_param *hash = params->v.array->value[i];
         if (hash->type != RHO_PARAM_HASH) {
@@ -174,7 +191,13 @@ void create_nativebar(int bar_type, rho_param *p)
         const char *icon = NULL;
         const char *reload = NULL;
         const char *colored_icon = NULL;
-        
+		
+		const char *selected_color = NULL;
+		//const char *selected_color_enable = NULL;
+		const char *disabled = NULL;
+		const char* web_bkg_color = NULL;
+		
+        BOOL skip_item = NO;
         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];
@@ -182,6 +205,11 @@ void create_nativebar(int bar_type, rho_param *p)
                 RAWLOG_ERROR1("Unexpected '%s' type, should be String", name);
                 return;
             }
+			if (strcasecmp(name, "background_color") == 0) {
+				background_color = value->v.string;
+				//background_color_enable = "true";
+				skip_item = YES;
+			}
             
             if (strcasecmp(name, "label") == 0)
                 label = value->v.string;
@@ -193,29 +221,53 @@ void create_nativebar(int bar_type, rho_param *p)
                 reload = value->v.string;
             else if (strcasecmp(name, "colored_icon") == 0)
                 colored_icon = value->v.string;
+            else if (strcasecmp(name, "selected_color") == 0){
+                selected_color = value->v.string;
+				//selected_color_enable = "true";
+			}	
+            else if (strcasecmp(name, "disabled") == 0)
+                disabled = value->v.string;
+            else if (strcasecmp(name, "web_bkg_color") == 0)
+                web_bkg_color = value->v.string;
         }
         
         if (label == NULL && bar_type == TOOLBAR_TYPE)
             label = "";
         
-        if (label == NULL || action == NULL) {
+        if ((label == NULL || action == NULL) && (!skip_item)) {
             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")]];
-        [items addObject:[NSString stringWithUTF8String:(colored_icon ? colored_icon : "false")]];
-    }
-    
+		if (!skip_item) {
+			NSMutableDictionary* item = [NSMutableDictionary dictionaryWithCapacity:9];	
+			
+			[item setObject:[NSString stringWithUTF8String:label] forKey:NATIVE_BAR_ITEM_LABEL];
+			[item setObject:[NSString stringWithUTF8String:action] forKey:NATIVE_BAR_ITEM_ACTION];
+			[item setObject:[NSString stringWithUTF8String:(icon ? icon : "")] forKey:NATIVE_BAR_ITEM_ICON];
+			[item setObject:[NSString stringWithUTF8String:(reload ? reload : "false")] forKey:NATIVE_BAR_ITEM_RELOAD];
+			[item setObject:[NSString stringWithUTF8String:(colored_icon ? colored_icon : "false")] forKey:NATIVE_BAR_ITEM_COLORED_ICON];
+			if (selected_color != nil) {
+				[item setObject:[NSString stringWithUTF8String:selected_color] forKey:NATIVE_BAR_ITEM_SELECTED_COLOR];
+			}
+			[item setObject:[NSString stringWithUTF8String:(disabled ? disabled : "false")] forKey:NATIVE_BAR_ITEM_DISABLED];
+			if (web_bkg_color != NULL) {
+				[item setObject:[NSString stringWithUTF8String:web_bkg_color] forKey:NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR];
+			}
+			
+			[items addObject:item];
+		}
+		
+	}
+	if (background_color != nil) {
+		[properties setObject:[NSString stringWithUTF8String:background_color] forKey:NATIVE_BAR_BACKGOUND_COLOR];	
+	}
+	
     id runnable = [RhoNativeBarCreateTask class];
     id arg1 = [NSValue valueWithBytes:&bar_type objCType:@encode(int)];
-    [Rhodes performOnUiThread:runnable arg:arg1 arg:items wait:NO];
+    [Rhodes performOnUiThread:runnable arg:arg1 arg:main_properties wait:NO];
 }
 
-void remove_nativebar() {
+void remove_nativebar_innner() {
     if (!rho_rhodesapp_check_mode())
         return;
     int bar_type = NOBAR_TYPE;
@@ -224,7 +276,7 @@ void remove_nativebar() {
     [Rhodes performOnUiThread:runnable arg:arg1 arg:nil wait:NO];
 }
 
-void nativebar_switch_tab(int index) {
+void nativebar_switch_tab_innner(int index) {
     if (!rho_rhodesapp_check_mode())
         return;
     id runnable = [RhoNativeBarSwitchTabTask class];
@@ -232,7 +284,7 @@ void nativebar_switch_tab(int index) {
     [Rhodes performOnUiThread:runnable arg:arg wait:NO];
 }
 
-void nativebar_set_tab_badge(int index, char *val)
+void nativebar_set_tab_badge_innner(int index, char *val)
 {
         RAWLOG_INFO2("set_tab_badge called: %d : %s",index,val);
         id runnable = [RhoNativeBarSetTabBadgeTask class];
@@ -246,3 +298,56 @@ void nativebar_set_tab_badge(int index, char *val)
 VALUE nativebar_started() {
     return rho_ruby_create_boolean(started);
 }
+
+
+
+void create_nativebar(int bar_type, rho_param *p)
+{
+	RAWLOG_INFO("NativeBar.create() is DEPRECATED. Use Rho::NativeToolbar.create() or Rho::NativeTabbar.create().");
+	create_nativebar_innner(bar_type, p);
+}
+
+void remove_nativebar() {
+	RAWLOG_INFO("NativeBar.remove() is DEPRECATED. Use Rho::NativeToolbar.remove() or Rho::NativeTabbar.remove().");
+	remove_nativebar_innner();
+}
+
+void nativebar_switch_tab(int index) {
+	RAWLOG_INFO("NativeBar.switch_tab() is DEPRECATED. Use Rho::NativeTabbar.switch_tab().");
+	nativebar_switch_tab_innner(index);
+}
+
+void nativebar_set_tab_badge(int index, char *val)
+{
+	RAWLOG_INFO("NativeBar.set_tab_badge() is DEPRECATED. Use Rho::NativeTabbar.set_tab_badge().");
+	nativebar_set_tab_badge_innner(index, val);
+}
+
+
+void create_native_toolbar(int bar_type, rho_param *p) {
+	create_nativebar_innner(bar_type, p);
+}
+
+void remove_native_toolbar() {
+	remove_nativebar_innner();
+}
+
+void create_native_tabbar(int bar_type, rho_param *p) {
+	create_nativebar_innner(bar_type, p);
+}
+
+void remove_native_tabbar() {
+	remove_nativebar_innner();
+}
+
+void native_tabbar_switch_tab(int index) {
+	nativebar_switch_tab_innner(index);
+}
+
+void native_tabbar_set_tab_badge(int index,char *val) {
+	nativebar_set_tab_badge_innner(index, val);
+}
+
+
+
+

data/platform/iphone/Classes/NativeView/NVDelegate.h

@@ -0,0 +1,26 @@
+//
+//  SignatureDelegate.h
+//  rhorunner
+//
+//  Created by Soldatenkov Dmitry on 27/07/10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import "RhoDelegate.h"
+#import "NVViewController.h"
+
+@interface NVDelegate : RhoDelegate {
+	NVViewController* nvViewController;
+	UIView* parentView;
+	UIView* prevView;
+}
+
+
+-(void)setNVViewControllerValue:(NVViewController*)svc;
+-(void)setParentView:(UIView*)parent_view;
+-(void)setPrevView:(UIView*)prev_view;
+-(void)doClose;
+
+@end

data/platform/iphone/Classes/NativeView/NVDelegate.m

@@ -0,0 +1,40 @@
+//
+//  SignatureDelegate.m
+//  rhorunner
+//
+//  Created by Soldatenkov Dmitry on 27/07/10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import "Rhodes.h"
+#import "NVDelegate.h"
+#import "AppManager.h"
+#import "common/RhodesApp.h"
+
+@implementation NVDelegate
+
+
+-(void)setNVViewControllerValue:(NVViewController *)svc {
+	nvViewController = svc;
+}
+
+-(void)setParentView:(UIView*)parent_view {
+	parentView = parent_view;
+}
+
+-(void)setPrevView:(UIView*)prev_view {
+	prevView = prev_view;
+}
+
+
+-(void)doClose {
+    [nvViewController.view removeFromSuperview];
+    [nvViewController release];
+	[parentView addSubview:prevView];
+	[parentView layoutSubviews];
+	[prevView release];
+}
+
+
+@end
+

data/platform/iphone/Classes/NativeView/NVViewController.h

@@ -0,0 +1,24 @@
+//
+//  SignatureView.h
+//  rhorunner
+//
+//  Created by Soldatenkov Dmitry on 27/07/10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RhoMainView.h"
+#import "RhoViewController.h"
+
+@class NVDelegate;
+
+@interface NVViewController : RhoViewController {
+	UIView *nvView; 
+	NVDelegate* nvDelegate;
+}
+
+- (id)initWithRect:(CGRect)rect nvview:(UIView*)nvview delegate:(NVDelegate*)delegate;
+
+- (void)loadView;
+
+@end

data/platform/iphone/Classes/NativeView/NVViewController.m

@@ -0,0 +1,90 @@
+//
+//  SignatureView.m
+//  rhorunner
+//
+//  Created by Soldatenkov Dmitry on 27/07/10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import "NVViewController.h"
+
+#import "AppManager.h"
+#import "Rhodes.h"
+
+#include "common/RhoConf.h"
+#include "common/RhodesApp.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NVViewController"
+
+
+@implementation NVViewController
+
+
+- (id)initWithRect:(CGRect)rect nvview:(UIView*)nvview delegate:(NVDelegate*)delegate {
+	[self init];
+	
+	nvDelegate = delegate;
+	self.view.frame = rect;
+
+	self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	self.view.autoresizesSubviews = YES;
+	
+	
+	CGRect srect = self.view.frame;
+	srect.origin.y = 0;
+	
+	nvView = nvview;
+	nvView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	nvView.autoresizesSubviews = YES;
+	nvView.frame = srect;
+	
+	[self.view addSubview:nvView];
+	[self.view layoutSubviews];
+	
+	return self;
+
+}
+
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView {
+    UIView* root = [[UIView alloc] init];
+    root.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    root.autoresizesSubviews = YES;
+    self.view = root;
+    [root release];	
+}
+
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+    [super viewDidLoad];
+	//[self.view 
+}
+
+
+/*
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+//	[signatureView setNeedsDisplay];
+}
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+	[signatureView setNeedsDisplay];
+}
+ */
+
+- (void)viewDidUnload {
+	// Release any retained subviews of the main view.
+	// e.g. self.myOutlet = nil;
+}
+
+- (void)dealloc {
+	[nvView removeFromSuperview];
+    [super dealloc];
+}
+
+
+
+@end