Fixed CalendarIcon text styling when isWildcat.

[winterboard.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index 058da10559261eb49c2e86609e4aea79fbe495f6..a377ae07a64b65142c9ad1870074f9411cd59068 100644 (file)
--- a/Library.mm
+++ b/Library.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-2010  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -82,6 +82,7 @@ bool _itv;
 #import <SpringBoard/SBIconModel.h>
 #import <SpringBoard/SBImageCache.h>
 // XXX: #import <SpringBoard/SBSearchView.h>
 #import <SpringBoard/SBIconModel.h>
 #import <SpringBoard/SBImageCache.h>
 // XXX: #import <SpringBoard/SBSearchView.h>

+#import <SpringBoard/SBSearchTableViewCell.h>

 #import <SpringBoard/SBStatusBarContentsView.h>
 #import <SpringBoard/SBStatusBarController.h>
 #import <SpringBoard/SBStatusBarOperatorNameView.h>
 #import <SpringBoard/SBStatusBarContentsView.h>
 #import <SpringBoard/SBStatusBarController.h>
 #import <SpringBoard/SBStatusBarOperatorNameView.h>


@@ -97,6 +98,8 @@ bool _itv;
 
 #import <CoreGraphics/CGGeometry.h>
 
 
 #import <CoreGraphics/CGGeometry.h>
 

+#import <ChatKit/CKMessageCell.h>
+

 extern "C" void __clear_cache (char *beg, char *end);
 
 @protocol WinterBoard
 extern "C" void __clear_cache (char *beg, char *end);
 
 @protocol WinterBoard


@@ -113,6 +116,11 @@ Class $UIImage;
 Class $UINavigationBar;
 Class $UIToolbar;
 
 Class $UINavigationBar;
 Class $UIToolbar;
 

+Class $CKMessageCell;
+Class $CKTimestampView;
+Class $CKTranscriptController;
+Class $CKTranscriptTableView;
+

 Class $SBApplication;
 Class $SBApplicationIcon;
 Class $SBAwayView;
 Class $SBApplication;
 Class $SBApplicationIcon;
 Class $SBAwayView;


@@ -127,6 +135,7 @@ Class $SBIconList;
 Class $SBIconModel;
 //Class $SBImageCache;
 Class $SBSearchView;
 Class $SBIconModel;
 //Class $SBImageCache;
 Class $SBSearchView;

+Class $SBSearchTableViewCell;

 Class $SBStatusBarContentsView;
 Class $SBStatusBarController;
 Class $SBStatusBarOperatorNameView;
 Class $SBStatusBarContentsView;
 Class $SBStatusBarController;
 Class $SBStatusBarOperatorNameView;


@@ -163,6 +172,7 @@ static BOOL (*_GSFontGetUseLegacyFontMetrics)();
 
 bool Debug_ = false;
 bool Engineer_ = false;
 
 bool Debug_ = false;
 bool Engineer_ = false;

+bool SummerBoard_ = true;

 
 static UIImage *(*_UIApplicationImageWithName)(NSString *name);
 static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path);
 
 static UIImage *(*_UIApplicationImageWithName)(NSString *name);
 static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path);


