Style timer changes less alarmingly.

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 89df8ddb31
commit 85beb93e86

@ -135,7 +135,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
SignalServiceKit: SignalServiceKit:
:commit: c274e3aa30ed07c5166f1bd3bec7097bafab8dc4 :commit: c2cb7c8484326333b5ac9225de993f62fab68c11
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:commit: 41b57bb2fc292a814f758441a05243eb38457027 :commit: 41b57bb2fc292a814f758441a05243eb38457027

@ -3,20 +3,17 @@
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved. // Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "OWSDisplayedMessage.h" #import "OWSDisplayedMessage.h"
#import "TSInfoMessage.h"
#import "TSMessageAdapter.h" #import "TSMessageAdapter.h"
typedef NS_ENUM(NSInteger, OWSInfoMessageType) {
OWSInfoMessageTypeSessionDidEnd,
};
@interface OWSInfoMessage : OWSDisplayedMessage @interface OWSInfoMessage : OWSDisplayedMessage
@property (nonatomic) OWSInfoMessageType infoMessageType; @property (nonatomic) TSInfoMessageType infoMessageType;
@property (nonatomic) TSMessageAdapterType messageType; @property (nonatomic) TSMessageAdapterType messageType;
#pragma mark - Initialization #pragma mark - Initialization
- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType - (instancetype)initWithInfoType:(TSInfoMessageType)messageType
senderId:(NSString *)senderId senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date; date:(NSDate *)date;

@ -6,7 +6,7 @@
@implementation OWSInfoMessage @implementation OWSInfoMessage
- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType - (instancetype)initWithInfoType:(TSInfoMessageType)messageType
senderId:(NSString *)senderId senderId:(NSString *)senderId
senderDisplayName:(NSString *)senderDisplayName senderDisplayName:(NSString *)senderDisplayName
date:(NSDate *)date date:(NSDate *)date
@ -27,7 +27,7 @@
- (NSString *)text - (NSString *)text
{ {
switch (self.infoMessageType) { switch (self.infoMessageType) {
case OWSInfoMessageTypeSessionDidEnd: case TSInfoMessageTypeSessionDidEnd:
return [NSString stringWithFormat:@"Session with %@ ended.", self.senderDisplayName]; return [NSString stringWithFormat:@"Session with %@ ended.", self.senderDisplayName];
break; break;

@ -33,7 +33,7 @@
// for InfoMessages // for InfoMessages
@property NSInteger infoMessageType; @property TSInfoMessageType infoMessageType;
// for ErrorMessages // for ErrorMessages

@ -876,7 +876,15 @@ typedef enum : NSUInteger {
infoCell.textView.selectable = NO; infoCell.textView.selectable = NO;
infoCell.messageBubbleContainerView.layer.borderColor = [[UIColor ows_infoMessageBorderColor] CGColor]; infoCell.messageBubbleContainerView.layer.borderColor = [[UIColor ows_infoMessageBorderColor] CGColor];
infoCell.headerImageView.image = [UIImage imageNamed:@"warning_white"]; if (infoMessage.infoMessageType == TSInfoMessageTypeDisappearingMessagesUpdate) {
infoCell.headerImageView.image = [UIImage imageNamed:@"ic_timer"];
infoCell.headerImageView.backgroundColor = [UIColor whiteColor];
// Lighten up the broad stroke header icon to match the perceived color of the border.
infoCell.headerImageView.tintColor = [UIColor ows_infoMessageBorderColor];
} else {
infoCell.headerImageView.image = [UIImage imageNamed:@"warning_white"];
}
return infoCell; return infoCell;
} }

Loading…
Cancel
Save