merged with master

honcheng · Dec 25, 2012 · 5053464 · 5053464
2 parents 3f44aa5 + 1abef49
commit 5053464
Show file tree

Hide file tree

Showing 8 changed files with 221 additions and 91 deletions.
diff --git a/PaperFold/PaperFold/DemoRootViewController.m b/PaperFold/PaperFold/DemoRootViewController.m
@@ -109,6 +109,7 @@ - (id)init
 
 #warning disabling scroll, requires tapping cell twice to select cells. to be fixed
         [_centerTableView setScrollEnabled:NO];
+        //[_paperFoldView setEnableHorizontalEdgeDragging:YES];
     }
     return self;
 }

diff --git a/PaperFold/PaperFold/PaperFold/MultiFoldView.m b/PaperFold/PaperFold/PaperFold/MultiFoldView.m
@@ -85,7 +85,7 @@ - (id)initWithFrame:(CGRect)frame folds:(int)folds pullFactor:(float)factor
 
 - (void)setContent:(UIView *)contentView
 {
-    if ([contentView isKindOfClass:[MKMapView class]]) _shouldTakeScreenshotBeforeUnfolding = YES;
+    if ([contentView isKindOfClass:NSClassFromString(@"MKMapView")]) _shouldTakeScreenshotBeforeUnfolding = YES;
 
     // set the content view
     self.contentViewHolder = [[UIView alloc] initWithFrame:CGRectMake(0,0,contentView.frame.size.width,contentView.frame.size.height)];
@@ -128,15 +128,19 @@ - (void)setScreenshotImage:(UIImage*)image
         for (int i=0; i<self.numberOfFolds; i++)
         {
             CGImageRef imageRef = CGImageCreateWithImageInRect([image CGImage], CGRectMake(foldWidth*i*image.scale, 0, foldWidth*image.scale, image.size.height*image.scale));
-            UIImage *croppedImage = [UIImage imageWithCGImage:imageRef];
-            CFRelease(imageRef);
-            FoldView *foldView = nil;
-            if (self.foldDirection==FoldDirectionHorizontalLeftToRight) {
-                foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG + (self.numberOfFolds - 1) - i];
-            } else {
-                foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG+i];
+            if (imageRef)
+            {
+                UIImage *croppedImage = [UIImage imageWithCGImage:imageRef];
+                CFRelease(imageRef);
+                FoldView *foldView = nil;
+                if (self.foldDirection==FoldDirectionHorizontalLeftToRight) {
+                    foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG + (self.numberOfFolds - 1) - i];
+                } else {
+                    foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG+i];
+                }
+                [foldView setImage:croppedImage];
             }
-            [foldView setImage:croppedImage];
+
         }
     }
     else if (self.foldDirection==FoldDirectionVertical)
@@ -145,10 +149,13 @@ - (void)setScreenshotImage:(UIImage*)image
         for (int i=0; i<self.numberOfFolds; i++)
         {
             CGImageRef imageRef = CGImageCreateWithImageInRect([image CGImage], CGRectMake(0, foldHeight*(self.numberOfFolds-i-1)*image.scale, image.size.width*image.scale, foldHeight*image.scale));
-            UIImage *croppedImage = [UIImage imageWithCGImage:imageRef];
-            CFRelease(imageRef);
-            FoldView *foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG+i];
-            [foldView setImage:croppedImage];
+            if (imageRef)
+            {
+                UIImage *croppedImage = [UIImage imageWithCGImage:imageRef];
+                CFRelease(imageRef);
+                FoldView *foldView = (FoldView*)[self viewWithTag:FOLDVIEW_TAG+i];
+                [foldView setImage:croppedImage];
+            }
         }
     }
 }

diff --git a/PaperFold/PaperFold/PaperFold/PaperFoldConstants.h b/PaperFold/PaperFold/PaperFold/PaperFoldConstants.h
@@ -14,6 +14,7 @@
 #define kRightViewUnfoldThreshold 0.3
 #define kTopViewUnfoldThreshold 0.3
 #define kBottomViewUnfoldThreshold 0.3
+#define kEdgeScrollWidth 40.0
 
 typedef enum
 {

diff --git a/PaperFold/PaperFold/PaperFold/PaperFoldView.h b/PaperFold/PaperFold/PaperFold/PaperFoldView.h
@@ -49,7 +49,7 @@ typedef void (^CompletionBlock)();
 - (void)paperFoldView:(id)paperFoldView viewDidOffset:(CGPoint)offset;
 @end
 
-@interface PaperFoldView : UIView <MultiFoldViewDelegate>
+@interface PaperFoldView : UIView <MultiFoldViewDelegate, UIGestureRecognizerDelegate>
 
 // main content view
 @property (nonatomic, strong) TouchThroughUIView *contentView;
@@ -68,6 +68,7 @@ typedef void (^CompletionBlock)();
 @property (nonatomic, assign) PaperFoldState state, lastState;
 // enable and disable dragging
 @property (nonatomic, assign) BOOL enableLeftFoldDragging, enableRightFoldDragging, enableTopFoldDragging, enableBottomFoldDragging;
+@property (nonatomic, assign) BOOL enableHorizontalEdgeDragging;
 // indicate if the fold was triggered by finger panning, or set state
 @property (nonatomic, assign) BOOL isAutomatedFolding;
 @property (nonatomic, assign) id<PaperFoldViewDelegate> delegate;
@@ -76,6 +77,16 @@ typedef void (^CompletionBlock)();
 // optimized screenshot follows the scale of the screen
 // non-optimized is always the non-retina image
 @property (nonatomic, assign) BOOL useOptimizedScreenshot;
+// restrict the dragging gesture recogniser to a certain UIRect of this view. Useful to restrict
+// dragging to, say, a navigation bar.
+@property (nonatomic, assign) CGRect restrictedDraggingRect;
+// divider lines
+// these are exposed so that it is possible to hide the lines
+// especially when views have rounded corners
+@property (nonatomic, weak) UIView *leftDividerLine;
+@property (nonatomic, weak) UIView *rightDividerLine;
+@property (nonatomic, weak) UIView *topDividerLine;
+@property (nonatomic, weak) UIView *bottomDividerLine;
 
 // animate folding and unfolding when sent the offset of contentView
 // offset are either sent from pan gesture recognizer, or manual animation done with NSTimer after gesture ended