@@ -226,9 +236,11 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
             [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
 
     if (identifier == nil);
             [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
 
     if (identifier == nil);

+    else if ([identifier isEqualToString:@"com.apple.chatkit"])
+        [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]];

     else if ([identifier isEqualToString:@"com.apple.calculator"])
         [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];
     else if ([identifier isEqualToString:@"com.apple.calculator"])
         [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];

-    else if (![identifier isEqualToString:@"com.apple.springboard"]);
+    else if (![identifier isEqualToString:@"com.apple.springboard"] || !SummerBoard_);

         remapResourceName(@"FSO_BG.png", @"StatusBar")
         remapResourceName(@"SBDockBG.png", @"Dock")
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
         remapResourceName(@"FSO_BG.png", @"StatusBar")
         remapResourceName(@"SBDockBG.png", @"Dock")
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")


@@ -250,18 +262,25 @@ static NSString *$pathForIcon$(SBApplication *self) {
 
     NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
 
 
     NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
 

+    /* XXX: I might need to keep this for backwards compatibility

     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/icon.png", identifier]];
     if (folder != nil)
     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/icon.png", identifier]];
     if (folder != nil)

-        [names addObject:[NSString stringWithFormat:@"Folders/%@/icon.png", folder]];
+        [names addObject:[NSString stringWithFormat:@"Folders/%@/icon.png", folder]]; */

 
     #define testForIcon(Name) \
         if (NSString *name = Name) \
             [names addObject:[NSString stringWithFormat:@"Icons/%@.png", name]];
 
 
     #define testForIcon(Name) \
         if (NSString *name = Name) \
             [names addObject:[NSString stringWithFormat:@"Icons/%@.png", name]];
 

+    if (![didentifier isEqualToString:identifier])
+        testForIcon(didentifier);
+

     testForIcon(identifier);
     testForIcon(dname);
 
     testForIcon(identifier);
     testForIcon(dname);
 

+    if ([identifier isEqualToString:@"com.apple.MobileSMS"])
+        testForIcon(@"SMS");
+

     if (didentifier != nil) {
         testForIcon([English_ objectForKey:didentifier]);
 
     if (didentifier != nil) {
         testForIcon([English_ objectForKey:didentifier]);
 


@@ -273,6 +292,7 @@ static NSString *$pathForIcon$(SBApplication *self) {
 
     if (NSString *path = $getTheme$(names))
         return path;
 
     if (NSString *path = $getTheme$(names))
         return path;

+

     return nil;
 }
 
     return nil;
 }
 


@@ -331,11 +351,16 @@ static NSString *$pathForIcon$(SBApplication *self) {
 
 @end
 
 
 @end
 

-void DumpHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) {
-    NSLog(@"%*s|%2d:%s", indent * 3, "", index, class_getName([view class]));
+void WBLogRect(const char *tag, struct CGRect rect) {
+    NSLog(@"%s:{%f,%f+%f,%f}", tag, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+}
+
+void WBLogHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) {
+    CGRect frame([view frame]);
+    NSLog(@"%*s|%2d:%p:%s : {%f,%f+%f,%f} (%@)", indent * 3, "", index, view, class_getName([view class]), frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, [view backgroundColor]);

     index = 0;
     for (UIView *child in [view subviews])
     index = 0;
     for (UIView *child in [view subviews])

-        DumpHierarchy(child, index++, indent + 1);
+        WBLogHierarchy(child, index++, indent + 1);

 }
 
 UIImage *$cacheForImage$(UIImage *image) {
 }
 
 UIImage *$cacheForImage$(UIImage *image) {


@@ -418,6 +443,20 @@ MSHook(id, SBSearchView$initWithFrame$, id /* XXX: SBSearchView */ self, SEL sel
     } return self;
 }
 
     } return self;
 }
 

+MSHook(id, SBSearchTableViewCell$initWithStyle$reuseIdentifier$, SBSearchTableViewCell *self, SEL sel, int style, NSString *reuse) {
+    if ((self = _SBSearchTableViewCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSHook(void, SBSearchTableViewCell$drawRect$, SBSearchTableViewCell *self, SEL sel, struct CGRect rect, BOOL selected) {
+    _SBSearchTableViewCell$drawRect$(self, sel, rect, selected);
+    float inset([self edgeInset]);
+    [[UIColor clearColor] set];
+    UIRectFill(CGRectMake(0, 0, inset, rect.size.height));
+    UIRectFill(CGRectMake(rect.size.width - inset, 0, inset, rect.size.height));
+}
+

 MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
     if (![Info_ wb$boolForKey:@"ComposeStoreIcons"])
         if (NSString *path = $pathForIcon$([self application]))
 MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
     if (![Info_ wb$boolForKey:@"ComposeStoreIcons"])
         if (NSString *path = $pathForIcon$([self application]))


@@ -553,21 +592,28 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s
 
     CFRelease(formatter);
 
 
     CFRelease(formatter);
 

-    NSString *datestyle(@""
+    UIDevice *device([UIDevice currentDevice]);
+    bool isWild([device respondsToSelector:@selector(isWildcat)] && [device isWildcat]);
+
+    NSString *datestyle([@""

         "font-family: Helvetica; "
         "font-weight: bold; "
         "font-family: Helvetica; "
         "font-weight: bold; "

-        "font-size: 39px; "

         "color: #333333; "
         "alpha: 1.0; "
         "color: #333333; "
         "alpha: 1.0; "

-    "");
+    "" stringByAppendingString:(isWild
+        ? @"font-size: 54px; "
+        : @"font-size: 39px; "
+    )]);

 
 

-    NSString *daystyle(@""
+    NSString *daystyle([@""

         "font-family: Helvetica; "
         "font-weight: bold; "
         "font-family: Helvetica; "
         "font-weight: bold; "

-        "font-size: 9px; "

         "color: white; "
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; "
         "color: white; "
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; "

-    "");
+    "" stringByAppendingString:(isWild
+        ? @"font-size: 11px; "
+        : @"font-size: 9px; "
+    )]);

 
     if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"])
         datestyle = [datestyle stringByAppendingString:style];
 
     if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"])
         datestyle = [datestyle stringByAppendingString:style];


@@ -579,14 +625,16 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s
     CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
     CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
 
     CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
     CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
 

-    unsigned base($GSFontGetUseLegacyFontMetrics() ? 71 : 70);
+    unsigned base(isWild ? 89 : 70);
+    if ($GSFontGetUseLegacyFontMetrics())
+        base = base + 1;

 
     [(NSString *)date drawAtPoint:CGPointMake(
         (width + 1 - datesize.width) / 2, (base - datesize.height) / 2
     ) withStyle:datestyle];
 
     [(NSString *)day drawAtPoint:CGPointMake(
 
     [(NSString *)date drawAtPoint:CGPointMake(
         (width + 1 - datesize.width) / 2, (base - datesize.height) / 2
     ) withStyle:datestyle];
 
     [(NSString *)day drawAtPoint:CGPointMake(

-        (width + 1 - daysize.width) / 2, (16 - daysize.height) / 2
+        (width + 1 - daysize.width) / 2, ((isWild ? 18 : 16) - daysize.height) / 2

     ) withStyle:daystyle];
 
     CFRelease(date);
     ) withStyle:daystyle];
 
     CFRelease(date);


@@ -712,7 +760,7 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
             [controller_ play:&error];
 #elif UseMPMoviePlayerController
             NSURL *url([NSURL fileURLWithPath:mp4]);
             [controller_ play:&error];
 #elif UseMPMoviePlayerController
             NSURL *url([NSURL fileURLWithPath:mp4]);

-            MPMoviePlayerController *controller = [[MPMoviePlayerController alloc] initWithContentURL:url];
+            MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url];

            controller.movieControlMode = MPMovieControlModeHidden;
            [controller play];
 #else
            controller.movieControlMode = MPMovieControlModeHidden;
            [controller play];
 #else


@@ -746,6 +794,8 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
         if (image != nil) {
             WallpaperFile_ = [path retain];
             WallpaperImage_ = [[UIImageView alloc] initWithImage:image];
         if (image != nil) {
             WallpaperFile_ = [path retain];
             WallpaperImage_ = [[UIImageView alloc] initWithImage:image];

+            if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"])
+                [WallpaperImage_ setAlpha:[number floatValue]];

             [content addSubview:WallpaperImage_];
         }
 
             [content addSubview:WallpaperImage_];
         }
 


@@ -792,7 +842,6 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
     }
 
     [content addSubview:layer];
     }
 
     [content addSubview:layer];

-    DumpHierarchy(_window);

 
     return self;
 }
 
     return self;
 }


