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

InviteRecentTableViewCell: Use "accept" as right button only for DM invite and restore "preview" action for room invite.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-11-17 22:40:37 +01:00
parent b58accec86
commit ad15230839
4 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/People/Views/InviteRecentTableViewCell.m
+35 -15
View File
@@ -48,7 +48,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
[self.rightButton.layer setCornerRadius:5];
self.rightButton.clipsToBounds = YES;
[self.rightButton setTitle:NSLocalizedStringFromTable(@"accept", @"Vector", nil) forState:UIControlStateNormal];
[self.rightButton addTarget:self action:@selector(onAcceptPressed:) forControlEvents:UIControlEventTouchUpInside];
[self.rightButton addTarget:self action:@selector(onRightButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
[self.noticeBadgeView.layer setCornerRadius:10];
@@ -63,8 +63,6 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
self.rightButton.backgroundColor = ThemeService.shared.theme.tintColor;
self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.noticeColor;
[self vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
}
- (void)prepareForReuse
@@ -72,22 +70,24 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
[super prepareForReuse];
[self resetButtonViews];
self.accessoryView = nil;
}
- (void)onDeclinePressed:(id)sender
{
if (self.delegate)
{
MXRoom *room = roomCellData.roomSummary.room;
if (room)
{
[self.delegate cell:self didRecognizeAction:kInviteRecentTableViewCellDeclineButtonPressed userInfo:@{kInviteRecentTableViewCellRoomKey:room}];
}
}
[self notifyDelegateWithActionIdentifier:kInviteRecentTableViewCellDeclineButtonPressed];
}
- (void)onAcceptPressed:(id)sender
- (void)onRightButtonPressed:(id)sender
{
MXRoom *room = roomCellData.roomSummary.room;
NSString *actionIdentifier = room.isDirect ? kInviteRecentTableViewCellAcceptButtonPressed : kInviteRecentTableViewCellPreviewButtonPressed;
[self notifyDelegateWithActionIdentifier:actionIdentifier];
}
- (void)notifyDelegateWithActionIdentifier:(NSString*)actionIdentifier
{
if (self.delegate)
{
@@ -95,7 +95,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
if (room)
{
[self.delegate cell:self didRecognizeAction:kInviteRecentTableViewCellAcceptButtonPressed userInfo:@{kInviteRecentTableViewCellRoomKey:room}];
[self.delegate cell:self didRecognizeAction:actionIdentifier userInfo:@{kInviteRecentTableViewCellRoomKey:room}];
}
}
}
@@ -108,10 +108,30 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
if (room.roomId)
{
[self updateButtonViewsWith:room.roomId session:room.mxSession];
[self updateViewsWithRoom:room];
}
}
- (void)updateViewsWithRoom:(MXRoom*)room
{
NSString *rightButtonTitle;
if (room.isDirect)
{
rightButtonTitle = NSLocalizedStringFromTable(@"accept", @"Vector", nil);
[self vc_setAccessoryDisclosureIndicatorWithCurrentTheme];
}
else
{
rightButtonTitle = NSLocalizedStringFromTable(@"preview", @"Vector", nil);
self.accessoryView = nil;
}
[self.rightButton setTitle:rightButtonTitle forState:UIControlStateNormal];
[self updateButtonViewsWith:room.roomId session:room.mxSession];
}
+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
{
// The height is fixed