Skip to content

Bugfixes: Settings view controller #487

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

Merged
kambala-decapitator merged 2 commits into from
Nov 26, 2021
Merged

Bugfixes: Settings view controller #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b085388
Hotfix to show complete settings string
wutschel Nov 21, 2021
f070723
Workaround to make value visible in Kodi settings sliders
wutschel Nov 22, 2021
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
32 changes: 19 additions & 13 deletions XBMC Remote/SettingsValuesViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ - (id)initWithFrame:(CGRect)frame withItem:(id)item {
else if ([itemControls[@"type"] isEqualToString:@"spinner"] && settingOptions == nil) {
xbmcSetting = cSlider;
storeSliderValue = [self.detailItem[@"value"] intValue];
cellHeight = 184.0;
cellHeight = 242.0;
}
else if ([itemControls[@"type"] isEqualToString:@"edit"]) {
xbmcSetting = cInput;
Expand Down Expand Up @@ -232,9 +232,7 @@ - (NSString*)getActionButtonTitle {
subTitle = [NSString stringWithFormat:@": %@", settingOptions[longPressRow.row][@"label"]];
break;
case cSlider:
if (itemControls[@"formatlabel"] != nil) {
stringFormat = [NSString stringWithFormat:@": %@", itemControls[@"formatlabel"]];
}
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
subTitle = [NSString stringWithFormat:stringFormat, (int)storeSliderValue];
break;
case cUnsupported:
Expand Down Expand Up @@ -344,7 +342,18 @@ - (void)retrieveXBMCData:(NSString*)method parameters:(NSDictionary*)params item
return;
}

#pragma mark -
#pragma mark Helper

- (NSString*)getStringFormatFromItem:(id)item defaultFormat:(NSString*)defaultFormat {
// Workaround!! Before Kodi 18.x an older format ("%i ms") was used. The new format ("{0:d} ms") needs
// an updated parser. Until this is implemented just display the value itself, without the unit.
NSString *format = item[@"formatlabel"];
if (format.length > 0 && AppDelegate.instance.serverVersion < 18) {
return format;
}
return defaultFormat;
}

#pragma mark Table view data source

- (CGFloat)tableView:(UITableView*)tableView heightForRowAtIndexPath:(NSIndexPath*)indexPath {
Expand Down Expand Up @@ -518,16 +527,15 @@ - (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSI
cellLabel.textAlignment = NSTextAlignmentCenter;
cellText = [NSString stringWithFormat:@"%@", self.detailItem[@"label"]];

descriptionLabel.frame = CGRectMake(descriptionLabel.frame.origin.x, descriptionLabel.frame.origin.y + 2, self.view.bounds.size.width - (cellLabelOffset * 2), 58);
descriptionLabel.frame = CGRectMake(descriptionLabel.frame.origin.x, descriptionLabel.frame.origin.y + 2, self.view.bounds.size.width - (cellLabelOffset * 2), 116);
descriptionLabel.textAlignment = NSTextAlignmentCenter;
descriptionLabel.numberOfLines = 4;
descriptionLabel.numberOfLines = 8;
descriptionLabel.text = [NSString stringWithFormat:@"%@", self.detailItem[@"genre"]];
[self adjustFontSize:descriptionLabel];
slider.minimumValue = [self.detailItem[@"minimum"] intValue];
slider.maximumValue = [self.detailItem[@"maximum"] intValue];
slider.value = [self.detailItem[@"value"] intValue];
if (itemControls[@"formatlabel"] != nil) {
stringFormat = [NSString stringWithFormat:@"%@", itemControls[@"formatlabel"]];
}
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
sliderLabel.text = [NSString stringWithFormat:stringFormat, [self.detailItem[@"value"] intValue]];
break;

Expand Down Expand Up @@ -788,9 +796,7 @@ - (void)sliderAction:(id)sender {
if ([[[slider superview] viewWithTag:102] isKindOfClass:[UILabel class]]) {
UILabel *sliderLabel = (UILabel*)[[slider superview] viewWithTag:102];
NSString *stringFormat = @"%i";
if (itemControls[@"formatlabel"] != nil) {
stringFormat = [NSString stringWithFormat:@"%@", itemControls[@"formatlabel"]];
}
stringFormat = [self getStringFormatFromItem:itemControls defaultFormat:stringFormat];
sliderLabel.text = [NSString stringWithFormat:stringFormat, (int)storeSliderValue];
}
}
Expand Down
⚡