mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-05-03 14:46:56 +02:00
Merge branch 'master' into develop
This commit is contained in:
@@ -2274,7 +2274,8 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
|
||||
self.recentsTableView.contentOffset = CGPointMake(0, self.recentsSearchBar.frame.size.height);
|
||||
self.recentsTableView.tableHeaderView = nil;
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
[self refreshRecentsTable];
|
||||
[self.recentsDataSource searchWithPatterns:nil];
|
||||
[self.recentsSearchBar setText:nil];
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
[recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeHome];
|
||||
|
||||
// Reset filtering on the shared data source when switching tabs
|
||||
[self searchBarCancelButtonClicked:self.recentsSearchBar];
|
||||
[recentsDataSource searchWithPatterns:nil];
|
||||
[self.recentsSearchBar setText:nil];
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -44,11 +44,16 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
|
||||
view.backgroundColor = .clear
|
||||
|
||||
stackView = UIStackView()
|
||||
stackView.translatesAutoresizingMaskIntoConstraints = false
|
||||
stackView.axis = .vertical
|
||||
stackView.distribution = .fill
|
||||
stackView.alignment = .fill
|
||||
|
||||
view.vc_addSubViewMatchingParentSafeArea(stackView)
|
||||
view.addSubview(stackView)
|
||||
NSLayoutConstraint.activate([stackView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor),
|
||||
stackView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
|
||||
stackView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
|
||||
stackView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)])
|
||||
|
||||
addChild(homeViewController)
|
||||
stackView.addArrangedSubview(homeViewController.view)
|
||||
|
||||
Reference in New Issue
Block a user