@@ -888,6 +937,7 @@ WBDelegate(time_)
 }
 
 - (id) initWithBadge:(NSString *)badge;
 }
 
 - (id) initWithBadge:(NSString *)badge;

+- (NSString *) description;

 
 @end
 
 
 @end
 


@@ -903,6 +953,10 @@ WBDelegate(time_)
     return self;
 }
 
     return self;
 }
 

+- (NSString *) description {
+    return [badge_ description];
+}
+

 WBDelegate(badge_)
 
 - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
 WBDelegate(badge_)
 
 - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {


@@ -953,15 +1007,15 @@ void SBStatusBarController$setStatusBarMode(int &mode) {
 }*/
 
 MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int fenceID, int animation) {
 }*/
 
 MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int fenceID, int animation) {

-    NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d", mode, orientation, duration, fenceID, animation);
+    //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d", mode, orientation, duration, fenceID, animation);

     SBStatusBarController$setStatusBarMode(mode);
     return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, fenceID, animation);
 }
 
 MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int fenceID, int animation, double startTime) {
     SBStatusBarController$setStatusBarMode(mode);
     return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, fenceID, animation);
 }
 
 MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int fenceID, int animation, double startTime) {

-    NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d startTime:%f", mode, orientation, duration, fenceID, animation, startTime);
+    //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d startTime:%f", mode, orientation, duration, fenceID, animation, startTime);

     SBStatusBarController$setStatusBarMode(mode);
     SBStatusBarController$setStatusBarMode(mode);

-    NSLog(@"mode=%u", mode);
+    //NSLog(@"mode=%u", mode);

     return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$(self, sel, mode, orientation, duration, fenceID, animation, startTime);
 }
 
     return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$(self, sel, mode, orientation, duration, fenceID, animation, startTime);
 }
 


