From ad30808be59bb242d179f35cae4509401ff5a857 Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Wed, 21 Nov 2018 13:31:50 -0800 Subject: [PATCH] iOS: #1139 (scroll to top) The search bar now remains visible. --- clients/ios/Classes/NewsBlurViewController.m | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m index 912b7ffb8..8f32e9e72 100644 --- a/clients/ios/Classes/NewsBlurViewController.m +++ b/clients/ios/Classes/NewsBlurViewController.m @@ -249,11 +249,11 @@ static NSArray *NewsBlurTopSectionNames; } if (self.searchFeedIds) { - [self.feedTitlesTable setContentOffset:CGPointMake(0, 0)]; +// [self.feedTitlesTable setContentOffset:CGPointMake(0, 0)]; [self.searchBar becomeFirstResponder]; } else { [self.searchBar setText:@""]; - [self.feedTitlesTable setContentOffset:CGPointMake(0, CGRectGetHeight(self.searchBar.frame))]; +// [self.feedTitlesTable setContentOffset:CGPointMake(0, CGRectGetHeight(self.searchBar.frame))]; } [self.searchBar setShowsCancelButton:self.searchBar.text.length > 0 animated:YES]; @@ -581,6 +581,11 @@ static NSArray *NewsBlurTopSectionNames; - (void)finishLoadingFeedListWithDict:(NSDictionary *)results finished:(BOOL)finished { NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults]; + // Doing this here avoids the search bar from appearing on initial load, but doesn't help when only a few rows visible. +// if (!self.searchFeedIds && self.feedTitlesTable.contentOffset.y == 0) { +// self.feedTitlesTable.contentOffset = CGPointMake(0, CGRectGetHeight(self.searchBar.frame)); +// } + [MBProgressHUD hideHUDForView:self.view animated:YES]; self.stillVisibleFeeds = [NSMutableDictionary dictionary]; @@ -2100,12 +2105,12 @@ heightForHeaderInSection:(NSInteger)section { [self.appDelegate startOfflineQueue]; } [self loadFavicons]; - if (!self.searchFeedIds && self.feedTitlesTable.contentOffset.y == 0) { - [UIView animateWithDuration:0.2 animations:^{ - self.feedTitlesTable.contentOffset = CGPointMake(0, CGRectGetHeight(self.searchBar.frame)); - }]; - - } +// if (!self.searchFeedIds && self.feedTitlesTable.contentOffset.y == 0) { +// [UIView animateWithDuration:0.2 animations:^{ +// self.feedTitlesTable.contentOffset = CGPointMake(0, CGRectGetHeight(self.searchBar.frame)); +// }]; +// +// } }); }); }