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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Yannick Le Collen
2014-12-16 16:11:47 +01:00
parent 392c7f9af1 7a49aa7d35
commit 1577313154
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/RoomViewController.m
+10 -17
View File
@@ -107,13 +107,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
// Hide messages table by default in order to hide initial scrolling to the bottom
self.messagesTableView.hidden = YES;
UIButton *membersButton = [UIButton buttonWithType:UIButtonTypeSystem];
[membersButton setImage:[UIImage imageNamed:@"icon_users"] forState:UIControlStateNormal];
[membersButton setImage:[UIImage imageNamed:@"icon_users"] forState:UIControlStateHighlighted];
membersButton.frame = CGRectMake(0, 0, 44, 44);
[membersButton addTarget:self action:@selector(showHideRoomMembers:) forControlEvents:UIControlEventTouchUpInside];
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:membersButton];
// Add tap detection on members view in order to hide members when the user taps outside members list
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideRoomMembers)];
[tap setNumberOfTouchesRequired:1];
@@ -616,16 +609,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
# pragma mark - Room members
- (void)showHideRoomMembers:(id)sender {
// Check whether the members list is displayed
if (members) {
[self hideRoomMembers];
} else {
[self hideAttachmentView];
[self showRoomMembers];
}
}
- (void)updateRoomMembers {
members = [[self.mxRoom.state members] sortedArrayUsingComparator:^NSComparisonResult(MXRoomMember *member1, MXRoomMember *member2) {
// Move banned and left members at the end of the list
@@ -1748,6 +1731,16 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
[self.messagesTableView reloadData];
}
- (IBAction)showHideRoomMembers:(id)sender {
// Check whether the members list is displayed
if (members) {
[self hideRoomMembers];
} else {
[self hideAttachmentView];
[self showRoomMembers];
}
}
#pragma mark - Post messages
- (void)postMessage:(NSDictionary*)msgContent withLocalEvent:(MXEvent*)localEvent {