@@ -996,6 +1050,7 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
 
 @interface UIView (WinterBoard)
 - (bool) wb$isWBImageView;
 
 @interface UIView (WinterBoard)
 - (bool) wb$isWBImageView;

+- (void) wb$logHierarchy;

 @end
 
 @implementation UIView (WinterBoard)
 @end
 
 @implementation UIView (WinterBoard)


@@ -1004,6 +1059,10 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
     return false;
 }
 
     return false;
 }
 

+- (void) wb$logHierarchy {
+    WBLogHierarchy(self);
+}
+

 @end
 
 @interface WBImageView : UIImageView {
 @end
 
 @interface WBImageView : UIImageView {


@@ -1171,24 +1230,68 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) {
     [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
 }
 
     [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
 }
 

-MSHook(void, mSMSMessageTranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) {
-    _mSMSMessageTranscriptController$loadView(self, sel);
+MSHook(void, CKMessageCell$addBalloonView$, id self, SEL sel, CKBalloonView *balloon) {
+    _CKMessageCell$addBalloonView$(self, sel, balloon);
+    [balloon setBackgroundColor:[UIColor clearColor]];
+}
+
+MSHook(id, CKMessageCell$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) {
+    if ((self = _CKMessageCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+        [[self contentView] setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSHook(id, CKTimestampView$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) {
+    if ((self = _CKTimestampView$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+        UILabel *&_label(MSHookIvar<UILabel *>(self, "_label"));
+        [_label setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
+MSHook(void, CKTranscriptTableView$setSeparatorStyle$, id self, SEL sel, int style) {
+    _CKTranscriptTableView$setSeparatorStyle$(self, sel, UITableViewCellSeparatorStyleNone);
+}
+
+MSHook(id, CKTranscriptTableView$initWithFrame$style$, id self, SEL sel, CGRect frame, int style) {
+    _trace();
+    if ((self = _CKTranscriptTableView$initWithFrame$style$(self, sel, frame, style)) != nil) {
+        [self setSeparatorStyle:UITableViewCellSeparatorStyleNone];
+    } return self;
+}
+
+MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) {
+    _TranscriptController$loadView(self, sel);

 
     if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]))
         if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) {
             [image autorelease];
 
     if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]))
         if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) {
             [image autorelease];

+
+            UIView *&_transcriptTable(MSHookIvar<UIView *>(self, "_transcriptTable"));

             UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));
             UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));

-            UIView *parent([_transcriptLayer superview]);
+            UIView *table;
+            if (&_transcriptTable != NULL)
+                table = _transcriptTable;
+            else if (&_transcriptLayer != NULL)
+                table = _transcriptLayer;
+            else
+                table = nil;
+
+            UIView *placard(table != nil ? [table superview] : MSHookIvar<UIView *>(self, "_backPlacard"));

             UIImageView *background([[[UIImageView alloc] initWithImage:image] autorelease]);
             UIImageView *background([[[UIImageView alloc] initWithImage:image] autorelease]);

-            [parent insertSubview:background belowSubview:_transcriptLayer];
-            [_transcriptLayer setBackgroundColor:[UIColor clearColor]];
+
+            if (table == nil)
+                [placard insertSubview:background atIndex:0];
+            else {
+                [table setBackgroundColor:[UIColor clearColor]];
+                [placard insertSubview:background belowSubview:table];
+            }

         }
 }
 
 MSHook(UIImage *, _UIImageWithName, NSString *name) {
     int id(_UISharedImageNameGetIdentifier(name));
     if (Debug_)
         }
 }
 
 MSHook(UIImage *, _UIImageWithName, NSString *name) {
     int id(_UISharedImageNameGetIdentifier(name));
     if (Debug_)

-        NSLog(@"WB:Debug: _UIImageWithName(\"%@\", %d)", name, id);
+        NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id);

 
     if (id == -1)
         return _UIImageAtPath(name, _UIKitBundle());
 
     if (id == -1)
         return _UIImageAtPath(name, _UIKitBundle());


