diff options
70 files changed, 19 insertions, 20 deletions
diff --git a/MobileCydia.app/Purposes/commercial.png b/MobileCydia.app/Purposes/commercial.png Binary files differindex 9c411cc..5008618 100644 --- a/MobileCydia.app/Purposes/commercial.png +++ b/MobileCydia.app/Purposes/commercial.png diff --git a/MobileCydia.app/Purposes/console.png b/MobileCydia.app/Purposes/console.png Binary files differindex 08d1869..58a4f65 100644 --- a/MobileCydia.app/Purposes/console.png +++ b/MobileCydia.app/Purposes/console.png diff --git a/MobileCydia.app/Purposes/daemon.png b/MobileCydia.app/Purposes/daemon.png Binary files differindex 896c9be..b4deb2a 100644 --- a/MobileCydia.app/Purposes/daemon.png +++ b/MobileCydia.app/Purposes/daemon.png diff --git a/MobileCydia.app/Purposes/extension.png b/MobileCydia.app/Purposes/extension.png Binary files differindex 59e051b..79acc42 100644 --- a/MobileCydia.app/Purposes/extension.png +++ b/MobileCydia.app/Purposes/extension.png diff --git a/MobileCydia.app/Purposes/library.png b/MobileCydia.app/Purposes/library.png Binary files differindex e275e06..bacf669 100644 --- a/MobileCydia.app/Purposes/library.png +++ b/MobileCydia.app/Purposes/library.png diff --git a/MobileCydia.app/Purposes/uikit.png b/MobileCydia.app/Purposes/uikit.png Binary files differindex 694107f..a3b289d 100644 --- a/MobileCydia.app/Purposes/uikit.png +++ b/MobileCydia.app/Purposes/uikit.png diff --git a/MobileCydia.app/Purposes/x.png b/MobileCydia.app/Purposes/x.png Binary files differindex 2feac90..fb8d852 100644 --- a/MobileCydia.app/Purposes/x.png +++ b/MobileCydia.app/Purposes/x.png diff --git a/MobileCydia.app/Sections/Addons.png b/MobileCydia.app/Sections/Addons.png Binary files differindex 424f565..3c92567 100644 --- a/MobileCydia.app/Sections/Addons.png +++ b/MobileCydia.app/Sections/Addons.png diff --git a/MobileCydia.app/Sections/Administration.png b/MobileCydia.app/Sections/Administration.png Binary files differindex 65efd3e..38a4121 100644 --- a/MobileCydia.app/Sections/Administration.png +++ b/MobileCydia.app/Sections/Administration.png diff --git a/MobileCydia.app/Sections/Archiving.png b/MobileCydia.app/Sections/Archiving.png Binary files differindex 9efce56..7d1ad14 100644 --- a/MobileCydia.app/Sections/Archiving.png +++ b/MobileCydia.app/Sections/Archiving.png diff --git a/MobileCydia.app/Sections/Blanks.png b/MobileCydia.app/Sections/Blanks.png Binary files differdeleted file mode 100644 index 7c0c2a0..0000000 --- a/MobileCydia.app/Sections/Blanks.png +++ /dev/null diff --git a/MobileCydia.app/Sections/Books.png b/MobileCydia.app/Sections/Books.png Binary files differindex 512c68b..f155ee6 100644 --- a/MobileCydia.app/Sections/Books.png +++ b/MobileCydia.app/Sections/Books.png diff --git a/MobileCydia.app/Sections/Carrier_Bundles.png b/MobileCydia.app/Sections/Carrier_Bundles.png Binary files differindex 00f36f7..1d3e660 100644 --- a/MobileCydia.app/Sections/Carrier_Bundles.png +++ b/MobileCydia.app/Sections/Carrier_Bundles.png diff --git a/MobileCydia.app/Sections/Communication.png b/MobileCydia.app/Sections/Communication.png Binary files differdeleted file mode 100644 index 00f36f7..0000000 --- a/MobileCydia.app/Sections/Communication.png +++ /dev/null diff --git a/MobileCydia.app/Sections/Data_Storage.png b/MobileCydia.app/Sections/Data_Storage.png Binary files differindex 1bb23fe..76b8287 100644 --- a/MobileCydia.app/Sections/Data_Storage.png +++ b/MobileCydia.app/Sections/Data_Storage.png diff --git a/MobileCydia.app/Sections/Development.png b/MobileCydia.app/Sections/Development.png Binary files differindex 806b442..7802910 100644 --- a/MobileCydia.app/Sections/Development.png +++ b/MobileCydia.app/Sections/Development.png diff --git a/MobileCydia.app/Sections/Dictionaries.png b/MobileCydia.app/Sections/Dictionaries.png Binary files differindex e386e76..c3464a7 100644 --- a/MobileCydia.app/Sections/Dictionaries.png +++ b/MobileCydia.app/Sections/Dictionaries.png diff --git a/MobileCydia.app/Sections/Education.png b/MobileCydia.app/Sections/Education.png Binary files differindex 4a2a03f..78fe874 100644 --- a/MobileCydia.app/Sections/Education.png +++ b/MobileCydia.app/Sections/Education.png diff --git a/MobileCydia.app/Sections/Entertainment.png b/MobileCydia.app/Sections/Entertainment.png Binary files differindex 69c8214..d36f1b8 100644 --- a/MobileCydia.app/Sections/Entertainment.png +++ b/MobileCydia.app/Sections/Entertainment.png diff --git a/MobileCydia.app/Sections/Fonts.png b/MobileCydia.app/Sections/Fonts.png Binary files differindex 6fdab33..00a6932 100644 --- a/MobileCydia.app/Sections/Fonts.png +++ b/MobileCydia.app/Sections/Fonts.png diff --git a/MobileCydia.app/Sections/Games.png b/MobileCydia.app/Sections/Games.png Binary files differindex 6e14c50..aa0cb11 100644 --- a/MobileCydia.app/Sections/Games.png +++ b/MobileCydia.app/Sections/Games.png diff --git a/MobileCydia.app/Sections/Health_and_Fitness.png b/MobileCydia.app/Sections/Health_and_Fitness.png Binary files differindex e2db013..7101660 100644 --- a/MobileCydia.app/Sections/Health_and_Fitness.png +++ b/MobileCydia.app/Sections/Health_and_Fitness.png diff --git a/MobileCydia.app/Sections/Imaging.png b/MobileCydia.app/Sections/Imaging.png Binary files differdeleted file mode 100644 index 1e8f7fa..0000000 --- a/MobileCydia.app/Sections/Imaging.png +++ /dev/null diff --git a/MobileCydia.app/Sections/Java.png b/MobileCydia.app/Sections/Java.png Binary files differindex e6bbc91..324b16c 100644 --- a/MobileCydia.app/Sections/Java.png +++ b/MobileCydia.app/Sections/Java.png diff --git a/MobileCydia.app/Sections/Keyboards.png b/MobileCydia.app/Sections/Keyboards.png Binary files differindex 6b3df89..0523db0 100644 --- a/MobileCydia.app/Sections/Keyboards.png +++ b/MobileCydia.app/Sections/Keyboards.png diff --git a/MobileCydia.app/Sections/Localization.png b/MobileCydia.app/Sections/Localization.png Binary files differindex 80d41d3..491b5d9 100644 --- a/MobileCydia.app/Sections/Localization.png +++ b/MobileCydia.app/Sections/Localization.png diff --git a/MobileCydia.app/Sections/Messaging.png b/MobileCydia.app/Sections/Messaging.png Binary files differindex 69d18e0..4e515ef 100644 --- a/MobileCydia.app/Sections/Messaging.png +++ b/MobileCydia.app/Sections/Messaging.png diff --git a/MobileCydia.app/Sections/Multimedia.png b/MobileCydia.app/Sections/Multimedia.png Binary files differindex 42d0b5e..037e13e 100644 --- a/MobileCydia.app/Sections/Multimedia.png +++ b/MobileCydia.app/Sections/Multimedia.png diff --git a/MobileCydia.app/Sections/Navigation.png b/MobileCydia.app/Sections/Navigation.png Binary files differindex 4829e62..3a12622 100644 --- a/MobileCydia.app/Sections/Navigation.png +++ b/MobileCydia.app/Sections/Navigation.png diff --git a/MobileCydia.app/Sections/Networking.png b/MobileCydia.app/Sections/Networking.png Binary files differindex a4f04e3..3b407c9 100644 --- a/MobileCydia.app/Sections/Networking.png +++ b/MobileCydia.app/Sections/Networking.png diff --git a/MobileCydia.app/Sections/Packaging.png b/MobileCydia.app/Sections/Packaging.png Binary files differindex d7d914e..c2e5e4e 100644 --- a/MobileCydia.app/Sections/Packaging.png +++ b/MobileCydia.app/Sections/Packaging.png diff --git a/MobileCydia.app/Sections/Productivity.png b/MobileCydia.app/Sections/Productivity.png Binary files differindex c99c69d..8b7ef3d 100644 --- a/MobileCydia.app/Sections/Productivity.png +++ b/MobileCydia.app/Sections/Productivity.png diff --git a/MobileCydia.app/Sections/Repositories.png b/MobileCydia.app/Sections/Repositories.png Binary files differindex d6fe267..2a31f22 100644 --- a/MobileCydia.app/Sections/Repositories.png +++ b/MobileCydia.app/Sections/Repositories.png diff --git a/MobileCydia.app/Sections/Ringtones.png b/MobileCydia.app/Sections/Ringtones.png Binary files differindex 57fd660..67e8db7 100644 --- a/MobileCydia.app/Sections/Ringtones.png +++ b/MobileCydia.app/Sections/Ringtones.png diff --git a/MobileCydia.app/Sections/Scripting.png b/MobileCydia.app/Sections/Scripting.png Binary files differindex 22285d2..d1301fc 100644 --- a/MobileCydia.app/Sections/Scripting.png +++ b/MobileCydia.app/Sections/Scripting.png diff --git a/MobileCydia.app/Sections/Security.png b/MobileCydia.app/Sections/Security.png Binary files differindex ae142eb..f44ea11 100644 --- a/MobileCydia.app/Sections/Security.png +++ b/MobileCydia.app/Sections/Security.png diff --git a/MobileCydia.app/Sections/Site-Specific_Apps.png b/MobileCydia.app/Sections/Site-Specific_Apps.png Binary files differindex 6732d7b..28c5627 100644 --- a/MobileCydia.app/Sections/Site-Specific_Apps.png +++ b/MobileCydia.app/Sections/Site-Specific_Apps.png diff --git a/MobileCydia.app/Sections/Social.png b/MobileCydia.app/Sections/Social.png Binary files differindex 6c0cfa4..a804e20 100644 --- a/MobileCydia.app/Sections/Social.png +++ b/MobileCydia.app/Sections/Social.png diff --git a/MobileCydia.app/Sections/Soundboards.png b/MobileCydia.app/Sections/Soundboards.png Binary files differindex accfcad..ce44a81 100644 --- a/MobileCydia.app/Sections/Soundboards.png +++ b/MobileCydia.app/Sections/Soundboards.png diff --git a/MobileCydia.app/Sections/System.png b/MobileCydia.app/Sections/System.png Binary files differindex 19d2c22..18dab28 100644 --- a/MobileCydia.app/Sections/System.png +++ b/MobileCydia.app/Sections/System.png diff --git a/MobileCydia.app/Sections/Terminal_Support.png b/MobileCydia.app/Sections/Terminal_Support.png Binary files differindex d664618..46cb54a 100644 --- a/MobileCydia.app/Sections/Terminal_Support.png +++ b/MobileCydia.app/Sections/Terminal_Support.png diff --git a/MobileCydia.app/Sections/Text_Editors.png b/MobileCydia.app/Sections/Text_Editors.png Binary files differindex 5e65d46..73b32cb 100644 --- a/MobileCydia.app/Sections/Text_Editors.png +++ b/MobileCydia.app/Sections/Text_Editors.png diff --git a/MobileCydia.app/Sections/Themes.png b/MobileCydia.app/Sections/Themes.png Binary files differindex e35b948..43dae6e 100644 --- a/MobileCydia.app/Sections/Themes.png +++ b/MobileCydia.app/Sections/Themes.png diff --git a/MobileCydia.app/Sections/Toys.png b/MobileCydia.app/Sections/Toys.png Binary files differindex 368eb4c..b3f3987 100644 --- a/MobileCydia.app/Sections/Toys.png +++ b/MobileCydia.app/Sections/Toys.png diff --git a/MobileCydia.app/Sections/Tweaks.png b/MobileCydia.app/Sections/Tweaks.png Binary files differindex 4f588c6..26f75e1 100644 --- a/MobileCydia.app/Sections/Tweaks.png +++ b/MobileCydia.app/Sections/Tweaks.png diff --git a/MobileCydia.app/Sections/Utilities.png b/MobileCydia.app/Sections/Utilities.png Binary files differindex fab5d32..19c55dd 100644 --- a/MobileCydia.app/Sections/Utilities.png +++ b/MobileCydia.app/Sections/Utilities.png diff --git a/MobileCydia.app/Sections/Wallpaper.png b/MobileCydia.app/Sections/Wallpaper.png Binary files differindex 1060fa0..1ea111d 100644 --- a/MobileCydia.app/Sections/Wallpaper.png +++ b/MobileCydia.app/Sections/Wallpaper.png diff --git a/MobileCydia.app/Sections/WebClips.png b/MobileCydia.app/Sections/WebClips.png Binary files differdeleted file mode 100644 index 7ed4053..0000000 --- a/MobileCydia.app/Sections/WebClips.png +++ /dev/null diff --git a/MobileCydia.app/Sections/Widgets.png b/MobileCydia.app/Sections/Widgets.png Binary files differindex ca8c1ef..715410f 100644 --- a/MobileCydia.app/Sections/Widgets.png +++ b/MobileCydia.app/Sections/Widgets.png diff --git a/MobileCydia.app/Sections/X_Window.png b/MobileCydia.app/Sections/X_Window.png Binary files differindex eac01e9..9f446bd 100644 --- a/MobileCydia.app/Sections/X_Window.png +++ b/MobileCydia.app/Sections/X_Window.png diff --git a/MobileCydia.app/folder.png b/MobileCydia.app/folder.png Binary files differindex b628e95..cc84b4d 100644 --- a/MobileCydia.app/folder.png +++ b/MobileCydia.app/folder.png diff --git a/MobileCydia.app/folder@2x.png b/MobileCydia.app/folder@2x.png Binary files differindex af3009c..73d5b77 100644 --- a/MobileCydia.app/folder@2x.png +++ b/MobileCydia.app/folder@2x.png diff --git a/MobileCydia.app/installed.png b/MobileCydia.app/installed.png Binary files differindex 2f86f0a..101546e 100644 --- a/MobileCydia.app/installed.png +++ b/MobileCydia.app/installed.png diff --git a/MobileCydia.app/installed@2x.png b/MobileCydia.app/installed@2x.png Binary files differindex ab86df2..37bcebd 100644 --- a/MobileCydia.app/installed@2x.png +++ b/MobileCydia.app/installed@2x.png diff --git a/MobileCydia.app/installing.png b/MobileCydia.app/installing.png Binary files differindex 6332fef..62da25c 100644 --- a/MobileCydia.app/installing.png +++ b/MobileCydia.app/installing.png diff --git a/MobileCydia.app/installing@2x.png b/MobileCydia.app/installing@2x.png Binary files differnew file mode 100644 index 0000000..08e8956 --- /dev/null +++ b/MobileCydia.app/installing@2x.png diff --git a/MobileCydia.app/manage.html b/MobileCydia.app/manage.html index 5d2a2d0..9aeab4d 100644 --- a/MobileCydia.app/manage.html +++ b/MobileCydia.app/manage.html @@ -54,14 +54,14 @@ a.giant-button > div.contents > label { display: block; font-size: 28px; - margin: 8px 0 8px 0; + margin: 8px 0 6px 0; text-align: center; text-shadow: rgba(200, 200, 200, 0.75) 1px 1px 0; } a.giant-button > div.contents > div { display: block; - font-size: 14px; + font-size: 12px; margin-left: 4px; text-align: center; } diff --git a/MobileCydia.app/manage7@2x.png b/MobileCydia.app/manage7@2x.png Binary files differindex ffef928..58a1a1f 100644 --- a/MobileCydia.app/manage7@2x.png +++ b/MobileCydia.app/manage7@2x.png diff --git a/MobileCydia.app/manage7s.png b/MobileCydia.app/manage7s.png Binary files differindex f3979cb..1781884 100644 --- a/MobileCydia.app/manage7s.png +++ b/MobileCydia.app/manage7s.png diff --git a/MobileCydia.app/manage7s@2x.png b/MobileCydia.app/manage7s@2x.png Binary files differindex 5334fbc..25a4ade 100644 --- a/MobileCydia.app/manage7s@2x.png +++ b/MobileCydia.app/manage7s@2x.png diff --git a/MobileCydia.app/packages.png b/MobileCydia.app/packages.png Binary files differindex 404fe0c..4e3a793 100644 --- a/MobileCydia.app/packages.png +++ b/MobileCydia.app/packages.png diff --git a/MobileCydia.app/removing.png b/MobileCydia.app/removing.png Binary files differindex 935d4c7..97c2f7f 100644 --- a/MobileCydia.app/removing.png +++ b/MobileCydia.app/removing.png diff --git a/MobileCydia.app/removing@2x.png b/MobileCydia.app/removing@2x.png Binary files differnew file mode 100644 index 0000000..e1811b0 --- /dev/null +++ b/MobileCydia.app/removing@2x.png diff --git a/MobileCydia.app/sources.png b/MobileCydia.app/sources.png Binary files differindex e8422e4..d7e6f76 100644 --- a/MobileCydia.app/sources.png +++ b/MobileCydia.app/sources.png diff --git a/MobileCydia.app/installed7s@2x.png b/MobileCydia.app/sources7@2x.png Binary files differindex 25a4ade..ffef928 100644 --- a/MobileCydia.app/installed7s@2x.png +++ b/MobileCydia.app/sources7@2x.png diff --git a/MobileCydia.app/installed7s.png b/MobileCydia.app/sources7s.png Binary files differindex 1781884..f3979cb 100644 --- a/MobileCydia.app/installed7s.png +++ b/MobileCydia.app/sources7s.png diff --git a/MobileCydia.app/installed7@2x.png b/MobileCydia.app/sources7s@2x.png Binary files differindex 58a1a1f..5334fbc 100644 --- a/MobileCydia.app/installed7@2x.png +++ b/MobileCydia.app/sources7s@2x.png diff --git a/MobileCydia.app/storage.png b/MobileCydia.app/storage.png Binary files differindex 3cefef0..3ca1c73 100644 --- a/MobileCydia.app/storage.png +++ b/MobileCydia.app/storage.png diff --git a/MobileCydia.app/unknown.png b/MobileCydia.app/unknown.png Binary files differindex 92d7338..f98c97a 100644 --- a/MobileCydia.app/unknown.png +++ b/MobileCydia.app/unknown.png diff --git a/MobileCydia.mm b/MobileCydia.mm index 27d397f..2546b3a 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -689,6 +689,7 @@ static bool Queuing_; static CYColor Blue_; static CYColor Blueish_; static CYColor Black_; +static CYColor Folder_; static CYColor Off_; static CYColor White_; static CYColor Gray_; @@ -5625,14 +5626,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (NSString *mode = [package mode]) { if ([mode isEqualToString:@"REMOVE"] || [mode isEqualToString:@"PURGE"]) { color = RemovingColor_; - //placard = @"removing"; + placard = @"removing"; } else { color = InstallingColor_; - //placard = @"installing"; + placard = @"installing"; } - - // XXX: the removing/installing placards are not @2x - placard = nil; } else { color = [UIColor whiteColor]; @@ -5665,8 +5663,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { rect.size.height /= 2; } - rect.origin.x = 18 - rect.size.width / 2; - rect.origin.y = 18 - rect.size.height / 2; + rect.origin.x = 19 - rect.size.width / 2; + rect.origin.y = 19 - rect.size.height / 2; [icon_ drawInRect:rect]; } @@ -5678,8 +5676,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { rect.size.width /= 4; rect.size.height /= 4; - rect.origin.x = 23 - rect.size.width / 2; - rect.origin.y = 23 - rect.size.height / 2; + rect.origin.x = 25 - rect.size.width / 2; + rect.origin.y = 25 - rect.size.height / 2; [badge_ drawInRect:rect]; } @@ -5692,7 +5690,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; if (placard_ != nil) - [placard_ drawAtPoint:CGPointMake(width - 52, 9)]; + [placard_ drawAtPoint:CGPointMake(width - 52, 11)]; } - (void) drawNormalContentRect:(CGRect)rect { @@ -5849,7 +5847,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) drawContentRect:(CGRect)rect { bool highlighted(highlighted_ && !editing_); - [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; + [icon_ drawInRect:CGRectMake(7, 7, 32, 32)]; if (highlighted && kCFCoreFoundationVersionNumber < 800) UISetColor(White_); @@ -5864,9 +5862,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { CGSize size = [count_ sizeWithFont:Font14_]; - UISetColor(White_); + UISetColor(Folder_); if (count_ != nil) - [count_ drawAtPoint:CGPointMake(13 + (29 - size.width) / 2, 16) withFont:Font12Bold_]; + [count_ drawAtPoint:CGPointMake(10 + (30 - size.width) / 2, 18) withFont:Font12Bold_]; } @end @@ -7591,7 +7589,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi - (void) loadView { list_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]; [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [list_ setRowHeight:45.0f]; + [list_ setRowHeight:46]; [(UITableView *) list_ setDataSource:self]; [list_ setDelegate:self]; [self setView:list_]; @@ -8513,8 +8511,8 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi rect.size.height /= 2; } - rect.origin.x = 25 - rect.size.width / 2; - rect.origin.y = 25 - rect.size.height / 2; + rect.origin.x = 26 - rect.size.width / 2; + rect.origin.y = 26 - rect.size.height / 2; [icon_ drawInRect:rect]; } @@ -8524,11 +8522,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (!highlighted) UISetColor(Black_); - [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 65) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; + [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 61) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation]; if (!highlighted) UISetColor(Gray_); - [label_ drawAtPoint:CGPointMake(48, 29) forWidth:(width - 65) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; + [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 61) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation]; } @end @@ -10880,6 +10878,7 @@ int main(int argc, char *argv[]) { Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0); Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0); Black_.Set(space_, 0.0, 0.0, 0.0, 1.0); + Folder_.Set(space_, 0x8e/255.f, 0x8e/255.f, 0x93/255.f, 1.0); Off_.Set(space_, 0.9, 0.9, 0.9, 1.0); White_.Set(space_, 1.0, 1.0, 1.0, 1.0); Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0); |
