Refactored preview image.

kent013 · May 28, 2012 · 416bb22 · 416bb22
1 parent 96a8d4d
commit 416bb22
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/PhotoSubmitter b/PhotoSubmitter
diff --git a/tottepost/FlashView.h b/tottepost/FlashView.h
@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FlashView : UIView{
+@interface FlashView : UIImageView{
     NSTimeInterval flashInterval_;
     float firstAlpha_;
 }

diff --git a/tottepost/FlashView.m b/tottepost/FlashView.m
@@ -24,6 +24,7 @@ - (id)initWithFrame:(CGRect)frame
 
 // flash this view
 -(void)flash{
+    self.image = nil;
     self.alpha = firstAlpha_;
     CGContextRef context = UIGraphicsGetCurrentContext();
     [UIView beginAnimations:nil context:context];

diff --git a/tottepost/MainViewController.m b/tottepost/MainViewController.m
@@ -446,7 +446,7 @@ - (void) createCameraController{
         imagePicker_.delegate = self;
         imagePicker_.showsCameraControls = YES;
         imagePicker_.showsShutterButton = NO;
-        imagePicker_.freezeAfterShutter = YES;
+        imagePicker_.freezeAfterShutter = NO;
         if([PhotoSubmitterManager sharedInstance].isSquarePhotoRequired){
             imagePicker_.showsSquareGrid = YES;
         }

diff --git a/tottepost/PreviewPhotoView.m b/tottepost/PreviewPhotoView.m
@@ -358,14 +358,7 @@ - (void) presentWithContent:(PhotoSubmitterContentEntity *)content videoOrientat
 
     if(content.isPhoto){
         PhotoSubmitterImageEntity *photo = (PhotoSubmitterImageEntity *)content;
-
-        UIImage *image = photo.image.fixOrientation;
-        if(orientation == UIDeviceOrientationLandscapeLeft){
-            image = [image UIImageRotateByAngle:270];                
-        }else if(orientation == UIDeviceOrientationLandscapeRight){
-            image = [image UIImageRotateByAngle:90];                 
-        }
-        imageView_.image = image.fixOrientation;
+        imageView_.image = [photo imageForPreviewWithOrientation:orientation];
         [self addSubview:imageView_];      
     }else if(content.isVideo){
         PhotoSubmitterVideoEntity *video = (PhotoSubmitterVideoEntity *)content;