Skip to content

Commit cb0372e

Browse files
committed
Remove unneeded keys from custom buttons
These keys were either not used at all ("helpText", "xbmxSettings, "revealViewTop") or are not needed anymore as all buttons are editable ("isSettings") nowadays.
1 parent b885390 commit cb0372e

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

XBMC Remote/DetailViewController.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,8 +3552,6 @@ - (void)actionSheetHandler:(NSString*)actiontitle origin:(CGPoint)origin fromvie
35523552
item[@"label"], @"label",
35533553
@"xbmc-exec-addon", @"type",
35543554
item[@"thumbnail"], @"icon",
3555-
@(0), @"xbmcSetting",
3556-
item[@"genre"], @"helpText",
35573555
[NSDictionary dictionaryWithObjectsAndKeys:
35583556
@"Addons.ExecuteAddon", @"command",
35593557
params, @"params",
@@ -3569,8 +3567,6 @@ - (void)actionSheetHandler:(NSString*)actiontitle origin:(CGPoint)origin fromvie
35693567
item[@"label"], @"label",
35703568
@"string", @"type",
35713569
@"", @"icon",
3572-
@(0), @"xbmcSetting",
3573-
item[@"genre"], @"helpText",
35743570
[NSDictionary dictionaryWithObjectsAndKeys:
35753571
@"Input.ExecuteAction", @"command",
35763572
params, @"params",
@@ -3586,8 +3582,6 @@ - (void)actionSheetHandler:(NSString*)actiontitle origin:(CGPoint)origin fromvie
35863582
item[@"label"], @"label",
35873583
@"string", @"type",
35883584
@"", @"icon",
3589-
@(0), @"xbmcSetting",
3590-
item[@"genre"], @"helpText",
35913585
[NSDictionary dictionaryWithObjectsAndKeys:
35923586
@"GUI.ActivateWindow", @"command",
35933587
params, @"params",

XBMC Remote/RightMenuViewController.m

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,11 @@ - (void)loadCustomButtons {
218218
NSString *label = item[@"label"] ?: @"";
219219
NSString *icon = item[@"icon"] ?: @"";
220220
NSString *type = item[@"type"] ?: @"";
221-
NSNumber *isSetting = item[@"isSetting"] ?: @YES;
222221
NSDictionary *action = item[@"action"] ?: @{};
223222

224223
NSMutableDictionary *itemDict = [@{
225224
@"label": label,
226225
@"icon": icon,
227-
@"isSetting": isSetting,
228-
@"revealViewTop": @NO,
229226
@"type": type,
230227
@"action": action,
231228
} mutableCopy];
@@ -290,12 +287,7 @@ - (void)tableView:(UITableView*)tableView moveRowAtIndexPath:(NSIndexPath*)sourc
290287
}
291288

292289
- (BOOL)tableView:(UITableView*)tableView canEditRowAtIndexPath:(NSIndexPath*)indexPath {
293-
if (indexPath.row < tableData.count) {
294-
return [tableData[indexPath.row][@"isSetting"] boolValue];
295-
}
296-
else {
297-
return NO;
298-
}
290+
return YES;
299291
}
300292

301293
- (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath {

XBMC Remote/SettingsValuesViewController.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,6 @@ - (void)addActionButton:(UIAlertController*)alertCtrl {
295295
alertCtrl.textFields[0].text, @"label",
296296
type, @"type",
297297
@"", @"icon",
298-
@(xbmcSetting), @"xbmcSetting",
299-
self.detailItem[@"genre"], @"helpText",
300298
[NSDictionary dictionaryWithObjectsAndKeys:
301299
@"Settings.SetSettingValue", @"command",
302300
params, @"params",

0 commit comments

Comments
 (0)