Skip to content

Fixed warnings and canReorder instance variable bug. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manide wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed warnings and canReorder instance variable bug. #28

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aded13
Fixed warnings and canReorder instance variable bug.
manide Jul 16, 2014
f5e7b12
Fixed more warnings.
manide Jul 16, 2014
1c06759
Improved warning fix.
manide Jul 17, 2014
0f53f0a
Fixed warnings.
manide Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions BVReorderTableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,12 @@ - (void)initialize {
self.draggingViewOpacity = 1.0;
}

- (BOOL)canReorder
{
return longPress.enabled;
}

- (void)setCanReorder:(BOOL)canReorder {
canReorder = canReorder;
longPress.enabled = canReorder;
}

Expand All @@ -102,9 +105,9 @@ - (void)longPress:(UILongPressGestureRecognizer *)gesture {
CGPoint location = [gesture locationInView:self];
NSIndexPath *indexPath = [self indexPathForRowAtPoint:location];

int sections = [self numberOfSections];
int rows = 0;
for(int i = 0; i < sections; i++) {
NSInteger sections = [self numberOfSections];
NSInteger rows = 0;
for(NSInteger i = 0; i < sections; i++) {
rows += [self numberOfRowsInSection:i];
}

Expand Down Expand Up @@ -146,12 +149,12 @@ - (void)longPress:(UILongPressGestureRecognizer *)gesture {
draggingView.layer.shadowColor = [[UIColor blackColor] CGColor];
draggingView.layer.shadowOffset = CGSizeMake(0, 0);
draggingView.layer.shadowRadius = 4.0;
draggingView.layer.shadowOpacity = 0.7;
draggingView.layer.opacity = self.draggingViewOpacity;
draggingView.layer.shadowOpacity = 0.7f;
draggingView.layer.opacity = (float)self.draggingViewOpacity;

// zoom image towards user
[UIView beginAnimations:@"zoom" context:nil];
draggingView.transform = CGAffineTransformMakeScale(1.1, 1.1);
draggingView.transform = CGAffineTransformMakeScale((CGFloat)1.1, (CGFloat)1.1);
draggingView.center = CGPointMake(self.center.x, location.y);
[UIView commitAnimations];
}
Expand Down Expand Up @@ -186,7 +189,7 @@ - (void)longPress:(UILongPressGestureRecognizer *)gesture {
CGRect rect = self.bounds;
// adjust rect for content inset as we will use it below for calculating scroll zones
rect.size.height -= self.contentInset.top;
CGPoint location = [gesture locationInView:self];
location = [gesture locationInView:self];

[self updateCurrentLocation:gesture];

Expand All @@ -209,7 +212,7 @@ - (void)longPress:(UILongPressGestureRecognizer *)gesture {
// dropped
else if (gesture.state == UIGestureRecognizerStateEnded) {

NSIndexPath *indexPath = self.currentLocationIndexPath;
indexPath = self.currentLocationIndexPath;

// remove scrolling CADisplayLink
[self.scrollDisplayLink invalidate];
Expand All @@ -220,10 +223,11 @@ - (void)longPress:(UILongPressGestureRecognizer *)gesture {
[UIView animateWithDuration:0.3
animations:^{
CGRect rect = [self rectForRowAtIndexPath:indexPath];
draggingView.transform = CGAffineTransformIdentity;
draggingView.frame = CGRectOffset(draggingView.bounds, rect.origin.x, rect.origin.y);
self->draggingView.transform = CGAffineTransformIdentity;
self->draggingView.frame = CGRectOffset(self->draggingView.bounds, rect.origin.x, rect.origin.y);
} completion:^(BOOL finished) {
[draggingView removeFromSuperview];
#pragma unused(finished)
[self->draggingView removeFromSuperview];

[self beginUpdates];
[self deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationNone];
Expand Down Expand Up @@ -263,8 +267,8 @@ - (void)updateCurrentLocation:(UILongPressGestureRecognizer *)gesture {
indexPath = [self.delegate tableView:self targetIndexPathForMoveFromRowAtIndexPath:self.initialIndexPath toProposedIndexPath:indexPath];
}

NSInteger oldHeight = [self rectForRowAtIndexPath:self.currentLocationIndexPath].size.height;
NSInteger newHeight = [self rectForRowAtIndexPath:indexPath].size.height;
NSInteger oldHeight = (NSInteger)round([self rectForRowAtIndexPath:self.currentLocationIndexPath].size.height);
NSInteger newHeight = (NSInteger)round([self rectForRowAtIndexPath:indexPath].size.height);

if (indexPath && ![indexPath isEqual:self.currentLocationIndexPath] && [gesture locationInView:[self cellForRowAtIndexPath:indexPath]].y > newHeight - oldHeight) {
[self beginUpdates];
Expand All @@ -283,7 +287,8 @@ - (void)updateCurrentLocation:(UILongPressGestureRecognizer *)gesture {
}
}

- (void)scrollTableWithCell:(NSTimer *)timer {
- (void)scrollTableWithCell:(NSTimer *)timer {
#pragma unused(timer)
UILongPressGestureRecognizer *gesture = self.longPress;
CGPoint location = [gesture locationInView:self];

Expand Down Expand Up @@ -312,4 +317,4 @@ - (void)cancelGesture {
longPress.enabled = YES;
}

@end
@end