From 675d2bd7c52ef0e191d52784f20f3c35e4b308f6 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 17 Oct 2018 00:30:51 +0300 Subject: Layout fixes --- Juick.xcodeproj/project.pbxproj | 12 ++++++------ Juick/Views/ConversationCell.m | 6 +++--- Juick/Views/ConversationCell.xib | 29 +++++++++++++---------------- Juick/Views/MessageCell.m | 1 + 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj index 3b9d2fd..f06323d 100644 --- a/Juick.xcodeproj/project.pbxproj +++ b/Juick.xcodeproj/project.pbxproj @@ -287,23 +287,23 @@ 77FFC0151D5FD13C003BD81A /* Views */ = { isa = PBXGroup; children = ( + 773E63A1204BE036008B8F8D /* BubbleMessageCell.h */, + 773E63A2204BE036008B8F8D /* BubbleMessageCell.m */, 773E6391204BCAD6008B8F8D /* BubbleMessageCell.xib */, + 773E6395204BCB64008B8F8D /* ConversationCell.h */, + 773E6396204BCB64008B8F8D /* ConversationCell.m */, 773E6392204BCAD6008B8F8D /* ConversationCell.xib */, 776C41BA1FD3EF180063B82E /* MessageCell.h */, 776C41BB1FD3EF180063B82E /* MessageCell.m */, 776C41BC1FD3EF180063B82E /* MessageCell.xib */, - 77E61A5A1FD467FC00B4E304 /* QuoteView.xib */, 77E61A5C1FD4682B00B4E304 /* QuoteView.h */, 77E61A5D1FD4682B00B4E304 /* QuoteView.m */, - 773E6395204BCB64008B8F8D /* ConversationCell.h */, - 773E6396204BCB64008B8F8D /* ConversationCell.m */, - 773E63A1204BE036008B8F8D /* BubbleMessageCell.h */, - 773E63A2204BE036008B8F8D /* BubbleMessageCell.m */, + 77E61A5A1FD467FC00B4E304 /* QuoteView.xib */, 773E63A4204BE11B008B8F8D /* FixedLabel.h */, 773E63A5204BE11B008B8F8D /* FixedLabel.m */, - 77B8B398207A52BD005CB20C /* MessageInputView.xib */, 77B8B39A207A5629005CB20C /* MessageInputView.h */, 77B8B39B207A5629005CB20C /* MessageInputView.m */, + 77B8B398207A52BD005CB20C /* MessageInputView.xib */, 7761133521766A3000D350CD /* ContentLoadingCell.h */, 7761133621766A3000D350CD /* ContentLoadingCell.m */, 7761133721766A3000D350CD /* ContentLoadingCell.xib */, diff --git a/Juick/Views/ConversationCell.m b/Juick/Views/ConversationCell.m index 873f21e..ca09cd0 100644 --- a/Juick/Views/ConversationCell.m +++ b/Juick/Views/ConversationCell.m @@ -7,6 +7,7 @@ // #import "ConversationCell.h" +#import "ColorScheme.h" @implementation ConversationCell @@ -16,10 +17,9 @@ } -(void) configureWithChat:(Chat *)chat { + self.chatName.textColor = [ColorScheme linkColor]; self.chatName.text = chat.uname; - self.lastMessage.text = @""; - self.unreadMarker.text = @""; - __weak UIImageView *weakAvatar; + __weak UIImageView *weakAvatar = self.avatar; [self.avatar setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/a/%d.png", [chat.uid intValue]]]] placeholderImage:nil success:^(NSURLRequest * _Nonnull request, NSHTTPURLResponse * _Nullable response, UIImage * _Nonnull image) { [UIView transitionWithView:weakAvatar duration:0.3 diff --git a/Juick/Views/ConversationCell.xib b/Juick/Views/ConversationCell.xib index 65f9766..09b5a7e 100644 --- a/Juick/Views/ConversationCell.xib +++ b/Juick/Views/ConversationCell.xib @@ -18,41 +18,38 @@ - + - - + + - - + + - - + + - - - - - + +