Fix Dark Mode

3 files changed, 7 insertions, 6 deletions

diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m
index f889200..53c4b2c 100644
--- a/Juick/Views/BubbleMessageCell.m
+++ b/Juick/Views/BubbleMessageCell.m
@@ -23,7 +23,7 @@
 }
 
 -(void) configureWithMessage:(Message *)message isMe:(BOOL)isMe {
-    self.message.backgroundColor = isMe ? [UIColor colorNamed:@"Funny"] : [UIColor colorNamed:@"Chat"];
+    self.message.backgroundColor = isMe ? [UIColor colorNamed:@"Funny"] : [UIColor colorNamed:@"Background"];
     self.message.textColor = isMe ? [UIColor whiteColor] : [UIColor colorNamed:@"Text"];
     self.message.dataDetectorTypes = UIDataDetectorTypeAll;
     self.message.tintColor = isMe? [UIColor whiteColor] : [UIColor colorNamed:@"Title"];
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 90d4ae2..c3a8afd 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -22,7 +22,6 @@ const NSString *unreadMarker = @"●";
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    self.text.textColor = [UIColor colorNamed:@"Text"];
     self.text.dataDetectorTypes = UIDataDetectorTypeAll;
     self.text.tintColor = [UIColor colorNamed:@"Title"];
     self.title.textColor = [UIColor colorNamed:@"Title"];
@@ -103,7 +102,9 @@ const NSString *unreadMarker = @"●";
         [self.text setHidden:NO];
         NSMutableAttributedString *txt = [[NSMutableAttributedString alloc]
                                           initWithString:msg.text
-                                          attributes:@{NSFontAttributeName:[UIFont preferredFontForTextStyle:UIFontTextStyleBody]}];
+                                          attributes:@{NSFontAttributeName:[UIFont preferredFontForTextStyle:UIFontTextStyleBody],
+                                                       NSForegroundColorAttributeName:[UIColor colorNamed:@"Text"]
+                                          }];
         [txt beginEditing];
         for (Entity *entity in msg.entities) {
             NSUInteger start = entity.start ? [entity.start unsignedIntegerValue] : 0;
@@ -115,7 +116,7 @@ const NSString *unreadMarker = @"●";
                 [txt addAttribute:NSLinkAttributeName value:entity.link range:currentRange];
             }
             if ([entity.type isEqualToString:@"q"]) {
-                [txt addAttribute:NSForegroundColorAttributeName value:[UIColor darkGrayColor] range:currentRange];
+                [txt addAttribute:NSForegroundColorAttributeName value:[UIColor colorNamed:@"Muted"] range:currentRange];
                 [txt addAttribute:NSParagraphStyleAttributeName value:_quoteStyle range:currentRange];
             }
             if ([entity.type isEqualToString:@"u"]) {
@@ -140,7 +141,7 @@ const NSString *unreadMarker = @"●";
                                          initWithString:tagsList
                                          attributes:@{
                                                       NSFontAttributeName:_italicFont,
-                                                      NSForegroundColorAttributeName:[UIColor darkGrayColor]
+                                                      NSForegroundColorAttributeName:[UIColor colorNamed:@"Muted"]
                                                       }] atIndex:0];
         }
         [txt endEditing];
diff --git a/Juick/Views/QuoteView.m b/Juick/Views/QuoteView.m
index 4ff78ce..5dd3d62 100644
--- a/Juick/Views/QuoteView.m
+++ b/Juick/Views/QuoteView.m
@@ -11,7 +11,7 @@
 
 -(void) awakeFromNib {
     [super awakeFromNib];
-    self.contentView.backgroundColor = [UIColor whiteColor];
+    self.contentView.backgroundColor = [UIColor colorNamed:@"Background"];
 }
 
 @end