Merge pull request #1900 from vector-im/fix_cells_border_color_leak

Fix a memory leak with cells direct room border color
This commit is contained in:
SBiOSoftWhare
2018-06-08 13:34:00 +02:00
committed by GitHub
3 changed files with 33 additions and 6 deletions
+11 -2
View File
@@ -25,6 +25,11 @@
#import "MXRoomSummary+Riot.h"
#pragma mark - Defines & Constants
static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
static const CGFloat kDirectRoomBorderWidth = 3.0;
@implementation RecentTableViewCell
#pragma mark - Class methods
@@ -48,10 +53,14 @@
self.missedNotifAndUnreadBadgeLabel.textColor = kRiotPrimaryBgColor;
// Prepare direct room border
CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
[self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
self.directRoomBorderView.clipsToBounds = YES;
self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
self.directRoomBorderView.layer.borderWidth = 3;
self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
CFRelease(directRoomBorderColor);
self.roomAvatar.defaultBackgroundColor = [UIColor clearColor];
}
+11 -2
View File
@@ -24,6 +24,11 @@
#import "MXTools.h"
#pragma mark - Defines & Constants
static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
static const CGFloat kDirectRoomBorderWidth = 3.0;
@implementation RoomCollectionViewCell
#pragma mark - Class methods
@@ -66,10 +71,14 @@
self.missedNotifAndUnreadBadgeLabel.textColor = kRiotPrimaryBgColor;
// Prepare direct room border
CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
[self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
self.directRoomBorderView.clipsToBounds = YES;
self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
self.directRoomBorderView.layer.borderWidth = 3;
self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
CFRelease(directRoomBorderColor);
self.editionArrowView.backgroundColor = kRiotSecondaryBgColor;
+11 -2
View File
@@ -20,6 +20,11 @@
#import "RiotDesignValues.h"
#import "MXRoomSummary+Riot.h"
#pragma mark - Defines & Constants
static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
static const CGFloat kDirectRoomBorderWidth = 3.0;
@implementation RoomTableViewCell
#pragma mark - Class methods
@@ -31,10 +36,14 @@
self.titleLabel.textColor = kRiotPrimaryTextColor;
// Prepare direct room border
CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
[self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
self.directRoomBorderView.clipsToBounds = YES;
self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
self.directRoomBorderView.layer.borderWidth = 3;
self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
CFRelease(directRoomBorderColor);
self.avatarImageView.defaultBackgroundColor = [UIColor clearColor];
}