X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/900dc9a5d6341928f9190bb8840fdf61df65b59b..59d5ae48171dea0f94985deab5fa29cc9e18fefe:/Settings.mm diff --git a/Settings.mm b/Settings.mm index 614a0b7..7beb1f3 100644 --- a/Settings.mm +++ b/Settings.mm @@ -28,15 +28,10 @@ #import #import +#include #include #include -static BOOL (*IsIconHiddenDisplayId)(NSString *); -static BOOL (*HideIconViaDisplayId)(NSString *); -static BOOL (*UnHideIconViaDisplayId)(NSString *); - -static NSString *WinterBoardDisplayID = @"com.saurik.WinterBoard"; - extern NSString *PSTableCellKey; extern "C" UIImage *_UIImageWithName(NSString *); @@ -47,6 +42,31 @@ static BOOL settingsChanged; static NSMutableDictionary *_settings; static NSString *_plist; +void AddThemes(NSMutableArray *themesOnDisk, NSString *folder) { + NSArray *themes([[NSFileManager defaultManager] contentsOfDirectoryAtPath:folder error:NULL]); + for (NSString *theme in themes) { + if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/Info.plist", folder, theme]]) { + if (NSArray *version = [info objectForKey:@"CoreFoundationVersion"]) { + size_t count([version count]); + if (count == 0 || count > 2) + continue; + + double lower([[version objectAtIndex:0] doubleValue]); + if (kCFCoreFoundationVersionNumber < lower) + continue; + + if (count != 1) { + double upper([[version objectAtIndex:1] doubleValue]); + if (upper <= kCFCoreFoundationVersionNumber) + continue; + } + } + } + + [themesOnDisk addObject:theme]; + } +} + /* [NSObject yieldToSelector:(withObject:)] {{{*/ @interface NSObject (wb$yieldToSelector) - (id) wb$yieldToSelector:(SEL)selector withObject:(id)object; @@ -119,6 +139,60 @@ static NSString *_plist; /* }}} */ /* Theme Settings Controller {{{ */ +@interface WBSThemesTableViewCell : UITableViewCell { + UIImageView *checkmark_; + UIImageView *icon_; + UILabel *name_; +} + +@end + +@implementation WBSThemesTableViewCell + +- (void) dealloc { + [super dealloc]; + [checkmark_ release]; + [icon_ release]; + [name_ release]; +} + +- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuse { + if ((self = [super initWithFrame:frame reuseIdentifier:reuse]) != nil) { + CGFloat border(48), check(40), icon(64); + UIView *content([self contentView]); + CGSize size([content frame].size); + + checkmark_ = [[UIImageView alloc] initWithFrame:CGRectMake(std::floor((border - check) / 2), 0, check, size.height)]; + [checkmark_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; + [content addSubview:checkmark_]; + + name_ = [[UILabel alloc] initWithFrame:CGRectMake(border, 0, 0, size.height)]; + [name_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [content addSubview:name_]; + + icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(size.width - icon - 48, 0, icon, icon)]; + [content addSubview:icon_]; + } return self; +} + +- (void) setCheck:(bool)inactive { + [self setImage:(inactive ? uncheckedImage : checkImage)]; +} + +- (void) setTheme:(NSDictionary *)theme { + [name_ setText:[theme objectForKey:@"Name"]]; + + NSNumber *active([theme objectForKey:@"Active"]); + BOOL inactive(active == nil || ![active boolValue]); + [self setCheck:inactive]; + + CGRect area([name_ frame]); + area.size.width = ([icon_ image] == nil ? self.contentView.frame.size.width : icon_.frame.origin.x) - area.origin.x - 9; + [name_ setFrame:area]; +} + +@end + @interface WBSThemesController: PSViewController { UITableView *_tableView; NSMutableArray *_themes; @@ -126,8 +200,6 @@ static NSString *_plist; @property (nonatomic, retain) NSMutableArray *themes; -+ (void) load; - - (id) initForContentSize:(CGSize)size; - (id) view; - (id) navigationTitle; @@ -149,7 +221,7 @@ static NSString *_plist; @synthesize themes = _themes; -+ (void) load { ++ (void) initialize { NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); checkImage = [_UIImageWithName(@"UIPreferencesBlueCheck.png") retain]; uncheckedImage = [[UIImage imageWithContentsOfFile:@"/System/Library/PreferenceBundles/WinterBoardSettings.bundle/SearchResultsCheckmarkClear.png"] retain]; @@ -173,16 +245,8 @@ static NSString *_plist; } NSMutableArray *themesOnDisk([NSMutableArray array]); - - [themesOnDisk - addObjectsFromArray:[[NSFileManager defaultManager] - contentsOfDirectoryAtPath:@"/Library/Themes" error:NULL] - ]; - - [themesOnDisk addObjectsFromArray:[[NSFileManager defaultManager] - contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/Library/SummerBoard/Themes", NSHomeDirectory()] - error:NULL - ]]; + AddThemes(themesOnDisk, @"/Library/Themes"); + AddThemes(themesOnDisk, [NSString stringWithFormat:@"%@/Library/SummerBoard/Themes", NSHomeDirectory()]); for (int i = 0, count = [themesOnDisk count]; i < count; i++) { NSString *theme = [themesOnDisk objectAtIndex:i]; @@ -216,7 +280,8 @@ static NSString *_plist; nil] atIndex:0]; } - _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, 320, 480-64) style:UITableViewStyleGrouped]; + _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, 320, 480-64) style:UITableViewStylePlain]; + [_tableView setRowHeight:48]; [_tableView setDataSource:self]; [_tableView setDelegate:self]; [_tableView setEditing:YES]; @@ -259,18 +324,14 @@ static NSString *_plist; } - (id) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ThemeCell"]; + WBSThemesTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ThemeCell"]; if (!cell) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectMake(0, 0, 100, 100) reuseIdentifier:@"ThemeCell"] autorelease]; + cell = [[[WBSThemesTableViewCell alloc] initWithFrame:CGRectMake(0, 0, 100, 100) reuseIdentifier:@"ThemeCell"] autorelease]; //[cell setTableViewStyle:UITableViewCellStyleDefault]; } NSDictionary *theme([_themes objectAtIndex:indexPath.row]); - cell.text = [theme objectForKey:@"Name"]; - cell.hidesAccessoryWhenEditing = NO; - NSNumber *active([theme objectForKey:@"Active"]); - BOOL inactive(active == nil || ![active boolValue]); - [cell setImage:(inactive ? uncheckedImage : checkImage)]; + [cell setTheme:theme]; return cell; } @@ -422,13 +483,6 @@ static NSString *_plist; @implementation WBSettingsController -+ (void) load { - void *libhide(dlopen("/usr/lib/hide.dylib", RTLD_LAZY)); - IsIconHiddenDisplayId = reinterpret_cast(dlsym(libhide, "IsIconHiddenDisplayId")); - HideIconViaDisplayId = reinterpret_cast(dlsym(libhide, "HideIconViaDisplayId")); - UnHideIconViaDisplayId = reinterpret_cast(dlsym(libhide, "UnHideIconViaDisplayId")); -} - - (void) _wb$loadSettings { _plist = [[NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.WinterBoard.plist", NSHomeDirectory()] retain]; _settings = [NSMutableDictionary dictionaryWithContentsOfFile:_plist]; @@ -445,8 +499,6 @@ static NSString *_plist; if ([_settings objectForKey:@"SummerBoard"] == nil) [_settings setObject:[NSNumber numberWithBool:set] forKey:@"SummerBoard"]; - - [_settings setObject:[NSNumber numberWithBool:IsIconHiddenDisplayId(WinterBoardDisplayID)] forKey:@"IconHidden"]; } - (id) initForContentSize:(CGSize)size { @@ -471,8 +523,6 @@ static NSString *_plist; if (![data writeToFile:_plist options:NSAtomicWrite error:NULL]) return; - ([[_settings objectForKey:@"IconHidden"] boolValue] ? HideIconViaDisplayId : UnHideIconViaDisplayId)(WinterBoardDisplayID); - unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons"); unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons.plist"); unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons"); @@ -491,6 +541,14 @@ static NSString *_plist; system("rm -rf /User/Library/Caches/com.apple.IconsCache"); system("rm -rf /User/Library/Caches/com.apple.newsstand"); system("rm -rf /User/Library/Caches/com.apple.springboard.sharedimagecache"); + system("rm -rf /User/Library/Caches/com.apple.UIStatusBar"); + + system("rm -rf /User/Library/Caches/BarDialer"); + system("rm -rf /User/Library/Caches/BarDialer_selected"); + system("rm -rf /User/Library/Caches/BarRecents"); + system("rm -rf /User/Library/Caches/BarRecents_selected"); + system("rm -rf /User/Library/Caches/BarVM"); + system("rm -rf /User/Library/Caches/BarVM_selected"); system("killall -9 lsd"); @@ -554,8 +612,28 @@ static NSString *_plist; } - (id) specifiers { - if (!_specifiers) - _specifiers = [[self loadSpecifiersFromPlistName:@"WinterBoard" target:self] retain]; + if (!_specifiers) { + NSMutableArray *specifiers([NSMutableArray array]); + for (PSSpecifier *specifier in [self loadSpecifiersFromPlistName:@"WinterBoard" target:self]) { + if (NSArray *version = [specifier propertyForKey:@"wb$filter"]) { + size_t count([version count]); + if (count == 0 || count > 2) + continue; + + double lower([[version objectAtIndex:0] doubleValue]); + if (kCFCoreFoundationVersionNumber < lower) + continue; + + if (count != 1) { + double upper([[version objectAtIndex:1] doubleValue]); + if (upper <= kCFCoreFoundationVersionNumber) + continue; + } + } + [specifiers addObject:specifier]; + } + _specifiers = [specifiers retain]; + } return _specifiers; }