From 1fc442b9401aa88e5d2fdb2c8f059e9aede5f7e0 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 31 Mar 2017 02:01:23 +0300
Subject: production pushes and color fixes

---
 Juick/Juick.entitlements                          |  8 ++++++++
 Juick/Supporting Files/Juick-Info.plist           |  2 +-
 Juick/ViewControllers/RevealPanelViewController.m | 15 ++++++++-------
 Juick/Views/MessageCell.m                         |  6 ++++++
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 Juick/Juick.entitlements

(limited to 'Juick')

diff --git a/Juick/Juick.entitlements b/Juick/Juick.entitlements
new file mode 100644
index 0000000..28c29bf
--- /dev/null
+++ b/Juick/Juick.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>production</string>
+</dict>
+</plist>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index ed5a794..4e1224b 100644
--- a/Juick/Supporting Files/Juick-Info.plist	
+++ b/Juick/Supporting Files/Juick-Info.plist	
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.16</string>
+	<string>1.0.19</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/RevealPanelViewController.m b/Juick/ViewControllers/RevealPanelViewController.m
index c327ca6..623bb87 100644
--- a/Juick/ViewControllers/RevealPanelViewController.m
+++ b/Juick/ViewControllers/RevealPanelViewController.m
@@ -39,9 +39,9 @@ static NSString *CellIdentifier = @"NavCell";
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    [self.view setBackgroundColor:[ColorScheme mainBackground]];
+    [self.view setBackgroundColor:[UIColor whiteColor]];
     self.tableView = [[UITableView alloc] init];
-    [self.tableView setBackgroundColor:[ColorScheme mainBackground]];
+    //[self.tableView setBackgroundColor:[UIColor whiteColor]];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     [self.tableView setSeparatorInset:UIEdgeInsetsZero];
@@ -114,8 +114,8 @@ static NSString *CellIdentifier = @"NavCell";
     NSInteger row = indexPath.row;
     [cell.contentView setBackgroundColor:[UIColor whiteColor]];
     cell.icon.font = [UIFont fontWithName:kFontAwesomeFamilyName size:32.f];
-    cell.icon.textColor = [ColorScheme linkColor];
-    cell.descriptionText.textColor = [ColorScheme linkColor];
+    cell.icon.textColor = [ColorScheme colorWithHex:0x222222];
+    cell.descriptionText.textColor = [ColorScheme colorWithHex:0x222222];
     if (row == 0) {
         cell.descriptionText.text = @"My feed";
         cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconHome];
@@ -131,7 +131,7 @@ static NSString *CellIdentifier = @"NavCell";
         cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconPicture];
     }
     UIView *bgColorView = [[UIView alloc] init];
-    bgColorView.backgroundColor = [UIColor blackColor];
+    bgColorView.backgroundColor = [ColorScheme colorWithHex:0xddddd5];
     bgColorView.layer.masksToBounds = YES;
     [cell setSelectedBackgroundView:bgColorView];
     [cell.contentView setNeedsLayout];
@@ -144,6 +144,8 @@ static NSString *CellIdentifier = @"NavCell";
     NSString *targetPath;
     NSDictionary *targetParams;
     NSString *targetTitle;
+    SWRevealViewController *reveal = self.revealViewController;
+    [reveal revealToggle:self];
     if (row == 0) {
         if ([[PDKeychainBindings sharedKeychainBindings] stringForKey:@"com.juick.username"] == nil) {
             AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -168,11 +170,10 @@ static NSString *CellIdentifier = @"NavCell";
         targetPath = [Message messagesUrl];
         targetParams = [NSDictionary dictionaryWithObjectsAndKeys:@"photo", @"media", nil];
     }
-    SWRevealViewController *reveal = self.revealViewController;
+    
     UINavigationController *front = (UINavigationController *)reveal.frontViewController;
     MessagesViewController *messages = (MessagesViewController *)[front.viewControllers objectAtIndex:0];
     [messages loadFromPath:targetPath withParams:targetParams withTitle:targetTitle];
-    [reveal revealToggle:self];
 }
 
 @end
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 2d34029..06b657c 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -7,6 +7,10 @@
 //
 
 #import "MessageCell.h"
+#import "ColorScheme.h"
+
+@import DateTools;
+@import YYWebImage;
 
 @implementation MessageCell
 
@@ -14,6 +18,8 @@
     [super awakeFromNib];
     self.text.enabledTextCheckingTypes = NSTextCheckingTypeLink;
     self.text.delegate = self;
+    self.text.linkAttributes = @{ (id)kCTForegroundColorAttributeName: [ColorScheme linkColor],
+                             (id)kCTUnderlineStyleAttributeName : [NSNumber numberWithInt:NSUnderlineStyleSingle] };
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-- 
cgit v1.2.3