Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

add back preset delete

roryclear336085a18334
diff --git a/clearcam/SettingsViewController.m b/clearcam/SettingsViewController.m
index 6d4be4c..e06a5f0 100644
--- a/clearcam/SettingsViewController.m
+++ b/clearcam/SettingsViewController.m
@@ -42,12 +42,11 @@
name:StoreManagerSubscriptionStatusDidChangeNotification
object:nil];
- // Initialize selectedResolution and selectedPresetKey based on SettingsManager
+ // Initialize properties from NSUserDefaults
SettingsManager *settingsManager = [SettingsManager sharedManager];
self.selectedResolution = [NSString stringWithFormat:@"%@p", settingsManager.height];
self.selectedPresetKey = [[NSUserDefaults standardUserDefaults] stringForKey:@"yolo_preset_idx"] ?: @"all";
- // Initialize sendEmailAlertsEnabled from NSUserDefaults
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[self updateIPAddressDisplay]; // Set initial value
@@ -61,7 +60,6 @@
} else {
self.streamViaWiFiEnabled = NO;
[defaults setBool:NO forKey:@"stream_via_wifi_enabled"];
- [defaults synchronize];
}
self.emailSchedules = [[defaults arrayForKey:@"email_schedules"] mutableCopy];
@@ -76,24 +74,19 @@
}] mutableCopy];
[defaults setObject:self.emailSchedules forKey:@"email_schedules"];
}
- [defaults synchronize];
-
if ([defaults objectForKey:@"send_email_alerts_enabled"] != nil) {
self.sendEmailAlertsEnabled = [defaults boolForKey:@"send_email_alerts_enabled"];
} else {
self.sendEmailAlertsEnabled = NO;
[defaults setBool:NO forKey:@"send_email_alerts_enabled"];
- [defaults synchronize];
}
- // Initialize encryptEmailDataEnabled from NSUserDefaults
if ([defaults objectForKey:@"encrypt_email_data_enabled"] != nil) {
self.encryptEmailDataEnabled = [defaults boolForKey:@"encrypt_email_data_enabled"];
} else {
self.encryptEmailDataEnabled = NO;
[defaults setBool:NO forKey:@"encrypt_email_data_enabled"];
- [defaults synchronize];
}
if ([defaults objectForKey:@"use_own_email_server_enabled"] != nil) {
@@ -101,32 +94,16 @@
} else {
self.useOwnEmailServerEnabled = NO;
[defaults setBool:NO forKey:@"use_own_email_server_enabled"];
- [defaults synchronize];
}
- // Initialize isEmailServerSectionExpanded based on useOwnEmailServerEnabled
self.isEmailServerSectionExpanded = self.useOwnEmailServerEnabled;
-
- // Initialize emailServerAddress from NSUserDefaults
self.emailServerAddress = [defaults stringForKey:@"own_email_server_address"] ?: @"http://192.168.1.1";
- // Initialize emailSchedules from NSUserDefaults
- self.emailSchedules = [[defaults arrayForKey:@"email_schedules"] mutableCopy];
- if (!self.emailSchedules) {
- self.emailSchedules = [@[@{
- @"days": @[@"Mon", @"Tue", @"Wed", @"Thu", @"Fri", @"Sat", @"Sun"],
- @"startHour": @0,
- @"endHour": @24,
- @"enabled": @YES
- }] mutableCopy];
- [defaults setObject:self.emailSchedules forKey:@"email_schedules"];
- [defaults synchronize];
- }
-
- // Initialize isScheduleSectionExpanded based on sendEmailAlertsEnabled
self.isScheduleSectionExpanded = self.sendEmailAlertsEnabled;
- // Create table view with proper Auto Layout constraints
+ [defaults synchronize];
+
+ // Create table view
self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped];
self.tableView.delegate = self;
self.tableView.dataSource = self;
@@ -134,7 +111,6 @@
self.tableView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.tableView];
- // Set up constraints
[NSLayoutConstraint activateConstraints:@[
[self.tableView.topAnchor constraintEqualToAnchor:self.view.topAnchor],
[self.tableView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
@@ -142,14 +118,12 @@
[self.tableView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor]
]];
- // Reload table view to reflect initial state
[self.tableView reloadData];
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [[NSUserDefaults standardUserDefaults] removeObserver:self
- forKeyPath:@"DeviceIPAddress"];
+ [[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:@"DeviceIPAddress"];
}
- (void)updateIPAddressDisplay {
@@ -223,23 +197,22 @@
#pragma mark - UITableView DataSource
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
- return 4;
+ return 2;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (section == 0) {
- NSInteger baseRows = 7; // Stream via Wi-Fi, Resolution, Detect objects, Email, Send Email Alerts, Encrypt, Use own email server
+ NSInteger baseRows = 9; // Stream via Wi-Fi, Resolution, Detect Objects, Manage Detection Presets, Email, Send Email Alerts, Encrypt, Use own email server, Manage Email Schedules
if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded) {
baseRows += 2; // Server Address and Test own server
}
+ if (self.isPresetsSectionExpanded) {
+ NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
+ baseRows += presetKeys.count + 1; // Preset options + "Add Preset" row
+ }
return baseRows;
} else if (section == 1) {
- return 1;
- } else if (section == 2) {
- NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
- return self.isPresetsSectionExpanded ? (presetKeys.count + 2) : 1;
- } else if (section == 3) {
- return [[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"] ? 0 : 1;
+ return [[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"] ? 0 : 1; // Upgrade button
}
return 0;
}
@@ -273,8 +246,7 @@
cell.accessoryType = UITableViewCellAccessoryNone;
UISwitch *wifiSwitch = [[UISwitch alloc] init];
wifiSwitch.on = self.streamViaWiFiEnabled;
- [wifiSwitch addTarget:self action:@selector(streamViaWiFiSwitchToggled:)
- forControlEvents:UIControlEventValueChanged];
+ [wifiSwitch addTarget:self action:@selector(streamViaWiFiSwitchToggled:) forControlEvents:UIControlEventValueChanged];
cell.accessoryView = wifiSwitch;
cell.userInteractionEnabled = YES;
} else if (indexPath.row == 1) {
@@ -282,83 +254,86 @@
cell.detailTextLabel.text = self.selectedResolution;
cell.userInteractionEnabled = YES;
} else if (indexPath.row == 2) {
- cell.textLabel.text = @"Detect objects";
+ cell.textLabel.text = @"Detect Objects";
cell.detailTextLabel.text = self.selectedPresetKey;
cell.userInteractionEnabled = YES;
} else if (indexPath.row == 3) {
- cell.textLabel.text = @"Email Address";
- NSString *email = [[NSUserDefaults standardUserDefaults] stringForKey:@"user_email"];
- cell.detailTextLabel.text = email ?: @"Not set";
- cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
- cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
- cell.detailTextLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor secondaryLabelColor] : [UIColor grayColor];
- } else if (indexPath.row == 4) {
- cell.textLabel.text = @"Send Email Alerts";
- cell.accessoryType = UITableViewCellAccessoryNone;
- UISwitch *emailAlertsSwitch = [[UISwitch alloc] init];
- emailAlertsSwitch.on = self.sendEmailAlertsEnabled;
- [emailAlertsSwitch addTarget:self action:@selector(emailAlertsSwitchToggled:) forControlEvents:UIControlEventValueChanged];
- cell.accessoryView = emailAlertsSwitch;
- emailAlertsSwitch.enabled = isPremiumOrUsingOwnServer;
- cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
- cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
- } else if (indexPath.row == 5) {
- cell.textLabel.text = @"Encrypt Email Data (Recommended)";
- cell.accessoryType = UITableViewCellAccessoryNone;
- UISwitch *encryptEmailDataSwitch = [[UISwitch alloc] init];
- encryptEmailDataSwitch.on = self.encryptEmailDataEnabled;
- [encryptEmailDataSwitch addTarget:self action:@selector(encryptEmailDataSwitchToggled:) forControlEvents:UIControlEventValueChanged];
- cell.accessoryView = encryptEmailDataSwitch;
- encryptEmailDataSwitch.enabled = isPremiumOrUsingOwnServer;
- cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
- cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
- } else if (indexPath.row == 6) {
- NSLog(@"Configuring 'Use own email server' cell");
- cell.textLabel.text = @"Use own email server";
- cell.accessoryType = UITableViewCellAccessoryNone;
- UISwitch *useOwnEmailServerSwitch = [[UISwitch alloc] init];
- useOwnEmailServerSwitch.on = self.useOwnEmailServerEnabled;
- [useOwnEmailServerSwitch addTarget:self action:@selector(useOwnEmailServerSwitchToggled:) forControlEvents:UIControlEventValueChanged];
- cell.accessoryView = useOwnEmailServerSwitch;
- cell.userInteractionEnabled = YES;
- } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 7) {
- cell.textLabel.text = @"Server Address";
- cell.detailTextLabel.text = self.emailServerAddress;
- cell.userInteractionEnabled = YES;
- } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 8) {
- cell.textLabel.text = @"Test own server";
- cell.textLabel.textColor = [UIColor systemBlueColor];
- cell.detailTextLabel.text = nil;
- cell.accessoryType = UITableViewCellAccessoryNone;
- cell.userInteractionEnabled = YES;
- }
- } else if (indexPath.section == 1) {
- cell.textLabel.text = @"Manage Email Schedules";
- cell.detailTextLabel.text = nil;
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- cell.userInteractionEnabled = YES;
- } else if (indexPath.section == 2) {
- NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
- if (indexPath.row == 0) {
cell.textLabel.text = @"Manage Detection Presets";
cell.detailTextLabel.text = nil;
cell.accessoryType = self.isPresetsSectionExpanded ? UITableViewCellAccessoryNone : UITableViewCellAccessoryDisclosureIndicator;
cell.userInteractionEnabled = YES;
- } else if (indexPath.row <= presetKeys.count) {
- NSString *presetKey = presetKeys[indexPath.row - 1];
- cell.textLabel.text = presetKey;
- cell.detailTextLabel.text = nil;
- cell.imageView.image = nil;
- cell.userInteractionEnabled = YES;
- } else if (indexPath.row == presetKeys.count + 1) {
- cell.textLabel.text = nil;
- cell.detailTextLabel.text = nil;
- cell.imageView.image = [UIImage systemImageNamed:@"plus.circle.fill"];
- cell.imageView.tintColor = [UIColor systemGreenColor];
- cell.accessoryType = UITableViewCellAccessoryNone;
- cell.userInteractionEnabled = YES;
+ } else if (self.isPresetsSectionExpanded && indexPath.row >= 4 && indexPath.row < 4 + [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys].count + 1) {
+ NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
+ if (indexPath.row - 4 < presetKeys.count) {
+ NSString *presetKey = presetKeys[indexPath.row - 4];
+ cell.textLabel.text = presetKey;
+ cell.detailTextLabel.text = nil;
+ cell.imageView.image = nil;
+ cell.userInteractionEnabled = YES;
+ } else {
+ cell.textLabel.text = nil;
+ cell.detailTextLabel.text = nil;
+ cell.imageView.image = [UIImage systemImageNamed:@"plus.circle.fill"];
+ cell.imageView.tintColor = [UIColor systemGreenColor];
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ cell.userInteractionEnabled = YES;
+ }
+ } else {
+ NSInteger offset = self.isPresetsSectionExpanded ? [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys].count + 1 : 0;
+ if (indexPath.row == 4 + offset) {
+ cell.textLabel.text = @"Email Address";
+ NSString *email = [[NSUserDefaults standardUserDefaults] stringForKey:@"user_email"];
+ cell.detailTextLabel.text = email ?: @"Not set";
+ cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
+ cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
+ cell.detailTextLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor secondaryLabelColor] : [UIColor grayColor];
+ } else if (indexPath.row == 5 + offset) {
+ cell.textLabel.text = @"Send Email Alerts";
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ UISwitch *emailAlertsSwitch = [[UISwitch alloc] init];
+ emailAlertsSwitch.on = self.sendEmailAlertsEnabled;
+ [emailAlertsSwitch addTarget:self action:@selector(emailAlertsSwitchToggled:) forControlEvents:UIControlEventValueChanged];
+ cell.accessoryView = emailAlertsSwitch;
+ emailAlertsSwitch.enabled = isPremiumOrUsingOwnServer;
+ cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
+ cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
+ } else if (indexPath.row == 6 + offset) {
+ cell.textLabel.text = @"Encrypt Email Data (Recommended)";
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ UISwitch *encryptEmailDataSwitch = [[UISwitch alloc] init];
+ encryptEmailDataSwitch.on = self.encryptEmailDataEnabled;
+ [encryptEmailDataSwitch addTarget:self action:@selector(encryptEmailDataSwitchToggled:) forControlEvents:UIControlEventValueChanged];
+ cell.accessoryView = encryptEmailDataSwitch;
+ encryptEmailDataSwitch.enabled = isPremiumOrUsingOwnServer;
+ cell.textLabel.textColor = isPremiumOrUsingOwnServer ? [UIColor labelColor] : [UIColor grayColor];
+ cell.userInteractionEnabled = isPremiumOrUsingOwnServer;
+ } else if (indexPath.row == 7 + offset) {
+ NSLog(@"Configuring 'Use own email server' cell");
+ cell.textLabel.text = @"Use own email server";
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ UISwitch *useOwnEmailServerSwitch = [[UISwitch alloc] init];
+ useOwnEmailServerSwitch.on = self.useOwnEmailServerEnabled;
+ [useOwnEmailServerSwitch addTarget:self action:@selector(useOwnEmailServerSwitchToggled:) forControlEvents:UIControlEventValueChanged];
+ cell.accessoryView = useOwnEmailServerSwitch;
+ cell.userInteractionEnabled = YES;
+ } else if (indexPath.row == 8 + offset) {
+ cell.textLabel.text = @"Manage Email Schedules";
+ cell.detailTextLabel.text = nil;
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ cell.userInteractionEnabled = YES;
+ } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 9 + offset) {
+ cell.textLabel.text = @"Server Address";
+ cell.detailTextLabel.text = self.emailServerAddress;
+ cell.userInteractionEnabled = YES;
+ } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 10 + offset) {
+ cell.textLabel.text = @"Test own server";
+ cell.textLabel.textColor = [UIColor systemBlueColor];
+ cell.detailTextLabel.text = nil;
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ cell.userInteractionEnabled = YES;
+ }
}
- } else if (indexPath.section == 3) {
+ } else if (indexPath.section == 1) {
cell.textLabel.text = @"Upgrade to Premium";
cell.textLabel.textColor = [UIColor systemBlueColor];
cell.textLabel.textAlignment = NSTextAlignmentCenter;
@@ -389,44 +364,47 @@
[self showResolutionPicker];
} else if (indexPath.row == 2) {
[self showYoloIndexesPicker];
- } else if (indexPath.row == 3 && ([[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"] || self.useOwnEmailServerEnabled)) {
- [self showEmailInputDialog];
- } else if (indexPath.row == 4) {
- // Send Email Alerts - handled by switch
- } else if (indexPath.row == 5) {
- // Encrypt Email Data - handled by switch
- } else if (indexPath.row == 6) {
- // Use own email server - handled by switch
- } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 7) {
- [self showEmailServerAddressInputDialog];
- } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 8) {
- [self testEmailServer];
- }
- } else if (indexPath.section == 1) {
- ScheduleManagementViewController *scheduleVC = [[ScheduleManagementViewController alloc] init];
- scheduleVC.emailSchedules = [self.emailSchedules mutableCopy];
- scheduleVC.completionHandler = ^(NSArray<NSDictionary *> *schedules) {
- self.emailSchedules = [schedules mutableCopy];
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- [defaults setObject:self.emailSchedules forKey:@"email_schedules"];
- [defaults synchronize];
- [self.tableView reloadData];
- };
- UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:scheduleVC];
- [self presentViewController:navController animated:YES completion:nil];
- } else if (indexPath.section == 2) {
- NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
- if (indexPath.row == 0) {
+ } else if (indexPath.row == 3) {
self.isPresetsSectionExpanded = !self.isPresetsSectionExpanded;
- [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:2] withRowAnimation:UITableViewRowAnimationAutomatic];
- } else if (indexPath.row <= presetKeys.count) {
- NSString *presetKey = presetKeys[indexPath.row - 1];
- NSArray *selectedIndexes = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"][presetKey];
- [self showNumberSelectionForPreset:presetKey selectedIndexes:selectedIndexes];
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationAutomatic];
+ } else if (self.isPresetsSectionExpanded && indexPath.row >= 4 && indexPath.row < 4 + [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys].count + 1) {
+ NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
+ if (indexPath.row - 4 < presetKeys.count) {
+ NSString *presetKey = presetKeys[indexPath.row - 4];
+ NSArray *selectedIndexes = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"][presetKey];
+ [self showNumberSelectionForPreset:presetKey selectedIndexes:selectedIndexes];
+ } else {
+ [self showAddPresetDialog];
+ }
} else {
- [self showAddPresetDialog];
+ NSInteger offset = self.isPresetsSectionExpanded ? [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys].count + 1 : 0;
+ if (indexPath.row == 4 + offset && ([[NSUserDefaults standardUserDefaults] boolForKey:@"isSubscribed"] || self.useOwnEmailServerEnabled)) {
+ [self showEmailInputDialog];
+ } else if (indexPath.row == 5 + offset) {
+ // Send Email Alerts - handled by switch
+ } else if (indexPath.row == 6 + offset) {
+ // Encrypt Email Data - handled by switch
+ } else if (indexPath.row == 7 + offset) {
+ // Use own email server - handled by switch
+ } else if (indexPath.row == 8 + offset) {
+ ScheduleManagementViewController *scheduleVC = [[ScheduleManagementViewController alloc] init];
+ scheduleVC.emailSchedules = [self.emailSchedules mutableCopy];
+ scheduleVC.completionHandler = ^(NSArray<NSDictionary *> *schedules) {
+ self.emailSchedules = [schedules mutableCopy];
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ [defaults setObject:self.emailSchedules forKey:@"email_schedules"];
+ [defaults synchronize];
+ [self.tableView reloadData];
+ };
+ UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:scheduleVC];
+ [self presentViewController:navController animated:YES completion:nil];
+ } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 9 + offset) {
+ [self showEmailServerAddressInputDialog];
+ } else if (self.useOwnEmailServerEnabled && self.isEmailServerSectionExpanded && indexPath.row == 10 + offset) {
+ [self testEmailServer];
+ }
}
- } else if (indexPath.section == 3) {
+ } else if (indexPath.section == 1) {
[[StoreManager sharedInstance] fetchAndPurchaseProduct];
}
[tableView deselectRowAtIndexPath:indexPath animated:YES];
@@ -712,48 +690,53 @@
#pragma mark - UITableView Delegate
- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
- if (indexPath.section == 1 && indexPath.row > 0 && indexPath.row <= [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys].count) {
- NSString *presetKey = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys][indexPath.row - 1];
- if (![presetKey isEqualToString:@"all"]) {
- return UITableViewCellEditingStyleDelete; // Enable swipe-to-delete for presets (except "all")
+ if (indexPath.section == 0 && self.isPresetsSectionExpanded) {
+ NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
+ // Enable swipe-to-delete for preset rows (from row 4 to 4 + presetKeys.count - 1), excluding "all"
+ if (indexPath.row >= 4 && indexPath.row < 4 + presetKeys.count) {
+ NSString *presetKey = presetKeys[indexPath.row - 4];
+ if (![presetKey isEqualToString:@"all"]) {
+ return UITableViewCellEditingStyleDelete;
+ }
}
}
return UITableViewCellEditingStyleNone;
}
- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
- if (editingStyle == UITableViewCellEditingStyleDelete) {
+ if (editingStyle == UITableViewCellEditingStyleDelete && indexPath.section == 0 && self.isPresetsSectionExpanded) {
NSArray *presetKeys = [[[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"] allKeys];
- NSString *presetKey = presetKeys[indexPath.row - 1];
-
- // Prevent deletion of the "all" preset
- if ([presetKey isEqualToString:@"all"]) {
- NSLog(@"Cannot delete the 'all' preset.");
- return;
- }
+ if (indexPath.row >= 4 && indexPath.row < 4 + presetKeys.count) {
+ NSString *presetKey = presetKeys[indexPath.row - 4];
- // Remove the preset
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSMutableDictionary *yoloPresets = [[defaults objectForKey:@"yolo_presets"] mutableCopy];
- [yoloPresets removeObjectForKey:presetKey];
- [defaults setObject:yoloPresets forKey:@"yolo_presets"];
+ // Prevent deletion of the "all" preset
+ if ([presetKey isEqualToString:@"all"]) {
+ NSLog(@"Cannot delete the 'all' preset.");
+ return;
+ }
- // Check if the deleted preset was the currently selected one
- if ([self.selectedPresetKey isEqualToString:presetKey]) {
- // Switch to the "all" preset
- self.selectedPresetKey = @"all";
- [defaults setObject:@"all" forKey:@"yolo_preset_idx"];
- }
+ // Remove the preset
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ NSMutableDictionary *yoloPresets = [[defaults objectForKey:@"yolo_presets"] mutableCopy];
+ [yoloPresets removeObjectForKey:presetKey];
+ [defaults setObject:yoloPresets forKey:@"yolo_presets"];
+
+ // Check if the deleted preset was the currently selected one
+ if ([self.selectedPresetKey isEqualToString:presetKey]) {
+ self.selectedPresetKey = @"all";
+ [defaults setObject:@"all" forKey:@"yolo_preset_idx"];
+ }
- [defaults synchronize];
+ [defaults synchronize];
- // Animate the deletion of the row
- [tableView beginUpdates];
- [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
- [tableView endUpdates];
+ // Animate the deletion of the row
+ [tableView beginUpdates];
+ [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
+ [tableView endUpdates];
- // Reload both sections to ensure the UI is fully updated
- [self.tableView reloadSections:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 2)] withRowAnimation:UITableViewRowAnimationAutomatic];
+ // Reload Section 0 to ensure the UI is fully updated
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationAutomatic];
+ }
}
}