From: Jay Freeman (saurik) Date: Sun, 3 Feb 2008 12:47:52 +0000 (+0000) Subject: Renaming folder structure, added settings icon, and fixed crash bug for everyone... X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/3a83ebf72770222d02197f75e2dcccc3192396f5 Renaming folder structure, added settings icon, and fixed crash bug for everyone but me. --- diff --git a/Cydia.app/Default.png b/Cydia.app/Default.png new file mode 100644 index 00000000..e83e6f30 Binary files /dev/null and b/Cydia.app/Default.png differ diff --git a/Cydia.app/Info.plist b/Cydia.app/Info.plist new file mode 100644 index 00000000..2490ace7 --- /dev/null +++ b/Cydia.app/Info.plist @@ -0,0 +1,34 @@ + + + + + + CFBundleDevelopmentRegion + en + + CFBundleExecutable + Cydia + + CFBundleIdentifier + com.saurik.Cydia + + CFBundleInfoDictionaryVersion + 6.0 + + CFBundleName + Cydia + + CFBundlePackageType + APPL + + CFBundleShortVersionString + 0.9 + + CFBundleSignature + ???? + + CFBundleVersion + 0.9 + + + diff --git a/Cydia.app/Test b/Cydia.app/Test new file mode 100755 index 00000000..ad2582e1 --- /dev/null +++ b/Cydia.app/Test @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +cd "$(dirname "$0")" +scp -p saurik@carrier.saurik.com:menes/cydia/Cydia . +chmod +s Cydia +su -c ./Cydia mobile diff --git a/Cydia.app/changes-dn.png b/Cydia.app/changes-dn.png new file mode 100644 index 00000000..cfd31f17 Binary files /dev/null and b/Cydia.app/changes-dn.png differ diff --git a/Cydia.app/changes-up.png b/Cydia.app/changes-up.png new file mode 100644 index 00000000..654208fd Binary files /dev/null and b/Cydia.app/changes-up.png differ diff --git a/Cydia.app/featured-dn.png b/Cydia.app/featured-dn.png new file mode 100644 index 00000000..c02c120a Binary files /dev/null and b/Cydia.app/featured-dn.png differ diff --git a/Cydia.app/featured-up.png b/Cydia.app/featured-up.png new file mode 100644 index 00000000..0611697d Binary files /dev/null and b/Cydia.app/featured-up.png differ diff --git a/Cydia.app/folder.png b/Cydia.app/folder.png new file mode 100644 index 00000000..b628e953 Binary files /dev/null and b/Cydia.app/folder.png differ diff --git a/Cydia.app/icon.png b/Cydia.app/icon.png new file mode 100644 index 00000000..5048c8fe Binary files /dev/null and b/Cydia.app/icon.png differ diff --git a/Cydia.app/install-dn.png b/Cydia.app/install-dn.png new file mode 100644 index 00000000..7e11a95f Binary files /dev/null and b/Cydia.app/install-dn.png differ diff --git a/Cydia.app/install-up.png b/Cydia.app/install-up.png new file mode 100644 index 00000000..1b7b1d97 Binary files /dev/null and b/Cydia.app/install-up.png differ diff --git a/Cydia.app/manage-dn.png b/Cydia.app/manage-dn.png new file mode 100644 index 00000000..727d067e Binary files /dev/null and b/Cydia.app/manage-dn.png differ diff --git a/Cydia.app/manage-up.png b/Cydia.app/manage-up.png new file mode 100644 index 00000000..9513a7cf Binary files /dev/null and b/Cydia.app/manage-up.png differ diff --git a/Cydia.app/pinstripe.png b/Cydia.app/pinstripe.png new file mode 100644 index 00000000..adabdd7d Binary files /dev/null and b/Cydia.app/pinstripe.png differ diff --git a/Cydia.app/reload.png b/Cydia.app/reload.png new file mode 100644 index 00000000..71dc424c Binary files /dev/null and b/Cydia.app/reload.png differ diff --git a/Cydia.app/search-dn.png b/Cydia.app/search-dn.png new file mode 100644 index 00000000..56ce6319 Binary files /dev/null and b/Cydia.app/search-dn.png differ diff --git a/Cydia.app/search-up.png b/Cydia.app/search-up.png new file mode 100644 index 00000000..4083f1b8 Binary files /dev/null and b/Cydia.app/search-up.png differ diff --git a/Cydia.mm b/Cydia.mm index 9796f468..7ecd9a58 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -178,6 +178,23 @@ static NSMutableDictionary *Metadata_; static NSMutableDictionary *Packages_; static NSDate *now_; +NSString *GetLastUpdate() { + NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; + + if (update == nil) + return @"Never or Unknown"; + + CFLocaleRef locale = CFLocaleCopyCurrent(); + CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); + CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); + + CFRelease(formatter); + CFRelease(formatted); + CFRelease(locale); + + return [(NSString *) formatted autorelease]; +} + @protocol ProgressDelegate - (void) setError:(NSString *)error; - (void) setTitle:(NSString *)title; @@ -590,17 +607,7 @@ inline float interpolate(float begin, float end, float fraction) { } - (void) setPrompt { - NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; - - CFLocaleRef locale = CFLocaleCopyCurrent(); - CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); - CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); - - [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", (NSString *) formatted]]; - - CFRelease(formatter); - CFRelease(formatted); - CFRelease(locale); + [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]]; } @end @@ -898,6 +905,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { NSString *tagline_; NSString *icon_; NSString *bundle_; + NSString *website_; } - (void) dealloc; @@ -922,6 +930,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (NSString *) tagline; - (NSString *) icon; - (NSString *) bundle; +- (NSString *) website; - (BOOL) matches:(NSString *)text; @@ -978,6 +987,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) { bundle_ = Scour("Bundle", begin, end); if (bundle_ != nil) bundle_ = [bundle_ retain]; + website_ = Scour("Website", begin, end); + if (website_ != nil) + website_ = [website_ retain]; NSMutableDictionary *metadata = [Packages_ objectForKey:id_]; if (metadata == nil) { @@ -1074,6 +1086,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return bundle_; } +- (NSString *) website { + return website_; +} + - (BOOL) matches:(NSString *)text { if (text == nil) return NO; @@ -3142,17 +3158,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } - (void) setPrompt { - NSDate *update = [Metadata_ objectForKey:@"LastUpdate"]; - - CFLocaleRef locale = CFLocaleCopyCurrent(); - CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle); - CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update); - - [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", (NSString *) formatted]]; - - CFRelease(formatter); - CFRelease(formatted); - CFRelease(locale); + [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]]; } - (void) resolve { diff --git a/data/Default.png b/data/Default.png deleted file mode 100644 index e83e6f30..00000000 Binary files a/data/Default.png and /dev/null differ diff --git a/data/Info.plist b/data/Info.plist deleted file mode 100644 index 2490ace7..00000000 --- a/data/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - CFBundleDevelopmentRegion - en - - CFBundleExecutable - Cydia - - CFBundleIdentifier - com.saurik.Cydia - - CFBundleInfoDictionaryVersion - 6.0 - - CFBundleName - Cydia - - CFBundlePackageType - APPL - - CFBundleShortVersionString - 0.9 - - CFBundleSignature - ???? - - CFBundleVersion - 0.9 - - - diff --git a/data/Test b/data/Test deleted file mode 100755 index ad2582e1..00000000 --- a/data/Test +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$0")" -scp -p saurik@carrier.saurik.com:menes/cydia/Cydia . -chmod +s Cydia -su -c ./Cydia mobile diff --git a/data/changes-dn.png b/data/changes-dn.png deleted file mode 100644 index cfd31f17..00000000 Binary files a/data/changes-dn.png and /dev/null differ diff --git a/data/changes-up.png b/data/changes-up.png deleted file mode 100644 index 654208fd..00000000 Binary files a/data/changes-up.png and /dev/null differ diff --git a/data/featured-dn.png b/data/featured-dn.png deleted file mode 100644 index c02c120a..00000000 Binary files a/data/featured-dn.png and /dev/null differ diff --git a/data/featured-up.png b/data/featured-up.png deleted file mode 100644 index 0611697d..00000000 Binary files a/data/featured-up.png and /dev/null differ diff --git a/data/folder.png b/data/folder.png deleted file mode 100644 index b628e953..00000000 Binary files a/data/folder.png and /dev/null differ diff --git a/data/icon.png b/data/icon.png deleted file mode 100644 index 5048c8fe..00000000 Binary files a/data/icon.png and /dev/null differ diff --git a/data/install-dn.png b/data/install-dn.png deleted file mode 100644 index 7e11a95f..00000000 Binary files a/data/install-dn.png and /dev/null differ diff --git a/data/install-up.png b/data/install-up.png deleted file mode 100644 index 1b7b1d97..00000000 Binary files a/data/install-up.png and /dev/null differ diff --git a/data/manage-dn.png b/data/manage-dn.png deleted file mode 100644 index 727d067e..00000000 Binary files a/data/manage-dn.png and /dev/null differ diff --git a/data/manage-up.png b/data/manage-up.png deleted file mode 100644 index 9513a7cf..00000000 Binary files a/data/manage-up.png and /dev/null differ diff --git a/data/pinstripe.png b/data/pinstripe.png deleted file mode 100644 index adabdd7d..00000000 Binary files a/data/pinstripe.png and /dev/null differ diff --git a/data/reload.png b/data/reload.png deleted file mode 100644 index 71dc424c..00000000 Binary files a/data/reload.png and /dev/null differ diff --git a/data/search-dn.png b/data/search-dn.png deleted file mode 100644 index 56ce6319..00000000 Binary files a/data/search-dn.png and /dev/null differ diff --git a/data/search-up.png b/data/search-up.png deleted file mode 100644 index 4083f1b8..00000000 Binary files a/data/search-up.png and /dev/null differ