Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Enable search in grid/wall view #519

Merged
merged 17 commits into from
Jan 7, 2022
Merged

Feature: Enable search in grid/wall view #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
39a20bd
Support search in grid/wall view
wutschel Dec 4, 2021
c9b4166
Do not show grid index when showing search results
wutschel Dec 4, 2021
97f7269
Show search icon for grid view index
wutschel Dec 4, 2021
ac548a9
Correct vertical position of grid view index
wutschel Dec 4, 2021
38cb887
Show amount of search results in section header in grid view
wutschel Dec 5, 2021
43dc4f7
Move duplicate code into method getAmountOfSearchResultsString
wutschel Dec 5, 2021
78baf13
Move duplicate code into method getItemFromIndexPath
wutschel Dec 5, 2021
5f7ad7f
Better readability for grid view's search bar
wutschel Dec 5, 2021
6c941b7
Fix search bar not showing properly in grid view
wutschel Dec 7, 2021
c1bbbcb
Refactor the searchController initialization into a method.
wutschel Dec 7, 2021
d818356
Remove unneeded UIScrollVIew delegates
wutschel Dec 7, 2021
e133cad
Beautify the search icon in grid view's index
wutschel Dec 18, 2021
b4fa863
Add missing braces to if condition
wutschel Dec 19, 2021
c0391e4
Rework initialization and visibility of grid/wall index
wutschel Jan 7, 2022
88e7178
Ensure we still show the collection view index in fullscreen mode
wutschel Jan 7, 2022
f921c8d
Stop search when attempting to show details
wutschel Jan 7, 2022
af4f21b
Ensure the searchbar width follows the view size
wutschel Jan 7, 2022
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
36 changes: 24 additions & 12 deletions XBMC Remote/BDKCollectionIndexView/BDKCollectionIndexView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,20 +166,32 @@ - (void)buildIndexLabels {

NSMutableArray *workingLabels = [NSMutableArray arrayWithCapacity:self.indexTitles.count];
for (NSString *indexTitle in self.indexTitles) {
if (![indexTitle isEqualToString:@"🔍"]) {
UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
label.text = indexTitle;
label.font = [UIFont boldSystemFontOfSize:11];
label.minimumScaleFactor = 11.0/11.0;
label.adjustsFontSizeToFitWidth = YES;
label.backgroundColor = UIColor.clearColor;
UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
label.text = indexTitle;
label.font = [UIFont boldSystemFontOfSize:11];
label.minimumScaleFactor = 11.0/11.0;
label.adjustsFontSizeToFitWidth = YES;
if ([indexTitle isEqualToString:@"🔍"]) {
// Use the same icon as iOS's index (magnifying glass with transparent circle)
wutschel marked this conversation as resolved.
Show resolved Hide resolved
UIImage *searchImage = [UIImage imageNamed:@"icon_search"];
searchImage = [Utilities colorizeImage:searchImage withColor:UIColor.systemBlueColor];
UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, 11)];
imageView.contentMode = UIViewContentModeScaleAspectFit;
imageView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
imageView.image = searchImage;

[label addSubview:imageView];
label.textColor = UIColor.clearColor;
}
else {
label.textColor = UIColor.systemBlueColor;
label.shadowColor = UIColor.clearColor;
label.shadowOffset = CGSizeMake(0, 1);
label.textAlignment = NSTextAlignmentCenter;
[self addSubview:label];
[workingLabels addObject:label];
}
label.backgroundColor = UIColor.clearColor;
label.shadowColor = UIColor.clearColor;
label.shadowOffset = CGSizeMake(0, 1);
label.textAlignment = NSTextAlignmentCenter;
[self addSubview:label];
[workingLabels addObject:label];
}
self.indexLabels = [NSArray arrayWithArray:workingLabels];
}
Expand Down
1 change: 0 additions & 1 deletion XBMC Remote/DetailViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
CGFloat iOSYDelta;
__weak IBOutlet UIToolbar *buttonsViewBgToolbar;
BOOL isViewDidLoad;
BOOL hideSearchBarActive;
BOOL forceMusicAlbumMode;
NSMutableDictionary *epgDict;
NSMutableArray *epgDownloadQueue;
Expand Down
Loading