Moved setting story's properties to StoryTableViewCell into StoryTabl…

…eViewCell class for code reuse
vetri02 · Jun 18, 2015 · 2deeefd · 2deeefd
1 parent b7fa401
commit 2deeefd
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 217 deletions.
diff --git a/HackerNews.xcworkspace/xcuserdata/lumenela.xcuserdatad/UserInterfaceState.xcuserstate b/HackerNews.xcworkspace/xcuserdata/lumenela.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/HackerNews.xcworkspace/xcuserdata/lumenela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/HackerNews.xcworkspace/xcuserdata/lumenela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "HackerNews/CommentsTableViewController.m"
-            timestampString = "456352239.412808"
+            timestampString = "456352693.487264"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "121"
-            endingLineNumber = "121"
+            startingLineNumber = "86"
+            endingLineNumber = "86"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>

diff --git a/HackerNews/HomeTableViewController.m b/HackerNews/HomeTableViewController.m
@@ -209,101 +209,22 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-
 {
-
-    //    static NSString *CellIdentifier = @"storyCell";
-    //    StoryTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-    //
-
-
     StoryTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"storyCell" forIndexPath:indexPath];
-
-    if (cell==nil) {
-
+    if (cell == nil) {
         NSArray* storyObject = [[NSBundle mainBundle] loadNibNamed:@"StoryTableCellView" owner:self options:nil];
-
         cell = [storyObject firstObject];
     }
 
-
-
-
     // Get data from the array at position of the row
     NSDictionary *story = [self.storiesArray objectAtIndex:indexPath.row];
+    cell.story = story;
 
-    //Get the Time interval from when the story is posted
-    NSTimeInterval timeSince = [[story valueForKey:@"time"] doubleValue];
-    NSDate *date = [[NSDate alloc] initWithTimeIntervalSince1970: timeSince];
-    NSString *ago = [date timeAgo];
-    //NSLog(@"Output is: \"%@\"", ago);
-
-    //Get Comments count
-    NSMutableArray *commentArray = [story valueForKey:@"kids"];
-    NSUInteger commentCount = [commentArray count];
-    NSString *commentCountText = [NSString stringWithFormat:@"%@",  @(commentCount)];
-    //NSLog (@"Number of elements in array = %lu", [commentArray count]);
-
-    //Get the HostName
-    NSString *urlString = [story valueForKey:@"url"];
-    NSURL* url = [NSURL URLWithString:[story valueForKey:@"url"]];
-    NSString* reducedUrl = [NSString stringWithFormat:
-                            @"%@",url.host];
-    //NSLog(@"Output is: \"%@\"", reducedUrl);
-    if([story valueForKey:@"deleted"]){
-    } else {
-
-
-        // Apply the data to each row
-        cell.titleLabel.text = [story valueForKey:@"title"];
-        cell.authorWithTimeLabel.text = [NSString stringWithFormat:@"by %@, %@", [story valueForKey:@"by"], ago];
-        cell.commentLabel.text = [NSString stringWithFormat:@"%@", commentCountText];
-        cell.scoreLabel.text = [NSString stringWithFormat:@"%@", [story valueForKey:@"score"]];
-        cell.sourceLabel.text = urlString.length > 0 ? reducedUrl : @"";
-        cell.typeImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"%@", [story valueForKeyPath:@"type"]]];
-
-        cell.accessoryType = UITableViewCellAccessoryNone;
-
-        cell.titleLabel.numberOfLines = 0;
-        [cell.titleLabel sizeToFit];
-
-    }
-    //[HUD hide:YES];
     [cell layoutIfNeeded];
     [cell setNeedsLayout];
-
-    //NSLog(@"Output is: \"%@\"", cell.titleLabel);
-
     return cell;
 }
 
-
-//
-//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-//{
-//
-//    NSDictionary *story = [self.storiesArray objectAtIndex:indexPath.row];
-//    NSString* text = [story valueForKey:@"title"];
-//    NSAttributedString * attributedString = [[NSAttributedString alloc] initWithString:text attributes:
-//                                                                                               @{ NSFontAttributeName: [UIFont systemFontOfSize:16]}];
-//
-//        //its not possible to get the cell label width since this method is called before cellForRow so best we can do
-//        //is get the table width and subtract the default extra space on either side of the label.
-//    CGSize constraintSize = CGSizeMake(300 - 30, MAXFLOAT);
-//
-//    CGRect rect = [attributedString boundingRectWithSize:constraintSize options:(NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading) context:nil];
-//
-//        //NSLog(@"Output is: \"%d\"", rect.size.height);
-//
-//        //Add back in the extra padding above and below label on table cell.
-//        rect.size.height = rect.size.height + 23;
-//
-//        //if height is smaller than a normal row set it to the normal cell height, otherwise return the bigger dynamic height.
-//
-//    return (rect.size.height < 44 ? 95 : 115);
-//    //return 95;
-//}
-
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     NSDictionary *story = [self.storiesArray objectAtIndex:indexPath.row];

