Fix build break.

pull/1/head
Matthew Chen 7 years ago
parent 6c02c2065c
commit 906d0b01a4

@ -10,8 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
@implementation NSAttributedString (OWS)
- (NSAttributedString *)rtlSafeAppend:(NSString *)text
attributes:(NSDictionary *)attributes
- (NSAttributedString *)rtlSafeAppend:(NSString *)text attributes:(NSDictionary *)attributes
{
OWSAssert(text);
OWSAssert(attributes);

@ -30,7 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - ConversationColor
+ (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName NS_SWIFT_NAME(ows_conversationColor(colorName:));
+ (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName
NS_SWIFT_NAME(ows_conversationColor(colorName:));
+ (nullable NSString *)ows_conversationColorNameForColor:(UIColor *)color
NS_SWIFT_NAME(ows_conversationColorName(color:));

@ -2,8 +2,8 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "UIColor+OWS.h"
#import "OWSMath.h"
#import "UIColor+OWS.h"
#import <SignalServiceKit/Cryptography.h>
NS_ASSUME_NONNULL_BEGIN
@ -278,19 +278,19 @@ NS_ASSUME_NONNULL_BEGIN
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
colorMap = @{
@"red" : self.ows_red700Color,
@"pink": self.ows_pink600Color,
@"purple": self.ows_purple600Color,
@"indigo": self.ows_indigo600Color,
@"blue": self.ows_blue700Color,
@"cyan": self.ows_cyan800Color,
@"teal": self.ows_teal700Color,
@"green": self.ows_green800Color,
@"deep_orange": self.ows_deepOrange900Color,
@"grey": self.ows_grey600Color
};
@"red" : self.ows_red700Color,
@"pink" : self.ows_pink600Color,
@"purple" : self.ows_purple600Color,
@"indigo" : self.ows_indigo600Color,
@"blue" : self.ows_blue700Color,
@"cyan" : self.ows_cyan800Color,
@"teal" : self.ows_teal700Color,
@"green" : self.ows_green800Color,
@"deep_orange" : self.ows_deepOrange900Color,
@"grey" : self.ows_grey600Color
};
});
return colorMap;
}
@ -307,7 +307,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (nullable UIColor *)ows_conversationColorForColorName:(NSString *)colorName
{
OWSAssert(colorName.length > 0);
return [self.ows_conversationColorMap objectForKey:colorName];
}

@ -2,8 +2,8 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "UIView+OWS.h"
#import "OWSMath.h"
#import "UIView+OWS.h"
#import <SignalServiceKit/AppContext.h>
NS_ASSUME_NONNULL_BEGIN

@ -73,7 +73,8 @@ NS_ASSUME_NONNULL_BEGIN
// in a UIBarButtonItem.
[backButton addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
UIImage *backImage = [[UIImage imageNamed:(isRTL ? @"NavBarBackRTL" : @"NavBarBack")] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
UIImage *backImage = [[UIImage imageNamed:(isRTL ? @"NavBarBackRTL" : @"NavBarBack")]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
OWSAssert(backImage);
[backButton setImage:backImage forState:UIControlStateNormal];
backButton.tintColor = Theme.navbarIconColor;

@ -9,6 +9,7 @@
#import "OWSRequestFactory.h"
#import "PhoneNumber.h"
#import "TSNetworkManager.h"
#import "Threading.h"
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>

Loading…
Cancel
Save