@@ -1196,24 +1299,22 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) {
         NSNumber *key([NSNumber numberWithInt:id]);
         UIImage *image = [UIImages_ objectForKey:key];
         if (image != nil)
         NSNumber *key([NSNumber numberWithInt:id]);
         UIImage *image = [UIImages_ objectForKey:key];
         if (image != nil)

-            return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+            return reinterpret_cast<id>(image) == [NSNull null] ? _UISharedImageWithIdentifier(id) : image;

         if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
             image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
             if (image != nil)
                 [image autorelease];
         }
         if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
             image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
             if (image != nil)
                 [image autorelease];
         }

-        if (image == nil)
-            image = _UISharedImageWithIdentifier(id);

         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];

-        return image;
+        return image == nil ? _UISharedImageWithIdentifier(id) : image;

     }
 }
 
 MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
     }
 }
 
 MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {

-    NSString *key = [NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name];
-    UIImage *image = [PathImages_ objectForKey:key];
+    NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]);
+    UIImage *image([PathImages_ objectForKey:key]);

     if (image != nil)
     if (image != nil)

-        return reinterpret_cast<id>(image) == [NSNull null] ? nil : image;
+        return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;

     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])) {
     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])) {


@@ -1221,13 +1322,13 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
         if (image != nil)
             [image autorelease];
     }
         if (image != nil)
             [image autorelease];
     }

-    if (image == nil)
-        image = __UIImageWithNameInDomain(name, domain);

     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];

-    return image;
+    return image == nil ? __UIImageWithNameInDomain(name, domain) : image;

 }
 
 MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
 }
 
 MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {

+    if (Debug_)
+        NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size);

     if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]])
         name = [font UTF8String];
     return _GSFontCreateWithName(name, traits, size);
     if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]])
         name = [font UTF8String];
     return _GSFontCreateWithName(name, traits, size);


@@ -1239,6 +1340,8 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t
 bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2);
 
 MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) {
 bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2);
 
 MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) {

+    if (Debug_)
+        NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, a2);

     bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
     if (Debug_)
         NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);
     bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
     if (Debug_)
         NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);


