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

Merge branch 'feature/5204_fix_federation_pill_appearance' into 'develop'

Browse Source 
MESSENGER-5204 fix federation pill appearance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!288
This commit is contained in:
JanNiklas Grabowski
2024-01-15 15:40:34 +00:00
parent 99e51e0a7a 5d71ab9fce
commit 366d6816ac
4 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
View File

@@ -40,14 +40,7 @@
_missedNotifAndUnreadBadgeBgViewWidthConstraint.constant = 0;
// bwi: 5203 add federation icon
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImage = FederationIconHelper.shared.federationBadgeImage;
self.federationImageView = [[UIImageView alloc] initWithImage:self.federationImage];
self.federationImageView.translatesAutoresizingMaskIntoConstraints = NO;
self.federationImageView.contentMode = UIViewContentModeScaleAspectFit;
@@ -90,14 +83,7 @@
_roomAvatar.clipsToBounds = YES;
// bwi: 5203 add federation icon
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImage = FederationIconHelper.shared.federationBadgeImage;
self.federationImageView.image = self.federationImage;
}

18
Riot/Modules/Contacts/Views/ContactTableViewCell.m
View File

@@ -48,14 +48,7 @@
self.thumbnailView.userInteractionEnabled = NO;
// BWI: 5208 add federation icon
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImage = FederationIconHelper.shared.federationBadgeImage;
self.federationImageView = [[UIImageView alloc] initWithImage:self.federationImage];
self.federationImageView.translatesAutoresizingMaskIntoConstraints = NO;
self.federationImageView.contentMode = UIViewContentModeScaleAspectFit;
@@ -97,14 +90,7 @@
self.thumbnailView.clipsToBounds = YES;
// BWI: 5208 add federation icon
if ([ThemeService.shared isCurrentThemeDark])
{
self.federationImage = AssetImages.roomFederatedBumIconDark.image;
}
else
{
self.federationImage = AssetImages.roomFederatedBumIconLight.image;
}
self.federationImage = FederationIconHelper.shared.federationBadgeImage;
self.federationImageView.image = self.federationImage;
}

10
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
View File

@@ -247,6 +247,16 @@
[self updateUserLabelTheme];
[self setNeedsStatusBarAppearanceUpdate];
// bwi: #5204 - federation
if (BWIBuildSettings.shared.isFederationEnabled && [self.mxRoom isRoomMemberFederated:self.mxRoomMember.userId])
{
if (self.pillImageView != nil)
{
self.pillImageView.image = FederationIconHelper.shared.federationBadgeImage;
}
self.roomMemberNameLabel.attributedText = [FederationIconHelper.shared roomNameWithFederationPillWithRoomDisplayName: self.mxRoomMember.displayname font: self.roomMemberNameLabel.font];
}
}
- (UIStatusBarStyle)preferredStatusBarStyle

15
Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
View File

@@ -64,6 +64,8 @@ class RoomInfoBasicView: UIView {
@IBOutlet private weak var securityInformationLabel: UILabel!
private var pillImageView: UIImageView?
private var roomDisplayName: String?
private var isRoomFederated: Bool = false
/// Block to be invoked when topic text view changes its content size.
var onTopicSizeChange: ((RoomInfoBasicView) -> Void)?
@@ -110,6 +112,8 @@ class RoomInfoBasicView: UIView {
// bwi: 5216 - federation
if BWIBuildSettings.shared.isFederationEnabled && viewData.isFederated {
isRoomFederated = true
self.roomDisplayName = viewData.roomDisplayName
// add imageview for the pill if it doesn't exist
if pillImageView == nil {
let imageView = FederationIconHelper.shared.getFederatedIconImageView(avatarFrame: avatarImageView.frame)
@@ -122,6 +126,7 @@ class RoomInfoBasicView: UIView {
roomNameLabel.attributedText = FederationIconHelper.shared.roomNameWithFederationPill(roomDisplayName: viewData.roomDisplayName, font: roomNameLabel.font)
} else {
roomNameLabel.text = viewData.roomDisplayName
isRoomFederated = false
pillImageView?.image = nil
}
@@ -220,6 +225,16 @@ extension RoomInfoBasicView: Themable {
securityTitleLabel.textColor = theme.textSecondaryColor
securityInformationLabel.textColor = theme.textPrimaryColor
presenceIndicatorView.borderColor = theme.headerBackgroundColor
// bwi: 5216 - federation
if BWIBuildSettings.shared.isFederationEnabled && isRoomFederated {
if pillImageView != nil {
pillImageView?.image = FederationIconHelper.shared.federationBadgeImage()
}
if let roomDisplayName = self.roomDisplayName {
roomNameLabel.attributedText = FederationIconHelper.shared.roomNameWithFederationPill(roomDisplayName: roomDisplayName, font: roomNameLabel.font)
}
}
}
}