Minor changes to match current version.

6 files changed, 61 insertions, 26 deletions

diff --git a/iphone/FixMyStreet/AboutView.xib b/iphone/FixMyStreet/AboutView.xib
index 9d5ffa765..2e5add074 100644
--- a/iphone/FixMyStreet/AboutView.xib
+++ b/iphone/FixMyStreet/AboutView.xib
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02">
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">672</string>
-		<string key="IBDocument.AppKitVersion">949.34</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
+		<string key="IBDocument.SystemVersion">9L31a</string>
+		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+		<string key="IBDocument.AppKitVersion">949.54</string>
+		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="IBProxyObject" id="372490531">
@@ -37,6 +45,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="201743607"/>
+								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<int key="IBUIContentMode">4</int>
@@ -49,6 +58,7 @@
 						</object>
 						<string key="NSFrameSize">{341, 80}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -63,6 +73,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 108}, {280, 143}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEgMAA</bytes>
@@ -73,7 +84,8 @@
 						<string type="base64-UTF8" key="IBUIText">Rml4TXlTdHJlZXQgZm9yIGlQaG9uZSB3YXMgd3JpdHRlbiBmb3IgbXlTb2NpZXR5IGJ5IE1hdHRoZXcg
 U29tZXJ2aWxsZS4gbXlTb2NpZXR5IGlzIHJ1biBieSBhIHJlZ2lzdGVyZWQgY2hhcml0eSDigJMgaWYg
 eW91IGxpa2UgdGhpcyBhcHBsaWNhdGlvbiwgcGxlYXNlIGRvbmF0ZSB0byB1cyBzbyB0aGF0IHdlIGNh
-biBidWlsZCBtb3JlIGNvb2wgdGhpbmdzIGxpa2UgdGhpcyBpbiB0aGUgZnV0dXJlLg</string>
+biBidWlsZCBtb3JlIGNvb2wgYW5kIHVzZWZ1bCB0aGluZ3MgbGlrZSB0aGlzIGluIHRoZSBmdXR1cmUu
+A</string>
 						<object class="NSFont" key="IBUIFont">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">1.700000e+01</double>
@@ -93,6 +105,7 @@ biBidWlsZCBtb3JlIGNvb2wgdGhpbmdzIGxpa2UgdGhpcyBpbiB0aGUgZnV0dXJlLg</string>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{82, 296}, {156, 86}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -115,10 +128,15 @@ biBidWlsZCBtb3JlIGNvb2wgdGhpbmdzIGxpa2UgdGhpcyBpbiB0aGUgZnV0dXJlLg</string>
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 						</object>
+						<object class="NSColor" key="IBUINormalTitleShadowColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 416}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -289,5 +307,6 @@ biBidWlsZCBtb3JlIGNvb2wgdGhpbmdzIGxpa2UgdGhpcyBpbiB0aGUgZnV0dXJlLg</string>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">3.0</string>
 	</data>
 </archive>
diff --git a/iphone/FixMyStreet/Classes/AboutViewController.m b/iphone/FixMyStreet/Classes/AboutViewController.m
index dcf6d5756..8f6e8a228 100644
--- a/iphone/FixMyStreet/Classes/AboutViewController.m
+++ b/iphone/FixMyStreet/Classes/AboutViewController.m
@@ -25,7 +25,7 @@
     [super viewDidLoad];
 	self.title = @"About";
 	self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
-	donateButton.font = [UIFont systemFontOfSize:32];
+	donateButton.titleLabel.font = [UIFont systemFontOfSize:32];
 }
 
 
diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.m b/iphone/FixMyStreet/Classes/InputTableViewController.m
index d77439aaa..7d336e115 100644
--- a/iphone/FixMyStreet/Classes/InputTableViewController.m
+++ b/iphone/FixMyStreet/Classes/InputTableViewController.m
@@ -43,6 +43,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
+	settingsButton.frame = CGRectMake(255, 350, 72, 73);
+
 	backButton = [[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonSystemItemCancel target:nil action:nil];
 	self.navigationItem.backBarButtonItem = backButton;
 
@@ -133,7 +135,7 @@
 		} else {
 			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 		}
