From 22d50f0254727757519ba8d8143c55b05654bbec Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Fri, 29 Aug 2014 18:40:16 +0200 Subject: [PATCH 1/9] -added Pod dependencies into podspec file in order to user SDWebImage and other pods if necessary --- JPSThumbnailAnnotation.podspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/JPSThumbnailAnnotation.podspec b/JPSThumbnailAnnotation.podspec index 97ff13d..8cd0b89 100644 --- a/JPSThumbnailAnnotation.podspec +++ b/JPSThumbnailAnnotation.podspec @@ -12,5 +12,10 @@ Pod::Spec.new do |s| s.source_files = 'JPSThumbnailAnnotation/*.{h,m}' s.frameworks = 'QuartzCore', 'MapKit', 'CoreLocation' + + #specifying dependencies for Web image Downloads + s.dependency 'SDWebImage', '~>3.5.2' + s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.0.3' + s.requires_arc = true end From 9507c00d7fb4216a1e83da3258ffa52c5d2af1a5 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Fri, 29 Aug 2014 19:04:20 +0200 Subject: [PATCH 2/9] -initialized a cocoa pods project (from now One MUST use the .xcworkspace file instead of the .xcodeproj file -added Needed pods -updated the podsSpec file for dependencies on used pods --- .../project.pbxproj | 1291 ++++++++++++----- .../contents.xcworkspacedata | 1 + Demo/Podfile | 13 + Demo/Podfile.lock | 48 + JPSThumbnailAnnotation.podspec | 3 +- 5 files changed, 1014 insertions(+), 342 deletions(-) create mode 100644 Demo/JPSThumbnailAnnotation.xcworkspace/contents.xcworkspacedata create mode 100644 Demo/Podfile create mode 100644 Demo/Podfile.lock diff --git a/Demo/JPSThumbnailAnnotation.xcodeproj/project.pbxproj b/Demo/JPSThumbnailAnnotation.xcodeproj/project.pbxproj index df9f908..af86ac3 100644 --- a/Demo/JPSThumbnailAnnotation.xcodeproj/project.pbxproj +++ b/Demo/JPSThumbnailAnnotation.xcodeproj/project.pbxproj @@ -1,340 +1,951 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - E875D68A17245D6C00009A6F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E875D68917245D6C00009A6F /* Foundation.framework */; }; - E875D69217245D6C00009A6F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E875D69017245D6C00009A6F /* InfoPlist.strings */; }; - E875D69417245D6C00009A6F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E875D69317245D6C00009A6F /* main.m */; }; - E875D69817245D6C00009A6F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E875D69717245D6C00009A6F /* AppDelegate.m */; }; - E875D69A17245D6C00009A6F /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = E875D69917245D6C00009A6F /* Default.png */; }; - E875D69C17245D6C00009A6F /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E875D69B17245D6C00009A6F /* Default@2x.png */; }; - E875D69E17245D6C00009A6F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E875D69D17245D6C00009A6F /* Default-568h@2x.png */; }; - E875D6A117245D6C00009A6F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E875D6A017245D6C00009A6F /* ViewController.m */; }; - E8B7E7D91724669200E93E96 /* JPSThumbnailAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B7E7D81724669200E93E96 /* JPSThumbnailAnnotation.m */; }; - E8B7E7DC172466B600E93E96 /* JPSThumbnailAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B7E7DB172466B600E93E96 /* JPSThumbnailAnnotationView.m */; }; - E8EF4F2A1724EE840051DB36 /* JPSThumnail.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EF4F291724EE840051DB36 /* JPSThumnail.m */; }; - E8EF4F2C1725027D0051DB36 /* empire.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E8EF4F2B1725027D0051DB36 /* empire.jpg */; }; - E8EF4F2F1725081E0051DB36 /* ottawa.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E8EF4F2D1725081E0051DB36 /* ottawa.jpg */; }; - E8EF4F301725081E0051DB36 /* apple.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E8EF4F2E1725081E0051DB36 /* apple.jpg */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - E875D68417245D6C00009A6F /* JPSThumbnailAnnotation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JPSThumbnailAnnotation.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E875D68717245D6C00009A6F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - E875D68917245D6C00009A6F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - E875D68B17245D6C00009A6F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - E875D68F17245D6C00009A6F /* JPSThumbnailAnnotation-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "JPSThumbnailAnnotation-Info.plist"; sourceTree = ""; }; - E875D69117245D6C00009A6F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - E875D69317245D6C00009A6F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - E875D69517245D6C00009A6F /* JPSThumbnailAnnotation-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JPSThumbnailAnnotation-Prefix.pch"; sourceTree = ""; }; - E875D69617245D6C00009A6F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - E875D69717245D6C00009A6F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - E875D69917245D6C00009A6F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; - E875D69B17245D6C00009A6F /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - E875D69D17245D6C00009A6F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - E875D69F17245D6C00009A6F /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - E875D6A017245D6C00009A6F /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - E875D6AA172461FB00009A6F /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; - E8B7E7D71724669200E93E96 /* JPSThumbnailAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPSThumbnailAnnotation.h; sourceTree = ""; }; - E8B7E7D81724669200E93E96 /* JPSThumbnailAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPSThumbnailAnnotation.m; sourceTree = ""; }; - E8B7E7DA172466B600E93E96 /* JPSThumbnailAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPSThumbnailAnnotationView.h; sourceTree = ""; }; - E8B7E7DB172466B600E93E96 /* JPSThumbnailAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPSThumbnailAnnotationView.m; sourceTree = ""; }; - E8EF4F241724E30C0051DB36 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - E8EF4F261724E5870051DB36 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - E8EF4F281724EE840051DB36 /* JPSThumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPSThumbnail.h; sourceTree = ""; }; - E8EF4F291724EE840051DB36 /* JPSThumnail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPSThumnail.m; sourceTree = ""; }; - E8EF4F2B1725027D0051DB36 /* empire.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = empire.jpg; sourceTree = ""; }; - E8EF4F2D1725081E0051DB36 /* ottawa.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = ottawa.jpg; sourceTree = ""; }; - E8EF4F2E1725081E0051DB36 /* apple.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = apple.jpg; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - E875D68117245D6C00009A6F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E875D68A17245D6C00009A6F /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - E875D67B17245D6C00009A6F = { - isa = PBXGroup; - children = ( - E8B7E7D61724664A00E93E96 /* JPSThumbnailAnnotation */, - E875D68D17245D6C00009A6F /* Classes */, - E875D68617245D6C00009A6F /* Frameworks */, - E875D68517245D6C00009A6F /* Products */, - ); - sourceTree = ""; - }; - E875D68517245D6C00009A6F /* Products */ = { - isa = PBXGroup; - children = ( - E875D68417245D6C00009A6F /* JPSThumbnailAnnotation.app */, - ); - name = Products; - sourceTree = ""; - }; - E875D68617245D6C00009A6F /* Frameworks */ = { - isa = PBXGroup; - children = ( - E8EF4F261724E5870051DB36 /* QuartzCore.framework */, - E8EF4F241724E30C0051DB36 /* CoreLocation.framework */, - E875D6AA172461FB00009A6F /* MapKit.framework */, - E875D68717245D6C00009A6F /* UIKit.framework */, - E875D68917245D6C00009A6F /* Foundation.framework */, - E875D68B17245D6C00009A6F /* CoreGraphics.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - E875D68D17245D6C00009A6F /* Classes */ = { - isa = PBXGroup; - children = ( - E875D69617245D6C00009A6F /* AppDelegate.h */, - E875D69717245D6C00009A6F /* AppDelegate.m */, - E875D69F17245D6C00009A6F /* ViewController.h */, - E875D6A017245D6C00009A6F /* ViewController.m */, - E875D68E17245D6C00009A6F /* Supporting Files */, - ); - name = Classes; - sourceTree = SOURCE_ROOT; - }; - E875D68E17245D6C00009A6F /* Supporting Files */ = { - isa = PBXGroup; - children = ( - E8EF4F2D1725081E0051DB36 /* ottawa.jpg */, - E8EF4F2E1725081E0051DB36 /* apple.jpg */, - E8EF4F2B1725027D0051DB36 /* empire.jpg */, - E875D68F17245D6C00009A6F /* JPSThumbnailAnnotation-Info.plist */, - E875D69017245D6C00009A6F /* InfoPlist.strings */, - E875D69317245D6C00009A6F /* main.m */, - E875D69517245D6C00009A6F /* JPSThumbnailAnnotation-Prefix.pch */, - E875D69917245D6C00009A6F /* Default.png */, - E875D69B17245D6C00009A6F /* Default@2x.png */, - E875D69D17245D6C00009A6F /* Default-568h@2x.png */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - E8B7E7D61724664A00E93E96 /* JPSThumbnailAnnotation */ = { - isa = PBXGroup; - children = ( - E8B7E7D71724669200E93E96 /* JPSThumbnailAnnotation.h */, - E8B7E7D81724669200E93E96 /* JPSThumbnailAnnotation.m */, - E8B7E7DA172466B600E93E96 /* JPSThumbnailAnnotationView.h */, - E8B7E7DB172466B600E93E96 /* JPSThumbnailAnnotationView.m */, - E8EF4F281724EE840051DB36 /* JPSThumbnail.h */, - E8EF4F291724EE840051DB36 /* JPSThumnail.m */, - ); - name = JPSThumbnailAnnotation; - path = ../JPSThumbnailAnnotation; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - E875D68317245D6C00009A6F /* JPSThumbnailAnnotation */ = { - isa = PBXNativeTarget; - buildConfigurationList = E875D6A717245D6C00009A6F /* Build configuration list for PBXNativeTarget "JPSThumbnailAnnotation" */; - buildPhases = ( - E875D68017245D6C00009A6F /* Sources */, - E875D68117245D6C00009A6F /* Frameworks */, - E875D68217245D6C00009A6F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = JPSThumbnailAnnotation; - productName = JPSThumbnailAnnotation; - productReference = E875D68417245D6C00009A6F /* JPSThumbnailAnnotation.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - E875D67C17245D6C00009A6F /* Project object */ = { - isa = PBXProject; - attributes = { - CLASSPREFIX = JPS; - LastUpgradeCheck = 0460; - ORGANIZATIONNAME = "JP Simard"; - }; - buildConfigurationList = E875D67F17245D6C00009A6F /* Build configuration list for PBXProject "JPSThumbnailAnnotation" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = E875D67B17245D6C00009A6F; - productRefGroup = E875D68517245D6C00009A6F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - E875D68317245D6C00009A6F /* JPSThumbnailAnnotation */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - E875D68217245D6C00009A6F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E875D69217245D6C00009A6F /* InfoPlist.strings in Resources */, - E875D69A17245D6C00009A6F /* Default.png in Resources */, - E875D69C17245D6C00009A6F /* Default@2x.png in Resources */, - E875D69E17245D6C00009A6F /* Default-568h@2x.png in Resources */, - E8EF4F2C1725027D0051DB36 /* empire.jpg in Resources */, - E8EF4F2F1725081E0051DB36 /* ottawa.jpg in Resources */, - E8EF4F301725081E0051DB36 /* apple.jpg in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - E875D68017245D6C00009A6F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E875D69417245D6C00009A6F /* main.m in Sources */, - E875D69817245D6C00009A6F /* AppDelegate.m in Sources */, - E875D6A117245D6C00009A6F /* ViewController.m in Sources */, - E8B7E7D91724669200E93E96 /* JPSThumbnailAnnotation.m in Sources */, - E8B7E7DC172466B600E93E96 /* JPSThumbnailAnnotationView.m in Sources */, - E8EF4F2A1724EE840051DB36 /* JPSThumnail.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - E875D69017245D6C00009A6F /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - E875D69117245D6C00009A6F /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - E875D6A517245D6C00009A6F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - E875D6A617245D6C00009A6F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - E875D6A817245D6C00009A6F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "JPSThumbnailAnnotation-Prefix.pch"; - INFOPLIST_FILE = "JPSThumbnailAnnotation-Info.plist"; - PRODUCT_NAME = JPSThumbnailAnnotation; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - E875D6A917245D6C00009A6F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "JPSThumbnailAnnotation-Prefix.pch"; - INFOPLIST_FILE = "JPSThumbnailAnnotation-Info.plist"; - PRODUCT_NAME = JPSThumbnailAnnotation; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - E875D67F17245D6C00009A6F /* Build configuration list for PBXProject "JPSThumbnailAnnotation" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E875D6A517245D6C00009A6F /* Debug */, - E875D6A617245D6C00009A6F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E875D6A717245D6C00009A6F /* Build configuration list for PBXNativeTarget "JPSThumbnailAnnotation" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E875D6A817245D6C00009A6F /* Debug */, - E875D6A917245D6C00009A6F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = E875D67C17245D6C00009A6F /* Project object */; -} + + + + + archiveVersion + 1 + classes + + objectVersion + 46 + objects + + 651F070BDE3F4FC29C8C6820 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + name + Pods-JPSThumbnailAnnotation.xcconfig + path + Pods/Pods-JPSThumbnailAnnotation.xcconfig + sourceTree + <group> + + 6F8A06480BFD477491B9566B + + buildActionMask + 2147483647 + files + + inputPaths + + isa + PBXShellScriptBuildPhase + name + Check Pods Manifest.lock + outputPaths + + runOnlyForDeploymentPostprocessing + 0 + shellPath + /bin/sh + shellScript + diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null +if [[ $? != 0 ]] ; then + cat << EOM +error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. +EOM + exit 1 +fi + + showEnvVarsInLog + 0 + + 8325CB7765404753819E0026 + + fileRef + FCC44B54839C4D29A3ED30BE + isa + PBXBuildFile + + BB114A669E2143F78480E958 + + buildActionMask + 2147483647 + files + + inputPaths + + isa + PBXShellScriptBuildPhase + name + Copy Pods Resources + outputPaths + + runOnlyForDeploymentPostprocessing + 0 + shellPath + /bin/sh + shellScript + "${SRCROOT}/Pods/Pods-JPSThumbnailAnnotation-resources.sh" + + showEnvVarsInLog + 0 + + E875D67B17245D6C00009A6F + + children + + E8B7E7D61724664A00E93E96 + E875D68D17245D6C00009A6F + E875D68617245D6C00009A6F + E875D68517245D6C00009A6F + 651F070BDE3F4FC29C8C6820 + + isa + PBXGroup + sourceTree + <group> + + E875D67C17245D6C00009A6F + + attributes + + CLASSPREFIX + JPS + LastUpgradeCheck + 0460 + ORGANIZATIONNAME + JP Simard + + buildConfigurationList + E875D67F17245D6C00009A6F + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 + isa + PBXProject + knownRegions + + en + + mainGroup + E875D67B17245D6C00009A6F + productRefGroup + E875D68517245D6C00009A6F + projectDirPath + + projectReferences + + projectRoot + + targets + + E875D68317245D6C00009A6F + + + E875D67F17245D6C00009A6F + + buildConfigurations + + E875D6A517245D6C00009A6F + E875D6A617245D6C00009A6F + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + E875D68017245D6C00009A6F + + buildActionMask + 2147483647 + files + + E875D69417245D6C00009A6F + E875D69817245D6C00009A6F + E875D6A117245D6C00009A6F + E8B7E7D91724669200E93E96 + E8B7E7DC172466B600E93E96 + E8EF4F2A1724EE840051DB36 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + E875D68117245D6C00009A6F + + buildActionMask + 2147483647 + files + + E875D68A17245D6C00009A6F + 8325CB7765404753819E0026 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + E875D68217245D6C00009A6F + + buildActionMask + 2147483647 + files + + E875D69217245D6C00009A6F + E875D69A17245D6C00009A6F + E875D69C17245D6C00009A6F + E875D69E17245D6C00009A6F + E8EF4F2C1725027D0051DB36 + E8EF4F2F1725081E0051DB36 + E8EF4F301725081E0051DB36 + + isa + PBXResourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + E875D68317245D6C00009A6F + + buildConfigurationList + E875D6A717245D6C00009A6F + buildPhases + + 6F8A06480BFD477491B9566B + E875D68017245D6C00009A6F + E875D68117245D6C00009A6F + E875D68217245D6C00009A6F + BB114A669E2143F78480E958 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + JPSThumbnailAnnotation + productName + JPSThumbnailAnnotation + productReference + E875D68417245D6C00009A6F + productType + com.apple.product-type.application + + E875D68417245D6C00009A6F + + explicitFileType + wrapper.application + includeInIndex + 0 + isa + PBXFileReference + path + JPSThumbnailAnnotation.app + sourceTree + BUILT_PRODUCTS_DIR + + E875D68517245D6C00009A6F + + children + + E875D68417245D6C00009A6F + + isa + PBXGroup + name + Products + sourceTree + <group> + + E875D68617245D6C00009A6F + + children + + E8EF4F261724E5870051DB36 + E8EF4F241724E30C0051DB36 + E875D6AA172461FB00009A6F + E875D68717245D6C00009A6F + E875D68917245D6C00009A6F + E875D68B17245D6C00009A6F + FCC44B54839C4D29A3ED30BE + + isa + PBXGroup + name + Frameworks + sourceTree + <group> + + E875D68717245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + UIKit.framework + path + System/Library/Frameworks/UIKit.framework + sourceTree + SDKROOT + + E875D68917245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + Foundation.framework + path + System/Library/Frameworks/Foundation.framework + sourceTree + SDKROOT + + E875D68A17245D6C00009A6F + + fileRef + E875D68917245D6C00009A6F + isa + PBXBuildFile + + E875D68B17245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + CoreGraphics.framework + path + System/Library/Frameworks/CoreGraphics.framework + sourceTree + SDKROOT + + E875D68D17245D6C00009A6F + + children + + E875D69617245D6C00009A6F + E875D69717245D6C00009A6F + E875D69F17245D6C00009A6F + E875D6A017245D6C00009A6F + E875D68E17245D6C00009A6F + + isa + PBXGroup + name + Classes + sourceTree + SOURCE_ROOT + + E875D68E17245D6C00009A6F + + children + + E8EF4F2D1725081E0051DB36 + E8EF4F2E1725081E0051DB36 + E8EF4F2B1725027D0051DB36 + E875D68F17245D6C00009A6F + E875D69017245D6C00009A6F + E875D69317245D6C00009A6F + E875D69517245D6C00009A6F + E875D69917245D6C00009A6F + E875D69B17245D6C00009A6F + E875D69D17245D6C00009A6F + + isa + PBXGroup + name + Supporting Files + sourceTree + <group> + + E875D68F17245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + text.plist.xml + path + JPSThumbnailAnnotation-Info.plist + sourceTree + <group> + + E875D69017245D6C00009A6F + + children + + E875D69117245D6C00009A6F + + isa + PBXVariantGroup + name + InfoPlist.strings + sourceTree + <group> + + E875D69117245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + text.plist.strings + name + en + path + en.lproj/InfoPlist.strings + sourceTree + <group> + + E875D69217245D6C00009A6F + + fileRef + E875D69017245D6C00009A6F + isa + PBXBuildFile + + E875D69317245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + main.m + sourceTree + <group> + + E875D69417245D6C00009A6F + + fileRef + E875D69317245D6C00009A6F + isa + PBXBuildFile + + E875D69517245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + JPSThumbnailAnnotation-Prefix.pch + sourceTree + <group> + + E875D69617245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + AppDelegate.h + sourceTree + <group> + + E875D69717245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + AppDelegate.m + sourceTree + <group> + + E875D69817245D6C00009A6F + + fileRef + E875D69717245D6C00009A6F + isa + PBXBuildFile + + E875D69917245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + image.png + path + Default.png + sourceTree + <group> + + E875D69A17245D6C00009A6F + + fileRef + E875D69917245D6C00009A6F + isa + PBXBuildFile + + E875D69B17245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + image.png + path + Default@2x.png + sourceTree + <group> + + E875D69C17245D6C00009A6F + + fileRef + E875D69B17245D6C00009A6F + isa + PBXBuildFile + + E875D69D17245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + image.png + path + Default-568h@2x.png + sourceTree + <group> + + E875D69E17245D6C00009A6F + + fileRef + E875D69D17245D6C00009A6F + isa + PBXBuildFile + + E875D69F17245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + ViewController.h + sourceTree + <group> + + E875D6A017245D6C00009A6F + + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + ViewController.m + sourceTree + <group> + + E875D6A117245D6C00009A6F + + fileRef + E875D6A017245D6C00009A6F + isa + PBXBuildFile + + E875D6A517245D6C00009A6F + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + COPY_PHASE_STRIP + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 6.1 + ONLY_ACTIVE_ARCH + YES + SDKROOT + iphoneos + + isa + XCBuildConfiguration + name + Debug + + E875D6A617245D6C00009A6F + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + COPY_PHASE_STRIP + YES + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 6.1 + OTHER_CFLAGS + -DNS_BLOCK_ASSERTIONS=1 + SDKROOT + iphoneos + VALIDATE_PRODUCT + YES + + isa + XCBuildConfiguration + name + Release + + E875D6A717245D6C00009A6F + + buildConfigurations + + E875D6A817245D6C00009A6F + E875D6A917245D6C00009A6F + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + E875D6A817245D6C00009A6F + + baseConfigurationReference + 651F070BDE3F4FC29C8C6820 + buildSettings + + CLANG_ENABLE_MODULES + YES + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + JPSThumbnailAnnotation-Prefix.pch + INFOPLIST_FILE + JPSThumbnailAnnotation-Info.plist + PRODUCT_NAME + JPSThumbnailAnnotation + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + app + + isa + XCBuildConfiguration + name + Debug + + E875D6A917245D6C00009A6F + + baseConfigurationReference + 651F070BDE3F4FC29C8C6820 + buildSettings + + CLANG_ENABLE_MODULES + YES + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + JPSThumbnailAnnotation-Prefix.pch + INFOPLIST_FILE + JPSThumbnailAnnotation-Info.plist + PRODUCT_NAME + JPSThumbnailAnnotation + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + app + + isa + XCBuildConfiguration + name + Release + + E875D6AA172461FB00009A6F + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + MapKit.framework + path + System/Library/Frameworks/MapKit.framework + sourceTree + SDKROOT + + E8B7E7D61724664A00E93E96 + + children + + E8B7E7D71724669200E93E96 + E8B7E7D81724669200E93E96 + E8B7E7DA172466B600E93E96 + E8B7E7DB172466B600E93E96 + E8EF4F281724EE840051DB36 + E8EF4F291724EE840051DB36 + + isa + PBXGroup + name + JPSThumbnailAnnotation + path + ../JPSThumbnailAnnotation + sourceTree + <group> + + E8B7E7D71724669200E93E96 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + JPSThumbnailAnnotation.h + sourceTree + <group> + + E8B7E7D81724669200E93E96 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + JPSThumbnailAnnotation.m + sourceTree + <group> + + E8B7E7D91724669200E93E96 + + fileRef + E8B7E7D81724669200E93E96 + isa + PBXBuildFile + + E8B7E7DA172466B600E93E96 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + JPSThumbnailAnnotationView.h + sourceTree + <group> + + E8B7E7DB172466B600E93E96 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + JPSThumbnailAnnotationView.m + sourceTree + <group> + + E8B7E7DC172466B600E93E96 + + fileRef + E8B7E7DB172466B600E93E96 + isa + PBXBuildFile + + E8EF4F241724E30C0051DB36 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + CoreLocation.framework + path + System/Library/Frameworks/CoreLocation.framework + sourceTree + SDKROOT + + E8EF4F261724E5870051DB36 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + QuartzCore.framework + path + System/Library/Frameworks/QuartzCore.framework + sourceTree + SDKROOT + + E8EF4F281724EE840051DB36 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + JPSThumbnail.h + sourceTree + <group> + + E8EF4F291724EE840051DB36 + + fileEncoding + 4 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + JPSThumnail.m + sourceTree + <group> + + E8EF4F2A1724EE840051DB36 + + fileRef + E8EF4F291724EE840051DB36 + isa + PBXBuildFile + + E8EF4F2B1725027D0051DB36 + + isa + PBXFileReference + lastKnownFileType + image.jpeg + path + empire.jpg + sourceTree + <group> + + E8EF4F2C1725027D0051DB36 + + fileRef + E8EF4F2B1725027D0051DB36 + isa + PBXBuildFile + + E8EF4F2D1725081E0051DB36 + + isa + PBXFileReference + lastKnownFileType + image.jpeg + path + ottawa.jpg + sourceTree + <group> + + E8EF4F2E1725081E0051DB36 + + isa + PBXFileReference + lastKnownFileType + image.jpeg + path + apple.jpg + sourceTree + <group> + + E8EF4F2F1725081E0051DB36 + + fileRef + E8EF4F2D1725081E0051DB36 + isa + PBXBuildFile + + E8EF4F301725081E0051DB36 + + fileRef + E8EF4F2E1725081E0051DB36 + isa + PBXBuildFile + + FCC44B54839C4D29A3ED30BE + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + path + libPods-JPSThumbnailAnnotation.a + sourceTree + BUILT_PRODUCTS_DIR + + + rootObject + E875D67C17245D6C00009A6F + + diff --git a/Demo/JPSThumbnailAnnotation.xcworkspace/contents.xcworkspacedata b/Demo/JPSThumbnailAnnotation.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..6a0d66d --- /dev/null +++ b/Demo/JPSThumbnailAnnotation.xcworkspace/contents.xcworkspacedata @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Demo/Podfile b/Demo/Podfile new file mode 100644 index 0000000..138d95c --- /dev/null +++ b/Demo/Podfile @@ -0,0 +1,13 @@ +# Uncomment this line to define a global platform for your project +platform :ios, "6.0" + +#inhibiting all warnings coming from CocoaPods libraries +inhibit_all_warnings! + +target "JPSThumbnailAnnotation" do + +pod 'UIActivityIndicator-for-SDWebImage', '~> 1.2' + + +end + diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock new file mode 100644 index 0000000..9b579fd --- /dev/null +++ b/Demo/Podfile.lock @@ -0,0 +1,48 @@ +PODS: + - libwebp (0.4.1): + - libwebp/dec + - libwebp/demux + - libwebp/dsp + - libwebp/enc + - libwebp/mux + - libwebp/utils + - libwebp/webp + - libwebp/dec (0.4.1): + - libwebp/enc + - libwebp/utils + - libwebp/demux (0.4.1): + - libwebp/utils + - libwebp/dsp (0.4.1): + - libwebp/dec + - libwebp/enc + - libwebp/utils + - libwebp/enc (0.4.1): + - libwebp/utils + - libwebp/mux (0.4.1): + - libwebp/utils + - libwebp/utils (0.4.1): + - libwebp/dsp + - libwebp/webp + - libwebp/webp (0.4.1) + - SDWebImage (3.7.1): + - SDWebImage/Core + - SDWebImage/MapKit + - SDWebImage/WebP + - SDWebImage/Core (3.7.1) + - SDWebImage/MapKit (3.7.1): + - SDWebImage/Core + - SDWebImage/WebP (3.7.1): + - libwebp + - SDWebImage/Core + - UIActivityIndicator-for-SDWebImage (1.2): + - SDWebImage (~> 3.7) + +DEPENDENCIES: + - UIActivityIndicator-for-SDWebImage (~> 1.2) + +SPEC CHECKSUMS: + libwebp: 88e6e172a01df354b0a78400d2e5b87a9f2796cb + SDWebImage: 116e88633b5b416ea0ca4b334a4ac59cf72dd38d + UIActivityIndicator-for-SDWebImage: 8bd92c15280fbe54816448c6b14674145eee05c7 + +COCOAPODS: 0.32.1 diff --git a/JPSThumbnailAnnotation.podspec b/JPSThumbnailAnnotation.podspec index 8cd0b89..0a41eb0 100644 --- a/JPSThumbnailAnnotation.podspec +++ b/JPSThumbnailAnnotation.podspec @@ -14,8 +14,7 @@ Pod::Spec.new do |s| s.frameworks = 'QuartzCore', 'MapKit', 'CoreLocation' #specifying dependencies for Web image Downloads - s.dependency 'SDWebImage', '~>3.5.2' - s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.0.3' + s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2' s.requires_arc = true end From 1df047c1f0c1dbcc08650232222ccffd483f53b2 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Fri, 29 Aug 2014 19:36:01 +0200 Subject: [PATCH 3/9] -added JPSThumbnail property "imageURL" to use for web image downloads -coded the setting of JPSThumbnailAnnotaionView's imageView property by checking if the image property is set: if it is, then it is used directly. otherwise, the imageURL is used instead. -updated Demo project to use an example of a Web fetched image --- Demo/ViewController.m | 11 ++++++++++- JPSThumbnailAnnotation/JPSThumbnail.h | 1 + .../JPSThumbnailAnnotationView.m | 16 +++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Demo/ViewController.m b/Demo/ViewController.m index f422c3f..f8c3c7f 100644 --- a/Demo/ViewController.m +++ b/Demo/ViewController.m @@ -54,9 +54,18 @@ - (NSArray *)annotations { ottawa.coordinate = CLLocationCoordinate2DMake(45.43f, -75.70f); ottawa.disclosureBlock = ^{ NSLog(@"selected Ottawa"); }; + // Central Park -- (Web image Example by using imageURL parameter) + JPSThumbnail *cPark = [[JPSThumbnail alloc] init]; + cPark.imageURL = [NSURL URLWithString:@"http://insidenanabreadshead.files.wordpress.com/2011/01/ynp-yellowstone-entry-sign.jpg"]; + cPark.title = @"Yellowstone National Park"; + cPark.subtitle = @"Wonders of Nature"; + cPark.coordinate = CLLocationCoordinate2DMake(44.427844f, -110.588519f); + cPark.disclosureBlock = ^{ NSLog(@"selected Yellowstone Park"); }; + return @[[JPSThumbnailAnnotation annotationWithThumbnail:empire], [JPSThumbnailAnnotation annotationWithThumbnail:apple], - [JPSThumbnailAnnotation annotationWithThumbnail:ottawa]]; + [JPSThumbnailAnnotation annotationWithThumbnail:ottawa], + [JPSThumbnailAnnotation annotationWithThumbnail:cPark]]; } #pragma mark - MKMapViewDelegate diff --git a/JPSThumbnailAnnotation/JPSThumbnail.h b/JPSThumbnailAnnotation/JPSThumbnail.h index c1092e4..82c846a 100644 --- a/JPSThumbnailAnnotation/JPSThumbnail.h +++ b/JPSThumbnailAnnotation/JPSThumbnail.h @@ -14,6 +14,7 @@ typedef void (^ActionBlock)(); @interface JPSThumbnail : NSObject @property (nonatomic, strong) UIImage *image; +@property (nonatomic, strong) NSURL *imageURL; @property (nonatomic, copy) NSString *title; @property (nonatomic, copy) NSString *subtitle; @property (nonatomic, assign) CLLocationCoordinate2D coordinate; diff --git a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.m b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.m index 543c8cc..05d8544 100755 --- a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.m +++ b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.m @@ -9,6 +9,7 @@ @import QuartzCore; #import "JPSThumbnailAnnotationView.h" #import "JPSThumbnail.h" +#import "UIImageView+UIActivityIndicatorForSDWebImage.h" NSString * const kJPSThumbnailAnnotationViewReuseID = @"JPSThumbnailAnnotationView"; @@ -126,10 +127,23 @@ - (void)updateWithThumbnail:(JPSThumbnail *)thumbnail { self.coordinate = thumbnail.coordinate; self.titleLabel.text = thumbnail.title; self.subtitleLabel.text = thumbnail.subtitle; - self.imageView.image = thumbnail.image; + [self assignImageWithThumbnail:thumbnail]; self.disclosureBlock = thumbnail.disclosureBlock; } +-(void)assignImageWithThumbnail:(JPSThumbnail *)thumbnail { + + //figure out if we Should directly set image or use URL to download it instead + if (thumbnail.image) { + self.imageView.image = thumbnail.image; + + }else if(thumbnail.imageURL){ + + [self.imageView setImageWithURL:thumbnail.imageURL placeholderImage:nil usingActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; + } + +} + #pragma mark - JPSThumbnailAnnotationViewProtocol - (void)didSelectAnnotationViewInMap:(MKMapView *)mapView { From 394f8517d036024a94738c7641c47c9400e1ee37 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Fri, 29 Aug 2014 19:44:26 +0200 Subject: [PATCH 4/9] -updated README file --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d36ff99..c7c10b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # JPSThumbnailAnnotation -JPSThumbnailAnnotation is a simple mapkit annotation view for displaying images with clean design and animations. It is 100% programmatically drawn and styled for iOS 7. +JPSThumbnailAnnotation is a simple mapkit annotation view for displaying images with clean design and animations. It is 100% programmatically drawn and styled for iOS 7. It supports both local and Web images. ![JPSThumbnailAnnotation in action](screenshots2.jpg) @@ -31,6 +31,18 @@ thumbnail.disclosureBlock = ^{ NSLog(@"selected Empire"); }; [mapView addAnnotation:[JPSThumbnailAnnotation annotationWithThumbnail:thumbnail]]; ``` +Additionally, you can display Web images, by simply leaving the image property set to nil when creating the JPSThumbnail instances, and providing an imageURL instead. + +``` objc +// Central Park -- (Web image Example by using imageURL parameter) + JPSThumbnail *cPark = [[JPSThumbnail alloc] init]; + cPark.imageURL = [NSURL URLWithString:@"http://insidenanabreadshead.files.wordpress.com/2011/01/ynp-yellowstone-entry-sign.jpg"]; + cPark.title = @"Yellowstone National Park"; + cPark.subtitle = @"Wonders of Nature"; + cPark.coordinate = CLLocationCoordinate2DMake(44.427844f, -110.588519f); + cPark.disclosureBlock = ^{ NSLog(@"selected Yellowstone Park"); }; +``` + ### Usage notes Make sure the mapView implements the following 3 MKMapViewDelegate methods: @@ -56,6 +68,10 @@ Make sure the mapView implements the following 3 MKMapViewDelegate methods: } ``` +### Dependencies +This class uses SDWebImage by means of the popular category "UIImageView+UIActivityIndicatorForSDWebImage.h" to allow Web image downloads + + ## License MIT Licensed. From 994f24f87f61be5f4d6a4e559642e7f6e493d9c1 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Fri, 29 Aug 2014 19:49:49 +0200 Subject: [PATCH 5/9] -bumped podspec file to version 1.0.1 --- JPSThumbnailAnnotation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JPSThumbnailAnnotation.podspec b/JPSThumbnailAnnotation.podspec index 0a41eb0..58b6911 100644 --- a/JPSThumbnailAnnotation.podspec +++ b/JPSThumbnailAnnotation.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'JPSThumbnailAnnotation' - s.version = '1.0.0' + s.version = '1.0.1' s.platform = :ios s.license = 'MIT' s.summary = 'A simple mapkit annotation for displaying images and details.' From 4dcb3b218237bb95747b6b595c8775622e64fb7a Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Tue, 2 Sep 2014 13:20:01 +0200 Subject: [PATCH 6/9] -changed modules in header files for regular imports --- JPSThumbnailAnnotation/JPSThumbnail.h | 4 +++- JPSThumbnailAnnotation/JPSThumbnailAnnotation.h | 7 +++++-- JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/JPSThumbnailAnnotation/JPSThumbnail.h b/JPSThumbnailAnnotation/JPSThumbnail.h index 82c846a..923d56a 100644 --- a/JPSThumbnailAnnotation/JPSThumbnail.h +++ b/JPSThumbnailAnnotation/JPSThumbnail.h @@ -7,7 +7,9 @@ // #import -@import MapKit; +#import +//removing Modules imports from headers +//@import MapKit; typedef void (^ActionBlock)(); diff --git a/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h b/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h index cee034f..5445b6e 100644 --- a/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h +++ b/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h @@ -6,8 +6,11 @@ // Copyright (c) 2013 JP Simard. All rights reserved. // -@import Foundation; -@import MapKit; +#import +#import +//removing Modules imports from headers +//@import Foundation; +//@import MapKit; #import "JPSThumbnail.h" #import "JPSThumbnailAnnotationView.h" diff --git a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h index f577c94..651e7e1 100644 --- a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h +++ b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h @@ -6,7 +6,8 @@ // Copyright (c) 2013 JP Simard. All rights reserved. // -@import MapKit; +#import +//@import MapKit; @class JPSThumbnail; From e1e08b333218e26f3ab97819831d3b4d70ada55d Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Tue, 2 Sep 2014 16:45:07 +0200 Subject: [PATCH 7/9] Revert "-changed modules in header files for regular imports" This reverts commit 4dcb3b218237bb95747b6b595c8775622e64fb7a. --- JPSThumbnailAnnotation/JPSThumbnail.h | 4 +--- JPSThumbnailAnnotation/JPSThumbnailAnnotation.h | 7 ++----- JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/JPSThumbnailAnnotation/JPSThumbnail.h b/JPSThumbnailAnnotation/JPSThumbnail.h index 923d56a..82c846a 100644 --- a/JPSThumbnailAnnotation/JPSThumbnail.h +++ b/JPSThumbnailAnnotation/JPSThumbnail.h @@ -7,9 +7,7 @@ // #import -#import -//removing Modules imports from headers -//@import MapKit; +@import MapKit; typedef void (^ActionBlock)(); diff --git a/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h b/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h index 5445b6e..cee034f 100644 --- a/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h +++ b/JPSThumbnailAnnotation/JPSThumbnailAnnotation.h @@ -6,11 +6,8 @@ // Copyright (c) 2013 JP Simard. All rights reserved. // -#import -#import -//removing Modules imports from headers -//@import Foundation; -//@import MapKit; +@import Foundation; +@import MapKit; #import "JPSThumbnail.h" #import "JPSThumbnailAnnotationView.h" diff --git a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h index 651e7e1..f577c94 100644 --- a/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h +++ b/JPSThumbnailAnnotation/JPSThumbnailAnnotationView.h @@ -6,8 +6,7 @@ // Copyright (c) 2013 JP Simard. All rights reserved. // -#import -//@import MapKit; +@import MapKit; @class JPSThumbnail; From b19e6410629e43cf84c928f4ec102ba1aae30397 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Thu, 24 Dec 2015 14:38:37 +0100 Subject: [PATCH 8/9] - updated dependency to UIActivityIndicator-for-SDWebImage to 1.2.1 --- JPSThumbnailAnnotation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JPSThumbnailAnnotation.podspec b/JPSThumbnailAnnotation.podspec index 58b6911..6e034c7 100644 --- a/JPSThumbnailAnnotation.podspec +++ b/JPSThumbnailAnnotation.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.frameworks = 'QuartzCore', 'MapKit', 'CoreLocation' #specifying dependencies for Web image Downloads - s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2' + s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2.1' s.requires_arc = true end From 811c82b6850d244b91002c04867aec64c3874e43 Mon Sep 17 00:00:00 2001 From: Roberto Arreaza Date: Thu, 24 Dec 2015 15:39:13 +0100 Subject: [PATCH 9/9] Revert "- updated dependency to UIActivityIndicator-for-SDWebImage to 1.2.1" This reverts commit b19e6410629e43cf84c928f4ec102ba1aae30397. --- JPSThumbnailAnnotation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JPSThumbnailAnnotation.podspec b/JPSThumbnailAnnotation.podspec index 6e034c7..58b6911 100644 --- a/JPSThumbnailAnnotation.podspec +++ b/JPSThumbnailAnnotation.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.frameworks = 'QuartzCore', 'MapKit', 'CoreLocation' #specifying dependencies for Web image Downloads - s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2.1' + s.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2' s.requires_arc = true end