Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: facebookarchive/three20
...
head fork: VerveWireless/three20
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 16 files changed
  • 0 commit comments
  • 2 contributors
Commits on Sep 20, 2009
mzarra Fixed assumptions in thumbs view controller 153edd5
Commits on Oct 08, 2009
ejohnst Slight modifications to caption style. Probably a way to override fro…
…m app, but I'm lazy.

Signed-off-by: ejohnst <ejohnst@ejohnsts-macbook-pro-2.local>
806cd95
Commits on Dec 15, 2009
mzarra Merge branch 'master' of git@github.com:ejohnst/three20 e829479
Commits on Dec 16, 2009
ejohnst Fix memory leak. 6f54585
ejohnst Tweak photo viewer. 30e3cc9
ejohnst Merge branch 'master' of github.com:ejohnst/three20 219b156
Commits on Dec 24, 2009
ejohnst Update default image for gallery. 1f5439d
Commits on Jun 14, 2010
ejohnst Update for Xcode 3.2.3. 1f190a8
Commits on Jun 15, 2010
ejohnst Fix modern iOS versions' warnings. f8469ad
Commits on Jun 22, 2010
ejohnst Fix double-release. 0764a27
Commits on Oct 14, 2010
ejohnst Bump up to SDK 4.1. b03bed4
Commits on Nov 10, 2010
ejohnst Update icons for Retina Display. bdfc3d6
Commits on Nov 20, 2010
ejohnst Revert to original image behavior (seems weirdness was due to the thu…
…mbnail being a square.
0f1d7a6
ejohnst Override style more appropriately. 9ef930a
Commits on Dec 07, 2010
ejohnst Use latest iOS SDK. 46c3295
Commits on Feb 03, 2011
ejohnst Turn off loading spinner on load error. 7d7056c
ejohnst Merge from more recent Three20 sources to fix @2x resource detection. 47ff644
ejohnst Loosen up max size for request. 65d87a5
View
4 samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj
@@ -635,7 +635,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
- SDKROOT = iphonesimulator2.2;
+ SDKROOT = iphoneos2.2.1;
};
name = Debug;
};
@@ -651,7 +651,7 @@
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
"PROVISIONING_PROFILE[sdk=iphoneos*]" = DefaultProfileUuid;
- SDKROOT = iphonesimulator2.2;
+ SDKROOT = iphoneos2.2.1;
};
name = Release;
};
View
2  src/TTPhotoView.m
@@ -125,7 +125,7 @@ - (void)imageViewDidLoadImage:(UIImage*)image {
}
- (void)imageViewDidFailLoadWithError:(NSError*)error {
- [self showProgress:0];
+ [self showProgress:-1];
if (error) {
[self showStatus:TTDescriptionForError(error)];
}
View
6 src/TTThumbsViewController.m
@@ -184,8 +184,10 @@ - (void)suspendLoadingThumbnails:(BOOL)suspended {
}
- (void)updateTableLayout {
- self.tableView.contentInset = UIEdgeInsetsMake(TTBarsHeight()+4, 0, 0, 0);
- self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(TTBarsHeight(), 0, 0, 0);
+ self.tableView.contentInset = UIEdgeInsetsMake(4, 0, 0, 0);
+ self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(0, 0, 0, 0);
+ //self.tableView.contentInset = UIEdgeInsetsMake(TTBarsHeight()+4, 0, 0, 0);
+ //self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(TTBarsHeight(), 0, 0, 0);
}
- (NSString*)URLForPhoto:(id<TTPhoto>)photo {
View
34 src/TTURLCache.m
@@ -69,17 +69,28 @@ + (void)setSharedCache:(TTURLCache*)cache {
}
}
++ (BOOL)createPathIfNecessary:(NSString*)path {
+ BOOL succeeded = YES;
+
+ NSFileManager* fm = [NSFileManager defaultManager];
+ if (![fm fileExistsAtPath:path]) {
+ succeeded = [fm createDirectoryAtPath: path
+ withIntermediateDirectories: YES
+ attributes: nil
+ error: nil];
+ }
+
+ return succeeded;
+}
+
+ (NSString*)cachePathWithName:(NSString*)name {
NSArray* paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
NSString* cachesPath = [paths objectAtIndex:0];
NSString* cachePath = [cachesPath stringByAppendingPathComponent:name];
- NSFileManager* fm = [NSFileManager defaultManager];
- if (![fm fileExistsAtPath:cachesPath]) {
- [fm createDirectoryAtPath:cachesPath attributes:nil];
- }
- if (![fm fileExistsAtPath:cachePath]) {
- [fm createDirectoryAtPath:cachePath attributes:nil];
- }
+
+ [self createPathIfNecessary:cachesPath];
+ [self createPathIfNecessary:cachePath];
+
return cachePath;
}
@@ -126,8 +137,7 @@ - (void)storeImage:(UIImage*)image forURL:(NSString*)URL force:(BOOL)force {
- (UIImage*)loadImageFromBundle:(NSString*)URL {
NSString* path = TTPathForBundleResource([URL substringFromIndex:9]);
- NSData* data = [NSData dataWithContentsOfFile:path];
- return [UIImage imageWithData:data];
+ return [UIImage imageWithContentsOfFile:path];
}
- (UIImage*)loadImageFromDocuments:(NSString*)URL {
@@ -398,7 +408,7 @@ - (void)removeAll:(BOOL)fromDisk {
if (fromDisk) {
NSFileManager* fm = [NSFileManager defaultManager];
[fm removeItemAtPath:_cachePath error:nil];
- [fm createDirectoryAtPath:_cachePath attributes:nil];
+ [TTURLCache createPathIfNecessary:_cachePath];
}
}
@@ -415,7 +425,7 @@ - (void)invalidateKey:(NSString*)key {
NSDictionary* attrs = [NSDictionary dictionaryWithObject:invalidDate
forKey:NSFileModificationDate];
- [fm changeFileAttributes:attrs atPath:filePath];
+ [fm setAttributes:attrs ofItemAtPath:filePath error:nil];
}
}
@@ -428,7 +438,7 @@ - (void)invalidateAll {
NSDirectoryEnumerator* e = [fm enumeratorAtPath:_cachePath];
for (NSString* fileName; fileName = [e nextObject]; ) {
NSString* filePath = [_cachePath stringByAppendingPathComponent:fileName];
- [fm changeFileAttributes:attrs atPath:filePath];
+ [fm setAttributes:attrs ofItemAtPath:filePath error:nil];
}
}
View
2  src/TTURLRequestQueue.m
@@ -29,7 +29,7 @@
static const NSTimeInterval kTimeout = 300.0;
static const NSInteger kLoadMaxRetries = 2;
static const NSInteger kMaxConcurrentLoads = 5;
-static NSUInteger kDefaultMaxContentLength = 150000;
+static NSUInteger kDefaultMaxContentLength = 200000;
static NSString* kSafariUserAgent = @"Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2 like Mac OS X;\
en-us) AppleWebKit/525.181 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20";
View
BIN  src/Three20.bundle/images/backIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/empty.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/error.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/forwardIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/nextIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/photoDefault.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/previousIcon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/Three20.bundle/images/previousIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
15 src/Three20.xcodeproj/project.pbxproj
@@ -1049,7 +1049,14 @@
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
projectRoot = "";
@@ -1219,6 +1226,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
PREBINDING = NO;
PRODUCT_NAME = Three20;
};
@@ -1231,6 +1239,7 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
PREBINDING = NO;
PRODUCT_NAME = Three20;
ZERO_LINK = NO;
@@ -1245,10 +1254,11 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = .;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
- SDKROOT = iphonesimulator3.0;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -1259,9 +1269,10 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 3.0;
OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO;
- SDKROOT = iphonesimulator3.0;
+ SDKROOT = iphoneos;
};
name = Release;
};
View
4 src/Three20/TTMarkupStripper.h
@@ -19,7 +19,11 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////
+#if __IPHONE_4_0 && __IPHONE_4_0 <= __IPHONE_OS_VERSION_MAX_ALLOWED
+@interface TTMarkupStripper : NSObject <NSXMLParserDelegate> {
+#else
@interface TTMarkupStripper : NSObject {
+#endif
NSMutableArray* _strings;
}
View
4 src/Three20/TTStyledTextParser.h
@@ -19,7 +19,11 @@
@class TTStyledNode, TTStyledElement;
+#if __IPHONE_4_0 && __IPHONE_4_0 <= __IPHONE_OS_VERSION_MAX_ALLOWED
+@interface TTStyledTextParser : NSObject <NSXMLParserDelegate> {
+#else
@interface TTStyledTextParser : NSObject {
+#endif
TTStyledNode* _rootNode;
TTStyledElement* _topElement;
TTStyledNode* _lastNode;

No commit comments for this range

Something went wrong with that request. Please try again.