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

Fix Room members: Add a specific section INVITED

Browse Source 
#132
This commit is contained in:
giomfo
2016-04-08 17:26:42 +02:00
parent eb2b2ffe0c
commit eef696b65c
13 changed files with 417 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Views/Contact/ContactTableViewCell.m
+2 -25
View File
@@ -47,8 +47,6 @@
self.thumbnailView.clipsToBounds = YES;
// apply the vector colours
self.bottomLineSeparator.backgroundColor = kVectorColorSiver;
self.topLineSeparator.backgroundColor = kVectorColorSiver;
self.lastPresenceLabel.textColor = kVectorTextColorGray;
}
@@ -198,29 +196,8 @@
{
NSString* presenceText = nil;
NSString* matrixId = [self getFirstMatrixId];
MXRoomMember* member = nil;
if (self.mxRoom && matrixId)
{
member = [self.mxRoom.state memberWithUserId:matrixId];
}
if (member && (member.membership != MXMembershipJoin))
{
if (member.membership == MXMembershipInvite)
{
presenceText = NSLocalizedStringFromTable(@"room_participants_invite", @"Vector", nil);
}
else if (member.membership == MXMembershipLeave)
{
presenceText = NSLocalizedStringFromTable(@"room_participants_leave", @"Vector", nil);
}
else if (member.membership == MXMembershipBan)
{
presenceText = NSLocalizedStringFromTable(@"room_participants_ban", @"Vector", nil);
}
}
else if (matrixId)
if (matrixId)
{
MXUser *user = nil;
@@ -268,7 +245,7 @@
}
else if (contact.isThirdPartyInvite)
{
presenceText = NSLocalizedStringFromTable(@"room_participants_invite", @"Vector", nil);
presenceText = NSLocalizedStringFromTable(@"room_participants_offline", @"Vector", nil);
}
self.lastPresenceLabel.text = presenceText;