-		cell.text = @"Take photo";
+		cell.textLabel.text = @"Take photo";
 		actionTakePhotoCell = cell;
 	} else if (indexPath.section == 2) {
 		if (delegate.latitude) {
@@ -147,7 +149,7 @@
 		} else {
 			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 		}
-		cell.text = @"Fetch location";
+		cell.textLabel.text = @"Fetch location";
 		actionFetchLocationCell = cell;
 	} else if (indexPath.section == 1) {
 		if (delegate.subject && delegate.subject.length) {
@@ -163,15 +165,15 @@
 				subjectContent.font = [UIFont systemFontOfSize:17];
 				[cell.contentView addSubview:subjectContent];
 			}
-			cell.text = nil;
+			cell.textLabel.text = nil;
 			subjectContent.text = delegate.subject;
 			subjectContent.hidden = NO;
 			cell.accessoryType = UITableViewCellAccessoryCheckmark;
 		} else {
 			subjectContent.hidden = YES;
 			subjectLabel.hidden = YES;
-			cell.text = @"Short summary of problem";
-			cell.textColor = [UIColor grayColor];
+			cell.textLabel.text = @"Short summary of problem";
+			cell.textLabel.textColor = [UIColor grayColor];
 			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 		}
 		actionSubjectCell = cell;
@@ -181,9 +183,9 @@
 		} else {
 			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 		}
-		cell.text = @"Your details";
+		cell.textLabel.text = @"Your details";
 	} else {
-		cell.text = @"Eh?";
+		cell.textLabel.text = @"Eh?";
 	}
 	return cell;
 }
@@ -215,7 +217,7 @@
 	BOOL photosAvailable = [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary];
 	if (!cameraAvailable && !photosAvailable) {
 		UITableViewCell *cell = [actionsToDoView cellForRowAtIndexPath:0]; // XXX
-		cell.text = @"No photo mechanism available";
+		cell.textLabel.text = @"No photo mechanism available";
 		return;
 	}
 	UIImagePickerController* picker = [[UIImagePickerController alloc] init];
diff --git a/iphone/FixMyStreet/Classes/SettingsViewController.m b/iphone/FixMyStreet/Classes/SettingsViewController.m
index a8a674ae3..c352f362a 100644
--- a/iphone/FixMyStreet/Classes/SettingsViewController.m
+++ b/iphone/FixMyStreet/Classes/SettingsViewController.m
@@ -139,15 +139,15 @@
 
 	if (text) {
 		label.hidden = NO;
-		cell.text = nil;
+		cell.textLabel.text = nil;
 		current.text = text;
 		current.hidden = NO;
 		// cell.accessoryType = UITableViewCellAccessoryCheckmark;
 	} else {
 		label.hidden = YES;
 		current.hidden = YES;
-		cell.text = placeholder;
-		cell.textColor = [UIColor grayColor];
+		cell.textLabel.text = placeholder;
+		cell.textLabel.textColor = [UIColor grayColor];
 		// cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
 		
diff --git a/iphone/FixMyStreet/Info.plist b/iphone/FixMyStreet/Info.plist
index 29c3ef529..fc58246b7 100644
--- a/iphone/FixMyStreet/Info.plist
+++ b/iphone/FixMyStreet/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/iphone/FixMyStreet/MainViewController.xib b/iphone/FixMyStreet/MainViewController.xib
index 726aa8eb2..42e12470a 100644
--- a/iphone/FixMyStreet/MainViewController.xib
+++ b/iphone/FixMyStreet/MainViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02">
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">672</string>
-		<string key="IBDocument.AppKitVersion">949.34</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
+		<string key="IBDocument.SystemVersion">9L31a</string>
+		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+		<string key="IBDocument.AppKitVersion">949.54</string>
+		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="1"/>
@@ -14,6 +14,15 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="IBProxyObject" id="372490531">
@@ -57,7 +66,7 @@
 					<object class="IBUIButton" id="323841673">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{272, 367}, {18, 19}}</string>
+						<string key="NSFrame">{{262, 357}, {18, 19}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -78,6 +87,10 @@
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 						</object>
+						<object class="NSColor" key="IBUINormalTitleShadowColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 416}</string>
@@ -293,5 +306,6 @@
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">3.0</string>
 	</data>
 </archive>