Skip to content

Commit

Permalink
Refactoring for more consistent naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@myell0w
myell0w committed Jan 4, 2012
1 parent 26146be commit 6b21859
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion MTSlideViewController/MTSlideViewController/MTSlideViewController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@interface MTSlideViewController : UIViewController

@property (nonatomic, strong, readonly) UINavigationController *slideNavigationController;
@property (nonatomic, assign) MTSlideNavigationControllerState slideNavigationControllerState;
@property (nonatomic, assign) MTSlideViewControllerState slideState;
@property (nonatomic, assign) BOOL slideOnNavigationBarOnly;

@property (nonatomic, weak) id <MTSlideViewControllerDelegate> delegate;
Expand Down
46 changes: 23 additions & 23 deletions MTSlideViewController/MTSlideViewController/MTSlideViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ @implementation MTSlideViewController
@synthesize searchBar = searchBar_;
@synthesize searchBarBackgroundView = searchBarBackgroundView_;
@synthesize tableView = tableView_;
@synthesize slideNavigationControllerState = slideNavigationControllerState_;
@synthesize slideState = slideNavigationControllerState_;
@synthesize delegate = delegate_;
@synthesize dataSource = dataSource_;
@synthesize slideOnNavigationBarOnly = slideOnNavigationBarOnly_;
Expand All @@ -54,7 +54,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
if ((self = [super initWithNibName:nibNameOrNil bundle:nil])) {
rotationEnabled_ = YES;
slideOnNavigationBarOnly_ = NO;
slideNavigationControllerState_ = MTSlideNavigationControllerStateNormal;
slideNavigationControllerState_ = MTSlideViewControllerStateNormal;
}

return self;
Expand Down Expand Up @@ -163,7 +163,7 @@ - (void)configureViewController:(UIViewController *)viewController {
}

- (void)menuBarButtonItemPressed:(id)sender {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStatePeeking) {
if (slideNavigationControllerState_ == MTSlideViewControllerStatePeeking) {
[self slideInSlideNavigationControllerView];
return;
}
Expand All @@ -181,7 +181,7 @@ - (void)menuBarButtonItemPressed:(id)sender {
}

- (void)slideOutSlideNavigationControllerView {
slideNavigationControllerState_ = MTSlideNavigationControllerStatePeeking;
slideNavigationControllerState_ = MTSlideViewControllerStatePeeking;

slideNavigationController_.topViewController.view.userInteractionEnabled = NO;
[UIView animateWithDuration:kMTSlideAnimationDuration
Expand All @@ -203,14 +203,14 @@ - (void)slideInSlideNavigationControllerView {
} completion:^(BOOL finished) {
slideNavigationController_.topViewController.view.userInteractionEnabled = YES;
[self cancelSearching];
slideNavigationControllerState_ = MTSlideNavigationControllerStateNormal;
slideNavigationControllerState_ = MTSlideViewControllerStateNormal;
}];
}

- (void)slideSlideNavigationControllerViewOffScreen {
CGFloat width = UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation) ? 480.f : 320.f;

slideNavigationControllerState_ = MTSlideNavigationControllerStateSearching;
slideNavigationControllerState_ = MTSlideViewControllerStateSearching;

[UIView animateWithDuration:kMTSlideAnimationDuration
delay:0.0
Expand Down Expand Up @@ -260,9 +260,9 @@ - (void)navigationController:(UINavigationController *)navigationController didS
[self cancelSearching];

if ([navigationController viewControllers].count > 1) {
slideNavigationControllerState_ = MTSlideNavigationControllerStateDrilledDown;
slideNavigationControllerState_ = MTSlideViewControllerStateDrilledDown;
} else {
slideNavigationControllerState_ = MTSlideNavigationControllerStateNormal;
slideNavigationControllerState_ = MTSlideViewControllerStateNormal;
}
}

Expand All @@ -271,15 +271,15 @@ - (void)navigationController:(UINavigationController *)navigationController didS
////////////////////////////////////////////////////////////////////////

- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return [self.dataSource searchDatasourceForSlideViewController:self].count;
} else {
return [[[[self.dataSource datasourceForSlideViewController:self] objectAtIndex:section] objectForKey:kMTSlideViewControllerSectionViewControllersKey] count];
}
}

- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return 1;
} else {
return [self.dataSource datasourceForSlideViewController:self].count;
Expand All @@ -290,7 +290,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
MTSlideViewTableViewCell *cell = [MTSlideViewTableViewCell cellForTableView:tableView style:UITableViewCellStyleDefault ];
NSDictionary *viewControllerDictionary = nil;

if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
viewControllerDictionary = [[self.dataSource searchDatasourceForSlideViewController:self] objectAtIndex:indexPath.row];
} else {
viewControllerDictionary = [[[[self.dataSource datasourceForSlideViewController:self] objectAtIndex:indexPath.section] objectForKey:kMTSlideViewControllerSectionViewControllersKey] objectAtIndex:indexPath.row];
Expand All @@ -308,7 +308,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
}

- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return nil;
}

Expand All @@ -328,7 +328,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
}

- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return nil;
}

Expand All @@ -355,7 +355,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
}

- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return 0.f;
} else if ([self tableView:tableView titleForHeaderInSection:section]) {
return 22.f;
Expand All @@ -371,7 +371,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSIntege
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
NSDictionary *viewControllerDictionary = nil;

if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
viewControllerDictionary = [[self.dataSource searchDatasourceForSlideViewController:self] objectAtIndex:indexPath.row];
} else {
viewControllerDictionary = [[[[self.dataSource datasourceForSlideViewController:self] objectAtIndex:indexPath.section] objectForKey:kMTSlideViewControllerSectionViewControllersKey] objectAtIndex:indexPath.row];
Expand Down Expand Up @@ -442,9 +442,9 @@ - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
}

- (void)cancelSearching {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
[searchBar_ resignFirstResponder];
slideNavigationControllerState_ = MTSlideNavigationControllerStateNormal;
slideNavigationControllerState_ = MTSlideViewControllerStateNormal;
searchBar_.text = @"";
[tableView_ reloadData];
}
Expand All @@ -455,28 +455,28 @@ - (void)cancelSearching {
////////////////////////////////////////////////////////////////////////

- (void)handleTouchesBeganAtLocation:(CGPoint)location {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateSearching) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateSearching) {
return;
}

startingDragPoint_ = location;

if ((CGRectContainsPoint(slideNavigationController_.view.frame, startingDragPoint_)) &&
slideNavigationControllerState_ == MTSlideNavigationControllerStatePeeking) {
slideNavigationControllerState_ = MTSlideNavigationControllerStateDragging;
slideNavigationControllerState_ == MTSlideViewControllerStatePeeking) {
slideNavigationControllerState_ = MTSlideViewControllerStateDragging;
startingDragTransformTx_ = slideNavigationController_.view.transform.tx;
}

// we only trigger a swipe if either navigationBarOnly is deactivated
// or we swiped in the navigationBar
if (!self.slideOnNavigationBarOnly || startingDragPoint_.y <= self.slideNavigationController.navigationBar.frame.size.height) {
slideNavigationControllerState_ = MTSlideNavigationControllerStateDragging;
slideNavigationControllerState_ = MTSlideViewControllerStateDragging;
startingDragTransformTx_ = slideNavigationController_.view.transform.tx;
}
}

- (void)handleTouchesMovedToLocation:(CGPoint)location {
if (slideNavigationControllerState_ != MTSlideNavigationControllerStateDragging) {
if (slideNavigationControllerState_ != MTSlideViewControllerStateDragging) {
return;
}

Expand All @@ -489,7 +489,7 @@ - (void)handleTouchesMovedToLocation:(CGPoint)location {
}

- (void)handleTouchesEndedAtLocation:(CGPoint)location {
if (slideNavigationControllerState_ == MTSlideNavigationControllerStateDragging) {
if (slideNavigationControllerState_ == MTSlideViewControllerStateDragging) {
// Check in which direction we were dragging
if (location.x < startingDragPoint_.x) {
if (slideNavigationController_.view.transform.tx <= kMTRightSlideDecisionPointX) {
Expand Down
12 changes: 6 additions & 6 deletions MTSlideViewController/MTSlideViewController/MTSlideViewControllerDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
#define kMTSlideViewControllerViewControllerKey @"kMTSlideViewControllerViewControllerKey"

typedef enum {
MTSlideNavigationControllerStateNormal = 0,
MTSlideNavigationControllerStateDragging,
MTSlideNavigationControllerStatePeeking,
MTSlideNavigationControllerStateDrilledDown,
MTSlideNavigationControllerStateSearching
} MTSlideNavigationControllerState;
MTSlideViewControllerStateNormal = 0,
MTSlideViewControllerStateDragging,
MTSlideViewControllerStatePeeking,
MTSlideViewControllerStateDrilledDown,
MTSlideViewControllerStateSearching
} MTSlideViewControllerState;

////////////////////////////////////////////////////////////////////////
#pragma mark - MTSlideViewControllerDataSource
Expand Down

0 comments on commit 6b21859

Please sign in to comment.