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

Made sample app build with the new MXRoomMember class

Browse Source
This commit is contained in:
manuroe
2014-11-05 17:26:35 +01:00
parent dc1146b72a
commit 2f872da688
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
syMessaging/syMessaging/View/RoomMemberTableCell.m
View File

@@ -26,7 +26,7 @@
self.pictureURL = roomMember.avatarUrl;
// Shade invited users
if ([roomMember.membership isEqualToString:@"invite"]) {
if (roomMember.membership == MXMembershipInvite) {
for (UIView *view in self.subviews) {
view.alpha = 0.3;
}
@@ -37,13 +37,13 @@
}
// Customize banned and left (kicked) members
if ([roomMember.membership isEqualToString:@"leave"] || [roomMember.membership isEqualToString:@"ban"]) {
if (roomMember.membership == MXMembershipLeave || roomMember.membership == MXMembershipBan) {
self.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1.0];
self.userPowerLevel.hidden = YES;
self.lastActiveAgoLabel.backgroundColor = [UIColor lightGrayColor];
self.lastActiveAgoLabel.text = [roomMember.membership isEqualToString:@"leave"] ? @"left" : @"banned";
self.lastActiveAgoLabel.text = (roomMember.membership == MXMembershipLeave) ? @"left" : @"banned";
} else {
self.backgroundColor = [UIColor whiteColor];
@@ -71,13 +71,13 @@
self.userPowerLevel.progress = 0;
}
if ([roomMember.membership isEqualToString:@"invite"]) {
if (roomMember.membership == MXMembershipInvite) {
self.lastActiveAgoLabel.backgroundColor = [UIColor lightGrayColor];
self.lastActiveAgoLabel.text = @"invited";
} else {
// TODO: handle last_active_ago duration when it will be available from SDK
self.lastActiveAgoLabel.backgroundColor = [UIColor colorWithRed:0.2 green:0.9 blue:0.2 alpha:1.0];
self.lastActiveAgoLabel.text = [NSString stringWithFormat:@"%ds ago", roomMember.lastActiveAgo];
self.lastActiveAgoLabel.text = [NSString stringWithFormat:@"%lus ago", (unsigned long)roomMember.lastActiveAgo];
self.lastActiveAgoLabel.numberOfLines = 0;
}
}

12
syMessaging/syMessaging/ViewController/RoomViewController.m
View File

@@ -371,20 +371,20 @@ NSString *const kFailedEventId = @"failedEventId";
MXRoomMember *member2 = (MXRoomMember*)obj2;
// Move banned and left members at the end of the list
if ([member1.membership isEqualToString:@"leave"] || [member1.membership isEqualToString:@"ban"]) {
if (![member2.membership isEqualToString:@"leave"] && ![member2.membership isEqualToString:@"ban"]) {
if (member1.membership == MXMembershipLeave || member1.membership == MXMembershipBan) {
if (member2.membership != MXMembershipLeave && member2.membership != MXMembershipBan) {
return NSOrderedDescending;
}
} else if ([member2.membership isEqualToString:@"leave"] || [member2.membership isEqualToString:@"ban"]) {
} else if (member2.membership == MXMembershipLeave || member2.membership == MXMembershipBan) {
return NSOrderedAscending;
}
// Move invited members just before left and banned members
if ([member1.membership isEqualToString:@"invite"]) {
if (![member2.membership isEqualToString:@"invite"]) {
if (member1.membership == MXMembershipInvite) {
if (member2.membership != MXMembershipInvite) {
return NSOrderedDescending;
}
} else if ([member2.membership isEqualToString:@"invite"]) {
} else if (member2.membership == MXMembershipInvite) {
return NSOrderedAscending;
}