@@ -1286,18 +1389,32 @@ static void ChangeWallpaper(
 #define WBRename(name, sel, imp) \
     _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
 
 #define WBRename(name, sel, imp) \
     _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
 

+template <typename Type_>
+static void nlset(Type_ &function, struct nlist *nl, size_t index) {
+    struct nlist &name(nl[index]);
+    uintptr_t value(name.n_value);
+    if ((name.n_desc & N_ARM_THUMB_DEF) != 0)
+        value |= 0x00000001;
+    function = reinterpret_cast<Type_>(value);
+}
+
+template <typename Type_>
+static void dlset(Type_ &function, const char *name) {
+    function = reinterpret_cast<Type_>(dlsym(RTLD_DEFAULT, name));
+}
+

 extern "C" void WBInitialize() {
 extern "C" void WBInitialize() {

-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);

 
     NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
 
     NSLog(@"WB:Notice: WinterBoard");
 
 
     NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
 
     NSLog(@"WB:Notice: WinterBoard");
 

-    _GSFontGetUseLegacyFontMetrics = reinterpret_cast<BOOL (*)()>(dlsym(RTLD_DEFAULT, "GSFontGetUseLegacyFontMetrics"));
+    dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");

 
     struct nlist nl[8];
 
     struct nlist nl[8];

-    memset(nl, 0, sizeof(nl));

 
 

+    memset(nl, 0, sizeof(nl));

     nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
     nl[1].n_un.n_name = (char *) "__UIImageAtPath";
     nl[2].n_un.n_name = (char *) "__UIImageRefAtPath";
     nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
     nl[1].n_un.n_name = (char *) "__UIImageAtPath";
     nl[2].n_un.n_name = (char *) "__UIImageRefAtPath";


@@ -1305,16 +1422,15 @@ extern "C" void WBInitialize() {
     nl[4].n_un.n_name = (char *) "__UIKitBundle";
     nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
     nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
     nl[4].n_un.n_name = (char *) "__UIKitBundle";
     nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
     nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";

-

     nlist(UIKit, nl);
 
     nlist(UIKit, nl);
 

-    _UIApplicationImageWithName = (UIImage *(*)(NSString *)) nl[0].n_value;
-    _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[1].n_value;
-    _UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value;
-    _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value;
-    _UIKitBundle = (NSBundle *(*)()) nl[4].n_value;
-    _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[5].n_value;
-    _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[6].n_value;
+    nlset(_UIApplicationImageWithName, nl, 0);
+    nlset(_UIImageAtPath, nl, 1);
+    nlset(_UIImageRefAtPath, nl, 2);
+    nlset(_UIImageWithNameInDomain, nl, 3);
+    nlset(_UIKitBundle, nl, 4);
+    nlset(_UISharedImageNameGetIdentifier, nl, 5);
+    nlset(_UISharedImageWithIdentifier, nl, 6);

 
     MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
     MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);
 
     MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
     MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);


@@ -1328,7 +1444,7 @@ extern "C" void WBInitialize() {
         memset(nl, 0, sizeof(nl));
         nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb";
         nlist(AudioToolbox, nl);
         memset(nl, 0, sizeof(nl));
         nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb";
         nlist(AudioToolbox, nl);

-        _Z24GetFileNameForThisActionmPcRb = (bool (*)(unsigned long, char *, bool &)) nl[0].n_value;
+        nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0);

         MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
     }
 
         MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
     }
 


@@ -1343,8 +1459,8 @@ extern "C" void WBInitialize() {
 
     _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
 
 
     _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
 

-    //WBRename("UINavigationBar", @selector(initWithCoder:", (IMP) &UINavigationBar$initWithCoder$);
-    //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);
+    //WBRename("UINavigationBar", @selector(initWithCoder:), (IMP) &UINavigationBar$initWithCoder$);
+    //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:), (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$);

 
     _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$);
     _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$);
 
     _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$);
     _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$);


