refactor completed

This commit is contained in:
Mauro Romito
2023-03-06 14:59:03 +01:00
parent eb55e1553c
commit 09daa04dd4
49 changed files with 72 additions and 72 deletions
@@ -62,7 +62,7 @@ final class RoomCreationEventsModalViewModel: RoomCreationEventsModalViewModelTy
guard let summary = session.roomSummary(withRoomId: roomState.roomId) else {
return nil
}
return summary.displayname
return summary.displayName
}
var roomInfo: String? {
+3 -3
View File
@@ -760,7 +760,7 @@
else
{
// set default title
self.navigationItem.title = roomDataSource.room.summary.displayname;
self.navigationItem.title = roomDataSource.room.summary.displayName;
}
// Show input tool bar
@@ -780,7 +780,7 @@
}
else
{
self.navigationItem.title = roomDataSource.room.summary.displayname;
self.navigationItem.title = roomDataSource.room.summary.displayName;
}
}
else
@@ -890,7 +890,7 @@
} failure:^(NSError *error) {
cancelIndicator();
MXLogDebug(@"[MXKRoomVC] Failed to join room (%@)", self->roomDataSource.room.summary.displayname);
MXLogDebug(@"[MXKRoomVC] Failed to join room (%@)", self->roomDataSource.room.summary.displayName);
[self processRoomJoinFailureWithError:error completion:completion];
}];
}
@@ -366,11 +366,11 @@
switch (roomPowerLevel) {
case RoomPowerLevelAdmin:
self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelAdminIn:self.mxRoom.summary.displayname];
self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelAdminIn:self.mxRoom.summary.displayName];
self.roomMemberPowerLevelContainerView.hidden = NO;
break;
case RoomPowerLevelModerator:
self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelModeratorIn:self.mxRoom.summary.displayname];
self.roomMemberPowerLevelLabel.text = [VectorL10n roomMemberPowerLevelModeratorIn:self.mxRoom.summary.displayName];
self.roomMemberPowerLevelContainerView.hidden = NO;
break;
default:
@@ -39,7 +39,7 @@ final class RoomInfoListViewModel: NSObject, RoomInfoListViewModelType {
let basicInfoViewData = RoomInfoBasicViewData(avatarUrl: room.summary.avatar,
mediaManager: session.mediaManager,
roomId: room.roomId,
roomDisplayName: room.summary.displayname,
roomDisplayName: room.summary.displayName,
mainRoomAlias: room.summary.aliases?.first,
roomTopic: room.summary.topic,
encryptionImage: encryptionImage,
@@ -237,13 +237,13 @@ class RoomGroupCallStatusCell: RoomCallBaseCell {
TimeInterval(widgetEvent.age)/MSEC_PER_SEC < Constants.secondsToDisplayAnswerDeclineOptions {
if JitsiService.shared.isWidgetDeclined(withId: widgetId) {
innerContentView.callerNameLabel.text = room.summary.displayname
innerContentView.callerNameLabel.text = room.summary.displayName
room.summary.setRoomAvatarImageIn(innerContentView.avatarImageView)
viewState = .declined
statusText = VectorL10n.eventFormatterCallYouDeclined
} else {
innerContentView.callerNameLabel.text = VectorL10n.eventFormatterGroupCallIncoming(bubbleCellData.senderDisplayName, room.summary.displayname)
innerContentView.callerNameLabel.text = VectorL10n.eventFormatterGroupCallIncoming(bubbleCellData.senderDisplayName, room.summary.displayName)
innerContentView.avatarImageView.setImageURI(bubbleCellData.senderAvatarUrl,
withType: nil,
@@ -257,7 +257,7 @@ class RoomGroupCallStatusCell: RoomCallBaseCell {
statusText = nil
}
} else {
innerContentView.callerNameLabel.text = room.summary.displayname
innerContentView.callerNameLabel.text = room.summary.displayName
room.summary.setRoomAvatarImageIn(innerContentView.avatarImageView)
}
@@ -189,7 +189,7 @@ class RoomCreationIntroCell: MXKRoomBubbleTableViewCell {
discussionType = .room(topic: roomSummary.topic, canInvitePeople: bubbleData.canInvitePeople)
}
let displayName = roomSummary.displayname ?? ""
let displayName = roomSummary.displayName ?? ""
let roomAvatarViewData = RoomAvatarViewData(roomId: roomId,
displayName: displayName,
@@ -85,7 +85,7 @@
[super customizeViewRendering];
self.backgroundColor = UIColor.clearColor;
self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? ThemeService.shared.theme.textPrimaryColor : ThemeService.shared.theme.textSecondaryColor);
self.displayNameTextField.textColor = (self.mxRoom.summary.displayName.length ? ThemeService.shared.theme.textPrimaryColor : ThemeService.shared.theme.textSecondaryColor);
self.typingLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
self.dotView.backgroundColor = ThemeService.shared.theme.warningColor;
self.missedDiscussionsBadgeLabel.textColor = ThemeService.shared.theme.tintColor;
@@ -121,7 +121,7 @@
[self.presenceIndicatorView stopListeningPresenceUpdates];
}
self.displayNameTextField.text = self.mxRoom.summary.displayname;
self.displayNameTextField.text = self.mxRoom.summary.displayName;
if (!self.displayNameTextField.text.length)
{
self.displayNameTextField.text = [VectorL10n roomDisplaynameEmptyRoom];
@@ -48,7 +48,7 @@ import MediaPlayer
didSet {
// set avatar placeholder for now
roomAvatar = AvatarGenerator.generateAvatar(forMatrixItem: currentRoomSummary?.roomId,
withDisplayName: currentRoomSummary?.displayname,
withDisplayName: currentRoomSummary?.displayName,
size: Constants.roomAvatarImageSize.width,
andFontSize: Constants.roomAvatarFontSize)