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

Add new tag: RoomBubbleCellDataTagRoomCreateConfiguration

Browse Source
This commit is contained in:
ismailgulek
2020-09-14 14:11:24 +03:00
parent 847c60d117
commit 6a92d5e99e
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+39
View File
@@ -85,6 +85,33 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
{
self.tag = RoomBubbleCellDataTagRoomCreateWithPredecessor;
}
else
{
self.tag = RoomBubbleCellDataTagRoomCreateConfiguration;
}
// Membership events can be collapsed together
self.collapsable = YES;
// Collapse them by default
self.collapsed = YES;
}
break;
case MXEventTypeRoomTopic:
case MXEventTypeRoomName:
case MXEventTypeRoomEncryption:
case MXEventTypeRoomHistoryVisibility:
case MXEventTypeRoomGuestAccess:
case MXEventTypeRoomAvatar:
case MXEventTypeRoomJoinRules:
{
self.tag = RoomBubbleCellDataTagRoomCreateConfiguration;
// Membership events can be collapsed together
self.collapsable = YES;
// Collapse them by default
self.collapsed = YES;
}
break;
default:
@@ -187,6 +214,15 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
return NO;
}
else if (self.tag == RoomBubbleCellDataTagRoomCreateConfiguration &&
(cellData.tag == RoomBubbleCellDataTagRoomCreateConfiguration || cellData.tag == RoomBubbleCellDataTagMembership))
{
return YES;
}
else if (self.tag == RoomBubbleCellDataTagMembership && cellData.tag == RoomBubbleCellDataTagRoomCreateConfiguration)
{
return YES;
}
if (self.tag == RoomBubbleCellDataTagRoomCreateWithPredecessor || cellData.tag == RoomBubbleCellDataTagRoomCreateWithPredecessor)
{
@@ -665,6 +701,9 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
// One single bubble per membership event
shouldAddEvent = NO;
break;
case RoomBubbleCellDataTagRoomCreateConfiguration:
shouldAddEvent = NO;
break;
default:
break;
}