From a04f0db29cb280eb45888d3a56967cf9adc6214d Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 4 Mar 2018 11:50:14 +0300 Subject: ChatViewController --- Juick.xcodeproj/project.pbxproj | 18 ++++++++ Juick/APIClient.h | 1 + Juick/APIClient.m | 21 +++++++++ Juick/Main.storyboard | 59 +++++++++++++++++++++--- Juick/ViewControllers/ChatViewController.h | 15 +++++++ Juick/ViewControllers/ChatViewController.m | 65 +++++++++++++++++++++++++++ Juick/ViewControllers/DialogsViewController.m | 13 ++++++ Juick/Views/BubbleMessageCell.h | 23 ++++++++++ Juick/Views/BubbleMessageCell.m | 43 ++++++++++++++++++ Juick/Views/BubbleMessageCell.xib | 29 ++++++++---- Juick/Views/FixedLabel.h | 13 ++++++ Juick/Views/FixedLabel.m | 21 +++++++++ 12 files changed, 307 insertions(+), 14 deletions(-) create mode 100644 Juick/ViewControllers/ChatViewController.h create mode 100644 Juick/ViewControllers/ChatViewController.m create mode 100644 Juick/Views/BubbleMessageCell.h create mode 100644 Juick/Views/BubbleMessageCell.m create mode 100644 Juick/Views/FixedLabel.h create mode 100644 Juick/Views/FixedLabel.m diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj index e8c6344..79b5e00 100644 --- a/Juick.xcodeproj/project.pbxproj +++ b/Juick.xcodeproj/project.pbxproj @@ -26,6 +26,9 @@ 773E6397204BCB64008B8F8D /* ConversationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E6396204BCB64008B8F8D /* ConversationCell.m */; }; 773E639A204BCE6D008B8F8D /* DialogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E6399204BCE6D008B8F8D /* DialogsViewController.m */; }; 773E639D204BD0F2008B8F8D /* Chat.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E639C204BD0F2008B8F8D /* Chat.m */; }; + 773E63A0204BDF16008B8F8D /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E639F204BDF16008B8F8D /* ChatViewController.m */; }; + 773E63A3204BE036008B8F8D /* BubbleMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E63A2204BE036008B8F8D /* BubbleMessageCell.m */; }; + 773E63A6204BE11B008B8F8D /* FixedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 773E63A5204BE11B008B8F8D /* FixedLabel.m */; }; 773F231C1F76DD0B00B5B0DF /* SerpentineBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 773F231B1F76DD0B00B5B0DF /* SerpentineBoldItalic.ttf */; }; 773F23331F76ECAC00B5B0DF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 773F23321F76ECAC00B5B0DF /* LaunchScreen.storyboard */; }; 773F23371F76ED5E00B5B0DF /* Splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 773F23341F76ED5D00B5B0DF /* Splash.png */; }; @@ -94,6 +97,12 @@ 773E6399204BCE6D008B8F8D /* DialogsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DialogsViewController.m; sourceTree = ""; }; 773E639B204BD0F2008B8F8D /* Chat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Chat.h; sourceTree = ""; }; 773E639C204BD0F2008B8F8D /* Chat.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Chat.m; sourceTree = ""; }; + 773E639E204BDF16008B8F8D /* ChatViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatViewController.h; sourceTree = ""; }; + 773E639F204BDF16008B8F8D /* ChatViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatViewController.m; sourceTree = ""; }; + 773E63A1204BE036008B8F8D /* BubbleMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BubbleMessageCell.h; sourceTree = ""; }; + 773E63A2204BE036008B8F8D /* BubbleMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BubbleMessageCell.m; sourceTree = ""; }; + 773E63A4204BE11B008B8F8D /* FixedLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FixedLabel.h; sourceTree = ""; }; + 773E63A5204BE11B008B8F8D /* FixedLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FixedLabel.m; sourceTree = ""; }; 773F231B1F76DD0B00B5B0DF /* SerpentineBoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = SerpentineBoldItalic.ttf; sourceTree = ""; }; 773F23321F76ECAC00B5B0DF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 773F23341F76ED5D00B5B0DF /* Splash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Splash.png; sourceTree = ""; }; @@ -302,6 +311,8 @@ 776C41C01FD3FF6E0063B82E /* DiscoverViewController.m */, 773E6398204BCE6D008B8F8D /* DialogsViewController.h */, 773E6399204BCE6D008B8F8D /* DialogsViewController.m */, + 773E639E204BDF16008B8F8D /* ChatViewController.h */, + 773E639F204BDF16008B8F8D /* ChatViewController.m */, ); path = ViewControllers; sourceTree = ""; @@ -332,6 +343,10 @@ 77E61A5D1FD4682B00B4E304 /* MessageInputView.m */, 773E6395204BCB64008B8F8D /* ConversationCell.h */, 773E6396204BCB64008B8F8D /* ConversationCell.m */, + 773E63A1204BE036008B8F8D /* BubbleMessageCell.h */, + 773E63A2204BE036008B8F8D /* BubbleMessageCell.m */, + 773E63A4204BE11B008B8F8D /* FixedLabel.h */, + 773E63A5204BE11B008B8F8D /* FixedLabel.m */, ); path = Views; sourceTree = ""; @@ -547,6 +562,7 @@ 776C41C11FD3FF6E0063B82E /* DiscoverViewController.m in Sources */, 77FCADDF1D6A50DA00CBA649 /* APIClient.m in Sources */, 77A0954A181F1F25002BDECD /* Message.m in Sources */, + 773E63A0204BDF16008B8F8D /* ChatViewController.m in Sources */, 773E639D204BD0F2008B8F8D /* Chat.m in Sources */, 773E639A204BCE6D008B8F8D /* DialogsViewController.m in Sources */, 774528C51F93AC0F004D110B /* CoreDataStack.m in Sources */, @@ -554,6 +570,7 @@ 77317BC2181BBE8500D60005 /* MessagesViewController.m in Sources */, 77B099A6189D57F000A84F59 /* User.m in Sources */, 77C6ADE41F7717BC000AEA8C /* ThreadViewController.m in Sources */, + 773E63A3204BE036008B8F8D /* BubbleMessageCell.m in Sources */, 77975A1D182B6E9A00410C2B /* NewPostViewController.m in Sources */, 77C67EE81828379700427098 /* ColorScheme.m in Sources */, 77C67EE51828342000427098 /* NSURL+PathParameters.m in Sources */, @@ -562,6 +579,7 @@ 776C41BD1FD3EF180063B82E /* MessageCell.m in Sources */, 77317BB8181BBE8500D60005 /* main.m in Sources */, 774528C21F930C06004D110B /* Attachment.m in Sources */, + 773E63A6204BE11B008B8F8D /* FixedLabel.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Juick/APIClient.h b/Juick/APIClient.h index 668a0a9..46e86c7 100644 --- a/Juick/APIClient.h +++ b/Juick/APIClient.h @@ -20,6 +20,7 @@ -(void) postMessage:(NSString *)text result:(void(^)(Message *, NSError *))callback; -(void) postReplyToThread:(NSNumber *)mid inReplyTo:(NSNumber *)rid text:(NSString *)text result:(void(^)(Message *, NSError *))callback; -(void) fetchChats:(void(^)(NSArray *, NSError *))callback; +-(void) fetchChatWithUser:(NSString *)uname callback:(void(^)(NSArray *, NSError *))callback; +(NSString *) messagesUrl; +(NSString *) threadUrl; diff --git a/Juick/APIClient.m b/Juick/APIClient.m index 5352320..aa5530b 100644 --- a/Juick/APIClient.m +++ b/Juick/APIClient.m @@ -122,6 +122,27 @@ }]; }]; } +-(void) fetchChatWithUser:(NSString *)uname callback:(void (^)(NSArray *, NSError *))callback { + AFHTTPSessionManager *manager = [APIClient sharedClient].manager; + NSDictionary *params = @{@"uname": uname}; + [self.backgroundQueue addOperationWithBlock:^{ + [manager GET:@"/pm" parameters:params progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { + NSMutableArray *messages = [NSMutableArray new]; + NSArray *messagesList = (NSArray *)responseObject; + [messagesList enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [messages addObject:[Message yy_modelWithJSON:obj]]; + }]; + [[NSOperationQueue mainQueue] addOperationWithBlock:^{ + callback(messages, nil); + }]; + } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { + NSLog(@"Error: %@", [error localizedDescription]); + [[NSOperationQueue mainQueue] addOperationWithBlock:^{ + callback(nil, error); + }]; + }]; + }]; +} +(NSString *) messagesUrl { diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard index 3383f18..d6698e4 100644 --- a/Juick/Main.storyboard +++ b/Juick/Main.storyboard @@ -231,13 +231,16 @@ - + - + + + + @@ -250,7 +253,24 @@ - + + + + + + + + + + + + + + + + + + @@ -296,6 +316,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -307,7 +356,7 @@ - + @@ -321,6 +370,6 @@ - + diff --git a/Juick/ViewControllers/ChatViewController.h b/Juick/ViewControllers/ChatViewController.h new file mode 100644 index 0000000..7ea8030 --- /dev/null +++ b/Juick/ViewControllers/ChatViewController.h @@ -0,0 +1,15 @@ +// +// ChatViewController.h +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import +#import "User.h" + +@interface ChatViewController : UITableViewController +@property(nonatomic, strong) NSMutableArray *messages; +@property(nonatomic, strong) NSString *uname; +@end diff --git a/Juick/ViewControllers/ChatViewController.m b/Juick/ViewControllers/ChatViewController.m new file mode 100644 index 0000000..f88bfa5 --- /dev/null +++ b/Juick/ViewControllers/ChatViewController.m @@ -0,0 +1,65 @@ +// +// ChatViewController.m +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import "ChatViewController.h" +#import "BubbleMessageCell.h" +#import "APIClient.h" + +@interface ChatViewController () + +@end + +@implementation ChatViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + [self.tableView registerNib:[UINib nibWithNibName:@"BubbleMessageCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"bubbleMessageCell"]; + self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; + self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive; + self.tableView.allowsSelection = NO; + self.messages = [NSMutableArray array]; + [[APIClient sharedClient] fetchChatWithUser:self.uname callback:^(NSArray *messages, NSError *err) { + if (err == nil) { + [self.messages addObjectsFromArray:[[messages reverseObjectEnumerator] allObjects]]; + NSMutableArray *indexPaths = [NSMutableArray new]; + for (NSUInteger index = 0; index < [messages count]; index++) { + [indexPaths addObject:[NSIndexPath indexPathForRow:index inSection: 0]]; + } + [self.tableView beginUpdates]; + [self.tableView insertRowsAtIndexPaths:indexPaths withRowAnimation:YES]; + [self.tableView endUpdates]; + [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:[self.messages count]-1 inSection:0] atScrollPosition:UITableViewScrollPositionBottom animated:NO]; + } + }]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [self.messages count]; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + BubbleMessageCell *cell = [tableView dequeueReusableCellWithIdentifier:@"bubbleMessageCell" forIndexPath:indexPath]; + + [cell configureWithMessage:[self.messages objectAtIndex:indexPath.row]]; + + return cell; +} + +@end diff --git a/Juick/ViewControllers/DialogsViewController.m b/Juick/ViewControllers/DialogsViewController.m index 8eea017..878e912 100644 --- a/Juick/ViewControllers/DialogsViewController.m +++ b/Juick/ViewControllers/DialogsViewController.m @@ -7,6 +7,7 @@ // #import "DialogsViewController.h" +#import "ChatViewController.h" #import "ColorScheme.h" #import "ConversationCell.h" #import "APIClient.h" @@ -53,5 +54,17 @@ return cell; } +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [self performSegueWithIdentifier:@"chatSegue" sender:self]; +} + +-(void) prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + if ([segue.identifier isEqualToString:@"chatSegue"]) { + Chat *chat = [self.chats objectAtIndex:[self.tableView indexPathForSelectedRow].row]; + ChatViewController *vc = (ChatViewController *)segue.destinationViewController; + [vc setUname:chat.uname]; + } +} + @end diff --git a/Juick/Views/BubbleMessageCell.h b/Juick/Views/BubbleMessageCell.h new file mode 100644 index 0000000..1f5d2e9 --- /dev/null +++ b/Juick/Views/BubbleMessageCell.h @@ -0,0 +1,23 @@ +// +// BubbleMessageCell.h +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import +#import "Message.h" +#import "FixedLabel.h" + +@import TTTAttributedLabel; + +@interface BubbleMessageCell : UITableViewCell +@property (strong, nonatomic) IBOutlet UIImageView *avatarView; +@property (strong, nonatomic) IBOutlet UILabel *unreadMarker; +@property (strong, nonatomic) IBOutlet UILabel *name; +@property (strong, nonatomic) IBOutlet FixedLabel *message; + +-(void) configureWithMessage:(Message *) message; + +@end diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m new file mode 100644 index 0000000..b201664 --- /dev/null +++ b/Juick/Views/BubbleMessageCell.m @@ -0,0 +1,43 @@ +// +// BubbleMessageCell.m +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import "BubbleMessageCell.h" +#import "ColorScheme.h" +@import YYWebImage; + +@implementation BubbleMessageCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +-(void) configureWithMessage:(Message *)message { + self.name.text = message.user.uname; + self.message.text = message.text; + self.unreadMarker.text = @""; + [self.avatarView yy_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/a/%d.png", [message.user.uid intValue]]] options:YYWebImageOptionProgressiveBlur|YYWebImageOptionSetImageWithFadeAnimation]; + self.message.enabledTextCheckingTypes = NSTextCheckingTypeLink; + self.message.backgroundColor = [ColorScheme mainBackground]; + self.message.layer.cornerRadius = 4; + self.message.clipsToBounds = YES; + self.message.textInsets = UIEdgeInsetsMake(4.0f, 8.0f, 4.0f, 8.0f); +} + +-(void) attributedLabel:(TTTAttributedLabel *)label didSelectLinkWithURL:(NSURL *)url { + [[UIApplication sharedApplication] openURL:url options: + @{} completionHandler:nil]; +} + +@end diff --git a/Juick/Views/BubbleMessageCell.xib b/Juick/Views/BubbleMessageCell.xib index a2b6bc3..b88ab17 100644 --- a/Juick/Views/BubbleMessageCell.xib +++ b/Juick/Views/BubbleMessageCell.xib @@ -1,30 +1,38 @@ - + + + + - + + - + - + + + + + - - - - - + + + + diff --git a/Juick/Views/FixedLabel.h b/Juick/Views/FixedLabel.h new file mode 100644 index 0000000..f05ac94 --- /dev/null +++ b/Juick/Views/FixedLabel.h @@ -0,0 +1,13 @@ +// +// FixedLabel.h +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import + +@interface FixedLabel : TTTAttributedLabel + +@end diff --git a/Juick/Views/FixedLabel.m b/Juick/Views/FixedLabel.m new file mode 100644 index 0000000..24d8648 --- /dev/null +++ b/Juick/Views/FixedLabel.m @@ -0,0 +1,21 @@ +// +// FixedLabel.m +// Juick +// +// Created by Vitaly Takmazov on 04/03/2018. +// Copyright © 2018 com.juick. All rights reserved. +// + +#import "FixedLabel.h" + +@implementation FixedLabel + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +@end -- cgit v1.2.3