Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix position of message expiration selector on iPads #1387

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Fix position of message expiration selector on iPads #1387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions NextcloudTalk/RoomInfoTableViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,17 @@ - (NSArray *)getConversationActions
return [NSArray arrayWithArray:actions];
}

- (NSIndexPath *)getIndexPathForConversationAction:(ConversationAction)action
{
NSInteger section = [self getSectionForRoomInfoSection:kRoomInfoSectionConversation];
NSIndexPath *actionIndexPath = [NSIndexPath indexPathForRow:0 inSection:section];
NSInteger actionRow = [[self getConversationActions] indexOfObject:[NSNumber numberWithInt:action]];
if(NSNotFound != actionRow) {
actionIndexPath = [NSIndexPath indexPathForRow:actionRow inSection:section];
}
return actionIndexPath;
}

- (NSArray *)getWebinarActions
{
NSMutableArray *actions = [[NSMutableArray alloc] init];
Expand Down Expand Up @@ -688,8 +699,8 @@ - (void)presentMessageExpirationSelector

// Presentation on iPads
optionsActionSheet.popoverPresentationController.sourceView = self.tableView;
optionsActionSheet.popoverPresentationController.sourceRect = [self.tableView rectForRowAtIndexPath:[self getIndexPathForNotificationAction:kNotificationActionChatNotifications]];
optionsActionSheet.popoverPresentationController.sourceRect = [self.tableView rectForRowAtIndexPath:[self getIndexPathForConversationAction:kConversationActionMessageExpiration]];

[self presentViewController:optionsActionSheet animated:YES completion:nil];
}

Expand Down
Loading