felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 01:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into spaces

Browse Source 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
This commit is contained in:
Gil Eluard
2021-09-15 14:42:04 +02:00
parent 7de6d2005d ee417c21d8
commit 6335acc0cd
366 changed files with 11801 additions and 3234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Home/Views/RoomCollectionViewCell.m
-17
View File
@@ -26,11 +26,6 @@
#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
@@ -67,16 +62,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
self.roomTitle1.textColor = ThemeService.shared.theme.textPrimaryColor;
self.roomTitle2.textColor = ThemeService.shared.theme.textPrimaryColor;
// Prepare direct room border
CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(ThemeService.shared.theme.tintColor.CGColor, kDirectRoomBorderColorAlpha);
[self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
self.directRoomBorderView.clipsToBounds = YES;
self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
CFRelease(directRoomBorderColor);
self.editionArrowView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
self.roomAvatar.defaultBackgroundColor = [UIColor clearColor];
@@ -145,8 +130,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
}
self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
if (roomCellData.roomSummary)
{
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.roomSummary.avatar displayName:roomCellData.roomSummary.displayname mediaManager:roomCellData.roomSummary.mxSession.mediaManager];