@@ -165,7 +165,7 @@ UIColor * checkmarkColor = nil; NSDictionary * inputProxyDict = [propDict objectForKey:@"input"]; if ([inputProxyDict isKindOfClass:[NSDictionary class]]){ UiModule * theUiModule = (UiModule *)[[TitaniumHost sharedHost] moduleNamed:@"UiModule"]; - UIButtonProxy * thisInputProxy = [theUiModule proxyForObject:inputProxyDict]; + UIButtonProxy * thisInputProxy = [theUiModule proxyForObject:inputProxyDict recurse:YES]; if (thisInputProxy != nil) [self setInputProxy:thisInputProxy]; } } iphone/Classes/TitaniumTableViewController.m @@ -211,6 +211,7 @@ NSString * const ControllerString = @"Controller"; if ([backgroundImageName isKindOfClass:NSStringClass]){ [self setBackgroundImage:[theTiHost imageForResource:backgroundImageName]]; } + id orientationObject = [inputState objectForKey:@"orientation"]; if (orientationObject != nil) { @@ -233,6 +234,11 @@ NSString * const ControllerString = @"Controller"; if ([fullScreenObject respondsToSelector:@selector(boolValue)]) { [self setFullscreen:[fullScreenObject boolValue]]; } + + id hidesBackObject = [inputState objectForKey:@"isPrimary"]; + if ([hidesBackObject respondsToSelector:@selector(boolValue)]) { + [[self navigationItem] setHidesBackButton:[hidesBackObject boolValue]]; + } [self setStatusBarStyleObject:[inputState objectForKey:@"statusBarStyle"]]; iphone/Classes/TitaniumViewController.m @@ -27,7 +27,7 @@ var btn5 = Ti.UI.createButton({title:'Moo'}); btn5.addEventListener('click',function(){Ti.UI.currentWindow.setFullscreen(true);}); - var btn6 = Ti.UI.createTextField({value:'Texty!',div:'sliderPlace',color:'red',backgroundColor:'blue',borderColor:'green'}); + var btn6 = Ti.UI.createTextArea({value:'Texty!',div:'sliderPlace',keyboardType:Ti.UI.KEYBOARD_EMAIL_ADDRESS,textAlign:'center',color:'red',backgroundColor:'blue',borderColor:'green'}); // btn6.width=100; btn6.addEventListener('change',function(foo){document.getElementById('sliderValue').innerHTML='Newvalue' + foo.value;}); // btn6.addEventListener('valuechange',function(foo){ iphone/Resources/ui.html @@ -34,6 +34,27 @@ NSArray * segmentLabelArray; NSArray * segmentImageArray; + //For texts + UITextAutocapitalizationType autocapitalizationType; // default is UITextAutocapitalizationTypeNone + UITextAutocorrectionType autocorrectionType; // default is UITextAutocorrectionTypeDefault + UIKeyboardType keyboardType; // default is UIKeyboardTypeDefault + UIKeyboardAppearance keyboardAppearance; // default is UIKeyboardAppearanceDefault + UIReturnKeyType returnKeyType; // default is UIReturnKeyDefault (See note under UIReturnKeyType enum) + BOOL enablesReturnKeyAutomatically; // default is NO (when YES, will automatically disable return key when text widget has zero-length contents, and will automatically enable when text widget has non-zero-length contents) + BOOL secureTextEntry; // default is NO + UITextAlignment textAlignment; + UITextBorderStyle borderStyle; + BOOL clearsOnBeginEditing; + UITextFieldViewMode clearButtonMode; + UIButtonProxy *leftViewProxy; + UITextFieldViewMode leftViewMode; + UIButtonProxy *rightViewProxy; + UITextFieldViewMode rightViewMode; + + + + NSString * placeholderText; + //Yes, even integer and bools are represented as floats. float minValue; //Default is 0 float maxValue; //Default is 1 @@ -71,6 +92,14 @@ @property(nonatomic,readwrite,assign) float floatValue; @property(nonatomic,readwrite,copy) NSString * stringValue; +@property(nonatomic,readwrite,copy) NSString * placeholderText; + +@property(nonatomic,readwrite,assign) UITextFieldViewMode leftViewMode; +@property(nonatomic,readwrite,assign) UITextFieldViewMode rightViewMode; +@property(nonatomic,readwrite,retain) UIButtonProxy *leftViewProxy; +@property(nonatomic,readwrite,retain) UIButtonProxy *rightViewProxy; + + - (IBAction) onClick: (id) sender; - (void) setPropertyDict: (NSDictionary *) newDict; @@ -89,7 +118,7 @@ - (void) setWindow:(NSString *)tokenString navSide:(id) isLeftObject button: (NSDictionary *) buttonObject options: (NSDictionary *) optionsObject; - (void) setWindow:(NSString *)tokenString toolbar: (id) barObject options: (id) optionsObject; -- (UIButtonProxy *) proxyForObject: (id) proxyObject; +- (UIButtonProxy *) proxyForObject: (id) proxyObject recurse: (BOOL) recursion; @end iphone/modules/UiModule/UiModule.h @@ -93,9 +93,9 @@ int barButtonSystemItemForString(NSString * inputString){ @implementation UIButtonProxy @synthesize nativeBarButton, segmentLabelArray, segmentImageArray; @synthesize titleString, iconPath, templateValue, barButtonStyle, nativeView, labelView, progressView; -@synthesize minValue,maxValue,floatValue,stringValue; +@synthesize minValue,maxValue,floatValue,stringValue, placeholderText; @synthesize elementColor, elementBorderColor, elementBackgroundColor; - +@synthesize leftViewProxy, rightViewProxy, leftViewMode, rightViewMode; - (id) init; { @@ -123,11 +123,11 @@ int barButtonSystemItemForString(NSString * inputString){ - (void) setPropertyDict: (NSDictionary *) newDict; { +//General purpose GRAB_IF_STRING(@"title",titleString); GRAB_IF_STRING(@"image",iconPath); - - GRAB_IF_SELECTOR(@"style",intValue,barButtonStyle); - + +//Sliders and other value-based things. GRAB_IF_SELECTOR(@"min",floatValue,minValue); GRAB_IF_SELECTOR(@"max",floatValue,maxValue); @@ -144,6 +144,7 @@ int barButtonSystemItemForString(NSString * inputString){ needsRefreshing = YES; } +//Segmented id labelArray = [newDict objectForKey:@"labels"]; if ([labelArray isKindOfClass:[NSArray class]]){ [self setSegmentLabelArray:labelArray]; @@ -158,6 +159,7 @@ int barButtonSystemItemForString(NSString * inputString){ [self setSegmentImageArray:nil]; } +//Colors id bgColorObject = [newDict objectForKey:@"backgroundColor"]; if (bgColorObject != nil)[self setElementBackgroundColor:UIColorWebColorNamed(bgColorObject)]; @@ -167,13 +169,13 @@ int barButtonSystemItemForString(NSString * inputString){ id borderColorObject = [newDict objectForKey:@"borderColor"]; if (borderColorObject != nil)[self setElementBorderColor:UIColorWebColorNamed(borderColorObject)]; - +//Sizes GRAB_IF_SELECTOR(@"width",floatValue,frame.size.width); GRAB_IF_SELECTOR(@"height",floatValue,frame.size.height); GRAB_IF_SELECTOR(@"x",floatValue,frame.origin.x); GRAB_IF_SELECTOR(@"y",floatValue,frame.origin.y); - +//System button id newTemplate = [newDict objectForKey:@"systemButton"]; if ([newTemplate isKindOfClass:[NSString class]]) { [self setTemplateValue:barButtonSystemItemForString(newTemplate)]; @@ -183,8 +185,43 @@ int barButtonSystemItemForString(NSString * inputString){ needsRefreshing = YES; } +//Tab bar stuff + GRAB_IF_SELECTOR(@"style",intValue,barButtonStyle); + +//Text view/field stuff + GRAB_IF_SELECTOR(@"autocapitalize",intValue,autocapitalizationType); + + GRAB_IF_SELECTOR(@"enableReturnKey",boolValue,enablesReturnKeyAutomatically); + + GRAB_IF_SELECTOR(@"returnKeyType",intValue,returnKeyType); + GRAB_IF_SELECTOR(@"keyboardType",intValue,keyboardType); + + id autoCorrectObject = [newDict objectForKey:@"autocorrect"]; + if ([autoCorrectObject respondsToSelector:@selector(boolValue)]){ + autocorrectionType = ([autoCorrectObject boolValue]?UITextAutocorrectionTypeYes:UITextAutocorrectionTypeNo); + } else if (autoCorrectObject == [NSNull null]) { + autocorrectionType = UITextAutocorrectionTypeDefault; + } + + GRAB_IF_STRING(@"hintText",placeholderText); + + id alignmentObject = [newDict objectForKey:@"textAlign"]; + if ([alignmentObject isKindOfClass:[NSString class]]){ + alignmentObject = [alignmentObject lowercaseString]; + if ([alignmentObject isEqualToString:@"left"]) textAlignment = UITextAlignmentLeft; + else if ([alignmentObject isEqualToString:@"center"]) textAlignment = UITextAlignmentCenter; + else if ([alignmentObject isEqualToString:@"right"]) textAlignment = UITextAlignmentRight; + } + + GRAB_IF_SELECTOR(@"clearOnEdit",boolValue,clearsOnBeginEditing); + + GRAB_IF_SELECTOR(@"borderStyle",intValue,borderStyle); + GRAB_IF_SELECTOR(@"clearButtonMode",intValue,clearButtonMode); + GRAB_IF_SELECTOR(@"leftButtonMode",intValue,leftViewMode); + GRAB_IF_SELECTOR(@"rightButtonMode",intValue,rightViewMode); + //Because the proxies are best from the UIModule itself, we don't check here. } - (BOOL) updateNativeView: (BOOL) forBar; @@ -245,6 +282,13 @@ int barButtonSystemItemForString(NSString * inputString){ resultView = [[UITextField alloc] initWithFrame:viewFrame]; [(UITextField *)resultView setDelegate:self]; } + [(UITextField *)resultView setBorderStyle:borderStyle]; + [(UITextField *)resultView setClearsOnBeginEditing:clearsOnBeginEditing]; + [(UITextField *)resultView setClearButtonMode:clearButtonMode]; + [(UITextField *)resultView setLeftViewMode:leftViewMode]; + [(UITextField *)resultView setLeftView:[leftViewProxy nativeView]]; + [(UITextField *)resultView setRightViewMode:rightViewMode]; + [(UITextField *)resultView setRightView:[rightViewProxy nativeView]]; } else { if ([nativeView isKindOfClass:[UITextView class]]){ resultView = [nativeView retain]; @@ -256,6 +300,12 @@ int barButtonSystemItemForString(NSString * inputString){ } if (elementColor != nil) [(UITextField *)resultView setTextColor:elementColor]; [(UITextField *)resultView setText:stringValue]; + [(UITextField *)resultView setAutocorrectionType:autocorrectionType]; + [(UITextField *)resultView setAutocapitalizationType:autocapitalizationType]; + [(UITextField *)resultView setTextAlignment:textAlignment]; + [(UITextField *)resultView setKeyboardType:keyboardType]; + [(UITextField *)resultView setReturnKeyType:returnKeyType]; + [(UITextField *)resultView setEnablesReturnKeyAutomatically:enablesReturnKeyAutomatically]; [resultView setBackgroundColor:elementBackgroundColor]; @@ -657,7 +707,7 @@ int barButtonSystemItemForString(NSString * inputString){ return buttonToken; } -- (UIButtonProxy *) proxyForObject: (id) proxyObject; +- (UIButtonProxy *) proxyForObject: (id) proxyObject recurse: (BOOL) recursion; { NSString * token = nil; if ([proxyObject isKindOfClass:[NSDictionary class]]){ @@ -669,6 +719,18 @@ int barButtonSystemItemForString(NSString * inputString){ if ([divAttributeDict isKindOfClass:[NSDictionary class]])[result setPropertyDict:divAttributeDict]; [result setPropertyDict:proxyObject]; + + if (recursion){ + id leftProxy = [proxyObject objectForKey:@"leftButton"]; + if (leftProxy != nil){ + [result setLeftViewProxy:[self proxyForObject:leftProxy recurse:NO]]; + } + id rightProxy = [proxyObject objectForKey:@"rightButton"]; + if (rightProxy != nil){ + [result setLeftViewProxy:[self proxyForObject:rightProxy recurse:NO]]; + } + } + return result; } else if ([proxyObject isKindOfClass:[NSString class]]){ @@ -812,7 +874,7 @@ int barButtonSystemItemForString(NSString * inputString){ UIButtonProxy * ourButton = nil; if ([buttonObject isKindOfClass:[NSDictionary class]]){ - ourButton = [self proxyForObject:buttonObject]; + ourButton = [self proxyForObject:buttonObject recurse:YES]; if (ourButton == nil) return; } else if ((buttonObject != nil) && (buttonObject != (id)[NSNull null])) { return; @@ -850,7 +912,7 @@ int barButtonSystemItemForString(NSString * inputString){ if ([barObject isKindOfClass:[NSArray class]]){ NSMutableArray *result = [NSMutableArray arrayWithCapacity:[barObject count]]; for (NSDictionary * thisButtonDict in barObject){ - UIButtonProxy * thisProxy = [self proxyForObject:thisButtonDict]; + UIButtonProxy * thisProxy = [self proxyForObject:thisButtonDict recurse:YES]; if (thisProxy == nil) return; [result addObject:thisProxy]; } @@ -867,7 +929,7 @@ int barButtonSystemItemForString(NSString * inputString){ TitaniumViewController * ourVC = [[TitaniumHost sharedHost] titaniumViewControllerForToken:tokenString]; if ((ourVC == nil) || ![viewObject isKindOfClass:dictClass]) return; - UIButtonProxy * ourNativeViewProxy = [self proxyForObject:viewObject]; + UIButtonProxy * ourNativeViewProxy = [self proxyForObject:viewObject recurse:YES]; if (ourNativeViewProxy == nil) return; [ourVC performSelectorOnMainThread:@selector(addNativeViewProxy:) withObject:ourNativeViewProxy waitUntilDone:NO]; @@ -1134,7 +1196,35 @@ int barButtonSystemItemForString(NSString * inputString){ [NSNumber numberWithInt:TitaniumViewControllerPortrait],@"PORTRAIT", [NSNumber numberWithInt:TitaniumViewControllerLandscape],@"LANDSCAPE", [NSNumber numberWithInt:TitaniumViewControllerLandscapeOrPortrait],@"PORTRAIT_AND_LANDSCAPE", - + [NSNumber numberWithInt:UIReturnKeyGo],@"RETURNKEY_GO", + [NSNumber numberWithInt:UIReturnKeyGoogle],@"RETURNKEY_GOOGLE", + [NSNumber numberWithInt:UIReturnKeyJoin],@"RETURNKEY_JOIN", + [NSNumber numberWithInt:UIReturnKeyNext],@"RETURNKEY_NEXT", + [NSNumber numberWithInt:UIReturnKeySearch],@"RETURNKEY_SEARCH", + [NSNumber numberWithInt:UIReturnKeySend],@"RETURNKEY_SEND", + [NSNumber numberWithInt:UIReturnKeyDone],@"RETURNKEY_DONE", + [NSNumber numberWithInt:UIReturnKeyDefault],@"RETURNKEY_DEFAULT", + [NSNumber numberWithInt:UIReturnKeyRoute],@"RETURNKEY_ROUTE", + [NSNumber numberWithInt:UIReturnKeyYahoo],@"RETURNKEY_YAHOO", + [NSNumber numberWithInt:UIReturnKeyEmergencyCall],@"RETURNKEY_EMERGENCY_CALL", + + [NSNumber numberWithInt:UIKeyboardTypeASCIICapable],@"KEYBOARD_ASCII", + [NSNumber numberWithInt:UIKeyboardTypeURL],@"KEYBOARD_URL", + [NSNumber numberWithInt:UIKeyboardTypePhonePad],@"KEYBOARD_PHONE_PAD", + [NSNumber numberWithInt:UIKeyboardTypeNumbersAndPunctuation],@"KEYBOARD_NUMBERS_PUNCTUATION", + [NSNumber numberWithInt:UIKeyboardTypeNumberPad],@"KEYBOARD_NUMBER_PAD", + [NSNumber numberWithInt:UIKeyboardTypeEmailAddress],@"KEYBOARD_EMAIL_ADDRESS", + [NSNumber numberWithInt:UIKeyboardTypeDefault],@"KEYBOARD_DEFAULT", + + [NSNumber numberWithInt:UITextFieldViewModeNever],@"INPUT_BUTTONMODE_NEVER", + [NSNumber numberWithInt:UITextFieldViewModeAlways],@"INPUT_BUTTONMODE_ALWAYS", + [NSNumber numberWithInt:UITextFieldViewModeWhileEditing],@"INPUT_BUTTONMODE_ONFOCUS", + [NSNumber numberWithInt:UITextFieldViewModeUnlessEditing],@"INPUT_BUTTONMODE_ONBLUR", + + [NSNumber numberWithInt:UITextBorderStyleNone],@"INPUT_BORDERSTYLE_NONE", + [NSNumber numberWithInt:UITextBorderStyleLine],@"INPUT_BORDERSTYLE_LINE", + [NSNumber numberWithInt:UITextBorderStyleBezel],@"INPUT_BORDERSTYLE_BEZEL", + [NSNumber numberWithInt:UITextBorderStyleRoundedRect],@"INPUT_BORDERSTYLE_ROUNDED", [NSDictionary dictionaryWithObjectsAndKeys: [TitaniumJSCode codeWithString:createGroupedViewString],@"createGroupedView", iphone/modules/UiModule/UiModule.m c2862e763b41d32e9df14310eafe52b67cddde1e Blain Hamon blain@Millenium-Falcon.local http://github.com/appcelerator/titanium_mobile/commit/edf2da9ac80a8599001bf66e2900d74cd8a04e6c edf2da9ac80a8599001bf66e2900d74cd8a04e6c 2009-06-30T19:52:08-07:00 2009-06-30T19:52:08-07:00 Text field properties implemented 0a15a0270a79cdcd93366b14551f13e4cadef1fc Blain Hamon blain@Millenium-Falcon.local