X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/1c220bde534289ad3b2f890cccb07c38f6b9106c..f03174c228eade8a273a17ba26edbc6626c95897:/MobileCydia.mm?ds=sidebyside diff --git a/MobileCydia.mm b/MobileCydia.mm index 540f9815..dae7d615 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -951,6 +951,11 @@ class CYColor { private: CGColorRef color_; + static CGColorRef Create_(CGColorSpaceRef space, float red, float green, float blue, float alpha) { + CGFloat color[] = {red, green, blue, alpha}; + return CGColorCreate(space, color); + } + public: CYColor() : color_(NULL) @@ -958,7 +963,7 @@ class CYColor { } CYColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) : - color_(NULL) + color_(Create_(space, red, green, blue, alpha)) { Set(space, red, green, blue, alpha); } @@ -974,8 +979,7 @@ class CYColor { void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) { Clear(); - float color[] = {red, green, blue, alpha}; - color_ = CGColorCreate(space, (CGFloat *) color); + color_ = Create_(space, red, green, blue, alpha); } operator CGColorRef() { @@ -1803,8 +1807,6 @@ typedef std::map< unsigned long, _H > SourceMap; - (uint32_t) compareBySection:(NSArray *)sections; -- (uint32_t) compareForChanges; - - (void) install; - (void) remove; @@ -2209,15 +2211,7 @@ struct PackageNameOrdering : _profile(Package$section) std::replace(section_.data(), section_.data() + section_.size(), '_', ' '); NSString *name(section_); - - lookup: - if (NSDictionary *value = [SectionMap_ objectForKey:name]) - if (NSString *rename = [value objectForKey:@"Rename"]) { - name = rename; - goto lookup; - } - - section$_ = name; + section$_ = [SectionMap_ objectForKey:name] ?: name; _end } return section$_; } @@ -2251,16 +2245,22 @@ struct PackageNameOrdering : } - (Address *) maintainer { - if (file_.end()) +@synchronized (database_) { + if ([database_ era] != era_ || file_.end()) return nil; + pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); const std::string &maintainer(parser->Maintainer()); return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]]; -} +} } - (size_t) size { - return version_.end() ? 0 : version_->InstalledSize; -} +@synchronized (database_) { + if ([database_ era] != era_ || version_.end()) + return 0; + + return version_->InstalledSize; +} } - (NSString *) longDescription { @synchronized (database_) { @@ -2454,7 +2454,7 @@ struct PackageNameOrdering : icon = [UIImage imageAtPath:[static_cast(icon_) substringFromIndex:7]]; if (icon == nil) if (section != nil) icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]]; - if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon]) + if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon]) if ([dicon hasPrefix:@"file:///"]) // XXX: correct escaping icon = [UIImage imageAtPath:[dicon substringFromIndex:7]]; @@ -2684,33 +2684,6 @@ struct PackageNameOrdering : return _not(uint32_t); } -- (uint32_t) compareForChanges { - union { - uint32_t key; - - struct { - uint32_t timestamp : 30; - uint32_t ignored : 1; - uint32_t upgradable : 1; - } bits; - } value; - - bool upgradable([self upgradableAndEssential:YES]); - value.bits.upgradable = upgradable ? 1 : 0; - - if (upgradable) { - value.bits.timestamp = 0; - value.bits.ignored = [self ignored] ? 0 : 1; - value.bits.upgradable = 1; - } else { - value.bits.timestamp = static_cast([[self seen] timeIntervalSince1970]) >> 2; - value.bits.ignored = 0; - value.bits.upgradable = 0; - } - - return _not(uint32_t) - value.key; -} - - (void) clear { @synchronized (database_) { pkgProblemResolver *resolver = [database_ resolver]; @@ -2923,6 +2896,7 @@ struct PackageNameOrdering : /* }}} */ static NSString *Colon_; +static NSString *Elision_; static NSString *Error_; static NSString *Warning_; @@ -2940,12 +2914,17 @@ static NSString *Warning_; return era_; } +- (void) releasePackages { + CFArrayApplyFunction(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&CFRelease), NULL); + CFArrayRemoveAllValues(packages_); +} + - (void) dealloc { // XXX: actually implement this thing _assert(false); - NSRecycleZone(zone_); - // XXX: malloc_destroy_zone(zone_); + [self releasePackages]; apr_pool_destroy(pool_); + NSRecycleZone(zone_); [super dealloc]; } @@ -3233,9 +3212,7 @@ static NSString *Warning_; @synchronized (self) { ++era_; - CFArrayApplyFunction(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&CFRelease), NULL); - CFArrayRemoveAllValues(packages_); - + [self releasePackages]; sources_.clear(); _error->Discard(); @@ -3701,7 +3678,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (NSArray *) getInstalledPackages { NSArray *packages([[Database sharedInstance] packages]); - NSMutableArray *installed([NSMutableArray arrayWithCapacity:[packages count]]); + NSMutableArray *installed([NSMutableArray arrayWithCapacity:1024]); for (Package *package in packages) if ([package installed] != nil) [installed addObject:package]; @@ -4582,9 +4559,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end @implementation ContentView + - (id) initWithFrame:(CGRect)frame { if ((self = [super initWithFrame:frame]) != nil) { - /* Fix landscape stretching. */ [self setNeedsDisplayOnBoundsChange:YES]; } return self; } @@ -4597,10 +4574,47 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super drawRect:rect]; [delegate_ drawContentRect:rect]; } + +@end +/* }}} */ +/* Cydia TableView Cell {{{ */ +@interface CYTableViewCell : UITableViewCell { + ContentView *content_; + bool highlighted_; +} + +@end + +@implementation CYTableViewCell + +- (void) dealloc { + [content_ release]; + [super dealloc]; +} + +- (void) _updateHighlightColorsForView:(id)view highlighted:(BOOL)highlighted { + //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_); + + if (view == content_) { + //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_); + highlighted_ = highlighted; + } + + [super _updateHighlightColorsForView:view highlighted:highlighted]; +} + +- (void) setSelected:(BOOL)selected animated:(BOOL)animated { + //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO"); + highlighted_ = selected; + + [super setSelected:selected animated:animated]; + [content_ setNeedsDisplay]; +} + @end /* }}} */ /* Package Cell {{{ */ -@interface PackageCell : UITableViewCell < +@interface PackageCell : CYTableViewCell < ContentDelegate > { UIImage *icon_; @@ -4610,10 +4624,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSString *source_; UIImage *badge_; Package *package_; - UIColor *color_; - ContentView *content_; - BOOL faded_; - float fade_; UIImage *placard_; } @@ -4664,15 +4674,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) dealloc { [self clearPackage]; - [content_ release]; - [color_ release]; [super dealloc]; } -- (float) fade { - return faded_ ? [self selectionPercent] : fade_; -} - - (PackageCell *) init { CGRect frame(CGRectMake(0, 0, 320, 74)); if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) { @@ -4685,8 +4689,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [content_ setDelegate:self]; [content_ setOpaque:YES]; - if ([self respondsToSelector:@selector(selectionPercent)]) - faded_ = YES; } return self; } @@ -4757,7 +4759,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentRect:(CGRect)rect { - bool selected([self isSelected]); + bool highlighted(highlighted_); float width([self bounds].size.width); #if 0 @@ -4788,15 +4790,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { )]; } - if (selected) + if (highlighted) UISetColor(White_); - if (!selected) + if (!highlighted) UISetColor(commercial_ ? Purple_ : Black_); [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; - if (!selected) + if (!highlighted) UISetColor(commercial_ ? Purplish_ : Gray_); [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation]; @@ -4804,12 +4806,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [placard_ drawAtPoint:CGPointMake(width - 52, 9)]; } -- (void) setSelected:(BOOL)selected animated:(BOOL)fade { - //[self _setBackgroundColor]; - [super setSelected:selected animated:fade]; - [content_ setNeedsDisplay]; -} - + (int) heightForPackage:(Package *)package { return 73; } @@ -4817,7 +4813,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ /* Section Cell {{{ */ -@interface SectionCell : UITableViewCell < +@interface SectionCell : CYTableViewCell < ContentDelegate > { NSString *basic_; @@ -4825,7 +4821,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSString *name_; NSString *count_; UIImage *icon_; - ContentView *content_; UISwitch *switch_; BOOL editing_; } @@ -4862,8 +4857,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [self clearSection]; [icon_ release]; [switch_ release]; - [content_ release]; - [super dealloc]; } @@ -4940,20 +4933,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentRect:(CGRect)rect { - BOOL selected = [self isSelected]; + bool highlighted(highlighted_); [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; - if (selected) + if (highlighted) UISetColor(White_); - if (!selected) - UISetColor(Black_); - float width(rect.size.width); if (editing_) width -= 87; + if (!highlighted) + UISetColor(Black_); [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation]; CGSize size = [count_ sizeWithFont:Font14_]; @@ -5630,14 +5622,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ /* Source Cell {{{ */ -@interface SourceCell : UITableViewCell < +@interface SourceCell : CYTableViewCell < ContentDelegate > { UIImage *icon_; NSString *origin_; NSString *description_; NSString *label_; - ContentView *content_; } - (void) setSource:(Source *)source; @@ -5676,7 +5667,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) dealloc { [self clearSource]; - [content_ release]; [super dealloc]; } @@ -5695,30 +5685,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } return self; } -- (void) setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - [content_ setNeedsDisplay]; -} - - (void) drawContentRect:(CGRect)rect { - bool selected([self isSelected]); + bool highlighted(highlighted_); float width(rect.size.width); if (icon_ != nil) [icon_ drawInRect:CGRectMake(10, 10, 30, 30)]; - if (selected) + if (highlighted) UISetColor(White_); - if (!selected) + if (!highlighted) UISetColor(Black_); [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; - if (!selected) + if (!highlighted) UISetColor(Blue_); [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; - if (!selected) + if (!highlighted) UISetColor(Gray_); [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation]; } @@ -7024,10 +7009,9 @@ freeing the view controllers on tab change */ [sections_ removeAllObjects]; -#if 0 +#if 1 UIProgressHUD *hud([delegate_ addProgressHUD]); - // XXX: localize - [hud setText:@"Loading Changes"]; + [hud setText:UCLocalize("LOADING")]; //NSLog(@"HUD:%@::%@", delegate_, hud); [self yieldToSelector:@selector(_reloadPackages:) withObject:packages]; [delegate_ removeProgressHUD:hud]; @@ -8737,7 +8721,7 @@ _trace(); [label setTextColor:[UIColor blackColor]]; [label setShadowColor:[UIColor whiteColor]]; [label setShadowOffset:CGSizeMake(0, 1)]; - [label setText:UCLocalize("LOADING_DATA")]; + [label setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]]; [container addSubview:label]; CGSize viewsize = [[tabbar_ view] frame].size; @@ -9102,6 +9086,7 @@ int main(int argc, char *argv[]) { _pooled /* }}} */ Colon_ = UCLocalize("COLON_DELIMITED"); + Elision_ = UCLocalize("ELISION"); Error_ = UCLocalize("ERROR"); Warning_ = UCLocalize("WARNING");