felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-06 07:57:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6681 from vector-im/gil/6680-Last_scrolling_glitches_in_All_Chats_screen

Browse Source 
Fixed last scrolling glitches in All Chats screen
This commit is contained in:
Gil Eluard
2022-09-06 08:47:19 +02:00
committed by GitHub
parent b289e4213e e3cc1f70e1
commit 8cf4c48186
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Home/AllChats/AllChatsViewController.swift
+24 -8
View File
@@ -113,6 +113,7 @@ class AllChatsViewController: HomeViewController {
searchController.obscuresBackgroundDuringPresentation = false
searchController.searchResultsUpdater = self
searchController.delegate = self
NotificationCenter.default.addObserver(self, selector: #selector(self.setupEditOptions), name: AllChatsLayoutSettingsManager.didUpdateSettings, object: nil)
}
@@ -197,7 +198,7 @@ class AllChatsViewController: HomeViewController {
self.dataSource.currentSpace = space
updateUI()
self.recentsTableView.setContentOffset(.zero, animated: true)
self.recentsTableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: true)
}
override var recentsDataSourceMode: RecentsDataSourceMode {
@@ -327,16 +328,22 @@ class AllChatsViewController: HomeViewController {
// MARK: - Toolbar animation
private var lastScrollPosition: Double = 0
private var initialScrollPosition: Double = 0
private func scrollPosition(of scrollView: UIScrollView) -> Double {
return scrollView.contentOffset.y + scrollView.adjustedContentInset.top + scrollView.adjustedContentInset.bottom
}
override func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
lastScrollPosition = self.recentsTableView.contentOffset.y
initialScrollPosition = scrollPosition(of: scrollView)
}
override func scrollViewDidScroll(_ scrollView: UIScrollView) {
super.scrollViewDidScroll(scrollView)
let scrollPosition = scrollPosition(of: scrollView)
if self.recentsTableView.contentOffset.y == 0 {
if !self.recentsTableView.isDragging && scrollPosition == 0 && self.navigationController?.isToolbarHidden == true {
self.navigationController?.setToolbarHidden(false, animated: true)
}
@@ -344,13 +351,14 @@ class AllChatsViewController: HomeViewController {
return
}
let scrollPosition = max(self.recentsTableView.contentOffset.y, 0)
guard scrollPosition < self.recentsTableView.contentSize.height - self.recentsTableView.bounds.height else {
guard scrollPosition > 0 && scrollPosition < self.recentsTableView.contentSize.height - self.recentsTableView.bounds.height else {
return
}
self.navigationController?.setToolbarHidden(scrollPosition - lastScrollPosition > 0, animated: true)
lastScrollPosition = scrollPosition
let isToolBarHidden: Bool = scrollPosition - initialScrollPosition > 0
if isToolBarHidden != self.navigationController?.isToolbarHidden {
self.navigationController?.setToolbarHidden(isToolBarHidden, animated: true)
}
}
// MARK: - Empty view management
@@ -648,6 +656,14 @@ extension AllChatsViewController: UISearchResultsUpdating {
}
// MARK: - UISearchControllerDelegate
extension AllChatsViewController: UISearchControllerDelegate {
func willPresentSearchController(_ searchController: UISearchController) {
// Fix for https://github.com/vector-im/element-ios/issues/6680
self.recentsTableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: true)
}
}
// MARK: - UIAdaptivePresentationControllerDelegate
extension AllChatsViewController: UIAdaptivePresentationControllerDelegate {
changelog.d/6680.bugfix
+1
View File
@@ -0,0 +1 @@
Fixed last scrolling glitches in All Chats screen