diff --git a/HackerNews/StoryTableViewCell.h b/HackerNews/StoryTableViewCell.h
@@ -18,4 +18,6 @@
 @property (weak, nonatomic) IBOutlet UIImageView *commentImageView;
 @property (weak, nonatomic) IBOutlet UIImageView *typeImageView;
 
+@property (strong, nonatomic) NSDictionary *story;
+
 @end
diff --git a/HackerNews/StoryTableViewCell.m b/HackerNews/StoryTableViewCell.m
@@ -7,17 +7,47 @@
 //
 
 #import "StoryTableViewCell.h"
+#import "NSDate+TimeAgo.h"
 
-@implementation StoryTableViewCell
-
-- (void)awakeFromNib {
-    // Initialization code
-}
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
+@implementation StoryTableViewCell
 
-    // Configure the view for the selected state
+- (void)setStory:(NSDictionary *)story {
+    if ([_story isEqualToDictionary:story]) {
+        return;
+    }
+    _story = story;
+    NSTimeInterval timeSince = [[story valueForKey:@"time"] doubleValue];
+    NSDate *date = [[NSDate alloc] initWithTimeIntervalSince1970: timeSince];
+    NSString *ago = [date timeAgo];
+    //NSLog(@"Output is: \"%@\"", ago);
+
+    //Get Comments count
+    NSMutableArray *commentArray = [story valueForKey:@"kids"];
+    NSUInteger commentCount = [commentArray count];
+    NSString *commentCountText = [NSString stringWithFormat:@"%@",  @(commentCount)];
+    //NSLog (@"Number of elements in array = %lu", [commentArray count]);
+
+    //Get the HostName
+    NSString *urlString = [story valueForKey:@"url"];
+    NSURL* url = [NSURL URLWithString:[story valueForKey:@"url"]];
+    NSString* reducedUrl = [NSString stringWithFormat:
+                            @"%@",url.host];
+    //NSLog(@"Output is: \"%@\"", reducedUrl);
+    if([story valueForKey:@"deleted"]){
+    } else {
+        self.titleLabel.text = [story valueForKey:@"title"];
+        self.authorWithTimeLabel.text = [NSString stringWithFormat:@"by %@, %@", [story valueForKey:@"by"], ago];
+        self.commentLabel.text = [NSString stringWithFormat:@"%@", commentCountText];
+        self.scoreLabel.text = [NSString stringWithFormat:@"%@", [story valueForKey:@"score"]];
+        self.sourceLabel.text = urlString.length > 0 ? reducedUrl : @"";
+        self.typeImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"%@", [story valueForKeyPath:@"type"]]];
+
+        self.accessoryType = UITableViewCellAccessoryNone;
+
+        self.titleLabel.numberOfLines = 0;
+        [self.titleLabel sizeToFit];
+    }
 }
 
 @end
diff --git a/HackerNews/commentsTableViewController.m b/HackerNews/commentsTableViewController.m
@@ -12,11 +12,13 @@
 #import "NSDate+TimeAgo.h"
 #import "CommentTableViewCell.h"
 
+
 @interface CommentsTableViewController ()
+
 @property (nonatomic, strong) NSMutableArray *temporaryCommentsIds;
-@property (nonatomic, strong) NSMutableArray *commentEventRefs;
 @property (nonatomic, strong) NSMutableArray *commentList;
 @property (nonatomic, assign) NSInteger count;
+
 @end
 
 @implementation CommentsTableViewController
@@ -43,52 +45,20 @@ - (void)viewDidLoad {
 
     UINib *commentCellNib = [UINib nibWithNibName:@"CommentTableViewCell" bundle:nil] ;
     [self.tableView registerNib:commentCellNib forCellReuseIdentifier:@"commentsCell"];
-
-
-//    [self.tableView reloadData];
-
 
     for(NSNumber *itemNumber in self.temporaryCommentsIds){
         [self getStoryDataOfItem:itemNumber];
     }
-
-        // Uncomment the following line to preserve selection between presentations.
-    // self.clearsSelectionOnViewWillAppear = NO;
-
-    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
 }
 
