MESSENGER-5203 add federation to lab settings and refactor

This commit is contained in:
JanNiklas Grabowski
2023-11-02 15:35:25 +01:00
parent 5f5aa69a73
commit a213954135
8 changed files with 76 additions and 49 deletions
@@ -40,32 +40,29 @@
_missedNotifAndUnreadBadgeBgViewWidthConstraint.constant = 0;
// bwi: 5203 add federation icon
if (BWIBuildSettings.shared.isFederationEnabled)
if ([ThemeService.shared isCurrentThemeDark])
{
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImageView = [[UIImageView alloc] initWithImage:self.federationImage];
self.federationImageView.translatesAutoresizingMaskIntoConstraints = NO;
self.federationImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.federationImageView];
// scale and new with federation icon
float scaleFactor = ((self.roomAvatar.frame.size.height * 0.34) / self.federationImage.size.height);
float imageWidth = scaleFactor * self.federationImage.size.width;
// offset federation icon
float offset = 3 * scaleFactor;
[self.federationImageView.bottomAnchor constraintEqualToAnchor:self.roomAvatar.bottomAnchor constant:0].active = YES;
[self.federationImageView.trailingAnchor constraintEqualToAnchor:self.roomAvatar.trailingAnchor constant:offset].active = YES;
[self.federationImageView.heightAnchor constraintEqualToConstant:(self.roomAvatar.frame.size.height * 0.34)].active = YES;
[self.federationImageView.widthAnchor constraintEqualToConstant:imageWidth].active = YES;
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImageView = [[UIImageView alloc] initWithImage:self.federationImage];
self.federationImageView.translatesAutoresizingMaskIntoConstraints = NO;
self.federationImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.contentView addSubview:self.federationImageView];
// scale and new with federation icon
float scaleFactor = ((self.roomAvatar.frame.size.height * 0.34) / self.federationImage.size.height);
float imageWidth = scaleFactor * self.federationImage.size.width;
// offset federation icon
float offset = 3 * scaleFactor;
[self.federationImageView.bottomAnchor constraintEqualToAnchor:self.roomAvatar.bottomAnchor constant:0].active = YES;
[self.federationImageView.trailingAnchor constraintEqualToAnchor:self.roomAvatar.trailingAnchor constant:offset].active = YES;
[self.federationImageView.heightAnchor constraintEqualToConstant:(self.roomAvatar.frame.size.height * 0.34)].active = YES;
[self.federationImageView.widthAnchor constraintEqualToConstant:imageWidth].active = YES;
}
- (void)customizeTableViewCellRendering
@@ -91,18 +88,15 @@
_roomAvatar.clipsToBounds = YES;
// bwi: 5203 add federation icon
if (BWIBuildSettings.shared.isFederationEnabled)
if ([ThemeService.shared isCurrentThemeDark])
{
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImageView.image = self.federationImage;
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImageView.image = self.federationImage;
}
- (void)render:(MXKCellData *)cellData
@@ -129,7 +123,7 @@
{
if (room.isDirect)
{
if ([room isDMFederated])
if (room.isDMFederated)
{
self.federationImageView.hidden = NO;
}
@@ -138,7 +132,7 @@
self.federationImageView.hidden = YES;
}
}
else if ([room isRoomFederated])
else if (room.isRoomFederated)
{
self.federationImageView.hidden = NO;
}