Merge bf8c76e4ca into 3a1525ec02

Classes/JPImagePickerDetailController.h

@@ -21,11 +21,13 @@
 	IBOutlet UIImageView *previewImageView;
 	NSInteger imageNumber;
 	UIStatusBarStyle originalStatusBarStyle;
+	UIImage * largeImage;
 }
 
 @property (nonatomic, retain) IBOutlet UIImageView *previewImageView;
 @property (nonatomic, retain, readonly) JPImagePickerOverviewController *overviewController;
 @property (nonatomic) NSInteger imageNumber;
+@property (nonatomic, retain) UIImage * largeImage;
 
 - (id)initWithOverviewController:(JPImagePickerOverviewController *)newOverviewController;
 - (void)prepareForImageNumber:(NSInteger)newImageNumber;

Classes/JPImagePickerDetailController.m

@@ -13,6 +13,7 @@
 @implementation JPImagePickerDetailController
 
 @synthesize previewImageView, overviewController, imageNumber;
+@synthesize largeImage;
 
 - (id)initWithOverviewController:(JPImagePickerOverviewController *)newOverviewController {
 	if (self = [super initWithNibName:@"JPImagePickerDetailController" bundle:nil]) {
@@ -64,12 +65,13 @@
 
 
 - (void)prepareForImageNumber:(NSInteger)newImageNumber {
-	imageNumber = newImageNumber;
+    imageNumber = newImageNumber;
 	previewImageView.image = [[overviewController.imagePickerController.dataSource
 							   imagePicker:overviewController.imagePickerController
 							   imageForImageNumber:imageNumber]
 							  scaleToSize:CGSizeMake(kJPImagePickerControllerPreviewImageSizeHeight, kJPImagePickerControllerPreviewImageSizeHeight)
 							  onlyIfNeeded:YES];
+	largeImage = previewImageView.image;
 }
 
 - (IBAction)cancelPreview:(id)sender {

Classes/JPImagePickerOverviewController.m

@@ -34,11 +34,10 @@
 	[self setImagePickerTitle:imagePickerController.imagePickerTitle];
 	
 	UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
-																				  target:self
+                                                                                  target:self
-																				  action:@selector(cancelPicking:)];
+                                                                                  action:@selector(cancelPicking:)];
-	self.navigationItem.rightBarButtonItem = cancelButton;
+    self.navigationItem.rightBarButtonItem = cancelButton;
-	[cancelButton release];
+    [cancelButton release];	
-	
 	
 	UIButton *button;
 	UIImage *thumbnail;
@@ -71,7 +70,7 @@
 	
 	scrollView.contentSize = CGSizeMake(self.view.frame.size.width, height);
 	scrollView.clipsToBounds = YES;
-	
+		
 }
 
 - (void)setImagePickerTitle:(NSString *)newTitle {
@@ -97,10 +96,15 @@
 
 
 - (void)buttonTouched:(UIButton *)sender {
+	[self performSelector:@selector(pushDetailViewWithSender:) withObject:sender afterDelay:0];
+}
+
+- (void)pushDetailViewWithSender:(UIButton *)sender {
 	if (detailController == nil) {
 		detailController = [[JPImagePickerDetailController alloc] initWithOverviewController:self];
 	}
-	[detailController prepareForImageNumber:(NSInteger)sender.tag];
+	
+	detailController.imageNumber = sender.tag;
 	[imagePickerController.modalNavigationController pushViewController:detailController animated:YES];
 }
 

JPImagePickerDemo/Classes/RootViewController.m

@@ -26,6 +26,9 @@
     // self.navigationItem.rightBarButtonItem = self.editButtonItem;
 	chosenImage = -1;
 	self.navigationItem.title = @"ImagePicker Demo";
+    self.navigationController.navigationBar.translucent = YES;
+    self.navigationController.navigationBar.barStyle = UIBarStyleBlackTranslucent;
+    
 }
 
 

JPImagePickerDemo/JPImagePickerDemo.xcodeproj/project.pbxproj

@@ -204,6 +204,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "JPImagePickerDemo" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -273,6 +274,7 @@
 				GCC_PREFIX_HEADER = JPImagePickerDemo_Prefix.pch;
 				INFOPLIST_FILE = "JPImagePickerDemo-Info.plist";
 				PRODUCT_NAME = JPImagePickerDemo;
+				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
@@ -285,6 +287,7 @@
 				GCC_PREFIX_HEADER = JPImagePickerDemo_Prefix.pch;
 				INFOPLIST_FILE = "JPImagePickerDemo-Info.plist";
 				PRODUCT_NAME = JPImagePickerDemo;
+				SDKROOT = iphoneos;
 			};
 			name = Release;
 		};