summaryrefslogtreecommitdiff
path: root/Juick/Views
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2019-03-21 20:17:42 +0300
committerGravatar Vitaly Takmazov2019-03-21 20:17:42 +0300
commit6b40f06a691e1264f6e35b6a5616198e6977787d (patch)
treed7aa6427861523a8447d52a8b45d57a605a1a714 /Juick/Views
parente6fec9707f61b5d521bf1a2e6a85998f2466bdfa (diff)
Named colours
Diffstat (limited to 'Juick/Views')
-rw-r--r--Juick/Views/BubbleMessageCell.m7
-rw-r--r--Juick/Views/ConversationCell.m3
-rw-r--r--Juick/Views/MessageCell.m11
-rw-r--r--Juick/Views/MessageInputView.m3
-rw-r--r--Juick/Views/QuoteView.m3
5 files changed, 11 insertions, 16 deletions
diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m
index 70746cf..ce41002 100644
--- a/Juick/Views/BubbleMessageCell.m
+++ b/Juick/Views/BubbleMessageCell.m
@@ -7,7 +7,6 @@
//
#import "BubbleMessageCell.h"
-#import "ColorScheme.h"
@implementation BubbleMessageCell
@@ -23,10 +22,10 @@
}
-(void) configureWithMessage:(Message *)message isMe:(BOOL)isMe {
- self.message.backgroundColor = isMe ? [ColorScheme secondaryBackground] : [ColorScheme mainBackground];
- self.message.textColor = isMe ? [UIColor whiteColor] : [ColorScheme textColor];
+ self.message.backgroundColor = isMe ? [UIColor colorNamed:@"Funny"] : [UIColor colorNamed:@"Chat"];
+ self.message.textColor = isMe ? [UIColor whiteColor] : [UIColor colorNamed:@"Text"];
self.message.dataDetectorTypes = UIDataDetectorTypeAll;
- self.message.tintColor = isMe? [UIColor whiteColor] : [ColorScheme linkColor];
+ self.message.tintColor = isMe? [UIColor whiteColor] : [UIColor colorNamed:@"Title"];
self.name.text = message.user.uname;
self.message.text = message.text;
self.unreadMarker.text = @"";
diff --git a/Juick/Views/ConversationCell.m b/Juick/Views/ConversationCell.m
index bcf99e7..e4a000c 100644
--- a/Juick/Views/ConversationCell.m
+++ b/Juick/Views/ConversationCell.m
@@ -7,12 +7,11 @@
//
#import "ConversationCell.h"
-#import "ColorScheme.h"
@implementation ConversationCell
-(void) configureWithChat:(Chat *)chat {
- self.chatName.textColor = [ColorScheme linkColor];
+ self.chatName.textColor = [UIColor colorNamed:@"Title"];
self.chatName.text = chat.uname;
self.lastMessage.text = chat.lastMessageText;
self.unreadMarker.hidden = true;
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 6929436..fc7a821 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -7,7 +7,6 @@
//
#import "MessageCell.h"
-#import "ColorScheme.h"
#import "APIClient.h"
#import "Entity.h"
@@ -21,12 +20,12 @@
- (void)awakeFromNib {
[super awakeFromNib];
- self.text.textColor = [ColorScheme textColor];
+ self.text.textColor = [UIColor colorNamed:@"Text"];
self.text.dataDetectorTypes = UIDataDetectorTypeAll;
- self.text.tintColor = [ColorScheme linkColor];
- self.title.textColor = [ColorScheme linkColor];
- self.timestamp.textColor = [UIColor grayColor];
- self.summary.textColor = [UIColor grayColor];
+ self.text.tintColor = [UIColor colorNamed:@"Title"];
+ self.title.textColor = [UIColor colorNamed:@"Title"];
+ self.timestamp.textColor = [UIColor colorNamed:@"Muted"];
+ self.summary.textColor = [UIColor colorNamed:@"Muted"];
UIGestureRecognizer *avatarTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarClicked:)];
[avatarTapRecognizer setEnabled:YES];
[self.avatar addGestureRecognizer:avatarTapRecognizer];
diff --git a/Juick/Views/MessageInputView.m b/Juick/Views/MessageInputView.m
index f16f490..ab6b3e5 100644
--- a/Juick/Views/MessageInputView.m
+++ b/Juick/Views/MessageInputView.m
@@ -7,13 +7,12 @@
//
#import "MessageInputView.h"
-#import "ColorScheme.h"
@implementation MessageInputView
-(void) awakeFromNib {
[super awakeFromNib];
- [self setTintColor:[ColorScheme linkColor]];
+ [self setTintColor:[UIColor colorNamed:@"Title"]];
}
@end
diff --git a/Juick/Views/QuoteView.m b/Juick/Views/QuoteView.m
index bb9cd75..4ff78ce 100644
--- a/Juick/Views/QuoteView.m
+++ b/Juick/Views/QuoteView.m
@@ -7,12 +7,11 @@
//
#import "QuoteView.h"
-#import "ColorScheme.h"
@implementation QuoteView
-(void) awakeFromNib {
[super awakeFromNib];
- self.contentView.backgroundColor = [ColorScheme headerBackground];
+ self.contentView.backgroundColor = [UIColor whiteColor];
}
@end