Various release engineeirng issues.

[winterboard.git] / Application.mm

diff --git a/Application.mm b/Application.mm
index 2e129d75c7d9a64052b74e51d9701af77a8649b4..36dc11157fd8005982b35d6a0db36b96b21b8ee4 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -39,7 +39,22 @@
 #import <CoreGraphics/CGGeometry.h>
 #import <UIKit/UIKit.h>
 
-#define _trace() NSLog(@"_trace(%u)", __LINE__);
+#define _trace() NSLog(@"WE:_trace(%u)", __LINE__);
+
+static NSString *plist_;
+static NSMutableDictionary *settings_;
+static BOOL changed_;
+
+@interface WBThemeTableViewCell : UITableViewCell {
+    UILabel *label;
+}
+
+@end
+
+@implementation WBThemeTableViewCell
+
+
+@end
 
 @interface WBApplication : UIApplication <
     UITableViewDataSource,
@@ -47,7 +62,7 @@
 > {
     UIWindow *window_;
     UITableView *themesTable_;
-    NSArray *themesArray_;
+    NSMutableArray *themesArray_;
 }
 
 @end
@@ -61,37 +76,124 @@
     [super dealloc];
 }
 
+- (void) applicationWillTerminate:(UIApplication *)application {
+    if (changed_) {
+        if (![settings_ writeToFile:plist_ atomically:YES])
+            NSLog(@"WB:Error:writeToFile");
+        system("killall SpringBoard");
+    }
+}
+
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero] autorelease];
-    cell.text = [themesArray_ objectAtIndex:[indexPath row]];
+    NSMutableDictionary *theme = [themesArray_ objectAtIndex:[indexPath row]];
+    cell.text = [theme objectForKey:@"Name"];
+    cell.hidesAccessoryWhenEditing = NO;
+    NSNumber *active = [theme objectForKey:@"Active"];
+    BOOL inactive = active == nil || ![active boolValue];
+    cell.accessoryType = inactive ? UITableViewCellAccessoryNone : UITableViewCellAccessoryCheckmark;
     return cell;
 }
 
+- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSMutableDictionary *theme = [themesArray_ objectAtIndex:[indexPath row]];
+    NSNumber *active = [theme objectForKey:@"Active"];
+    BOOL inactive = active == nil || ![active boolValue];
+    [theme setObject:[NSNumber numberWithBool:inactive] forKey:@"Active"];
+    cell.accessoryType = inactive ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
+    [themesTable_ deselectRowAtIndexPath:(NSIndexPath *)indexPath animated:YES];
+    changed_ = YES;
+}
+
 - (NSInteger) tableView:(UITableView *)table numberOfRowsInSection:(NSInteger)section {
     return [themesArray_ count];
 }
 
-- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    NSString *theme = [themesArray_ objectAtIndex:[indexPath row]];
+- (UITableViewCellEditingStyle) tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return UITableViewCellEditingStyleNone;
+}
 
-    [[NSDictionary dictionaryWithObjectsAndKeys:
-        theme, @"Theme",
-    nil] writeToFile:[NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.WinterBoard.plist",
-        NSHomeDirectory()
-    ] atomically:YES];
+- (void) tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+    NSUInteger fromIndex = [fromIndexPath row];
+    NSUInteger toIndex = [toIndexPath row];
+    if (fromIndex == toIndex)
+        return;
+    NSMutableDictionary *theme = [[[themesArray_ objectAtIndex:fromIndex] retain] autorelease];
+    [themesArray_ removeObjectAtIndex:fromIndex];
+    [themesArray_ insertObject:theme atIndex:toIndex];
+    changed_ = YES;
+}
 
-    if (fork() == 0) {
-        execlp("killall", "killall", "SpringBoard", NULL);
-        exit(0);
-    }
+- (BOOL) tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    return YES;
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
     window_ = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].applicationFrame];
     [window_ makeKeyAndVisible];
 
+    plist_ = [[NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.WinterBoard.plist",
+        NSHomeDirectory()
+    ] retain];
+
+    settings_ = [[NSMutableDictionary alloc] initWithContentsOfFile:plist_];
+    if (settings_ == nil)
+        settings_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+
+    themesArray_ = [settings_ objectForKey:@"Themes"];
+    if (themesArray_ == nil) {
+        if (NSString *theme = [settings_ objectForKey:@"Theme"]) {
+            themesArray_ = [[NSArray arrayWithObject:[[NSDictionary dictionaryWithObjectsAndKeys:
+                theme, @"Name",
+                [NSNumber numberWithBool:YES], @"Active",
+            nil] mutableCopy]] mutableCopy];
+
+            [settings_ removeObjectForKey:@"Theme"];
+        }
+
+        if (themesArray_ == nil)
+            themesArray_ = [NSMutableArray arrayWithCapacity:16];
+        [settings_ setObject:themesArray_ forKey:@"Themes"];
+    }
+
+    themesArray_ = [themesArray_ retain];
+
+    NSMutableSet *themesSet = [NSMutableSet setWithCapacity:32];
+    for (NSMutableDictionary *theme in themesArray_)
+        if (NSString *name = [theme objectForKey:@"Name"])
+            [themesSet addObject:name];
+
     NSFileManager *manager = [NSFileManager defaultManager];
-    themesArray_ = [[manager contentsOfDirectoryAtPath:@"/Library/Themes" error:nil] retain];
+
+    NSMutableArray *themes = [NSMutableArray arrayWithCapacity:32];
+    [themes addObjectsFromArray:[manager contentsOfDirectoryAtPath:@"/Library/Themes" error:NULL]];
+    [themes addObjectsFromArray:[manager contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/Library/SummerBoard/Themes", NSHomeDirectory()] error:NULL]];
+
+    for (NSUInteger i(0), e([themes count]); i != e; ++i) {
+        NSString *theme = [themes objectAtIndex:i];
+        if ([theme hasSuffix:@".theme"])
+            [themes replaceObjectAtIndex:i withObject:[theme substringWithRange:NSMakeRange(0, [theme length] - 6)]];
+    }
+
+    for (NSUInteger i(0), e([themesArray_ count]); i != e; ++i) {
+        NSMutableDictionary *theme = [themesArray_ objectAtIndex:i];
+        NSString *name = [theme objectForKey:@"Name"];
+        if (name == nil || ![themes containsObject:name]) {
+            [themesArray_ removeObjectAtIndex:i];
+            --i; --e;
+        }
+    }
+
+    for (NSString *theme in themes) {
+        if ([themesSet containsObject:theme])
+            continue;
+        [themesSet addObject:theme];
+        [themesArray_ addObject:[[NSDictionary dictionaryWithObjectsAndKeys:
+            theme, @"Name",
+            [NSNumber numberWithBool:NO], @"Active",
+        nil] mutableCopy]];
+    }
 
     themesTable_ = [[UITableView alloc] initWithFrame:window_.bounds];
     [window_ addSubview:themesTable_];
@@ -99,6 +201,9 @@
     [themesTable_ setDataSource:self];
     [themesTable_ setDelegate:self];
 
+    [themesTable_ setEditing:YES animated:NO];
+    themesTable_.allowsSelectionDuringEditing = YES;
+
     [themesTable_ setSeparatorStyle:UITableViewCellSeparatorStyleSingleLine];
 }