Merge branch 'master' into develop

This commit is contained in:
Andy Uhnak
2022-05-19 18:21:22 +01:00
7 changed files with 31 additions and 13 deletions
@@ -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];
});
}
+1 -1
View File
@@ -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];
}
}
@@ -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)