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.xcodeproj/project.pbxproj | 10 +++++++++- Juick/Juick.entitlements | 8 ++++++++ Juick/Supporting Files/Juick-Info.plist | 2 +- Juick/ViewControllers/RevealPanelViewController.m | 15 ++++++++------- Juick/Views/MessageCell.m | 6 ++++++ 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 Juick/Juick.entitlements diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj index 7dd079e..aae97f5 100644 --- a/Juick.xcodeproj/project.pbxproj +++ b/Juick.xcodeproj/project.pbxproj @@ -593,8 +593,10 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = KH4MX79ZK7; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -637,8 +639,10 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; + DEVELOPMENT_TEAM = KH4MX79ZK7; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -662,12 +666,15 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = KH4MX79ZK7; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Juick/Supporting Files/Juick-Prefix.pch"; INFOPLIST_FILE = "Juick/Supporting Files/Juick-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.3; PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; @@ -686,6 +693,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.3; PRODUCT_BUNDLE_IDENTIFIER = "com.juick.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; 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 @@ + + + + + aps-environment + production + + 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 @@ CFBundleSignature ???? CFBundleVersion - 1.0.16 + 1.0.19 ITSAppUsesNonExemptEncryption LSApplicationCategoryType 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