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

Scroll to bottom (#2260) #2261

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Scroll to bottom (#2260) #2261

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
41 changes: 20 additions & 21 deletions deltachat-ios/Chat/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,13 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
}
}

if self.isLastRowScrolledToBottom() {
self.scrollToBottom(animated: true)
}

let wasLastSectionScrolledToBottom = self.isLastRowScrolledToBottom()
self.refreshMessages()
self.updateTitle()
if wasLastSectionScrolledToBottom {
self.scrollToBottom(animated: true)
}
self.updateScrollDownButtonVisibility()
self.markSeenMessagesInVisibleArea()
}
}
Expand Down Expand Up @@ -514,14 +515,14 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {

let chatId = ui["chat_id"] as? Int ?? 0
if chatId == 0 || chatId == self.chatId {
let wasLastSectionScrolledToBottom = isLastRowScrolledToBottom()
refreshMessages()
updateTitle()
let wasLastSectionScrolledToBottom = self.isLastRowScrolledToBottom()
self.refreshMessages()
self.updateTitle()
if wasLastSectionScrolledToBottom {
scrollToBottom(animated: true)
self.scrollToBottom(animated: true)
}
updateScrollDownButtonVisibility()
markSeenMessagesInVisibleArea()
self.updateScrollDownButtonVisibility()
self.markSeenMessagesInVisibleArea()
}
}
}
Expand Down Expand Up @@ -977,13 +978,13 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {

@objc
private func refreshMessages() {
self.messageIds = dcContext.getChatMsgs(chatId: chatId)
messageIds = dcContext.getChatMsgs(chatId: chatId)
let wasLastSectionScrolledToBottom = isLastRowScrolledToBottom()
self.reloadData()
reloadData()
if wasLastSectionScrolledToBottom {
self.scrollToBottom(animated: true)
scrollToBottom(animated: true)
}
self.showEmptyStateView(self.messageIds.isEmpty)
showEmptyStateView(messageIds.isEmpty)
}

private func reloadData() {
Expand Down Expand Up @@ -1067,13 +1068,11 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
}

private func scrollToBottom(animated: Bool, focusOnVoiceOver: Bool = false) {
if !messageIds.isEmpty {
let numberOfRows = self.tableView.numberOfRows(inSection: 0)
if numberOfRows > 0 {
self.scrollToRow(at: IndexPath(row: numberOfRows - 1, section: 0),
animated: animated,
focusWithVoiceOver: focusOnVoiceOver)
}
let numberOfRows = messageIds.count
if numberOfRows > 0 {
scrollToRow(at: IndexPath(row: numberOfRows - 1, section: 0),
animated: animated,
focusWithVoiceOver: focusOnVoiceOver)
}
}

Expand Down
Loading