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

Jump to bottom

Improvement: Align GlobalSearch thumb size and content #779

Merged
merged 3 commits into from
Nov 20, 2022
Merged

Improvement: Align GlobalSearch thumb size and content #779

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
656c0c3
Use common music video thumb size
wutschel Nov 16, 2022
f98f6e2
Add kodiExtrasPropertiesMinimumVersion processing to GlobalSearch
wutschel Nov 16, 2022
0e5bdc4
Introduce addExtraProperties to avoid code duplication
wutschel Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 23 additions & 38 deletions XBMC Remote/DetailViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,25 @@ - (void)updateSyncDate:(NSString*)filePath {

#pragma mark - Utility

- (void)addExtraProperties:(NSMutableArray*)mutableProperties newParams:(NSMutableDictionary*)mutableParameters params:(NSDictionary*)parameters {
if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
[mutableProperties addObject:@"art"];
}
if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
if (AppDelegate.instance.serverVersion >= [key integerValue]) {
id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
for (id value in arrayProperties) {
[mutableProperties addObject:value];
}
}
}
}
if (mutableProperties != nil) {
mutableParameters[@"properties"] = mutableProperties;
}
}

- (UIViewController*)topMostController {
UIViewController *topController = UIApplication.sharedApplication.keyWindow.rootViewController;

Expand Down Expand Up @@ -574,6 +593,7 @@ - (CGPoint)getGlobalSearchThumbsize:(NSDictionary*)item {
CGPoint thumbSize = CGPointMake(53, 53);
if ([item[@"family"] isEqualToString:@"movieid"] ||
[item[@"family"] isEqualToString:@"setid"] ||
[item[@"family"] isEqualToString:@"musicvideoid"] ||
[item[@"family"] isEqualToString:@"tvshowid"]) {
thumbSize.x = 53;
thumbSize.y = 76;
Expand Down Expand Up @@ -1247,22 +1267,7 @@ - (IBAction)changeTab:(id)sender {
[activeLayoutView setContentOffset:[(UITableView*)activeLayoutView contentOffset] animated:NO];
NSString *labelText = parameters[@"label"];
[self setFilternameLabel:labelText runFullscreenButtonCheck:YES forceHide:NO];
if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
[mutableProperties addObject:@"art"];
}
if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
if (AppDelegate.instance.serverVersion >= [key integerValue]) {
id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
for (id value in arrayProperties) {
[mutableProperties addObject:value];
}
}
}
}
if (mutableProperties != nil) {
mutableParameters[@"properties"] = mutableProperties;
}
[self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
if ([parameters[@"blackTableSeparator"] boolValue] && ![Utilities getPreferTvPosterMode]) {
blackTableSeparator = YES;
dataList.separatorColor = [Utilities getGrayColor:38 alpha:1];
Expand Down Expand Up @@ -4440,22 +4445,7 @@ - (void)startRetrieveDataWithRefresh:(BOOL)forceRefresh {
NSDictionary *parameters = [Utilities indexKeyedDictionaryFromArray:menuItem.mainParameters[choosedTab]];
NSMutableDictionary *mutableParameters = [parameters[@"parameters"] mutableCopy];
NSMutableArray *mutableProperties = [parameters[@"parameters"][@"properties"] mutableCopy];
if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
[mutableProperties addObject:@"art"];
}
if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
if (AppDelegate.instance.serverVersion >= [key integerValue]) {
id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
for (id value in arrayProperties) {
[mutableProperties addObject:value];
}
}
}
}
if (mutableProperties != nil) {
mutableParameters[@"properties"] = mutableProperties;
}
[self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
NSString *methodToCall = methods[@"method"];
if (parameters[@"exploreCommand"] != nil) {
methodToCall = parameters[@"exploreCommand"];
Expand Down Expand Up @@ -4541,12 +4531,7 @@ - (void)loadDetailedData:(NSArray*)itemsAndTabs index:(int)index results:(NSMuta
NSString *methodToCall = methods[@"method"];
NSMutableDictionary *mutableParameters = [parameters[@"parameters"] mutableCopy];
NSMutableArray *mutableProperties = [parameters[@"parameters"][@"properties"] mutableCopy];
if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
[mutableProperties addObject:@"art"];
}
if (mutableProperties != nil) {
mutableParameters[@"properties"] = mutableProperties;
}
[self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
[[Utilities getJsonRPC]
callMethod:methodToCall
withParameters:mutableParameters
Expand Down