Apply "disappearing messages disabled" icon.

pull/1/head
Matthew Chen 7 years ago
parent 92515bdd1d
commit 4d3707a16e

@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "timer-disabled-48@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "timer-disabled-48@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "timer-disabled-48@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "timer-20@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "timer-20@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "timer-20@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -237,8 +237,13 @@ typedef void (^SystemMessageActionBlock)(void);
case TSInfoMessageAddGroupToProfileWhitelistOffer:
case TSInfoMessageTypeGroupUpdate:
case TSInfoMessageTypeGroupQuit:
case TSInfoMessageTypeDisappearingMessagesUpdate:
return nil;
case TSInfoMessageTypeDisappearingMessagesUpdate: {
// OWSDisappearingConfigurationUpdateInfoMessage *configurationUpdate =
// (OWSDisappearingConfigurationUpdateInfoMessage *)interaction; configurationIsEnabled
result = [UIImage imageNamed:@"system_message_disappearing_messages"];
break;
}
case TSInfoMessageVerificationStateChange:
OWSAssert([interaction isKindOfClass:[OWSVerificationStateChangeMessage class]]);
if ([interaction isKindOfClass:[OWSVerificationStateChangeMessage class]]) {

@ -378,7 +378,10 @@ const CGFloat kIconViewLength = 24;
[topView autoPinEdgeToSuperviewEdge:ALEdgeTop];
[topView autoSetDimension:ALDimensionHeight toSize:kOWSTable_DefaultCellHeight];
UIImageView *iconView = [strongSelf viewForIconWithName:@"ic_timer"];
NSString *iconName
= (strongSelf.disappearingMessagesConfiguration.isEnabled ? @"ic_timer"
: @"ic_timer_disabled");
UIImageView *iconView = [strongSelf viewForIconWithName:iconName];
[topView addSubview:iconView];
[iconView autoVCenterInSuperview];
[iconView autoPinLeadingToSuperviewMargin];

@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface OWSDisappearingConfigurationUpdateInfoMessage : TSInfoMessage
@property (nonatomic, readonly) BOOL configurationIsEnabled;
/**
* @param remoteName is nil when created by the local user
*/

@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly, nullable) NSString *createdByRemoteName;
@property (nonatomic, readonly) BOOL createdInExistingGroup;
@property (nonatomic, readonly) BOOL configurationIsEnabled;
@property (nonatomic, readonly) uint32_t configurationDurationSeconds;
@end

Loading…
Cancel
Save