@@ -1358,30 +1474,31 @@ extern "C" void WBInitialize() {
 
     themes_ = [[NSMutableArray alloc] initWithCapacity:8];
 
 
     themes_ = [[NSMutableArray alloc] initWithCapacity:8];
 

-    if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
-        [settings autorelease];
-
-        if (NSNumber *debug = [settings objectForKey:@"Debug"])
-            Debug_ = [debug boolValue];
+    if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
+        if (NSNumber *value = [settings objectForKey:@"SummerBoard"])
+            SummerBoard_ = [value boolValue];
+        if (NSNumber *value = [settings objectForKey:@"Debug"])
+            Debug_ = [value boolValue];

 
 

-        NSArray *themes = [settings objectForKey:@"Themes"];
+        NSArray *themes([settings objectForKey:@"Themes"]);

         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
                     [NSNumber numberWithBool:true], @"Active",
                 nil]];
         if (themes == nil)
             if (NSString *theme = [settings objectForKey:@"Theme"])
                 themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys:
                     theme, @"Name",
                     [NSNumber numberWithBool:true], @"Active",
                 nil]];

+

         if (themes != nil)
             for (NSDictionary *theme in themes) {
         if (themes != nil)
             for (NSDictionary *theme in themes) {

-                NSNumber *active = [theme objectForKey:@"Active"];
+                NSNumber *active([theme objectForKey:@"Active"]);

                 if (![active boolValue])
                     continue;
 
                 if (![active boolValue])
                     continue;
 

-                NSString *name = [theme objectForKey:@"Name"];
+                NSString *name([theme objectForKey:@"Name"]);

                 if (name == nil)
                     continue;
 
                 if (name == nil)
                     continue;
 

-                NSString *theme = nil;
+                NSString *theme(nil);

 
                 #define testForTheme(format...) \
                     if (theme == nil) { \
 
                 #define testForTheme(format...) \
                     if (theme == nil) { \


@@ -1395,34 +1512,59 @@ extern "C" void WBInitialize() {
                 testForTheme(@"/Library/Themes/%@.theme", name)
                 testForTheme(@"/Library/Themes/%@", name)
                 testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name)
                 testForTheme(@"/Library/Themes/%@.theme", name)
                 testForTheme(@"/Library/Themes/%@", name)
                 testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name)

+

             }
     }
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
     for (NSString *theme in themes_)
             }
     }
 
     Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
     for (NSString *theme in themes_)

-        if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]]) {
-            [info autorelease];
+        if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])

             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];
             for (NSString *key in [info allKeys])
                 if ([Info_ objectForKey:key] == nil)
                     [Info_ setObject:[info objectForKey:key] forKey:key];

+
+    bool sms($getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]) != nil);
+
+    if ([NSBundle bundleWithIdentifier:@"com.apple.chatkit"])
+        if (sms) {
+            $CKMessageCell = objc_getClass("CKMessageCell");
+            _CKMessageCell$addBalloonView$ = MSHookMessage($CKMessageCell, @selector(addBalloonView:), &$CKMessageCell$addBalloonView$);
+            _CKMessageCell$initWithStyle$reuseIdentifier$ = MSHookMessage($CKMessageCell, @selector(initWithStyle:reuseIdentifier:), &$CKMessageCell$initWithStyle$reuseIdentifier$);
+
+            $CKTranscriptTableView = objc_getClass("CKTranscriptTableView");
+            _CKTranscriptTableView$setSeparatorStyle$ = MSHookMessage($CKTranscriptTableView, @selector(setSeparatorStyle:), &$CKTranscriptTableView$setSeparatorStyle$);
+            _CKTranscriptTableView$initWithFrame$style$ = MSHookMessage($CKTranscriptTableView, @selector(initWithFrame:style:), &$CKTranscriptTableView$initWithFrame$style$);
+
+            $CKTimestampView = objc_getClass("CKTimestampView");
+            _CKTimestampView$initWithStyle$reuseIdentifier$ = MSHookMessage($CKTimestampView, @selector(initWithStyle:reuseIdentifier:), &$CKTimestampView$initWithStyle$reuseIdentifier$);
+
+            $CKTranscriptController = objc_getClass("CKTranscriptController");
+            _TranscriptController$loadView = MSHookMessage($CKTranscriptController, @selector(loadView), &$TranscriptController$loadView);

         }
 
     if ([identifier isEqualToString:@"com.apple.MobileSMS"]) {
         }
 
     if ([identifier isEqualToString:@"com.apple.MobileSMS"]) {

-        Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController");
-        _mSMSMessageTranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$mSMSMessageTranscriptController$loadView);
+        if (sms) {
+            if (_TranscriptController$loadView == NULL) {
+                Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController");
+                _TranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$TranscriptController$loadView);
+            }
+        }

     } else if ([identifier isEqualToString:@"com.apple.springboard"]) {
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
         );
 
     } else if ([identifier isEqualToString:@"com.apple.springboard"]) {
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
             NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
         );
 

