Skip to content
This repository has been archived by the owner on Nov 29, 2022. It is now read-only.

Google Images integration. Fixes #111 #119

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Google Images integration. Fixes #111 #119

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df007bc
Fixes jumping searchbar when using one service
ebalassanian May 3, 2016
8b4e73a
remove defunct services
ebalassanian May 3, 2016
f5464f3
Address google being stingy
ebalassanian May 3, 2016
d73a890
fix for a merge issue
ebalassanian May 3, 2016
7f8f65e
address issue with searchbar frame
ebalassanian May 4, 2016
d7c0857
Merge remote-tracking branch 'dzenbot/master'
ebalassanian May 25, 2016
54e6bf3
merged in changes from strings project
rickbdotcom Feb 15, 2017
b4ea291
Show activity indicator when downloading images
rob5408 May 19, 2017
7e390b7
Automatically show keyboard when opening web image search
rob5408 May 21, 2017
46df6c2
Update DZNPhotoPickerController.podspec
Nov 14, 2017
050c3be
Update DZNPhotoDisplayViewCell.m
Jan 4, 2018
3243b22
Rebase w/ master & finish child vc setup to fix ipad display bug
eddies5 Feb 8, 2018
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
10 changes: 9 additions & 1 deletion Source/Classes/Core/DZNPhotoDisplayViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ - (UISearchController *)searchController
UISearchBar *searchBar = _searchController.searchBar;
searchBar.placeholder = NSLocalizedString(@"Search", nil);
searchBar.text = self.navigationController.initialSearchTerm;
searchBar.scopeButtonTitles = [self segmentedControlTitles].count > 1 ? [self segmentedControlTitles] : nil;
searchBar.scopeButtonTitles = [self segmentedControlTitles];
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to say that this was fixed. Thanks for reverting to the previous implementation.

searchBar.searchBarStyle = UISearchBarStyleProminent;
searchBar.barStyle = UIBarStyleDefault;
searchBar.selectedScopeButtonIndex = 0;
Expand Down Expand Up @@ -234,6 +234,14 @@ - (UIActivityIndicatorView *)activityIndicator
return _activityIndicator;
}

- (NSArray *)segmentedControlTitles
{
if (_segmentedControlTitles.count > 1) {
return _segmentedControlTitles;
}
return nil;
}

/* Returns the appropriate cell view's size. */
- (CGSize)cellSize
{
Expand Down