We actually need to hard-set SummerBoard to NO.

[winterboard.git] / Application.mm

diff --git a/Application.mm b/Application.mm
index a65c77f5a168be287f13bbf17586c91939a28bf8..f033c3f5395344c144ed07e971f7c0b6d1f16835 100644 (file)
--- a/Application.mm
+++ b/Application.mm
@@ -1,5 +1,5 @@
 /* WinterBoard - Theme Manager for the iPhone
 /* WinterBoard - Theme Manager for the iPhone

- * Copyright (C) 2008  Jay Freeman (saurik)
+ * Copyright (C) 2008-2009  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -39,178 +39,161 @@
 #import <CoreGraphics/CGGeometry.h>
 #import <UIKit/UIKit.h>
 
 #import <CoreGraphics/CGGeometry.h>
 #import <UIKit/UIKit.h>
 

-#define _trace() NSLog(@"WE:_trace(%u)", __LINE__);
+#include <objc/objc-runtime.h>

 
 

-static NSString *plist_;
-static NSMutableDictionary *settings_;
-static BOOL changed_;
+#import <Preferences/PSRootController.h>
+#import <Preferences/PSViewController.h>
+#import <Preferences/PSListController.h>
+#import <Preferences/PSSpecifier.h>

 
 

-@interface WBThemeTableViewCell : UITableViewCell {
-    UILabel *label;
-}
+#include <substrate.h>
+#include <mach-o/dyld.h>
+
+static NSBundle *wbSettingsBundle;
+static Class $WBSettingsController;

 
 

+@interface UIApplication (Private)
+- (void) terminateWithSuccess;

 @end
 
 @end
 

-@implementation WBThemeTableViewCell
+@interface UIDevice (Private)
+- (BOOL) isWildcat;
+@end

 
 

+@interface PSRootController (Compatibility)
+- (id) _popController; // < 3.2
+- (id) contentView; // < 3.2
+- (id) lastController; // < 3.2
+- (id) topViewController; // >= 3.2
+@end

 
 

+@interface PSListController (Compatibility)
+- (void) viewWillBecomeVisible:(void *)specifier; // < 3.2
+- (void) viewWillAppear:(BOOL)a; // >= 3.2
+- (void) setSpecifier:(PSSpecifier *)spec; // >= 3.2

 @end
 
 @end
 

-@interface WBApplication : UIApplication <
-    UITableViewDataSource,
-    UITableViewDelegate
-> {
-    UIWindow *window_;
-    UITableView *themesTable_;
-    NSMutableArray *themesArray_;
+@interface WBRootController : PSRootController {
+    PSListController *_rootListController;

 }
 
 }
 

+@property (readonly) PSListController *rootListController;
+
+- (void) setupRootListForSize:(CGSize)size;
+- (id) topViewController;

 @end
 
 @end
 

-@implementation WBApplication
+@implementation WBRootController

 
 

-- (void) dealloc {
-    [window_ release];
-    [themesTable_ release];
-    [themesArray_ release];
-    [super dealloc];
-}
+@synthesize rootListController = _rootListController;

 
 

-- (void) applicationWillTerminate:(UIApplication *)application {
-    if (changed_) {
-        if (![settings_ writeToFile:plist_ atomically:YES])
-            NSLog(@"WB:Error:writeToFile");
-        system("killall SpringBoard");
-    }
-}
+// < 3.2
+- (void) setupRootListForSize:(CGSize)size {
+    PSSpecifier *spec([[PSSpecifier alloc] init]);
+    [spec setTarget:self];
+    spec.name = @"WinterBoard";

 
 

-- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    UITableViewCell *cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero] autorelease];
-    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;
-}
+    _rootListController = [[$WBSettingsController alloc] initForContentSize:size];
+    _rootListController.rootController = self;
+    _rootListController.parentController = self;
+    [_rootListController viewWillBecomeVisible:spec];

 
 

-- (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;
-}
+    [spec release];

 
 

-- (NSInteger) tableView:(UITableView *)table numberOfRowsInSection:(NSInteger)section {
-    return [themesArray_ count];
+    [self pushController:_rootListController];

 }
 
 }
 

-- (UITableViewCellEditingStyle) tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return UITableViewCellEditingStyleNone;
+// >= 3.2
+- (void) loadView {
+    [super loadView];
+    [self pushViewController:[self rootListController] animated:NO];

 }
 
 }
 

-- (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;
+- (PSListController *) rootListController {
+    if(!_rootListController) {
+        PSSpecifier *spec([[PSSpecifier alloc] init]);
+        [spec setTarget:self];
+        spec.name = @"WinterBoard";
+        _rootListController = [[$WBSettingsController alloc] initForContentSize:CGSizeZero];
+        _rootListController.rootController = self;
+        _rootListController.parentController = self;
+        [_rootListController setSpecifier:spec];
+        [spec release];
+    }
+    return _rootListController;

 }
 
 }
 

-- (BOOL) tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
-    return YES;
+- (id) contentView {
+    if ([[PSRootController class] instancesRespondToSelector:@selector(contentView)]) {
+        return [super contentView];
+    } else {
+        return [super view];
+    }

 }
 
 }
 

-- (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"];
+- (id) topViewController {
+    if ([[PSRootController class] instancesRespondToSelector:@selector(topViewController)]) {
+        return [super topViewController];
+    } else {
+        return [super lastController];

     }
     }

+}

 
 

-    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];
-
-    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]];
+- (void) _popController {
+    // Pop the last controller = exit the application.
+    // The only time the last controller should pop is when the user taps Respring/Cancel.
+    // Which only gets displayed if the user has made changes.
+    if ([self topViewController] == _rootListController)
+        [[UIApplication sharedApplication] terminateWithSuccess];
+    [super _popController];
+}

 
 

-    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)]];
-    }
+@end

 
 

-    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;
-        }
-    }
+@interface WBApplication : UIApplication {
+    WBRootController *_rootController;
+}

 
 

-    for (NSString *theme in themes) {
-        if ([themesSet containsObject:theme])
-            continue;
-        [themesSet addObject:theme];
-        [themesArray_ insertObject:[[NSDictionary dictionaryWithObjectsAndKeys:
-            theme, @"Name",
-            [NSNumber numberWithBool:NO], @"Active",
-        nil] mutableCopy] atIndex:0];
-    }
+@end

 
 

-    themesTable_ = [[UITableView alloc] initWithFrame:window_.bounds];
-    [window_ addSubview:themesTable_];
+@implementation WBApplication

 
 

-    [themesTable_ setDataSource:self];
-    [themesTable_ setDelegate:self];
+- (void) dealloc {
+    [_rootController release];
+    [super dealloc];
+}

 
 

-    [themesTable_ setEditing:YES animated:NO];
-    themesTable_.allowsSelectionDuringEditing = YES;
+- (void) applicationWillTerminate:(UIApplication *)application {
+    [_rootController.rootListController suspend];
+}

 
 

-    [themesTable_ setSeparatorStyle:UITableViewCellSeparatorStyleSingleLine];
+- (void) applicationDidFinishLaunching:(id)unused {
+    wbSettingsBundle = [NSBundle bundleWithPath:@"/System/Library/PreferenceBundles/WinterBoardSettings.bundle"];
+    [wbSettingsBundle load];
+    $WBSettingsController = [wbSettingsBundle principalClass];
+
+    CGRect applicationFrame(([UIDevice instancesRespondToSelector:@selector(isWildcat)]
+                         && [[UIDevice currentDevice] isWildcat]) || objc_getClass("UIStatusBar") != nil
+                          ? [UIScreen mainScreen].bounds
+                          : [UIScreen mainScreen].applicationFrame);
+    UIWindow *window([[UIWindow alloc] initWithFrame:applicationFrame]);
+    _rootController = [[WBRootController alloc] initWithTitle:@"WinterBoard" identifier:[[NSBundle mainBundle] bundleIdentifier]];
+    [window addSubview:[_rootController contentView]];
+    [window makeKeyAndVisible];

 }
 
 @end
 
 }
 
 @end
 

+MSHook(int32_t, NSVersionOfLinkTimeLibrary, const char *name) {
+    if (strcmp(name, "UIKit") == 0)
+        return 0x6400000;
+    return _NSVersionOfLinkTimeLibrary(name);
+}
+

 int main(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {

-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool( [[NSAutoreleasePool alloc] init]);
+
+    MSHookFunction(NSVersionOfLinkTimeLibrary, MSHake(NSVersionOfLinkTimeLibrary));

 
     int value = UIApplicationMain(argc, argv, @"WBApplication", @"WBApplication");
 
 
     int value = UIApplicationMain(argc, argv, @"WBApplication", @"WBApplication");