fixed call to - (void)textField:(TTPickerTextField*)textField didAddC…

…ellAtIndex:(NSInteger)cellIndex to get right index fixed black nav bar
facebookarchive · Nov 9, 2010 · 741fc1c · 741fc1c
1 parent 897cf61
commit 741fc1c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 284 deletions.
diff --git a/samples/TTCatalog/Classes/MockDataSource.m b/samples/TTCatalog/Classes/MockDataSource.m
@@ -12,285 +12,6 @@ @implementation MockAddressBook
 
 + (NSMutableArray*)fakeNames {
   return [NSMutableArray arrayWithObjects:
-  @"Hector Lewis",
-  @"Juanita Fredrick",
-  @"Richard Raymond",
-  @"Marcia Myer",
-  @"Shannon Mahoney",
-  @"James Steiner",
-  @"Daniel Lloyd",
-  @"Fredrick Hutchins",
-  @"Tracey Smith",
-  @"Brandon Rutherford",
-  @"Megan Lopez",
-  @"Jean Trujillo",
-  @"Franklin Diamond",
-  @"Mildred Jacobsen",
-  @"Sandra Adams",
-  @"Debra Pugliese",
-  @"Cynthia Hall",
-  @"Joshua Hicks",
-  @"Lorenzo Evatt",
-  @"Erica Dozier",
-  @"Barbara Lazarus",
-  @"Joye Hocker",
-  @"Henry Arana",
-  @"Glen Cabrales",
-  @"Mai Valdez",
-  @"Travis Book",
-  @"John Ibanez",
-  @"Barbara White",
-  @"Cassandra Smith",
-  @"Virginia Costilla",
-  @"Rachel Baker",
-  @"Mildred Foley",
-  @"Todd Nevels",
-  @"William Boes",
-  @"Claire Harrell",
-  @"Charlotte Espinoza",
-  @"Gerald Miller",
-  @"Lucille Lankford",
-  @"Lloyd Fritz",
-  @"Charlie Cabrera",
-  @"Shane Vogt",
-  @"Cynthia Simon",
-  @"Clayton Land",
-  @"Roy Stahl",
-  @"Helen Peralta",
-  @"Reinaldo Self",
-  @"Thomas Carter",
-  @"Anthony Hebert",
-  @"Timothy Abernathy",
-  @"Rob Magruder",
-  @"Ira Kaplan",
-  @"Dixie Gurney",
-  @"Darrin Pritchard",
-  @"Patrick Brooks",
-  @"Norman Sanchez",
-  @"Vickie Robbins",
-  @"Santiago Chiles",
-  @"Douglas Bearden",
-  @"Cora Jones",
-  @"Donald Kennedy",
-  @"Henry Nelson",
-  @"Rosa Judge",
-  @"Andrew Khan",
-  @"Lauretta Rose",
-  @"Mildred Nance",
-  @"Antoinette Delarosa",
-  @"Stephanie Johnson",
-  @"Geoffrey Perry",
-  @"Sally Houston",
-  @"Pamela Pellegrin",
-  @"Nereida Faul",
-  @"Nichole Moore",
-  @"David Thompson",
-  @"Rob Burt",
-  @"Mary Gelb",
-  @"Glenda Stgeorge",
-  @"Lydia Freeman",
-  @"Otto Brown",
-  @"Erica Cooke",
-  @"Evelyn Stephens",
-  @"Vanessa Ayers",
-  @"Jeffrey Kirk",
-  @"Christine Stradford",
-  @"John Murphy",
-  @"Paul Pederson",
-  @"Genevieve Barrett",
-  @"Stanley Kelly",
-  @"Marie Noel",
-  @"Mike Mathis",
-  @"Albert Gary",
-  @"Alice Thomas",
-  @"Anna Bond",
-  @"Bobby Gaines",
-  @"Helen Ellis",
-  @"Bobbie Thayer",
-  @"Dorothy Totten",
-  @"Laura Wegener",
-  @"Pam Hackett",
-  @"Arlene Blount",
-  @"James Clark",
-  @"Richard Harris",
-  @"Joseph Cain",
-  @"Stacy Jones",
-  @"Bonnie Gonzalez",
-  @"Maria Bailey",
-  @"Francis Caldwell",
-  @"Anthony Gale",
-  @"John Zackery",
-  @"Patricia Taylor",
-  @"Kimberly Jarrett",
-  @"Carol Dennie",
-  @"Betty Zager",
-  @"Ellen Godines",
-  @"Edward Adams",
-  @"Ricky Salamanca",
-  @"Elizabeth Ruvalcaba",
-  @"Veronica Esposito",
-  @"Russel Owen",
-  @"Harry Plascencia",
-  @"Thomas Dewalt",
-  @"Robert Eldred",
-  @"Frank Buerger",
-  @"Phillip James",
-  @"James Beverly",
-  @"Michael Mcallister",
-  @"George Nichols",
-  @"Richard Larson",
-  @"Patricia Ramirez",
-  @"Rob Govan",
-  @"Charles Johnston",
-  @"David Rogers",
-  @"Homer Allen",
-  @"Carolyn Green",
-  @"Velma Beery",
-  @"Ida Garcia",
-  @"Jasmine Creighton",
-  @"Ozie Templin",
-  @"Julia Hudson",
-  @"David Cortez",
-  @"Tina Henderson",
-  @"Janette Bray",
-  @"Michael Hamilton",
-  @"Andrew Bennett",
-  @"Margarita Lehmann",
-  @"Stephanie Whitehead",
-  @"Mary Saladino",
-  @"Nicholas Alaniz",
-  @"John Escobedo",
-  @"Macie Workman",
-  @"Michelle Thomas",
-  @"Robert Carvalho",
-  @"Allen Johnson",
-  @"Will Norris",
-  @"Matthew Mabrey",
-  @"Vicki Howard",
-  @"Annie Campbell",
-  @"Stephen Anderson",
-  @"Leah Scott",
-  @"Dominic Winters",
-  @"Catherine Rondeau",
-  @"Amanda Hall",
-  @"Michael Hucks",
-  @"Truman Vidal",
-  @"Jennifer Worley",
-  @"Jack Fiore",
-  @"Douglas Irby",
-  @"Ana Bonilla",
-  @"Jacob Lankford",
-  @"Robert Garcia",
-  @"Helene Arispe",
-  @"Ola Barnhill",
-  @"Rosario Delaney",
-  @"Robert Estes",
-  @"Karen Carter",
-  @"Hazel Thompson",
-  @"Rebecca Mack",
-  @"Lashawn Rice",
-  @"Harry Davis",
-  @"Matilda Woodbury",
-  @"Celia Barnhart",
-  @"Ava Murray",
-  @"John Williams",
-  @"Debbie Watts",
-  @"Karen Borel",
-  @"Neta Yingst",
-  @"Roy Carter",
-  @"Leon Roberts",
-  @"Evette Jones",
-  @"Dianna Adams",
-  @"Brian Reed",
-  @"Joyce Ritter",
-  @"Stephen Diaz",
-  @"Elizabeth Shealey",
-  @"Barbara Hatch",
-  @"Doug Harrison",
-  @"Sharon Castro",
-  @"Juan Frakes",
-  @"Gary Berry",
-  @"Helen Zamora",
-  @"Sarah Woodard",
-  @"Phillip Hebert",
-  @"Weldon Goldsmith",
-  @"Lisa Segura",
-  @"Adrienne Pedroza",
-  @"Alfred Ransom",
-  @"Everett Rambo",
-  @"John Phillips",
-  @"Carol Mccabe",
-  @"James Martinez",
-  @"Trang Strickland",
-  @"Linda Brown",
-  @"Shayla Hodgson",
-  @"Magdalena Moore",
-  @"Gwendolyn Meyers",
-  @"Stephen Williams",
-  @"Pamela Radford",
-  @"Jeffrey Hooker",
-  @"David Catania",
-  @"Marvin Miller",
-  @"Laura Murray",
-  @"Dorothy James",
-  @"Susannah Gibson",
-  @"Melissa Owens",
-  @"Deborah Horrell",
-  @"Franklin Williams",
-  @"Scott Brown",
-  @"Adam Gautreaux",
-  @"Joseph Byers",
-  @"Deborah Barker",
-  @"Linda Virgin",
-  @"Patricia Mitchell",
-  @"John Donovan",
-  @"Robert Hamill",
-  @"Jamel Mcmillen",
-  @"Patty Guzzi",
-  @"Mildred Leon",
-  @"Benjamin Mapes",
-  @"Allen Cave",
-  @"Patrick Sims",
-  @"Patrick Mercado",
-  @"Joyce Orozco",
-  @"Gloria Bell",
-  @"Gerard Kelley",
-  @"Molly Grant",
-  @"Patrick Perez",
-  @"John Corey",
-  @"Ryan Clemmer",
-  @"James Davis",
-  @"Kevin Scarborough",
-  @"Frankie Montagna",
-  @"Terry Joseph",
-  @"Ira Boyle",
-  @"Kathryn Hildebrandt",
-  @"James Larson",
-  @"Shelia Easter",
-  @"Gabriel Dorsett",
-  @"Irene Mcbroom",
-  @"Robert Hardin",
-  @"Sue Grossi",
-  @"Rebecca Stock",
-  @"Ruby Kiefer",
-  @"John Sandoval",
-  @"Peter King",
-  @"Joseph Fleming",
-  @"Joan Swenson",
-  @"Conrad Savory",
-  @"Grant Kowalewski",
-  @"Shirley Garcia",
-  @"Dorris West",
-  @"Jane Tran",
-  @"Meaghan Lam",
-  @"Jorge White",
-  @"Catherine Whittaker",
-  @"Katherine Hope",
-  @"Maria Underwood",
-  @"Rose Ray",
-  @"Samatha Sedlacek",
-  @"Jerri Sampson",
-  @"Loren Bourdeau",
   @"William Wilson",
   @"Stephen Canady",
   @"Elaine Ruth",

diff --git a/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj b/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj
@@ -744,6 +744,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTCatalog" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -994,7 +995,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				INFOPLIST_FILE = Info.plist;
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos4.1;
 			};
 			name = Debug;
 		};

