cleaned up code & added loading check to infinite scroll

jtdaugh · Mar 21, 2013 · 8b73dae · 8b73dae
1 parent 4d60021
commit 8b73dae
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 111 deletions.
diff --git a/MarketLoco/CategoriesViewController.m b/MarketLoco/CategoriesViewController.m
@@ -36,28 +36,24 @@ - (void)viewDidLoad
     self.peekRightAmount = 40.0f;
     [self.slidingViewController setAnchorRightPeekAmount:self.peekRightAmount];
     self.slidingViewController.underLeftWidthLayout = ECVariableRevealWidth;
-
-    // Do any additional setup after loading the view.
 }
 
 
-
-
-
-
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    // Return the number of sections.
     return 1;
 }
 
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return [[[ParseData sharedParseData] categories] count]+1;
 }
 
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 50;
 }
 
+
 // Customize the appearance of table view cells.
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 
@@ -66,7 +62,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
-
     }
     NSString *title;
     if (indexPath.row > 0) {
@@ -82,7 +77,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath  {
     NSString *title;
     if (indexPath.row == 0) {
@@ -102,11 +96,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 }
 
 
-
-
-
-
-
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];

diff --git a/MarketLoco/FancyCell.h b/MarketLoco/FancyCell.h
@@ -12,8 +12,7 @@
 #import <Parse/Parse.h>
 //#import "AppDelegate.h"
 
-@interface FancyCell : UITableViewCell <MFMailComposeViewControllerDelegate,
-MFMessageComposeViewControllerDelegate>
+@interface FancyCell : UITableViewCell 
 
 @property (nonatomic, strong) IBOutlet UILabel *title;
 @property (nonatomic, strong) IBOutlet UILabel *description;

diff --git a/MarketLoco/FancyCell.m b/MarketLoco/FancyCell.m
@@ -47,23 +47,21 @@ -(IBAction)contactSellerClicked {
                               cancelButtonTitle:@"OK"
                               otherButtonTitles:nil];
         [alert show];
-
     }
 }
 
+
 -(void)displaySMSComposerSheet
 {
     MFMessageComposeViewController *controller = [[MFMessageComposeViewController alloc] init];
     if([MFMessageComposeViewController canSendText])
     {
         [item fetchIfNeeded];
-
         controller.body = [NSString stringWithFormat:@"I'm interested in \"%@.\" ", [item objectForKey:@"title"]];
         controller.recipients = [NSArray arrayWithObject:[item objectForKey:@"postedBy"]];
         controller.messageComposeDelegate = [APP_DELEGATE viewController];
         [[APP_DELEGATE viewController] presentModalViewController:controller animated:YES];
     }
-    //do nothing (OS will alert user of error)
 }
 
 

diff --git a/MarketLoco/NetworksViewController.h b/MarketLoco/NetworksViewController.h
@@ -14,8 +14,7 @@
 #import <MessageUI/MessageUI.h>
 #import <MessageUI/MFMailComposeViewController.h>
 
-@interface NetworksViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, MFMailComposeViewControllerDelegate,
-MFMessageComposeViewControllerDelegate>
+@interface NetworksViewController : UIViewController <UITableViewDelegate, UITableViewDataSource>
 
 @property (nonatomic, strong) IBOutlet UITableView *networkTable;
 

diff --git a/MarketLoco/NetworksViewController.m b/MarketLoco/NetworksViewController.m
@@ -27,6 +27,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
     return self;
 }
 
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -38,32 +39,28 @@ - (void)viewDidLoad
 }
 
 
-
-
-
-
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     // Return the number of sections.
     return 1;
 }
 
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return [[[ParseData sharedParseData] networks] count] + 1;
 }
 
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 50;
 }
 
+
 // Customize the appearance of table view cells.
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
     static NSString *CellIdentifier = @"networkCell";
-
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
-
     }
     [cell.textLabel setTextColor:[UIColor colorWithRed:250 green:250 blue:250 alpha:1]];
     if (indexPath.row < [[[ParseData sharedParseData] networks] count]) {
@@ -74,12 +71,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     } else {
         [cell.textLabel setText:@"+ Add Your Campus"];
     }
-
     return cell;
 }
 
 
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath  {
     if (indexPath.row < [[[ParseData sharedParseData] networks] count]) {
 
@@ -112,10 +107,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                                   cancelButtonTitle:@"OK"
                                   otherButtonTitles:nil];
             [alert show];
-
         }
     }
-
 }
 
 

diff --git a/MarketLoco/ViewController.h b/MarketLoco/ViewController.h
@@ -18,7 +18,9 @@
 #import "CategoriesViewController.h"
 
 @interface ViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, CLLocationManagerDelegate, MFMailComposeViewControllerDelegate,
-MFMessageComposeViewControllerDelegate>
+MFMessageComposeViewControllerDelegate> {
+    bool currentlyLoadingMore;
+}
 
 @property (nonatomic, strong) CLLocationManager *locationManager;
 @property (nonatomic,strong)CLLocation *userLocation;
@@ -39,7 +41,7 @@ MFMessageComposeViewControllerDelegate>
 -(void)addItemsToBottomFromIndex:(int)startIndex;
 -(void)getMoreObjectsWithQuery:(PFQuery *)query andStartIndex:(int) startIndex;
 -(void)geoQueryForNetwork;
--(void) makeBarPretty;
+-(void)makeBarPretty;
 
 - (IBAction)revealNetworks:(id)sender;
 - (IBAction)revealCategories:(id)sender;