From 9a0a039c5df78526bba67f6bef93e431cf94430a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 1 Nov 2018 18:46:13 +0300 Subject: Link MessageCell and Message --- Juick/Supporting Files/Juick-Info.plist | 2 +- Juick/ViewControllers/ThreadViewController.m | 2 +- Juick/Views/ContentLoadingCell.m | 1 + Juick/Views/MessageCell.h | 2 ++ Juick/Views/MessageCell.m | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) (limited to 'Juick') diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist index 2fa5ee4..3b9b7ba 100644 --- a/Juick/Supporting Files/Juick-Info.plist +++ b/Juick/Supporting Files/Juick-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 77 + 78 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Juick/ViewControllers/ThreadViewController.m b/Juick/ViewControllers/ThreadViewController.m index 3b6854c..8e64cb9 100644 --- a/Juick/ViewControllers/ThreadViewController.m +++ b/Juick/ViewControllers/ThreadViewController.m @@ -30,7 +30,7 @@ -(void) prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { if ([segue.identifier isEqual: @"replySegue"]) { - Message *msg = [self.messages objectAtIndex:[self.tableView indexPathForSelectedRow].row]; + Message *msg = ((MessageCell *)sender).message; NewPostViewController *postVC = (NewPostViewController *)segue.destinationViewController; [postVC setReplyTo:msg]; } diff --git a/Juick/Views/ContentLoadingCell.m b/Juick/Views/ContentLoadingCell.m index 5ec67b3..90329fa 100644 --- a/Juick/Views/ContentLoadingCell.m +++ b/Juick/Views/ContentLoadingCell.m @@ -12,6 +12,7 @@ - (void)awakeFromNib { [super awakeFromNib]; + self.userInteractionEnabled = NO; } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { diff --git a/Juick/Views/MessageCell.h b/Juick/Views/MessageCell.h index d9a5533..abb1347 100644 --- a/Juick/Views/MessageCell.h +++ b/Juick/Views/MessageCell.h @@ -24,6 +24,8 @@ @property (weak, nonatomic) IBOutlet NSLayoutConstraint *attachmentHeight; @property (weak, nonatomic) IBOutlet UILabel *summary; +@property (nonatomic, weak) Message *message; + @property (nonatomic, strong) id delegate; - (void) configureWithMessage:(Message *)msg; diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m index cf23f62..ffb564a 100644 --- a/Juick/Views/MessageCell.m +++ b/Juick/Views/MessageCell.m @@ -30,6 +30,7 @@ } - (void) configureWithMessage:(Message *)msg { + self.message = msg; self.avatar.image = nil; __weak UIImageView *weakAvatar = self.avatar; [self.avatar setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/a/%d.png", [msg.user.uid intValue]]]] placeholderImage:nil success:^(NSURLRequest * _Nonnull request, NSHTTPURLResponse * _Nullable response, UIImage * _Nonnull image) { -- cgit v1.2.3