diff --git a/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj b/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
@@ -581,7 +581,14 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTFacebook" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectReferences = (
@@ -855,7 +862,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				INFOPLIST_FILE = "TTFacebook-Info.plist";
-				SDKROOT = iphoneos3.0;
+				SDKROOT = iphoneos4.1;
 			};
 			name = Debug;
 		};

diff --git a/samples/TTTwitter/TTTwitter.xcodeproj/project.pbxproj b/samples/TTTwitter/TTTwitter.xcodeproj/project.pbxproj
@@ -534,7 +534,14 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTTwitter" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectReferences = (

diff --git a/samples/UI/TTNibDemo/TTNibDemo.xcodeproj/project.pbxproj b/samples/UI/TTNibDemo/TTNibDemo.xcodeproj/project.pbxproj
@@ -534,6 +534,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TTNibDemo" */;
 			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,

diff --git a/src/Three20UI/Sources/TTPickerTextField.m b/src/Three20UI/Sources/TTPickerTextField.m
@@ -415,7 +415,7 @@ - (void)addCellWithObject:(id)object {
 
   SEL sel = @selector(textField:didAddCellAtIndex:);
   if ([self.delegate respondsToSelector:sel]) {
-    [self.delegate performSelector:sel withObject:self withObject:(id)_cellViews.count-1];
+    [self.delegate performSelector:sel withObject:self withObject:(id)(_cellViews.count-1)];
   }
 }
 

diff --git a/src/Three20UICommon/Sources/TTBaseViewController.m b/src/Three20UICommon/Sources/TTBaseViewController.m
@@ -164,8 +164,15 @@ - (void)viewWillAppear:(BOOL)animated {
 
   if (!self.popupViewController) {
     UINavigationBar* bar = self.navigationController.navigationBar;
-    bar.tintColor = _navigationBarTintColor;
-    bar.barStyle = _navigationBarStyle;
+
+	if (_navigationBarTintColor == [UIColor blackColor] && _navigationBarStyle == UIBarStyleDefault) {
+	  bar.barStyle = UIBarStyleBlack;
+	  bar.tintColor = nil;
+	}
+	else {
+	  bar.tintColor = _navigationBarTintColor;
+	  bar.barStyle = _navigationBarStyle;
+	}
     [[UIApplication sharedApplication] setStatusBarStyle:_statusBarStyle animated:YES];
   }
 }