-- (void)getStoryDataOfItem:(NSNumber *)itemNumber{
-
-    //[[Crashlytics sharedInstance] crash];
-
+- (void)getStoryDataOfItem:(NSNumber *)itemNumber {
     NSString *urlString = [NSString stringWithFormat:@"https://hacker-news.firebaseio.com/v0/item/%@",itemNumber];
 
-    //    NSLog(@"%@", itemNumber);
-
     Firebase *storyDescriptionRef = [[Firebase alloc] initWithUrl:urlString];
 
-    [self.commentEventRefs addObject:storyDescriptionRef];
-    //[storyDescriptionRef observeEventType:FEventTypeValue withBlock:^(FDataSnapshot *snapshot) {
     [storyDescriptionRef observeSingleEventOfType:FEventTypeValue withBlock:^(FDataSnapshot *snapshot) {
-
-        //NSDictionary *responseDictionary = snapshot.value;
-
-
         if(snapshot.value != [NSNull null]){
-            NSLog(@"%@", snapshot.value);
             [self.commentList addObject:snapshot.value];
-//            NSInteger row = self.commentList.count - 1;
-//            if (self.tableView.numberOfSections == 1) {
-//                [self.tableView beginUpdates];
-//                [self.tableView insertSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationAutomatic];
-//                [self.tableView endUpdates];
-//            }
-//                [self.tableView beginUpdates];
-//            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:1];
-//            [self.tableView insertRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
-//            [self.tableView endUpdates];
         }
         self.count++;
         if (self.count == self.temporaryCommentsIds.count) {
@@ -97,22 +67,17 @@ - (void)getStoryDataOfItem:(NSNumber *)itemNumber{
 
     } withCancelBlock:^(NSError *error) {
 
-    }
-     ];
+    }];
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    // Return the number of sections.
     return 2;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     if (section == 0) {
         return 1;
     }
-    // Return the number of rows in the section.
-
-    //NSLog(@"%@", snapshot.value);
     return self.commentList.count;
 }
 
@@ -127,45 +92,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         }
 
         // Get data from the array at position of the row
-        NSDictionary *story = self.story;
-
-        //Get the Time interval from when the story is posted
-        NSTimeInterval timeSince = [[story valueForKey:@"time"] doubleValue];
-        NSDate *date = [[NSDate alloc] initWithTimeIntervalSince1970: timeSince];
-        NSString *ago = [date timeAgo];
-        //NSLog(@"Output is: \"%@\"", ago);
-
-        //Get Comments count
-        NSMutableArray *commentArray = [story valueForKey:@"kids"];
-        NSUInteger commentCount = [commentArray count];
-        NSString *commentCountText = [NSString stringWithFormat:@"%@",  @(commentCount)];
-        //NSLog (@"Number of elements in array = %lu", [commentArray count]);
-
-        //Get the HostName
-        NSString *urlString = [story valueForKey:@"url"];
-        NSURL* url = [NSURL URLWithString:[story valueForKey:@"url"]];
-        NSString* reducedUrl = [NSString stringWithFormat:
-                                @"%@",url.host];
-        //NSLog(@"Output is: \"%@\"", reducedUrl);
-        if ([story valueForKey:@"deleted"]) {
-        } else {
-
-
-            // Apply the data to each row
-            cell.titleLabel.text = [story valueForKey:@"title"];
-            cell.authorWithTimeLabel.text = [NSString stringWithFormat:@"by %@, %@", [story valueForKey:@"by"], ago];
-            cell.commentLabel.text = [NSString stringWithFormat:@"%@", commentCountText];
-            cell.scoreLabel.text = [NSString stringWithFormat:@"%@", [story valueForKey:@"score"]];
-            cell.sourceLabel.text = urlString.length > 0 ? reducedUrl : @"";
-            cell.typeImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"%@", [story valueForKeyPath:@"type"]]];
-
-            cell.accessoryType = UITableViewCellAccessoryNone;
-
-            cell.titleLabel.numberOfLines = 0;
-            [cell.titleLabel sizeToFit];
-
-        }
-        //[HUD hide:YES];
+        cell.story = self.story;
         [cell layoutIfNeeded];
         [cell setNeedsLayout];
         return cell;
@@ -176,7 +103,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             NSArray* storyObject = [[NSBundle mainBundle] loadNibNamed:@"CommentTableCellView" owner:self options:nil];
             cell = [storyObject firstObject];
         }
-//        cell.comment = [self.commentList objectAtIndex:indexPath.row];
+        cell.comment = [self.commentList objectAtIndex:indexPath.row];
 
         [cell layoutIfNeeded];
         [cell setNeedsLayout];
@@ -207,51 +134,6 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
     //if height is smaller than a normal row set it to the normal cell height, otherwise return the bigger dynamic height.
 
     return rect.size.height;
-    //return 95;
-}
-
-/*
-// Override to support conditional editing of the table view.
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Return NO if you do not want the specified item to be editable.
-    return YES;
-}
-*/
-
-/*
-// Override to support editing the table view.
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (editingStyle == UITableViewCellEditingStyleDelete) {
-        // Delete the row from the data source
-        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
-    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
-        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
-    }   
-}
-*/
-
-/*
-// Override to support rearranging the table view.
-- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
-}
-*/
-
-/*
-// Override to support conditional rearranging of the table view.
-- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Return NO if you do not want the item to be re-orderable.
-    return YES;
-}
-*/
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
 }
-*/
 
 @end