demos/KitchenSink/Resources/appcelerator_small.png demos/KitchenSink/Resources/apple_logo.jpg demos/KitchenSink/Resources/atlanta.jpg @@ -33,11 +33,23 @@ if os.path.exists('android/titanium/bin'): # hard to include python after an external SConscript # -build_dirs = ['android/titanium'] -if platform.system() == "Darwin": +build_dirs = [] + +if not ARGUMENTS.get('iphone',0): + build_dirs.append('android/titanium') + +if platform.system() == "Darwin" and not ARGUMENTS.get('android',0): build_dirs.append('iphone') flags = '' +build_type = 'full' + + +if ARGUMENTS.get('iphone',0): + build_type='iphone' + +if ARGUMENTS.get('android',0): + build_type='android' if ARGUMENTS.get('COMPILER_FLAGS', 0): flags = ARGUMENTS.get('COMPILER_FLAGS') @@ -46,7 +58,7 @@ for dir in build_dirs: d = os.getcwd() os.chdir(dir) try: - os.system("scons PRODUCT_VERSION=%s COMPILER_FLAGS='%s'" % (version,flags)) + os.system("scons PRODUCT_VERSION=%s COMPILER_FLAGS='%s' BUILD_TYPE='%s'" % (version,flags,build_type)) finally: os.chdir(d) SConstruct @@ -13,33 +13,50 @@ { latitude:37.337681, longitude:-122.038193, - title:"Appcelerator's cool", - subtitle:'Mountain View', + title:"Appcelerator Headquarters", + subtitle:'Mountain View, CA', pincolor:Titanium.Map.ANNOTATION_PURPLE, - animate:true + animate:true, + leftButton: 'appcelerator_small.png' }, { latitude:37.33168900, longitude:-122.03073100, title:"Apple, Inc.", - subtitle:'Cupertino', + subtitle:'Cupertino, CA', pincolor:Titanium.Map.ANNOTATION_BLUE, - animate:true + animate:true, + rightButton: 'apple_logo.jpg' }, { latitude:33.74511, longitude:-84.38993, - title:"Atlanta", - subtitle:'Georgia', + title:"Atlanta, GA", + subtitle:'Atlanta Braves Stadium', pincolor:Titanium.Map.ANNOTATION_RED, - animate:true + animate:true, + leftButton:'atlanta.jpg', + rightButton:Titanium.UI.iPhone.SystemButton.DISCLOSURE } ] }); mapview.addEventListener('click',function(evt) { - Ti.API.info('you clicked on '+evt.title); + Ti.API.info('you clicked on '+evt.title+' with click source = '+evt.source); + + if (evt.title == 'Atlanta, GA' && evt.source == 'rightButton') + { + var w = Titanium.UI.createWindow({ + url:'credits.html' + }); + w.open({animated:true}); + } + }); + + mapview.addEventListener('regionChanged',function(evt) + { + Ti.API.info('maps region has updated to '+evt.longitude+','+evt.latitude); }); Titanium.UI.currentWindow.addView(mapview); demos/KitchenSink/Resources/maps.html @@ -214,4 +214,33 @@ typedef enum { extern BOOL TitaniumPrepareAnimationsForView(NSDictionary * optionObject, UIView * view); +int barButtonSystemItemForString(NSString * inputString); + +enum { + UITitaniumNativeStyleBar = -32, + UITitaniumNativeStyleBig = -33, + UITitaniumNativeStyleDark = -34, +}; + +enum { //MUST BE NEGATIVE, as it inhabits the same space as UIBarButtonSystemItem + UITitaniumNativeItemNone = -1, //Also is a bog-standard button. + UITitaniumNativeItemSpinner = -2, + UITitaniumNativeItemProgressBar = -3, + + UITitaniumNativeItemSlider = -4, + UITitaniumNativeItemSwitch = -5, + UITitaniumNativeItemMultiButton = -6, + UITitaniumNativeItemSegmented = -7, + + UITitaniumNativeItemTextView = -8, + UITitaniumNativeItemTextField = -9, + UITitaniumNativeItemSearchBar = -10, + + UITitaniumNativeItemPicker = -11, + UITitaniumNativeItemDatePicker = -12, + + UITitaniumNativeItemInfoLight = -13, + UITitaniumNativeItemInfoDark = -14, +}; + @end iphone/Classes/TitaniumHost.h @@ -34,6 +34,54 @@ NSString * CleanJSEnd(NSString * inputString) } +NSDictionary * barButtonSystemItemForStringDict = nil; + +int barButtonSystemItemForString(NSString * inputString){ + if (barButtonSystemItemForStringDict == nil) { + barButtonSystemItemForStringDict = [[NSDictionary alloc] initWithObjectsAndKeys: + [NSNumber numberWithInt:UIBarButtonSystemItemAction],@"action", + [NSNumber numberWithInt:UIBarButtonSystemItemBookmarks],@"bookmarks", + [NSNumber numberWithInt:UIBarButtonSystemItemCamera],@"camera", + [NSNumber numberWithInt:UIBarButtonSystemItemCompose],@"compose", + [NSNumber numberWithInt:UIBarButtonSystemItemDone],@"done", + [NSNumber numberWithInt:UIBarButtonSystemItemCancel],@"cancel", + [NSNumber numberWithInt:UIBarButtonSystemItemEdit],@"edit", + [NSNumber numberWithInt:UIBarButtonSystemItemSave],@"save", + [NSNumber numberWithInt:UIBarButtonSystemItemAdd],@"add", + [NSNumber numberWithInt:UIBarButtonSystemItemFlexibleSpace],@"flexiblespace", + [NSNumber numberWithInt:UIBarButtonSystemItemFixedSpace],@"fixedspace", + [NSNumber numberWithInt:UIBarButtonSystemItemReply],@"reply", + [NSNumber numberWithInt:UIBarButtonSystemItemOrganize],@"organize", + [NSNumber numberWithInt:UIBarButtonSystemItemSearch],@"search", + [NSNumber numberWithInt:UIBarButtonSystemItemRefresh],@"refresh", + [NSNumber numberWithInt:UIBarButtonSystemItemStop],@"stop", + [NSNumber numberWithInt:UIBarButtonSystemItemTrash],@"trash", + [NSNumber numberWithInt:UIBarButtonSystemItemPlay],@"play", + [NSNumber numberWithInt:UIBarButtonSystemItemPause],@"pause", + [NSNumber numberWithInt:UIBarButtonSystemItemRewind],@"rewind", + [NSNumber numberWithInt:UIBarButtonSystemItemFastForward],@"fastforward", + [NSNumber numberWithInt:UITitaniumNativeItemSpinner],@"activity", + [NSNumber numberWithInt:UITitaniumNativeItemSlider],@"slider", + [NSNumber numberWithInt:UITitaniumNativeItemSwitch],@"switch", + [NSNumber numberWithInt:UITitaniumNativeItemPicker],@"picker", + [NSNumber numberWithInt:UITitaniumNativeItemDatePicker],@"datepicker", + [NSNumber numberWithInt:UITitaniumNativeItemTextField],@"text", + [NSNumber numberWithInt:UITitaniumNativeItemTextView],@"textarea", + [NSNumber numberWithInt:UITitaniumNativeItemSearchBar],@"search", + [NSNumber numberWithInt:UITitaniumNativeItemMultiButton],@"multibutton", + [NSNumber numberWithInt:UITitaniumNativeItemSegmented],@"segmented", + [NSNumber numberWithInt:UITitaniumNativeItemInfoLight],@"infolight", + [NSNumber numberWithInt:UITitaniumNativeItemInfoDark],@"infodark", + [NSNumber numberWithInt:UITitaniumNativeItemProgressBar],@"progressbar", + [NSNumber numberWithInt:UIButtonTypeDetailDisclosure],@"disclosure", + nil]; + } + NSNumber * result = [barButtonSystemItemForStringDict objectForKey:[inputString lowercaseString]]; + if (result != nil) return [result intValue]; + return UITitaniumNativeItemNone; +} + + NSString * const TitaniumTabChangeNotification = @"tabChange"; NSString * const TitaniumJsonKey = @"json"; iphone/Classes/TitaniumHost.m @@ -16,7 +16,7 @@ modules = [ 'api', 'filesystem', 'network', 'platform', - 'analytics', + 'analytics', 'gesture', 'notification', 'facebook', @@ -52,6 +52,7 @@ sys.path.append(iphone_dir) import run,prereq +quick_build = ARGUMENTS.get('BUILD_TYPE',0) == 'iphone' def build(name): # execute the phone and simulator release builds @@ -66,17 +67,22 @@ def build(name): # build the merged library using lipo os.system("lipo build/%s-iphonesimulator/lib%s.a build/%s-iphoneos/lib%s.a -create -output build/lib%s-%s.a" %(config,name,config,name,name,apiversion)) - -for apiversion in prereq.get_sdks(): - # execute the phone and simulator release builds - +def forversion(): build('Titanium') - # build each of the modules for module in modules: - module_name = module[0:1].capitalize()+module[1:] - if len(module)==2: - module_name = module.upper() - build(module_name) + module_name = module[0:1].capitalize()+module[1:] + if len(module)==2: + module_name = module.upper() + build(module_name) + + +if quick_build: + apiversion = '3.0' + forversion() +else: + for apiversion in prereq.get_sdks(): + forversion() + iphone/SConstruct @@ -15,6 +15,8 @@ BOOL animate; MKPinAnnotationColor pincolor; CLLocationCoordinate2D coordinate; + NSString *leftButton; + NSString *rightButton; } -(id)init:(CLLocationCoordinate2D)coord; @property (nonatomic, readonly) CLLocationCoordinate2D coordinate; @@ -22,11 +24,14 @@ @property (nonatomic) MKPinAnnotationColor pincolor; @property (nonatomic,retain) NSString* title; @property (nonatomic,retain) NSString* subtitle; +@property (nonatomic,retain) NSString* leftButton; +@property (nonatomic,retain) NSString* rightButton; @end @implementation MapViewAnnotation @synthesize animate,pincolor,coordinate,title,subtitle; +@synthesize leftButton,rightButton; -(id)init:(CLLocationCoordinate2D)coord { @@ -40,6 +45,8 @@ { [title release]; [subtitle release]; + [leftButton release]; + [rightButton release]; [super dealloc]; } @end @@ -84,7 +91,6 @@ -(void)setMapType:(NSNumber*)type { - //view.mapType = MKMapTypeStandard; view.mapType = [type unsignedIntegerValue]; } @@ -165,6 +171,8 @@ userLocation = [ul boolValue]; } + TitaniumHost *tiHost = [TitaniumHost sharedHost]; + id ant = [dict objectForKey:@"annotations"]; if ([ant isKindOfClass:[NSArray class]]) { @@ -177,22 +185,31 @@ l.latitude = [[value objectForKey:@"latitude"] doubleValue]; l.longitude = [[value objectForKey:@"longitude"] doubleValue]; MapViewAnnotation * loc = [[MapViewAnnotation alloc] init:l]; - loc.title = [value objectForKey:@"title"]; - loc.subtitle = [value objectForKey:@"subtitle"]; loc.pincolor = [[value objectForKey:@"pincolor"] unsignedIntegerValue]; loc.animate = [[value objectForKey:@"animate"] boolValue]; + loc.title = [value objectForKey:@"title"]; + loc.subtitle = [value objectForKey:@"subtitle"]; + id li = [value objectForKey:@"leftButton"]; + if (li) + { + loc.leftButton=(NSString*)li; + } + id ri = [value objectForKey:@"rightButton"]; + if (ri) + { + loc.rightButton=(NSString*)ri; + } [annotations addObject:loc]; [loc release]; } } - MapModule * mod = (MapModule *) [[TitaniumHost sharedHost] moduleNamed:@"MapModule"]; + MapModule * mod = (MapModule *) [tiHost moduleNamed:@"MapModule"]; token = [(NSString*)[dict objectForKey:@"_TOKEN"] retain]; [mod registerView:self forToken:token]; pageToken = [[[TitaniumHost sharedHost] currentThread] magicToken]; region.center = coord; - region.span = span; } @@ -218,6 +235,9 @@ view.mapType = mapType; view.showsUserLocation=YES; view.delegate = self; + view.userInteractionEnabled = YES; + + [view setAutoresizingMask:UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight]; if (annotations && [annotations count]>0) @@ -248,41 +268,153 @@ context:(void *)context { NSString *action = (NSString*)context; + +// NSLog(@"[INFO] object key value = %@ for %@",keyPath,object); + if([action isEqualToString:@"ANSELECTED"]) { - BOOL flag = [[change valueForKey:@"new"] boolValue]; + //BOOL flag = [[change valueForKey:@"new"] boolValue]; if ([object isKindOfClass:[MKPinAnnotationView class]]) { MKPinAnnotationView *pinview = (MKPinAnnotationView*)object; NSString *title = [[pinview reuseIdentifier] stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"]; TitaniumHost * theHost = [TitaniumHost sharedHost]; NSString * pathString = [self javaScriptPath]; - NSString * commandString = [NSString stringWithFormat:@"%@.onClick('click',{type:'click',title:'%@','new':%d});",pathString,title,flag]; + NSString * commandString = [NSString stringWithFormat:@"%@.onEvent('click',{source:'annotation',type:'click',title:'%@'});",pathString,title]; [theHost sendJavascript:commandString toPagesWithTokens:listeningWebContextTokens update:YES]; } } } +- (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)aview calloutAccessoryControlTapped:(UIControl *)control +{ + if ([control isKindOfClass:[UIButton class]]) + { + if (aview.leftCalloutAccessoryView == control) + { + NSString *title = [[aview reuseIdentifier] stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"]; + TitaniumHost * theHost = [TitaniumHost sharedHost]; + NSString * pathString = [self javaScriptPath]; + NSString * commandString = [NSString stringWithFormat:@"%@.onEvent('click',{source:'leftButton',type:'click',title:'%@'});",pathString,title]; + [theHost sendJavascript:commandString toPagesWithTokens:listeningWebContextTokens update:YES]; + } + else if (aview.rightCalloutAccessoryView == control) + { + NSString *title = [[aview reuseIdentifier] stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"]; + TitaniumHost * theHost = [TitaniumHost sharedHost]; + NSString * pathString = [self javaScriptPath]; + NSString * commandString = [NSString stringWithFormat:@"%@.onEvent('click',{source:'rightButton',type:'click',title:'%@'});",pathString,title]; + [theHost sendJavascript:commandString toPagesWithTokens:listeningWebContextTokens update:YES]; + } + else + { + NSLog(@"[INFO] clicked on center button"); + } + } +} + +-(UIButton*)makeButton:(NSString*)url +{ + int type = barButtonSystemItemForString(url); + if (type == UITitaniumNativeItemNone) + { + TitaniumHost * theHost = [TitaniumHost sharedHost]; + UIImage *image = [theHost imageForResource:url]; + CGSize size = [image size]; + UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; + button.frame = CGRectMake(0,0,size.width,size.height); + button.backgroundColor = [UIColor clearColor]; + [button setImage:image forState:UIControlStateNormal]; + [image autorelease]; + return button; + } + return [UIButton buttonWithType:type]; +} + - (MKAnnotationView *) mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnnotation>) annotation { if ([annotation isKindOfClass:[MapViewAnnotation class]]) { MapViewAnnotation *ann = (MapViewAnnotation*)annotation; - MKPinAnnotationView *annView=[[MKPinAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:[ann title]]; - annView.pinColor = [ann pincolor]; - annView.animatesDrop = [ann animate]; - annView.canShowCallout = YES; - annView.calloutOffset = CGPointMake(-5, 5); - [annView addObserver:self - forKeyPath:@"selected" - options:NSKeyValueObservingOptionNew - context:@"ANSELECTED"]; + MKPinAnnotationView *annView =(MKPinAnnotationView*) [mapView dequeueReusableAnnotationViewWithIdentifier:[ann title]]; + if (annView==nil) + { + annView=[[MKPinAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:[ann title]]; + annView.pinColor = [ann pincolor]; + annView.animatesDrop = [ann animate]; + annView.canShowCallout = YES; + annView.calloutOffset = CGPointMake(-5, 5); + annView.enabled = YES; + if (ann.leftButton) + { + annView.leftCalloutAccessoryView = [self makeButton:ann.leftButton]; + } + if (ann.rightButton) + { + annView.rightCalloutAccessoryView = [self makeButton:ann.rightButton]; + } + annView.userInteractionEnabled = YES; + [annView addObserver:self + forKeyPath:@"selected" + options:NSKeyValueObservingOptionNew + context:@"ANSELECTED"]; + } + return annView; } return nil; } +/* +- (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)views +{ + NSLog(@"[INFO] MapKit annotation view added"); +}*/ + +- (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated +{ + TitaniumHost * theHost = [TitaniumHost sharedHost]; + NSString * pathString = [self javaScriptPath]; + MKCoordinateRegion aregion = [mapView region]; + NSDictionary * props = [NSDictionary dictionaryWithObjectsAndKeys: + @"regionChanged",@"type", + [NSNumber numberWithDouble:aregion.center.latitude],@"latitude", + [NSNumber numberWithDouble:aregion.center.longitude],@"longitude", + [NSNumber numberWithDouble:aregion.span.latitudeDelta],@"latitudeDelta", + [NSNumber numberWithDouble:aregion.span.longitudeDelta],@"longitudeDelta",nil]; + + SBJSON *json = [[[SBJSON alloc] init] autorelease]; + NSString * commandString = [NSString stringWithFormat:@"%@.onEvent('regionChanged',%@);",pathString,[json stringWithObject:props error:nil]]; + [theHost sendJavascript:commandString toPagesWithTokens:listeningWebContextTokens update:YES]; +} + +/* +- (void)mapViewWillStartLoadingMap:(MKMapView *)mapView +{ + NSLog(@"[INFO] MapKit load map started"); +}*/ + +- (void)mapViewDidFailLoadingMap:(MKMapView *)mapView withError:(NSError *)error +{ + NSLog(@"[ERROR] MapKit load map failed = %@",[error description]); + TitaniumHost * theHost = [TitaniumHost sharedHost]; + NSString * pathString = [self javaScriptPath]; + NSDictionary * props = [NSDictionary dictionaryWithObjectsAndKeys: + @"error",@"type", + [error description],@"message",nil]; + + SBJSON *json = [[[SBJSON alloc] init] autorelease]; + NSString * commandString = [NSString stringWithFormat:@"%@.onEvent('error',%@);",pathString,[json stringWithObject:props error:nil]]; + [theHost sendJavascript:commandString toPagesWithTokens:listeningWebContextTokens update:YES]; +} + +/* +- (void)mapViewDidFinishLoadingMap:(MKMapView *)mapView +{ + NSLog(@"[INFO] MapKit load map finished"); +}*/ + - (void)reverseGeocoder:(MKReverseGeocoder *)geocoder didFailWithError:(NSError *)error{ } @@ -356,9 +488,13 @@ } } +-(void)addAnnotation:(NSDictionary*)dict +{ +} + -(void) configure { - NSString * createViewString = @"function(args){var res=Ti.UI.createView(args);res._TYPE='map'; if(!Ti.Map._VIEWS){Ti.Map._VIEWS={};} Ti.Map._VIEWS[res._TOKEN]=res; res.onClick=Ti._ONEVT; res._EVT = {click:[]}; res.addEventListener=Ti._ADDEVT; res.removeEventListener = Ti._REMEVT; res.setLocation=function(obj){Ti.Map._SETLOC(obj,res._TOKEN);}; res.setMapType=function(type){Ti.Map._SETMAP(type,res._TOKEN);}; return res;}"; + NSString * createViewString = @"function(args){var res=Ti.UI.createView(args);res._TYPE='map'; if(!Ti.Map._VIEWS){Ti.Map._VIEWS={};} Ti.Map._VIEWS[res._TOKEN]=res; res.onEvent=Ti._ONEVT; res._EVT = {click:[]}; res.addEventListener=Ti._ADDEVT; res.removeEventListener = Ti._REMEVT; res.setLocation=function(obj){Ti.Map._SETLOC(obj,res._TOKEN);}; res.setMapType=function(type){Ti.Map._SETMAP(type,res._TOKEN);}; return res;}"; [self registerContentViewController:[MapViewController class] forToken:@"map"]; [self bindProperty:@"STANDARD_TYPE" value:[NSNumber numberWithUnsignedInteger:MKMapTypeStandard]]; iphone/modules/MapModule/MapModule.m @@ -12,32 +12,6 @@ #define PICKER_SELECTROW 0 -enum { - UITitaniumNativeStyleBar = -32, - UITitaniumNativeStyleBig = -33, - UITitaniumNativeStyleDark = -34, -}; - -enum { //MUST BE NEGATIVE, as it inhabits the same space as UIBarButtonSystemItem - UITitaniumNativeItemNone = -1, //Also is a bog-standard button. - UITitaniumNativeItemSpinner = -2, - UITitaniumNativeItemProgressBar = -3, - - UITitaniumNativeItemSlider = -4, - UITitaniumNativeItemSwitch = -5, - UITitaniumNativeItemMultiButton = -6, - UITitaniumNativeItemSegmented = -7, - - UITitaniumNativeItemTextView = -8, - UITitaniumNativeItemTextField = -9, - UITitaniumNativeItemSearchBar = -10, - - UITitaniumNativeItemPicker = -11, - UITitaniumNativeItemDatePicker = -12, - - UITitaniumNativeItemInfoLight = -13, - UITitaniumNativeItemInfoDark = -14, -}; BOOL TitaniumPrepareAnimationsForView(NSDictionary * optionObject, UIView * view); iphone/modules/UiModule/NativeControlProxy.h @@ -33,51 +33,6 @@ BOOL TitaniumPrepareAnimationsForView(NSDictionary * optionObject, UIView * view return YES; } -NSDictionary * barButtonSystemItemForStringDict = nil; - -int barButtonSystemItemForString(NSString * inputString){ - if (barButtonSystemItemForStringDict == nil) { - barButtonSystemItemForStringDict = [[NSDictionary alloc] initWithObjectsAndKeys: - [NSNumber numberWithInt:UIBarButtonSystemItemAction],@"action", - [NSNumber numberWithInt:UIBarButtonSystemItemBookmarks],@"bookmarks", - [NSNumber numberWithInt:UIBarButtonSystemItemCamera],@"camera", - [NSNumber numberWithInt:UIBarButtonSystemItemCompose],@"compose", - [NSNumber numberWithInt:UIBarButtonSystemItemDone],@"done", - [NSNumber numberWithInt:UIBarButtonSystemItemCancel],@"cancel", - [NSNumber numberWithInt:UIBarButtonSystemItemEdit],@"edit", - [NSNumber numberWithInt:UIBarButtonSystemItemSave],@"save", - [NSNumber numberWithInt:UIBarButtonSystemItemAdd],@"add", - [NSNumber numberWithInt:UIBarButtonSystemItemFlexibleSpace],@"flexiblespace", - [NSNumber numberWithInt:UIBarButtonSystemItemFixedSpace],@"fixedspace", - [NSNumber numberWithInt:UIBarButtonSystemItemReply],@"reply", - [NSNumber numberWithInt:UIBarButtonSystemItemOrganize],@"organize", - [NSNumber numberWithInt:UIBarButtonSystemItemSearch],@"search", - [NSNumber numberWithInt:UIBarButtonSystemItemRefresh],@"refresh", - [NSNumber numberWithInt:UIBarButtonSystemItemStop],@"stop", - [NSNumber numberWithInt:UIBarButtonSystemItemTrash],@"trash", - [NSNumber numberWithInt:UIBarButtonSystemItemPlay],@"play", - [NSNumber numberWithInt:UIBarButtonSystemItemPause],@"pause", - [NSNumber numberWithInt:UIBarButtonSystemItemRewind],@"rewind", - [NSNumber numberWithInt:UIBarButtonSystemItemFastForward],@"fastforward", - [NSNumber numberWithInt:UITitaniumNativeItemSpinner],@"activity", - [NSNumber numberWithInt:UITitaniumNativeItemSlider],@"slider", - [NSNumber numberWithInt:UITitaniumNativeItemSwitch],@"switch", - [NSNumber numberWithInt:UITitaniumNativeItemPicker],@"picker", - [NSNumber numberWithInt:UITitaniumNativeItemDatePicker],@"datepicker", - [NSNumber numberWithInt:UITitaniumNativeItemTextField],@"text", - [NSNumber numberWithInt:UITitaniumNativeItemTextView],@"textarea", - [NSNumber numberWithInt:UITitaniumNativeItemSearchBar],@"search", - [NSNumber numberWithInt:UITitaniumNativeItemMultiButton],@"multibutton", - [NSNumber numberWithInt:UITitaniumNativeItemSegmented],@"segmented", - [NSNumber numberWithInt:UITitaniumNativeItemInfoLight],@"infolight", - [NSNumber numberWithInt:UITitaniumNativeItemInfoDark],@"infodark", - [NSNumber numberWithInt:UITitaniumNativeItemProgressBar],@"progressbar", - nil]; - } - NSNumber * result = [barButtonSystemItemForStringDict objectForKey:[inputString lowercaseString]]; - if (result != nil) return [result intValue]; - return UITitaniumNativeItemNone; -} @interface PickerColumnWrapper : NSObject { @@ -1221,7 +1176,7 @@ needsRefreshing = YES; \ NSString * const systemButtonString = @"{ACTION:'action',ACTIVITY:'activity',CAMERA:'camera',COMPOSE:'compose',BOOKMARKS:'bookmarks'," "SEARCH:'search',ADD:'add',TRASH:'trash',ORGANIZE:'organize',REPLY:'reply',STOP:'stop',REFRESH:'refresh'," "PLAY:'play',FAST_FORWARD:'fastforward',PAUSE:'pause',REWIND:'rewind',EDIT:'edit',CANCEL:'cancel'," - "SAVE:'save',DONE:'done',FLEXIBLE_SPACE:'flexiblespace',FIXED_SPACE:'fixedspace',INFO_LIGHT:'infolight',INFO_DARK:'infodark'}"; + "SAVE:'save',DONE:'done',FLEXIBLE_SPACE:'flexiblespace',FIXED_SPACE:'fixedspace',INFO_LIGHT:'infolight',INFO_DARK:'infodark',DISCLOSURE:'disclosure'}"; NSString * const createButtonString = @"function(args,btnType){var res={" iphone/modules/UiModule/NativeControlProxy.m @@ -48,7 +48,8 @@ def zip_it(dist_dir,osname,version): android_jar = os.path.join(cur_dir,'android','titanium','bin','titanium.jar') - zf.write(android_jar,'%s/android/titanium.jar' % basepath) + if os.path.exists(android_jar): + zf.write(android_jar,'%s/android/titanium.jar' % basepath) if osname == "osx": sys.path.append(iphone_dir) package.py 98d0c64be52623ca998bda191e58621538b22e19 Jeff Haynie jhaynie@gmail.com http://github.com/appcelerator/titanium_mobile/commit/443c9dcb2334a6024b2a6b6ee8ee0f64350645ba 443c9dcb2334a6024b2a6b6ee8ee0f64350645ba 2009-10-24T17:05:41-07:00 2009-10-24T17:05:41-07:00 - scons improvement to try and make it faster to build single library for testing - move out constants from UI module that need to be used by other UI-type modules - improve mapping to support left/right images, system buttons - improve mapping by adding additional events that are captured like regionChanged - improve mapping to support left/right/center click events - added disclosure type system button 19443d48af8d0815d30fcdc19be585e489076077 Jeff Haynie jhaynie@gmail.com