From c9221c731561e90ca322c7fc53ae936317ee655a Mon Sep 17 00:00:00 2001
From: arichornlover <78001398+arichornlover@users.noreply.github.com>
Date: Sun, 14 Apr 2024 13:40:50 -0500
Subject: [PATCH] Update AppIconOptionsController (Better Interface)

---
 Source/AppIconOptionsController.m | 53 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/Source/AppIconOptionsController.m b/Source/AppIconOptionsController.m
index 599167c..7a3e99c 100644
--- a/Source/AppIconOptionsController.m
+++ b/Source/AppIconOptionsController.m
@@ -6,6 +6,7 @@
 @property (strong, nonatomic) UIImageView *iconPreview;
 @property (strong, nonatomic) NSArray<NSString *> *appIcons;
 @property (assign, nonatomic) NSInteger selectedIconIndex;
+@property (assign, nonatomic) NSInteger defaultIconIndex;
 
 @end
 
@@ -13,35 +14,27 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    
     self.selectedIconIndex = 0;
-
+    self.defaultIconIndex = 0;
+    
     self.tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
     self.tableView.dataSource = self;
     self.tableView.delegate = self;
     [self.view addSubview:self.tableView];
-
+    
     UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStylePlain target:self action:@selector(close)];
     self.navigationItem.leftBarButtonItem = closeButton;
-
-    UIButton *defaultButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    defaultButton.frame = CGRectMake(20, 100, 100, 40);
-    [defaultButton setTitle:@"Default" forState:UIControlStateNormal];
-    [defaultButton addTarget:self action:@selector(setDefaultIcon) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:defaultButton];
     
-    UIButton *saveButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    saveButton.frame = CGRectMake(20, 100, 100, 40);
-    [saveButton setTitle:@"Save" forState:UIControlStateNormal];
-    [saveButton addTarget:self action:@selector(saveIcon) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:saveButton];
-
-    self.iconPreview = [[UIImageView alloc] initWithFrame:CGRectMake(20, 150, 60, 60)];
+    UIBarButtonItem *saveButton = [[UIBarButtonItem alloc] initWithTitle:@"Save" style:UIBarButtonItemStylePlain target:self action:@selector(saveIcon)];
+    self.navigationItem.rightBarButtonItem = saveButton;
+    
+    self.iconPreview = [[UIImageView alloc] initWithFrame:CGRectMake(self.view.bounds.size.width - 80, self.view.bounds.size.height - 80, 60, 60)];
     self.iconPreview.layer.cornerRadius = 10.0;
     self.iconPreview.clipsToBounds = YES;
     [self.view addSubview:self.iconPreview];
-        
-    NSString *path = [[NSBundle mainBundle] pathForResource:@"YTLitePlus" ofType:@"bundle"];
+    
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"uYouPlus" ofType:@"bundle"];
     NSBundle *bundle = [NSBundle bundleWithPath:path];
     self.appIcons = [bundle pathsForResourcesOfType:@"png" inDirectory:@"AppIcons"];
     
@@ -59,31 +52,45 @@
     if (!cell) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"Cell"];
     }
-    cell.textLabel.text = [self.appIcons[indexPath.row] lastPathComponent];
+    
+    NSString *iconPath = self.appIcons[indexPath.row];
+    cell.textLabel.text = [iconPath.lastPathComponent stringByDeletingPathExtension];
 
+    UIImage *iconImage = [UIImage imageWithContentsOfFile:iconPath];
+    cell.imageView.image = [self resizedImageWithImage:iconImage];
+    
     if (indexPath.row == self.selectedIconIndex) {
         cell.accessoryType = UITableViewCellAccessoryCheckmark;
     } else {
         cell.accessoryType = UITableViewCellAccessoryNone;
     }
+    
+    if (indexPath.row == self.defaultIconIndex) {
+        cell.textLabel.text = @"Default";
+    }
+    
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    
     UITableViewCell *previousSelectedCell = [tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:self.selectedIconIndex inSection:0]];
     previousSelectedCell.accessoryType = UITableViewCellAccessoryNone;
+    
     self.selectedIconIndex = indexPath.row;
+    
     UITableViewCell *selectedCell = [tableView cellForRowAtIndexPath:indexPath];
     selectedCell.accessoryType = UITableViewCellAccessoryCheckmark;
-
-    UIImage *selectedIconImage = [UIImage imageWithContentsOfFile:self.appIcons[self.selectedIconIndex]];
+    
+    NSString *selectedIconPath = self.appIcons[self.selectedIconIndex];
+    UIImage *selectedIconImage = [UIImage imageWithContentsOfFile:selectedIconPath];
     self.iconPreview.image = [self resizedImageWithImage:selectedIconImage];
 }
 
 - (void)saveIcon {
-    NSString *selectedIcon = self.appIcons[self.selectedIconIndex];
-    [[UIApplication sharedApplication] setAlternateIconName:selectedIcon completionHandler:^(NSError * _Nullable error){
+    NSString *selectedIconPath = self.appIcons[self.selectedIconIndex];
+    [[UIApplication sharedApplication] setAlternateIconName:selectedIconPath completionHandler:^(NSError * _Nullable error) {
         if (error) {
             NSLog(@"Error setting alternate icon: %@", error.localizedDescription);
             [self showAlertWithTitle:@"Error" message:@"Failed to set alternate icon"];