diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fe6e86c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ + +*.xcuserstate + +*.xcscheme + +ImagePicker.xcodeproj/xcuserdata/fraser.xcuserdatad/xcschemes/xcschememanagement.plist + +*.xccheckout diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec new file mode 100644 index 0000000..8969f20 --- /dev/null +++ b/DoImagePickerController.podspec @@ -0,0 +1,19 @@ +Pod::Spec.new do |s| +s.name = 'DoImagePickerController' +s.version = '1.6' +s.summary = 'An image picker controller with single selection and multiple selection. Support to select lots photos with panning gesture' +s.homepage = 'https://github.com/IdleHandsApps/DoImagePickerController/' +s.description = <<-DESC +DoImagePickerController is an image picker controller with single selection and multiple selection. Support to select lots photos with panning gesture +DESC +s.license = 'MIT' +s.author = { 'Fraser Scott-Morrison' => 'fraserscottmorrison@me.com' } +s.source = { :git => 'https://github.com/IdleHandsApps/DoImagePickerController.git', :tag => s.version.to_s } +s.platform = :ios, '7.0' +s.source_files = "DoImagePicker", "ImagePicker/DoImagePicker/*.{h,m}" +s.public_header_files = 'ImagePicker/DoImagePicker/*.h' +s.resource_bundles = { 'DoImagePickerController' => ["Resources/Images/*.png","ImagePicker/DoImagePicker/*.xib"] } + +s.ios.deployment_target = '7.0' +s.requires_arc = true +end \ No newline at end of file diff --git a/ImagePicker.xcodeproj/project.pbxproj b/DoImagePickerController.xcodeproj/project.pbxproj similarity index 89% rename from ImagePicker.xcodeproj/project.pbxproj rename to DoImagePickerController.xcodeproj/project.pbxproj index 929e42b..138c903 100644 --- a/ImagePicker.xcodeproj/project.pbxproj +++ b/DoImagePickerController.xcodeproj/project.pbxproj @@ -53,26 +53,27 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 4CCA82E61B0946F200CA4365 /* DoImagePickerController.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = DoImagePickerController.podspec; sourceTree = SOURCE_ROOT; }; 731D67C918A087A5002BAEF6 /* line@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "line@2x.png"; sourceTree = ""; }; 731D67CC18A0D066002BAEF6 /* show.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = show.png; sourceTree = ""; }; 731D67CD18A0D066002BAEF6 /* show@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "show@2x.png"; sourceTree = ""; }; - 73238CE71890AAC60047DDA0 /* ImagePicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ImagePicker.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 73238CE71890AAC60047DDA0 /* DoImagePickerController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DoImagePickerController.app; sourceTree = BUILT_PRODUCTS_DIR; }; 73238CEA1890AAC60047DDA0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 73238CEC1890AAC60047DDA0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 73238CEE1890AAC60047DDA0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 73238CF21890AAC60047DDA0 /* ImagePicker-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ImagePicker-Info.plist"; sourceTree = ""; }; + 73238CF21890AAC60047DDA0 /* DoImagePickerController-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "DoImagePickerController-Info.plist"; sourceTree = ""; }; 73238CF41890AAC60047DDA0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 73238CF61890AAC60047DDA0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 73238CF81890AAC60047DDA0 /* ImagePicker-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ImagePicker-Prefix.pch"; sourceTree = ""; }; + 73238CF81890AAC60047DDA0 /* DoImagePickerController-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DoImagePickerController-Prefix.pch"; sourceTree = ""; }; 73238CF91890AAC60047DDA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 73238CFA1890AAC60047DDA0 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 73238CFD1890AAC60047DDA0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 73238CFF1890AAC60047DDA0 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; 73238D001890AAC60047DDA0 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 73238D021890AAC70047DDA0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 73238D081890AAC70047DDA0 /* ImagePickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ImagePickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 73238D081890AAC70047DDA0 /* DoImagePickerController.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DoImagePickerController.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 73238D091890AAC70047DDA0 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - 73238D111890AAC70047DDA0 /* ImagePickerTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ImagePickerTests-Info.plist"; sourceTree = ""; }; + 73238D111890AAC70047DDA0 /* DoImagePickerControllerTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "DoImagePickerControllerTests-Info.plist"; sourceTree = ""; }; 73238D131890AAC70047DDA0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 73238D151890AAC70047DDA0 /* ImagePickerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImagePickerTests.m; sourceTree = ""; }; 73238D201890AD4B0047DDA0 /* DoImagePickerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoImagePickerController.h; sourceTree = ""; }; @@ -134,8 +135,8 @@ 73238CE81890AAC60047DDA0 /* Products */ = { isa = PBXGroup; children = ( - 73238CE71890AAC60047DDA0 /* ImagePicker.app */, - 73238D081890AAC70047DDA0 /* ImagePickerTests.xctest */, + 73238CE71890AAC60047DDA0 /* DoImagePickerController.app */, + 73238D081890AAC70047DDA0 /* DoImagePickerController.xctest */, ); name = Products; sourceTree = ""; @@ -171,10 +172,11 @@ 73238CF11890AAC60047DDA0 /* Supporting Files */ = { isa = PBXGroup; children = ( - 73238CF21890AAC60047DDA0 /* ImagePicker-Info.plist */, + 4CCA82E61B0946F200CA4365 /* DoImagePickerController.podspec */, + 73238CF21890AAC60047DDA0 /* DoImagePickerController-Info.plist */, 73238CF31890AAC60047DDA0 /* InfoPlist.strings */, 73238CF61890AAC60047DDA0 /* main.m */, - 73238CF81890AAC60047DDA0 /* ImagePicker-Prefix.pch */, + 73238CF81890AAC60047DDA0 /* DoImagePickerController-Prefix.pch */, ); name = "Supporting Files"; sourceTree = ""; @@ -191,7 +193,7 @@ 73238D101890AAC70047DDA0 /* Supporting Files */ = { isa = PBXGroup; children = ( - 73238D111890AAC70047DDA0 /* ImagePickerTests-Info.plist */, + 73238D111890AAC70047DDA0 /* DoImagePickerControllerTests-Info.plist */, 73238D121890AAC70047DDA0 /* InfoPlist.strings */, ); name = "Supporting Files"; @@ -245,9 +247,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 73238CE61890AAC60047DDA0 /* ImagePicker */ = { + 73238CE61890AAC60047DDA0 /* DoImagePickerController */ = { isa = PBXNativeTarget; - buildConfigurationList = 73238D191890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "ImagePicker" */; + buildConfigurationList = 73238D191890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "DoImagePickerController" */; buildPhases = ( 73238CE31890AAC60047DDA0 /* Sources */, 73238CE41890AAC60047DDA0 /* Frameworks */, @@ -257,14 +259,14 @@ ); dependencies = ( ); - name = ImagePicker; + name = DoImagePickerController; productName = ImagePicker; - productReference = 73238CE71890AAC60047DDA0 /* ImagePicker.app */; + productReference = 73238CE71890AAC60047DDA0 /* DoImagePickerController.app */; productType = "com.apple.product-type.application"; }; - 73238D071890AAC70047DDA0 /* ImagePickerTests */ = { + 73238D071890AAC70047DDA0 /* DoImagePickerControllerTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 73238D1C1890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "ImagePickerTests" */; + buildConfigurationList = 73238D1C1890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "DoImagePickerControllerTests" */; buildPhases = ( 73238D041890AAC70047DDA0 /* Sources */, 73238D051890AAC70047DDA0 /* Frameworks */, @@ -275,9 +277,9 @@ dependencies = ( 73238D0E1890AAC70047DDA0 /* PBXTargetDependency */, ); - name = ImagePickerTests; + name = DoImagePickerControllerTests; productName = ImagePickerTests; - productReference = 73238D081890AAC70047DDA0 /* ImagePickerTests.xctest */; + productReference = 73238D081890AAC70047DDA0 /* DoImagePickerController.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -297,7 +299,7 @@ }; }; }; - buildConfigurationList = 73238CE21890AAC60047DDA0 /* Build configuration list for PBXProject "ImagePicker" */; + buildConfigurationList = 73238CE21890AAC60047DDA0 /* Build configuration list for PBXProject "DoImagePickerController" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -310,8 +312,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 73238CE61890AAC60047DDA0 /* ImagePicker */, - 73238D071890AAC70047DDA0 /* ImagePickerTests */, + 73238CE61890AAC60047DDA0 /* DoImagePickerController */, + 73238D071890AAC70047DDA0 /* DoImagePickerControllerTests */, ); }; /* End PBXProject section */ @@ -380,7 +382,7 @@ /* Begin PBXTargetDependency section */ 73238D0E1890AAC70047DDA0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 73238CE61890AAC60047DDA0 /* ImagePicker */; + target = 73238CE61890AAC60047DDA0 /* DoImagePickerController */; targetProxy = 73238D0D1890AAC70047DDA0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -493,9 +495,9 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "ImagePicker/ImagePicker-Prefix.pch"; - INFOPLIST_FILE = "ImagePicker/ImagePicker-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; + GCC_PREFIX_HEADER = "ImagePicker/DoImagePickerController-Prefix.pch"; + INFOPLIST_FILE = "ImagePicker/DoImagePickerController-Info.plist"; + PRODUCT_NAME = DoImagePickerController; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; @@ -509,9 +511,9 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "ImagePicker/ImagePicker-Prefix.pch"; - INFOPLIST_FILE = "ImagePicker/ImagePicker-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; + GCC_PREFIX_HEADER = "ImagePicker/DoImagePickerController-Prefix.pch"; + INFOPLIST_FILE = "ImagePicker/DoImagePickerController-Info.plist"; + PRODUCT_NAME = DoImagePickerController; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = app; }; @@ -528,13 +530,13 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "ImagePicker/ImagePicker-Prefix.pch"; + GCC_PREFIX_HEADER = "ImagePicker/DoImagePickerController-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = "ImagePickerTests/ImagePickerTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; + INFOPLIST_FILE = "ImagePickerTests/DoImagePickerControllerTests-Info.plist"; + PRODUCT_NAME = DoImagePickerController; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -551,9 +553,9 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "ImagePicker/ImagePicker-Prefix.pch"; - INFOPLIST_FILE = "ImagePickerTests/ImagePickerTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; + GCC_PREFIX_HEADER = "ImagePicker/DoImagePickerController-Prefix.pch"; + INFOPLIST_FILE = "ImagePickerTests/DoImagePickerControllerTests-Info.plist"; + PRODUCT_NAME = DoImagePickerController; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -562,7 +564,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 73238CE21890AAC60047DDA0 /* Build configuration list for PBXProject "ImagePicker" */ = { + 73238CE21890AAC60047DDA0 /* Build configuration list for PBXProject "DoImagePickerController" */ = { isa = XCConfigurationList; buildConfigurations = ( 73238D171890AAC70047DDA0 /* Debug */, @@ -571,7 +573,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 73238D191890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "ImagePicker" */ = { + 73238D191890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "DoImagePickerController" */ = { isa = XCConfigurationList; buildConfigurations = ( 73238D1A1890AAC70047DDA0 /* Debug */, @@ -580,7 +582,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 73238D1C1890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "ImagePickerTests" */ = { + 73238D1C1890AAC70047DDA0 /* Build configuration list for PBXNativeTarget "DoImagePickerControllerTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 73238D1D1890AAC70047DDA0 /* Debug */, diff --git a/ImagePicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DoImagePickerController.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 50% rename from ImagePicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to DoImagePickerController.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 0c09ee9..f84c122 100644 --- a/ImagePicker.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/DoImagePickerController.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Users/fraser/Documents/DoImagePickerController/DoImagePickerController.xcodeproj"> diff --git a/ImagePicker.xcodeproj/project.xcworkspace/xcshareddata/ImagePicker.xccheckout b/ImagePicker.xcodeproj/project.xcworkspace/xcshareddata/ImagePicker.xccheckout deleted file mode 100644 index 193f368..0000000 --- a/ImagePicker.xcodeproj/project.xcworkspace/xcshareddata/ImagePicker.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 663A9C6B-1B3F-41E1-A66F-AC4A2E8DA8C6 - IDESourceControlProjectName - ImagePicker - IDESourceControlProjectOriginsDictionary - - 53914F7A-695E-460E-A681-C2F69F56103D - https://github.com/donobono/DoImagePickerController.git - - IDESourceControlProjectPath - ImagePicker.xcodeproj/project.xcworkspace - IDESourceControlProjectRelativeInstallPathDictionary - - 53914F7A-695E-460E-A681-C2F69F56103D - ../.. - - IDESourceControlProjectURL - https://github.com/donobono/DoImagePickerController.git - IDESourceControlProjectVersion - 110 - IDESourceControlProjectWCCIdentifier - 53914F7A-695E-460E-A681-C2F69F56103D - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 53914F7A-695E-460E-A681-C2F69F56103D - IDESourceControlWCCName - DoImagePickerController - - - - diff --git a/ImagePicker.xcodeproj/project.xcworkspace/xcuserdata/seungbocho.xcuserdatad/UserInterfaceState.xcuserstate b/ImagePicker.xcodeproj/project.xcworkspace/xcuserdata/seungbocho.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index a89e2e1..0000000 Binary files a/ImagePicker.xcodeproj/project.xcworkspace/xcuserdata/seungbocho.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index f967fd7..0000000 --- a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/ImagePicker.xcscheme b/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/ImagePicker.xcscheme deleted file mode 100644 index d6c3ded..0000000 --- a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/ImagePicker.xcscheme +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/xcschememanagement.plist b/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index f1a5c83..0000000 --- a/ImagePicker.xcodeproj/xcuserdata/seungbocho.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SchemeUserState - - ImagePicker.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 73238CE61890AAC60047DDA0 - - primary - - - 73238D071890AAC70047DDA0 - - primary - - - - - diff --git a/ImagePicker/Base.lproj/Main.storyboard b/ImagePicker/Base.lproj/Main.storyboard index 6ddda3d..33bb3db 100644 --- a/ImagePicker/Base.lproj/Main.storyboard +++ b/ImagePicker/Base.lproj/Main.storyboard @@ -1,13 +1,14 @@ - + - + + - + @@ -93,9 +94,4 @@ - - - - - - \ No newline at end of file + diff --git a/ImagePicker/DoImagePicker/DoAlbumCell.m b/ImagePicker/DoImagePicker/DoAlbumCell.m index 5474ac7..5c1f3b2 100644 --- a/ImagePicker/DoImagePicker/DoAlbumCell.m +++ b/ImagePicker/DoImagePicker/DoAlbumCell.m @@ -28,12 +28,12 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated _lbAlbumName.textColor = [UIColor whiteColor]; _lbCount.textColor = [UIColor whiteColor]; - self.contentView.backgroundColor = DO_ALBUM_NAME_TEXT_COLOR; + self.contentView.backgroundColor = DoImagePickerController.albumNameSelectedTextColor; } else { - _lbAlbumName.textColor = DO_ALBUM_NAME_TEXT_COLOR; - _lbCount.textColor = DO_ALBUM_COUNT_TEXT_COLOR; + _lbAlbumName.textColor = DoImagePickerController.albumNameUnselectedTextColor; + _lbCount.textColor = DoImagePickerController.albumCountTextColor; self.contentView.backgroundColor = [UIColor whiteColor]; } diff --git a/ImagePicker/DoImagePicker/DoAlbumCell.xib b/ImagePicker/DoImagePicker/DoAlbumCell.xib index a613b07..0d5987e 100644 --- a/ImagePicker/DoImagePicker/DoAlbumCell.xib +++ b/ImagePicker/DoImagePicker/DoAlbumCell.xib @@ -1,7 +1,8 @@ - + - + + @@ -35,4 +36,4 @@ - \ No newline at end of file + diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.h b/ImagePicker/DoImagePicker/DoImagePickerController.h index ded8a56..d7bfd93 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.h +++ b/ImagePicker/DoImagePicker/DoImagePickerController.h @@ -7,16 +7,6 @@ #import -#define DO_RGB(r, g, b) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1] -#define DO_RGBA(r, g, b, a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a] - -#define DO_MENU_BACK_COLOR DO_RGBA(57, 185, 238, 0.98) -#define DO_SIDE_BUTTON_COLOR DO_RGBA(57, 185, 238, 0.9) - -#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(57, 185, 238) -#define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(247, 200, 142) -#define DO_BOTTOM_TEXT_COLOR DO_RGB(255, 255, 255) - #define DO_PICKER_RESULT_UIIMAGE 0 #define DO_PICKER_RESULT_ASSET 1 @@ -79,6 +69,20 @@ @property (strong, nonatomic) NSMutableDictionary *dSelected; @property (strong, nonatomic) NSIndexPath *lastAccessed; +// static branding ++ (UIColor *)menuBackColor; ++ (void)setMenuBackColor:(UIColor *)color; ++ (UIColor *)sideButtonColor; ++ (void)setSideButtonColor:(UIColor *)color; ++ (UIColor *)albumNameSelectedTextColor; ++ (void)setAlbumNameSelectedTextColor:(UIColor *)color; ++ (UIColor *)albumNameUnselectedTextColor; ++ (void)setAlbumNameUnselectedTextColor:(UIColor *)color; ++ (UIColor *)albumCountTextColor; ++ (void)setAlbumCountTextColor:(UIColor *)color; ++ (UIColor *)bottomTextColor; ++ (void)setBottomTextColor:(UIColor *)color; + @end @protocol DoImagePickerControllerDelegate diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.m b/ImagePicker/DoImagePicker/DoImagePickerController.m index 3b7bcde..2830e32 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.m +++ b/ImagePicker/DoImagePicker/DoImagePickerController.m @@ -11,6 +11,16 @@ #import "DoAlbumCell.h" #import "DoPhotoCell.h" +#define DO_RGB(r, g, b) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1] +#define DO_RGBA(r, g, b, a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a] + +#define DO_MENU_BACK_COLOR DO_RGBA(57, 185, 238, 0.98) +#define DO_SIDE_BUTTON_COLOR DO_RGBA(57, 185, 238, 0.9) + +#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(57, 185, 238) +#define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(247, 200, 142) +#define DO_BOTTOM_TEXT_COLOR DO_RGB(255, 255, 255) + @implementation DoImagePickerController - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil @@ -29,24 +39,27 @@ - (void)viewDidLoad [self initBottomMenu]; [self initControls]; - UINib *nib = [UINib nibWithNibName:@"DoPhotoCell" bundle:nil]; + NSBundle *podBundle = [NSBundle bundleForClass:DoPhotoCell.classForCoder]; + NSURL *bundleUrl = [podBundle URLForResource:@"DoImagePickerController" withExtension:@"bundle"]; + NSBundle *bundle = [NSBundle bundleWithURL:bundleUrl]; + UINib *nib = [UINib nibWithNibName:@"DoPhotoCell" bundle:bundle]; [_cvPhotoList registerNib:nib forCellWithReuseIdentifier:@"DoPhotoCell"]; _tvAlbumList.frame = CGRectMake(0, _vBottomMenu.frame.origin.y, self.view.frame.size.width, self.view.frame.size.height); _tvAlbumList.alpha = 0.0; - + [self readAlbumList:YES]; - + // new photo is located at the first of array ASSETHELPER.bReverse = YES; - - if (_nMaxCount != 1) - { - // init gesture for multiple selection with panning - UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(onPanForSelection:)]; - [self.view addGestureRecognizer:pan]; - } - + + if (_nMaxCount != 1) + { + // init gesture for multiple selection with panning + UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(onPanForSelection:)]; + [self.view addGestureRecognizer:pan]; + } + // init gesture for preview UILongPressGestureRecognizer *longTap = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongTapForPreview:)]; longTap.minimumPressDuration = 0.3; @@ -64,7 +77,7 @@ - (void)viewDidDisappear:(BOOL)animated if (_nResultType == DO_PICKER_RESULT_UIIMAGE) [ASSETHELPER clearData]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil]; } - (void)handleEnterForeground:(NSNotification*)notification @@ -76,24 +89,24 @@ - (void)handleEnterForeground:(NSNotification*)notification - (void)initControls { // side buttons - _btUp.backgroundColor = DO_SIDE_BUTTON_COLOR; - _btDown.backgroundColor = DO_SIDE_BUTTON_COLOR; + _btUp.backgroundColor = DoImagePickerController.sideButtonColor; + _btDown.backgroundColor = DoImagePickerController.sideButtonColor; CALayer *layer1 = [_btDown layer]; - [layer1 setMasksToBounds:YES]; - [layer1 setCornerRadius:_btDown.frame.size.height / 2.0 - 1]; + [layer1 setMasksToBounds:YES]; + [layer1 setCornerRadius:_btDown.frame.size.height / 2.0 - 1]; CALayer *layer2 = [_btUp layer]; - [layer2 setMasksToBounds:YES]; - [layer2 setCornerRadius:_btUp.frame.size.height / 2.0 - 1]; + [layer2 setMasksToBounds:YES]; + [layer2 setCornerRadius:_btUp.frame.size.height / 2.0 - 1]; // table view UIImageView *ivHeader = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, _tvAlbumList.frame.size.width, 0.5)]; - ivHeader.backgroundColor = DO_ALBUM_NAME_TEXT_COLOR; + ivHeader.backgroundColor = DoImagePickerController.albumNameSelectedTextColor; _tvAlbumList.tableHeaderView = ivHeader; UIImageView *ivFooter = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, _tvAlbumList.frame.size.width, 0.5)]; - ivFooter.backgroundColor = DO_ALBUM_NAME_TEXT_COLOR; + ivFooter.backgroundColor = DoImagePickerController.albumNameSelectedTextColor; _tvAlbumList.tableFooterView = ivFooter; // dimmed view @@ -108,7 +121,7 @@ - (void)readAlbumList:(BOOL)bFirst [ASSETHELPER getGroupList:^(NSArray *aGroups) { [_tvAlbumList reloadData]; - + NSInteger nIndex = 0; #ifdef DO_SAVE_SELECTED_ALBUM nIndex = [self getSelectedGroupIndex:aGroups]; @@ -131,9 +144,9 @@ - (void)readAlbumList:(BOOL)bFirst #pragma mark - for bottom menu - (void)initBottomMenu { - _vBottomMenu.backgroundColor = DO_MENU_BACK_COLOR; - [_btSelectAlbum setTitleColor:DO_BOTTOM_TEXT_COLOR forState:UIControlStateNormal]; - [_btSelectAlbum setTitleColor:DO_BOTTOM_TEXT_COLOR forState:UIControlStateDisabled]; + _vBottomMenu.backgroundColor = DoImagePickerController.menuBackColor; + [_btSelectAlbum setTitleColor:DoImagePickerController.bottomTextColor forState:UIControlStateNormal]; + [_btSelectAlbum setTitleColor:DoImagePickerController.bottomTextColor forState:UIControlStateDisabled]; _ivLine1.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"line.png"]]; _ivLine2.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"line.png"]]; @@ -141,7 +154,7 @@ - (void)initBottomMenu if (_nMaxCount == DO_NO_LIMIT_SELECT) { _lbSelectCount.text = @"(0)"; - _lbSelectCount.textColor = DO_BOTTOM_TEXT_COLOR; + _lbSelectCount.textColor = DoImagePickerController.bottomTextColor; } else if (_nMaxCount <= 1) { @@ -158,7 +171,7 @@ - (void)initBottomMenu else { _lbSelectCount.text = [NSString stringWithFormat:@"(0/%d)", (int)_nMaxCount]; - _lbSelectCount.textColor = DO_BOTTOM_TEXT_COLOR; + _lbSelectCount.textColor = DoImagePickerController.bottomTextColor; } } @@ -166,7 +179,7 @@ - (IBAction)onSelectPhoto:(id)sender { NSMutableArray *aResult = [[NSMutableArray alloc] initWithCapacity:_dSelected.count]; NSArray *aKeys = [_dSelected keysSortedByValueUsingSelector:@selector(compare:)]; - + if (_nResultType == DO_PICKER_RESULT_UIIMAGE) { for (int i = 0; i < _dSelected.count; i++) @@ -181,7 +194,7 @@ - (IBAction)onSelectPhoto:(id)sender for (int i = 0; i < _dSelected.count; i++) [aResult addObject:[ASSETHELPER getAssetAtIndex:[aKeys[i] integerValue]]]; } - + [_delegate didSelectPhotosFromDoImagePickerController:self result:aResult]; } @@ -196,9 +209,9 @@ - (IBAction)onSelectAlbum:(id)sender { // show tableview [UIView animateWithDuration:0.2 animations:^(void) { - + _vDimmed.alpha = 0.7; - + _tvAlbumList.frame = CGRectMake(0, _vBottomMenu.frame.origin.y - _tvAlbumList.frame.size.height, _tvAlbumList.frame.size.width, _tvAlbumList.frame.size.height); _tvAlbumList.alpha = 1.0; @@ -247,9 +260,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N if (cell == nil) { - cell = [[[NSBundle mainBundle] loadNibNamed:@"DoAlbumCell" owner:nil options:nil] lastObject]; + NSBundle *podBundle = [NSBundle bundleForClass:DoAlbumCell.classForCoder]; + NSURL *bundleUrl = [podBundle URLForResource:@"DoImagePickerController" withExtension:@"bundle"]; + NSBundle *bundle = [NSBundle bundleWithURL:bundleUrl]; + cell = [[bundle loadNibNamed:@"DoAlbumCell" owner:nil options:nil] lastObject]; } - + NSDictionary *d = [ASSETHELPER getGroupInfo:indexPath.row]; cell.lbAlbumName.text = d[@"name"]; cell.lbCount.text = [NSString stringWithFormat:@"%@", d[@"count"]]; @@ -261,7 +277,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath { [self showPhotosInGroup:indexPath.row]; [_btSelectAlbum setTitle:[ASSETHELPER getGroupInfo:indexPath.row][@"name"] forState:UIControlStateNormal]; - + [self hideBottomMenu]; } @@ -275,7 +291,7 @@ - (void)hideBottomMenu _ivShowMark.transform = CGAffineTransformMakeRotation(0); [UIView setAnimationDelay:0.1]; - + _tvAlbumList.alpha = 0.0; }]; } @@ -289,18 +305,18 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { DoPhotoCell *cell = (DoPhotoCell *)[_cvPhotoList dequeueReusableCellWithReuseIdentifier:@"DoPhotoCell" forIndexPath:indexPath]; - + if (_nColumnCount == 4) cell.ivPhoto.image = [ASSETHELPER getImageAtIndex:indexPath.row type:ASSET_PHOTO_THUMBNAIL]; else cell.ivPhoto.image = [ASSETHELPER getImageAtIndex:indexPath.row type:ASSET_PHOTO_ASPECT_THUMBNAIL]; - - if (_dSelected[@(indexPath.row)] == nil) - [cell setSelectMode:NO]; + + if (_dSelected[@(indexPath.row)] == nil) + [cell setSelectMode:NO]; else - [cell setSelectMode:YES]; - + [cell setSelectMode:YES]; + return cell; } @@ -308,20 +324,20 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa { if (_nMaxCount > 1 || _nMaxCount == DO_NO_LIMIT_SELECT) { - DoPhotoCell *cell = (DoPhotoCell *)[collectionView cellForItemAtIndexPath:indexPath]; + DoPhotoCell *cell = (DoPhotoCell *)[collectionView cellForItemAtIndexPath:indexPath]; - if ((_dSelected[@(indexPath.row)] == nil) && (_nMaxCount > _dSelected.count)) - { - // select - _dSelected[@(indexPath.row)] = @(_dSelected.count); - [cell setSelectMode:YES]; - } - else - { - // unselect - [_dSelected removeObjectForKey:@(indexPath.row)]; - [cell setSelectMode:NO]; - } + if ((_dSelected[@(indexPath.row)] == nil) && (_nMaxCount > _dSelected.count)) + { + // select + _dSelected[@(indexPath.row)] = @(_dSelected.count); + [cell setSelectMode:YES]; + } + else + { + // unselect + [_dSelected removeObjectForKey:@(indexPath.row)]; + [cell setSelectMode:NO]; + } if (_nMaxCount == DO_NO_LIMIT_SELECT) _lbSelectCount.text = [NSString stringWithFormat:@"(%d)", (int)_dSelected.count]; @@ -345,7 +361,7 @@ - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollection return CGSizeMake(104, 104); else if (_nColumnCount == 4) return CGSizeMake(77, 77); - + return CGSizeZero; } @@ -375,9 +391,9 @@ - (void)onPanForSelection:(UIPanGestureRecognizer *)gestureRecognizer double fX = [gestureRecognizer locationInView:_cvPhotoList].x; double fY = [gestureRecognizer locationInView:_cvPhotoList].y; - + for (UICollectionViewCell *cell in _cvPhotoList.visibleCells) - { + { float fSX = cell.frame.origin.x; float fEX = cell.frame.origin.x + cell.frame.size.width; float fSY = cell.frame.origin.y; @@ -389,7 +405,7 @@ - (void)onPanForSelection:(UIPanGestureRecognizer *)gestureRecognizer if (_lastAccessed != indexPath) { - [self collectionView:_cvPhotoList didSelectItemAtIndexPath:indexPath]; + [self collectionView:_cvPhotoList didSelectItemAtIndexPath:indexPath]; } _lastAccessed = indexPath; @@ -413,7 +429,7 @@ - (void)onLongTapForPreview:(UILongPressGestureRecognizer *)gestureRecognizer { double fX = [gestureRecognizer locationInView:_cvPhotoList].x; double fY = [gestureRecognizer locationInView:_cvPhotoList].y; - + // check boundary of controls CGPoint pt = [gestureRecognizer locationInView:self.view]; if (CGRectContainsPoint(_vBottomMenu.frame, pt)) @@ -467,13 +483,13 @@ - (void)showPhotosInGroup:(NSInteger)nIndex _cvPhotoList.alpha = 1.0; }]; - if (aPhotos.count > 0) - { - [_cvPhotoList scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionTop animated:NO]; + if (aPhotos.count > 0) + { + [_cvPhotoList scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionTop animated:NO]; } - + _btUp.alpha = 0.0; - + dispatch_async(dispatch_get_main_queue(), ^(void) { if (_cvPhotoList.contentSize.height < _cvPhotoList.frame.size.height) _btDown.alpha = 0.0; @@ -516,7 +532,7 @@ - (void)hidePreview [_ivPreview removeFromSuperview]; _ivPreview = nil; - + _vDimmed.alpha = 0.0; [_vDimmed removeGestureRecognizer:[_vDimmed.gestureRecognizers lastObject]]; } @@ -524,7 +540,7 @@ - (void)hidePreview - (void)onPanToClosePreview:(UIPanGestureRecognizer *)gestureRecognizer { CGPoint translation = [gestureRecognizer translationInView:self.view]; - + if (gestureRecognizer.state == UIGestureRecognizerStateEnded) { [UIView animateWithDuration:0.2 animations:^(void) { @@ -536,9 +552,9 @@ - (void)onPanToClosePreview:(UIPanGestureRecognizer *)gestureRecognizer pt.y = self.view.frame.size.height * 1.5; else if (_ivPreview.center.y < _vDimmed.center.y) pt.y = -self.view.frame.size.height * 1.5; - + _ivPreview.center = pt; - + [self hidePreview]; } else @@ -551,8 +567,8 @@ - (void)onPanToClosePreview:(UIPanGestureRecognizer *)gestureRecognizer } else { - _ivPreview.center = CGPointMake(_ivPreview.center.x, _ivPreview.center.y + translation.y); - [gestureRecognizer setTranslation:CGPointMake(0, 0) inView:self.view]; + _ivPreview.center = CGPointMake(_ivPreview.center.x, _ivPreview.center.y + translation.y); + [gestureRecognizer setTranslation:CGPointMake(0, 0) inView:self.view]; _vDimmed.alpha = 1 - ABS(_ivPreview.center.y - _vDimmed.center.y) / (self.view.frame.size.height / 2.0); } @@ -562,9 +578,9 @@ - (void)onPanToClosePreview:(UIPanGestureRecognizer *)gestureRecognizer - (void)saveSelectedGroup:(NSInteger)nIndex { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - [defaults setObject:[[ASSETHELPER getGroupAtIndex:nIndex] valueForProperty:ALAssetsGroupPropertyName] forKey:@"DO_SELECTED_ALBUM"]; - [defaults synchronize]; + + [defaults setObject:[[ASSETHELPER getGroupAtIndex:nIndex] valueForProperty:ALAssetsGroupPropertyName] forKey:@"DO_SELECTED_ALBUM"]; + [defaults synchronize]; NSLog(@"[[ASSETHELPER getGroupAtIndex:nIndex] valueForProperty:ALAssetsGroupPropertyName] : %@", [[ASSETHELPER getGroupAtIndex:nIndex] valueForProperty:ALAssetsGroupPropertyName]); } @@ -572,7 +588,7 @@ - (void)saveSelectedGroup:(NSInteger)nIndex - (NSString *)loadSelectedGroup { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - + NSLog(@"---------> %@", [defaults objectForKey:@"DO_SELECTED_ALBUM"]); return [defaults objectForKey:@"DO_SELECTED_ALBUM"]; @@ -591,6 +607,33 @@ - (NSInteger)getSelectedGroupIndex:(NSArray *)aGroups return -1; } +#pragma mark - static branding + +static UIColor *_menuBackColor; +static UIColor *_sideButtonColor; +static UIColor *_albumNameSelectedTextColor; +static UIColor *_albumNameUnselectedTextColor; +static UIColor *_albumCountTextColor; +static UIColor *_bottomTextColor; + ++ (UIColor *)menuBackColor { @synchronized(self) { return _menuBackColor ? _menuBackColor : DO_MENU_BACK_COLOR; } } ++ (void)setMenuBackColor:(UIColor *)color { @synchronized(self) { _menuBackColor = color; } } + ++ (UIColor *)sideButtonColor { @synchronized(self) { return _sideButtonColor ? _sideButtonColor : DO_SIDE_BUTTON_COLOR; } } ++ (void)setSideButtonColor:(UIColor *)color { @synchronized(self) { _sideButtonColor = color; } } + ++ (UIColor *)albumNameSelectedTextColor { @synchronized(self) { return _albumNameSelectedTextColor ? _albumNameSelectedTextColor : DO_ALBUM_NAME_TEXT_COLOR; } } ++ (void)setAlbumNameSelectedTextColor:(UIColor *)color { @synchronized(self) { _albumNameSelectedTextColor = color; } } + ++ (UIColor *)albumNameUnselectedTextColor { @synchronized(self) { return _albumNameUnselectedTextColor ? _albumNameUnselectedTextColor : DO_ALBUM_NAME_TEXT_COLOR; } } ++ (void)setAlbumNameUnselectedTextColor:(UIColor *)color { @synchronized(self) { _albumNameUnselectedTextColor = color; } } + ++ (UIColor *)albumCountTextColor { @synchronized(self) { return _albumCountTextColor ? _albumCountTextColor : DO_ALBUM_COUNT_TEXT_COLOR; } } ++ (void)setAlbumCountTextColor:(UIColor *)color { @synchronized(self) { _albumCountTextColor = color; } } + ++ (UIColor *)bottomTextColor { @synchronized(self) { return _bottomTextColor ? _bottomTextColor : DO_BOTTOM_TEXT_COLOR; } } ++ (void)setBottomTextColor:(UIColor *)color { @synchronized(self) { _bottomTextColor = color; } } + #pragma mark - Others - (void)didReceiveMemoryWarning { diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.xib b/ImagePicker/DoImagePicker/DoImagePickerController.xib index 7480eb9..c722918 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.xib +++ b/ImagePicker/DoImagePicker/DoImagePickerController.xib @@ -1,7 +1,8 @@ - + - + + @@ -127,7 +128,7 @@ - + @@ -139,7 +140,6 @@ - diff --git a/ImagePicker/DoImagePicker/DoPhotoCell.xib b/ImagePicker/DoImagePicker/DoPhotoCell.xib index 45f133a..3830627 100644 --- a/ImagePicker/DoImagePicker/DoPhotoCell.xib +++ b/ImagePicker/DoImagePicker/DoPhotoCell.xib @@ -1,12 +1,13 @@ - + - + + - + diff --git a/ImagePicker/ImagePicker-Info.plist b/ImagePicker/DoImagePickerController-Info.plist similarity index 96% rename from ImagePicker/ImagePicker-Info.plist rename to ImagePicker/DoImagePickerController-Info.plist index cae8184..72084aa 100644 --- a/ImagePicker/ImagePicker-Info.plist +++ b/ImagePicker/DoImagePickerController-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 1.6 CFBundleSignature ???? CFBundleVersion - 1.0 + 1.6 LSRequiresIPhoneOS UIMainStoryboardFile diff --git a/ImagePicker/ImagePicker-Prefix.pch b/ImagePicker/DoImagePickerController-Prefix.pch similarity index 100% rename from ImagePicker/ImagePicker-Prefix.pch rename to ImagePicker/DoImagePickerController-Prefix.pch diff --git a/ImagePicker/Images.xcassets/AppIcon.appiconset/Contents.json b/ImagePicker/Images.xcassets/AppIcon.appiconset/Contents.json index a396706..118c98f 100644 --- a/ImagePicker/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ImagePicker/Images.xcassets/AppIcon.appiconset/Contents.json @@ -5,15 +5,30 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "60x60", "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" } ], "info" : { diff --git a/ImagePickerTests/ImagePickerTests-Info.plist b/ImagePickerTests/DoImagePickerControllerTests-Info.plist similarity index 100% rename from ImagePickerTests/ImagePickerTests-Info.plist rename to ImagePickerTests/DoImagePickerControllerTests-Info.plist