-        NSBundle *MediaPlayer = [NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"];
-        if (MediaPlayer != nil)
-            [MediaPlayer load];
+        if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) {
+            NSBundle *MediaPlayer([NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"]);
+            if (MediaPlayer != nil)
+                [MediaPlayer load];
+
+            $MPMoviePlayerController = objc_getClass("MPMoviePlayerController");
+            $MPVideoView = objc_getClass("MPVideoView");
+        }

 
 

-        $MPMoviePlayerController = objc_getClass("MPMoviePlayerController");
-        $MPVideoView = objc_getClass("MPVideoView");

         $WebCoreFrameBridge = objc_getClass("WebCoreFrameBridge");
 
         $SBApplication = objc_getClass("SBApplication");
         $WebCoreFrameBridge = objc_getClass("WebCoreFrameBridge");
 
         $SBApplication = objc_getClass("SBApplication");


@@ -1439,6 +1581,7 @@ extern "C" void WBInitialize() {
         $SBIconModel = objc_getClass("SBIconModel");
         //$SBImageCache = objc_getClass("SBImageCache");
         $SBSearchView = objc_getClass("SBSearchView");
         $SBIconModel = objc_getClass("SBIconModel");
         //$SBImageCache = objc_getClass("SBImageCache");
         $SBSearchView = objc_getClass("SBSearchView");

+        $SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell");

         $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
         $SBStatusBarController = objc_getClass("SBStatusBarController");
         $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");
         $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
         $SBStatusBarController = objc_getClass("SBStatusBarController");
         $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");


@@ -1448,8 +1591,11 @@ extern "C" void WBInitialize() {
 
         WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
 
 
         WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
 

-        WBRename(SBApplication, pathForIcon, pathForIcon);
-        WBRename(SBApplicationIcon, icon, icon);
+        if (SummerBoard_) {
+            WBRename(SBApplication, pathForIcon, pathForIcon);
+            WBRename(SBApplicationIcon, icon, icon);
+        }
+

         WBRename(SBBookmarkIcon, icon, icon);
         WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
         WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);
         WBRename(SBBookmarkIcon, icon, icon);
         WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
         WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);


@@ -1471,6 +1617,8 @@ extern "C" void WBInitialize() {
         WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$);
 
         WBRename(SBSearchView, initWithFrame:, initWithFrame$);
         WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$);
 
         WBRename(SBSearchView, initWithFrame:, initWithFrame$);

+        WBRename(SBSearchTableViewCell, drawRect:, drawRect$);
+        WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$);

 
         //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$);
 
 
         //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$);
 


@@ -1484,7 +1632,9 @@ extern "C" void WBInitialize() {
         WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$);
         WBRename(SBStatusBarTimeView, drawRect:, drawRect$);
 
         WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$);
         WBRename(SBStatusBarTimeView, drawRect:, drawRect$);
 

-        English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
+        if (SummerBoard_)
+            English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
+

         Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
     }
 
         Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
     }