diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a3890f --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +# Created by https://www.gitignore.io + +### Xcode ### +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.xcuserstate + +### CocoaPods ### + +Pods/ diff --git a/PicsNearMe.xcodeproj/project.pbxproj b/PicsNearMe.xcodeproj/project.pbxproj index 43b4abd..1a9cb50 100644 --- a/PicsNearMe.xcodeproj/project.pbxproj +++ b/PicsNearMe.xcodeproj/project.pbxproj @@ -37,8 +37,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 40F356E5A83153C763987D66 /* Pods-PicsNearMe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PicsNearMe.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PicsNearMe/Pods-PicsNearMe.debug.xcconfig"; sourceTree = ""; }; 6D5E6EFD4D8A4D4EA21CD85E /* libPods-PicsNearMe.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PicsNearMe.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - AB8AE05FB2F84A0286D021C2 /* Pods-PicsNearMe.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PicsNearMe.xcconfig"; path = "Pods/Pods-PicsNearMe.xcconfig"; sourceTree = ""; }; + B515EBF001A60F6FD2809335 /* Pods-PicsNearMe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PicsNearMe.release.xcconfig"; path = "Pods/Target Support Files/Pods-PicsNearMe/Pods-PicsNearMe.release.xcconfig"; sourceTree = ""; }; D182283419262DC80037B30F /* MRTImageCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRTImageCollectionViewCell.h; sourceTree = ""; }; D182283519262DC80037B30F /* MRTImageCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MRTImageCollectionViewCell.m; sourceTree = ""; }; D1822837192645450037B30F /* MRTSessionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MRTSessionController.h; sourceTree = ""; }; @@ -89,6 +90,15 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 089DAC3E19BE992AD5B47CC0 /* Pods */ = { + isa = PBXGroup; + children = ( + 40F356E5A83153C763987D66 /* Pods-PicsNearMe.debug.xcconfig */, + B515EBF001A60F6FD2809335 /* Pods-PicsNearMe.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; D1F1D65419261258009551C9 = { isa = PBXGroup; children = ( @@ -96,7 +106,7 @@ D1F1D68519261258009551C9 /* PicsNearMeTests */, D1F1D65F19261258009551C9 /* Frameworks */, D1F1D65E19261258009551C9 /* Products */, - AB8AE05FB2F84A0286D021C2 /* Pods-PicsNearMe.xcconfig */, + 089DAC3E19BE992AD5B47CC0 /* Pods */, ); sourceTree = ""; }; @@ -218,6 +228,9 @@ LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Michele Titolo"; TargetAttributes = { + D1F1D65C19261258009551C9 = { + DevelopmentTeam = M3FCT79SM9; + }; D1F1D67D19261258009551C9 = { TestTargetID = D1F1D65C19261258009551C9; }; @@ -291,7 +304,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Pods-PicsNearMe-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PicsNearMe/Pods-PicsNearMe-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -427,33 +440,36 @@ }; D1F1D69019261258009551C9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AB8AE05FB2F84A0286D021C2 /* Pods-PicsNearMe.xcconfig */; + baseConfigurationReference = 40F356E5A83153C763987D66 /* Pods-PicsNearMe.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Michele Titolo (33PYV69KEW)"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "PicsNearMe/PicsNearMe-Prefix.pch"; INFOPLIST_FILE = "PicsNearMe/PicsNearMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "EE982B7F-A547-4DAB-9633-333B0BE02EC5"; + PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; name = Debug; }; D1F1D69119261258009551C9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AB8AE05FB2F84A0286D021C2 /* Pods-PicsNearMe.xcconfig */; + baseConfigurationReference = B515EBF001A60F6FD2809335 /* Pods-PicsNearMe.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "PicsNearMe/PicsNearMe-Prefix.pch"; INFOPLIST_FILE = "PicsNearMe/PicsNearMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "EE982B7F-A547-4DAB-9633-333B0BE02EC5"; + PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/PicsNearMe/MRTImageCollectionViewCell.m b/PicsNearMe/MRTImageCollectionViewCell.m index 6f7722c..92f21b3 100644 --- a/PicsNearMe/MRTImageCollectionViewCell.m +++ b/PicsNearMe/MRTImageCollectionViewCell.m @@ -22,12 +22,12 @@ - (id)initWithFrame:(CGRect)frame - (void)setImageWithURLString:(NSString *)string { - [self.imageView setImageWithURL:[NSURL URLWithString:string] placeholderImage:nil options:SDWebImageRetryFailed]; + [self.imageView sd_setImageWithURL:[NSURL URLWithString:string] placeholderImage:nil options:SDWebImageRetryFailed]; } - (void)prepareForReuse { - [self.imageView cancelCurrentImageLoad]; + [self.imageView sd_cancelCurrentImageLoad]; } @end diff --git a/PicsNearMe/MRTViewController.m b/PicsNearMe/MRTViewController.m index 1acc2cb..c4c3e9a 100644 --- a/PicsNearMe/MRTViewController.m +++ b/PicsNearMe/MRTViewController.m @@ -199,7 +199,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa JTSImageViewController *imageViewer = [[JTSImageViewController alloc] initWithImageInfo:imageInfo mode:JTSImageViewControllerMode_Image - backgroundStyle:JTSImageViewControllerBackgroundStyle_ScaledDimmedBlurred]; + backgroundStyle:JTSImageViewControllerBackgroundOption_Blurred]; [imageViewer showFromViewController:self transition:JTSImageViewControllerTransition_FromOriginalPosition]; diff --git a/Podfile b/Podfile index baedcf9..4ef56f6 100644 --- a/Podfile +++ b/Podfile @@ -1,13 +1,14 @@ -# Uncomment this line to define a global platform for your project -platform :ios, "7.0" +platform :ios, "7.1" + +source 'https://github.com/CocoaPods/Specs.git' target "PicsNearMe" do -pod 'DBCamera', :git => 'https://github.com/danielebogo/DBCamera.git', :tag => '2.0' -pod 'Parse-iOS-SDK' -pod 'SVProgressHUD' -pod 'SDWebImage' -pod 'JTSImageViewController' +pod 'DBCamera', '~> 2.3' +pod 'Parse', '~> 1.5' +pod 'SVProgressHUD', '~> 1.0' +pod 'SDWebImage', '~> 3.7' +pod 'JTSImageViewController', '~> 1.4' end diff --git a/Podfile.lock b/Podfile.lock index d4915db..c1e873b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,32 +1,30 @@ PODS: - - DBCamera (2.0) - - Facebook-iOS-SDK (3.13.1) - - JTSImageViewController (1.1.1) - - Parse-iOS-SDK (1.2.19): - - Facebook-iOS-SDK (~> 3.7) - - SDWebImage (3.6): + - Bolts (1.1.3) + - DBCamera (2.3.5): + - GPUImage (~> 0.1) + - GPUImage (0.1.6) + - JTSImageViewController (1.4) + - Parse (1.5.0): + - Bolts (~> 1.1.3) + - SDWebImage (3.7.1): - SDWebImage/Core - - SDWebImage/Core (3.6) + - SDWebImage/Core (3.7.1) - SVProgressHUD (1.0) DEPENDENCIES: - - DBCamera (from `https://github.com/danielebogo/DBCamera.git`, tag `2.0`) - - JTSImageViewController - - Parse-iOS-SDK - - SDWebImage - - SVProgressHUD - -EXTERNAL SOURCES: - DBCamera: - :git: https://github.com/danielebogo/DBCamera.git - :tag: 2.0 + - DBCamera (~> 2.3) + - JTSImageViewController (~> 1.4) + - Parse (~> 1.5) + - SDWebImage (~> 3.7) + - SVProgressHUD (~> 1.0) SPEC CHECKSUMS: - DBCamera: 92d3ca3646d27a6784af95dfbc72539e1ea296fc - Facebook-iOS-SDK: 47ae9e54684c84f93d75d4e6ab47cd031abdf406 - JTSImageViewController: adabb94f1fe52b22cef2b3b0fe803f47d1cea889 - Parse-iOS-SDK: 48e366fb9a8956c4e50d93cfd16243176938fae1 - SDWebImage: 7eb273e54ca8a2e506ad9bd5e80c35b2a4d7c95e - SVProgressHUD: 5e10939a296debf5fe5a5895eda9539b8b2114f1 + Bolts: 3db0a875235e0c9042b013af13af0f00f79b102c + DBCamera: 0095227e0d2d0292c5a2cc400fe75687120e6f29 + GPUImage: cecb0830bb9428f50192042e3c7b53810f51388e + JTSImageViewController: 9fe6402194b7679f0e28d0c1002d6164301fc34a + Parse: 7de25b6f70f0b233e5d25835f62eabfa91e4f9d7 + SDWebImage: 116e88633b5b416ea0ca4b334a4ac59cf72dd38d + SVProgressHUD: 5034c6e22b8c2ca3e09402e48d41ed0340aa1c50 -COCOAPODS: 0.32.1 +COCOAPODS: 0.34.4