From 330a7fdf4faeceb1b921e32e6f6099fc66af0c7a Mon Sep 17 00:00:00 2001 From: ljlin Date: Sat, 17 May 2014 10:28:18 +0800 Subject: [PATCH 01/10] add podspec file --- DoImagePickerController.podspec | 136 ++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 DoImagePickerController.podspec diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec new file mode 100644 index 0000000..3f39380 --- /dev/null +++ b/DoImagePickerController.podspec @@ -0,0 +1,136 @@ +# +# Be sure to run `pod spec lint DoImagePickerController.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # These will help people to find your library, and whilst it + # can feel like a chore to fill in it's definitely to your advantage. The + # summary should be tweet-length, and the description more in depth. + # + + s.name = "DoImagePickerController" + s.version = "0.0.1" + s.summary = "An image picker controller with single selection and multiple selection. Support to select lots photos with panning gesture." + + s.description = <<-DESC + A longer description of DoImagePickerController in Markdown format. + + * Think: Why did you write this? What is the focus? What does it do? + * CocoaPods will be using this to generate tags, and improve search results. + * Try to keep it short, snappy and to the point. + * Finally, don't worry about the indent, CocoaPods strips it! + DESC + + s.homepage = "https://github.com/ljlin/DoImagePickerController" + # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" + + + # ――― Spec License ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # Licensing your code is important. See http://choosealicense.com for more info. + # CocoaPods will detect a license file if there is a named LICENSE* + # Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'. + # + + s.license = "MIT (example)" + # s.license = { :type => "MIT", :file => "FILE_LICENSE" } + + + # ――― Author Metadata ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # Specify the authors of the library, with email addresses. Email addresses + # of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also + # accepts just a name if you'd rather not provide an email address. + # + # Specify a social_media_url where others can refer to, for example a twitter + # profile URL. + # + + s.author = { "ljlin" => "email@address.com" } + # Or just: s.author = "ljlin" + # s.authors = { "ljlin" => "email@address.com" } + # s.social_media_url = "http://twitter.com/ljlin" + + # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # If this Pod runs only on iOS or OS X, then specify the platform and + # the deployment target. You can optionally include the target after the platform. + # + + # s.platform = :ios + # s.platform = :ios, "7.0" + + # When using multiple platforms + # s.ios.deployment_target = "5.0" + # s.osx.deployment_target = "10.7" + + + # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # Specify the location from where the source should be retrieved. + # Supports git, hg, bzr, svn and HTTP. + # + + s.source = { :git => "https://github.com/ljlin/DoImagePickerController.git", :commit => "7ffcdd17dc866649f0e32e0220b64e314eee5b7e" } + + + # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # CocoaPods is smart about how it includes source code. For source files + # giving a folder will include any h, m, mm, c & cpp files. For header + # files it will include any header in the folder. + # Not including the public_header_files will make all headers public. + # + + s.source_files = "DoImagePicker", "ImagePicker/DoImagePicker/*.{h,m,xib}" + s.exclude_files = "Classes/Exclude" + + # s.public_header_files = "ImagePicker/DoImagePicker/*.h" + + + # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # A list of resources included with the Pod. These are copied into the + # target bundle with a build phase script. Anything else will be cleaned. + # You can preserve files from being cleaned, please don't preserve + # non-essential files like tests, examples and documentation. + # + + # s.resource = "icon.png" + # s.resources = "Resources/Images/*.png" + + # s.preserve_paths = "FilesToSave", "MoreFilesToSave" + + + # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # Link your library with frameworks, or libraries. Libraries do not include + # the lib prefix of their name. + # + + # s.framework = "SomeFramework" + # s.frameworks = "SomeFramework", "AnotherFramework" + + # s.library = "iconv" + # s.libraries = "iconv", "xml2" + + + # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # + # + # If your library depends on compiler flags you can set them in the xcconfig hash + # where they will only apply to your library. If you depend on other Podspecs + # you can include multiple dependencies to ensure it works. + + # s.requires_arc = true + + # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" } + # s.dependency "JSONKit", "~> 1.4" + +end From 4ea87f9c68f6b057ca4160abce7445c9cf5e9ac7 Mon Sep 17 00:00:00 2001 From: ljlin Date: Sat, 17 May 2014 11:35:43 +0800 Subject: [PATCH 02/10] spec --- DoImagePickerController.podspec | 145 +++----------------------------- 1 file changed, 11 insertions(+), 134 deletions(-) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index 3f39380..c9de268 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -1,136 +1,13 @@ -# -# Be sure to run `pod spec lint DoImagePickerController.podspec' to ensure this is a -# valid spec and to remove all comments including this before submitting the spec. -# -# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html -# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ -# - Pod::Spec.new do |s| - - # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # These will help people to find your library, and whilst it - # can feel like a chore to fill in it's definitely to your advantage. The - # summary should be tweet-length, and the description more in depth. - # - - s.name = "DoImagePickerController" - s.version = "0.0.1" - s.summary = "An image picker controller with single selection and multiple selection. Support to select lots photos with panning gesture." - - s.description = <<-DESC - A longer description of DoImagePickerController in Markdown format. - - * Think: Why did you write this? What is the focus? What does it do? - * CocoaPods will be using this to generate tags, and improve search results. - * Try to keep it short, snappy and to the point. - * Finally, don't worry about the indent, CocoaPods strips it! - DESC - - s.homepage = "https://github.com/ljlin/DoImagePickerController" - # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" - - - # ――― Spec License ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # Licensing your code is important. See http://choosealicense.com for more info. - # CocoaPods will detect a license file if there is a named LICENSE* - # Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'. - # - - s.license = "MIT (example)" - # s.license = { :type => "MIT", :file => "FILE_LICENSE" } - - - # ――― Author Metadata ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # Specify the authors of the library, with email addresses. Email addresses - # of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also - # accepts just a name if you'd rather not provide an email address. - # - # Specify a social_media_url where others can refer to, for example a twitter - # profile URL. - # - - s.author = { "ljlin" => "email@address.com" } - # Or just: s.author = "ljlin" - # s.authors = { "ljlin" => "email@address.com" } - # s.social_media_url = "http://twitter.com/ljlin" - - # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # If this Pod runs only on iOS or OS X, then specify the platform and - # the deployment target. You can optionally include the target after the platform. - # - - # s.platform = :ios - # s.platform = :ios, "7.0" - - # When using multiple platforms - # s.ios.deployment_target = "5.0" - # s.osx.deployment_target = "10.7" - - - # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # Specify the location from where the source should be retrieved. - # Supports git, hg, bzr, svn and HTTP. - # - - s.source = { :git => "https://github.com/ljlin/DoImagePickerController.git", :commit => "7ffcdd17dc866649f0e32e0220b64e314eee5b7e" } - - - # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # CocoaPods is smart about how it includes source code. For source files - # giving a folder will include any h, m, mm, c & cpp files. For header - # files it will include any header in the folder. - # Not including the public_header_files will make all headers public. - # - - s.source_files = "DoImagePicker", "ImagePicker/DoImagePicker/*.{h,m,xib}" - s.exclude_files = "Classes/Exclude" - - # s.public_header_files = "ImagePicker/DoImagePicker/*.h" - - - # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # A list of resources included with the Pod. These are copied into the - # target bundle with a build phase script. Anything else will be cleaned. - # You can preserve files from being cleaned, please don't preserve - # non-essential files like tests, examples and documentation. - # - - # s.resource = "icon.png" - # s.resources = "Resources/Images/*.png" - - # s.preserve_paths = "FilesToSave", "MoreFilesToSave" - - - # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # Link your library with frameworks, or libraries. Libraries do not include - # the lib prefix of their name. - # - - # s.framework = "SomeFramework" - # s.frameworks = "SomeFramework", "AnotherFramework" - - # s.library = "iconv" - # s.libraries = "iconv", "xml2" - - - # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - # - # If your library depends on compiler flags you can set them in the xcconfig hash - # where they will only apply to your library. If you depend on other Podspecs - # you can include multiple dependencies to ensure it works. - - # s.requires_arc = true - - # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" } - # s.dependency "JSONKit", "~> 1.4" - + s.name = 'DoImagePickerController' + s.version = '0.0.1' + 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/donobono/DoImagePickerController' + s.license = 'MIT (example)' + s.author = { 'donobono' => 'email@address.com' } + s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } + s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m,xib}' + s.public_header_files = 'ImagePicker/DoImagePicker/*.h' + s.resources = 'Resources/Images/*.png' + s.requires_arc = true end From f0ce8d967cad62f888494185ad900b89b8445628 Mon Sep 17 00:00:00 2001 From: ljlin Date: Sat, 17 May 2014 12:15:21 +0800 Subject: [PATCH 03/10] add xib in resources --- DoImagePickerController.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index c9de268..76e475b 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -6,8 +6,8 @@ Pod::Spec.new do |s| s.license = 'MIT (example)' s.author = { 'donobono' => 'email@address.com' } s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } - s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m,xib}' + s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m}' s.public_header_files = 'ImagePicker/DoImagePicker/*.h' - s.resources = 'Resources/Images/*.png' + s.resources = 'Resources/*' s.requires_arc = true end From f30ab63af259ee20b21557740742a7b6b07bf150 Mon Sep 17 00:00:00 2001 From: ljlin Date: Sat, 17 May 2014 12:17:58 +0800 Subject: [PATCH 04/10] move xib file --- {ImagePicker/DoImagePicker => Resources}/DoAlbumCell.xib | 0 .../DoImagePicker => Resources}/DoImagePickerController.xib | 0 {ImagePicker/DoImagePicker => Resources}/DoPhotoCell.xib | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {ImagePicker/DoImagePicker => Resources}/DoAlbumCell.xib (100%) rename {ImagePicker/DoImagePicker => Resources}/DoImagePickerController.xib (100%) rename {ImagePicker/DoImagePicker => Resources}/DoPhotoCell.xib (100%) diff --git a/ImagePicker/DoImagePicker/DoAlbumCell.xib b/Resources/DoAlbumCell.xib similarity index 100% rename from ImagePicker/DoImagePicker/DoAlbumCell.xib rename to Resources/DoAlbumCell.xib diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.xib b/Resources/DoImagePickerController.xib similarity index 100% rename from ImagePicker/DoImagePicker/DoImagePickerController.xib rename to Resources/DoImagePickerController.xib diff --git a/ImagePicker/DoImagePicker/DoPhotoCell.xib b/Resources/DoPhotoCell.xib similarity index 100% rename from ImagePicker/DoImagePicker/DoPhotoCell.xib rename to Resources/DoPhotoCell.xib From 3fdebf34f2a076a12c8aefb459e7afe528c1b69c Mon Sep 17 00:00:00 2001 From: ljlin Date: Sun, 18 May 2014 01:16:56 +0800 Subject: [PATCH 05/10] no public setting --- DoImagePickerController.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index 76e475b..0f72952 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.author = { 'donobono' => 'email@address.com' } s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m}' - s.public_header_files = 'ImagePicker/DoImagePicker/*.h' s.resources = 'Resources/*' s.requires_arc = true + end From c70754848c2c5858e8eac7848dd3388877c72d84 Mon Sep 17 00:00:00 2001 From: ljlin Date: Sun, 18 May 2014 01:48:04 +0800 Subject: [PATCH 06/10] move xib back --- DoImagePickerController.podspec | 4 ++-- {Resources => ImagePicker}/DoAlbumCell.xib | 0 {Resources => ImagePicker}/DoImagePickerController.xib | 0 {Resources => ImagePicker}/DoPhotoCell.xib | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {Resources => ImagePicker}/DoAlbumCell.xib (100%) rename {Resources => ImagePicker}/DoImagePickerController.xib (100%) rename {Resources => ImagePicker}/DoPhotoCell.xib (100%) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index 0f72952..b579f05 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -6,8 +6,8 @@ Pod::Spec.new do |s| s.license = 'MIT (example)' s.author = { 'donobono' => 'email@address.com' } s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } - s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m}' - s.resources = 'Resources/*' + s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m,xib}' + s.resources = 'Resources/Images/*.png' s.requires_arc = true end diff --git a/Resources/DoAlbumCell.xib b/ImagePicker/DoAlbumCell.xib similarity index 100% rename from Resources/DoAlbumCell.xib rename to ImagePicker/DoAlbumCell.xib diff --git a/Resources/DoImagePickerController.xib b/ImagePicker/DoImagePickerController.xib similarity index 100% rename from Resources/DoImagePickerController.xib rename to ImagePicker/DoImagePickerController.xib diff --git a/Resources/DoPhotoCell.xib b/ImagePicker/DoPhotoCell.xib similarity index 100% rename from Resources/DoPhotoCell.xib rename to ImagePicker/DoPhotoCell.xib From 3e9795687e728e8e1b931cfa0d9a7541992a692b Mon Sep 17 00:00:00 2001 From: ljlin Date: Tue, 20 May 2014 22:43:34 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=A7=BB=E5=8A=A8xib=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ImagePicker/{ => DoImagePicker}/DoAlbumCell.xib | 0 ImagePicker/{ => DoImagePicker}/DoImagePickerController.xib | 0 ImagePicker/{ => DoImagePicker}/DoPhotoCell.xib | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename ImagePicker/{ => DoImagePicker}/DoAlbumCell.xib (100%) rename ImagePicker/{ => DoImagePicker}/DoImagePickerController.xib (100%) rename ImagePicker/{ => DoImagePicker}/DoPhotoCell.xib (100%) diff --git a/ImagePicker/DoAlbumCell.xib b/ImagePicker/DoImagePicker/DoAlbumCell.xib similarity index 100% rename from ImagePicker/DoAlbumCell.xib rename to ImagePicker/DoImagePicker/DoAlbumCell.xib diff --git a/ImagePicker/DoImagePickerController.xib b/ImagePicker/DoImagePicker/DoImagePickerController.xib similarity index 100% rename from ImagePicker/DoImagePickerController.xib rename to ImagePicker/DoImagePicker/DoImagePickerController.xib diff --git a/ImagePicker/DoPhotoCell.xib b/ImagePicker/DoImagePicker/DoPhotoCell.xib similarity index 100% rename from ImagePicker/DoPhotoCell.xib rename to ImagePicker/DoImagePicker/DoPhotoCell.xib From 04c06d1fdf7e3de7a7ce8f02adc3e1ef27eb56c8 Mon Sep 17 00:00:00 2001 From: ljlin Date: Tue, 20 May 2014 22:58:05 +0800 Subject: [PATCH 08/10] move xib to resource --- DoImagePickerController.podspec | 4 ++-- ImagePicker.xcodeproj/project.pbxproj | 24 +++++++++---------- .../Images}/DoAlbumCell.xib | 0 .../Images}/DoImagePickerController.xib | 0 .../Images}/DoPhotoCell.xib | 0 5 files changed, 14 insertions(+), 14 deletions(-) rename {ImagePicker => Resources/Images}/DoAlbumCell.xib (100%) rename {ImagePicker => Resources/Images}/DoImagePickerController.xib (100%) rename {ImagePicker => Resources/Images}/DoPhotoCell.xib (100%) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index b579f05..3e0b696 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -6,8 +6,8 @@ Pod::Spec.new do |s| s.license = 'MIT (example)' s.author = { 'donobono' => 'email@address.com' } s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } - s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m,xib}' - s.resources = 'Resources/Images/*.png' + s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m}' + s.resources = 'Resources/Images/*.{png,xib}' s.requires_arc = true end diff --git a/ImagePicker.xcodeproj/project.pbxproj b/ImagePicker.xcodeproj/project.pbxproj index 929e42b..4dc37c6 100644 --- a/ImagePicker.xcodeproj/project.pbxproj +++ b/ImagePicker.xcodeproj/project.pbxproj @@ -25,12 +25,9 @@ 73238D141890AAC70047DDA0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 73238D121890AAC70047DDA0 /* InfoPlist.strings */; }; 73238D161890AAC70047DDA0 /* ImagePickerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 73238D151890AAC70047DDA0 /* ImagePickerTests.m */; }; 73238D231890AD4B0047DDA0 /* DoImagePickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 73238D211890AD4B0047DDA0 /* DoImagePickerController.m */; }; - 73238D241890AD4B0047DDA0 /* DoImagePickerController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 73238D221890AD4B0047DDA0 /* DoImagePickerController.xib */; }; 73238D2A1890AF010047DDA0 /* DoAlbumCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 73238D291890AF010047DDA0 /* DoAlbumCell.m */; }; - 73238D311890AF380047DDA0 /* DoAlbumCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 73238D301890AF380047DDA0 /* DoAlbumCell.xib */; }; 73238D341890C97F0047DDA0 /* AssetHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 73238D331890C97F0047DDA0 /* AssetHelper.m */; }; 73238D4D1890DC320047DDA0 /* DoPhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 73238D4C1890DC320047DDA0 /* DoPhotoCell.m */; }; - 73238D4F1890DC4C0047DDA0 /* DoPhotoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 73238D4E1890DC4C0047DDA0 /* DoPhotoCell.xib */; }; 73C76E3518A109A8001C60EB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 73C76E3418A109A8001C60EB /* README.md */; }; 73E1110C18914C260011CBD3 /* check@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E1110818914C260011CBD3 /* check@2x.png */; }; 73E1110D18914C260011CBD3 /* close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E1110918914C260011CBD3 /* close@2x.png */; }; @@ -40,6 +37,9 @@ 73E1111518915AEA0011CBD3 /* close.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E1111118915AEA0011CBD3 /* close.png */; }; 73E1111618915AEA0011CBD3 /* down.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E1111218915AEA0011CBD3 /* down.png */; }; 73E1111718915AEA0011CBD3 /* up.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E1111318915AEA0011CBD3 /* up.png */; }; + BF577C9A192BA47800E874E6 /* DoAlbumCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF577C97192BA47800E874E6 /* DoAlbumCell.xib */; }; + BF577C9B192BA47800E874E6 /* DoImagePickerController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF577C98192BA47800E874E6 /* DoImagePickerController.xib */; }; + BF577C9C192BA47800E874E6 /* DoPhotoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF577C99192BA47800E874E6 /* DoPhotoCell.xib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -77,15 +77,12 @@ 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 = ""; }; 73238D211890AD4B0047DDA0 /* DoImagePickerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoImagePickerController.m; sourceTree = ""; }; - 73238D221890AD4B0047DDA0 /* DoImagePickerController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoImagePickerController.xib; sourceTree = ""; }; 73238D281890AF010047DDA0 /* DoAlbumCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoAlbumCell.h; sourceTree = ""; }; 73238D291890AF010047DDA0 /* DoAlbumCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoAlbumCell.m; sourceTree = ""; }; - 73238D301890AF380047DDA0 /* DoAlbumCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoAlbumCell.xib; sourceTree = ""; }; 73238D321890C97F0047DDA0 /* AssetHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetHelper.h; sourceTree = ""; }; 73238D331890C97F0047DDA0 /* AssetHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssetHelper.m; sourceTree = ""; }; 73238D4B1890DC320047DDA0 /* DoPhotoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoPhotoCell.h; sourceTree = ""; }; 73238D4C1890DC320047DDA0 /* DoPhotoCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoPhotoCell.m; sourceTree = ""; }; - 73238D4E1890DC4C0047DDA0 /* DoPhotoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoPhotoCell.xib; sourceTree = ""; }; 73C76E3418A109A8001C60EB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = SOURCE_ROOT; }; 73E1110818914C260011CBD3 /* check@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "check@2x.png"; sourceTree = ""; }; 73E1110918914C260011CBD3 /* close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close@2x.png"; sourceTree = ""; }; @@ -95,6 +92,9 @@ 73E1111118915AEA0011CBD3 /* close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = close.png; sourceTree = ""; }; 73E1111218915AEA0011CBD3 /* down.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = down.png; sourceTree = ""; }; 73E1111318915AEA0011CBD3 /* up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = up.png; sourceTree = ""; }; + BF577C97192BA47800E874E6 /* DoAlbumCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoAlbumCell.xib; sourceTree = ""; }; + BF577C98192BA47800E874E6 /* DoImagePickerController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoImagePickerController.xib; sourceTree = ""; }; + BF577C99192BA47800E874E6 /* DoPhotoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoPhotoCell.xib; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -204,13 +204,10 @@ 73238D331890C97F0047DDA0 /* AssetHelper.m */, 73238D201890AD4B0047DDA0 /* DoImagePickerController.h */, 73238D211890AD4B0047DDA0 /* DoImagePickerController.m */, - 73238D221890AD4B0047DDA0 /* DoImagePickerController.xib */, 73238D281890AF010047DDA0 /* DoAlbumCell.h */, 73238D291890AF010047DDA0 /* DoAlbumCell.m */, - 73238D301890AF380047DDA0 /* DoAlbumCell.xib */, 73238D4B1890DC320047DDA0 /* DoPhotoCell.h */, 73238D4C1890DC320047DDA0 /* DoPhotoCell.m */, - 73238D4E1890DC4C0047DDA0 /* DoPhotoCell.xib */, ); path = DoImagePicker; sourceTree = ""; @@ -226,6 +223,9 @@ 73E1110718914C260011CBD3 /* Images */ = { isa = PBXGroup; children = ( + BF577C97192BA47800E874E6 /* DoAlbumCell.xib */, + BF577C98192BA47800E874E6 /* DoImagePickerController.xib */, + BF577C99192BA47800E874E6 /* DoPhotoCell.xib */, 731D67C918A087A5002BAEF6 /* line@2x.png */, 731D67CC18A0D066002BAEF6 /* show.png */, 731D67CD18A0D066002BAEF6 /* show@2x.png */, @@ -322,22 +322,22 @@ buildActionMask = 2147483647; files = ( 73E1111718915AEA0011CBD3 /* up.png in Resources */, - 73238D311890AF380047DDA0 /* DoAlbumCell.xib in Resources */, - 73238D241890AD4B0047DDA0 /* DoImagePickerController.xib in Resources */, 73238D031890AAC70047DDA0 /* Images.xcassets in Resources */, 73E1111618915AEA0011CBD3 /* down.png in Resources */, 73E1110F18914C260011CBD3 /* up@2x.png in Resources */, + BF577C9A192BA47800E874E6 /* DoAlbumCell.xib in Resources */, 73C76E3518A109A8001C60EB /* README.md in Resources */, 73E1111418915AEA0011CBD3 /* check.png in Resources */, 73238CF51890AAC60047DDA0 /* InfoPlist.strings in Resources */, 73E1111518915AEA0011CBD3 /* close.png in Resources */, + BF577C9C192BA47800E874E6 /* DoPhotoCell.xib in Resources */, 73238CFE1890AAC60047DDA0 /* Main.storyboard in Resources */, 73E1110E18914C260011CBD3 /* down@2x.png in Resources */, 731D67CA18A087A5002BAEF6 /* line@2x.png in Resources */, 731D67CE18A0D066002BAEF6 /* show.png in Resources */, - 73238D4F1890DC4C0047DDA0 /* DoPhotoCell.xib in Resources */, 73E1110C18914C260011CBD3 /* check@2x.png in Resources */, 731D67CF18A0D066002BAEF6 /* show@2x.png in Resources */, + BF577C9B192BA47800E874E6 /* DoImagePickerController.xib in Resources */, 73E1110D18914C260011CBD3 /* close@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ImagePicker/DoAlbumCell.xib b/Resources/Images/DoAlbumCell.xib similarity index 100% rename from ImagePicker/DoAlbumCell.xib rename to Resources/Images/DoAlbumCell.xib diff --git a/ImagePicker/DoImagePickerController.xib b/Resources/Images/DoImagePickerController.xib similarity index 100% rename from ImagePicker/DoImagePickerController.xib rename to Resources/Images/DoImagePickerController.xib diff --git a/ImagePicker/DoPhotoCell.xib b/Resources/Images/DoPhotoCell.xib similarity index 100% rename from ImagePicker/DoPhotoCell.xib rename to Resources/Images/DoPhotoCell.xib From a3f1e130051fce1910019960193ca66eccd6c16f Mon Sep 17 00:00:00 2001 From: Lewis Eric Date: Tue, 27 May 2014 20:48:02 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=8A=8A=E8=93=9D=E8=89=B2=E6=94=B9?= =?UTF-8?q?=E7=A7=B0=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ImagePicker.xcodeproj/project.pbxproj | 2 +- ImagePicker/DoImagePicker/DoAlbumCell.m | 6 ++++-- .../DoImagePicker/DoImagePickerController.h | 14 +++++++++----- .../DoImagePicker/DoImagePickerController.m | 3 ++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ImagePicker.xcodeproj/project.pbxproj b/ImagePicker.xcodeproj/project.pbxproj index 4dc37c6..0752005 100644 --- a/ImagePicker.xcodeproj/project.pbxproj +++ b/ImagePicker.xcodeproj/project.pbxproj @@ -290,7 +290,7 @@ ORGANIZATIONNAME = "Seungbo Cho"; TargetAttributes = { 73238CE61890AAC60047DDA0 = { - DevelopmentTeam = GXDY7L4VT8; + DevelopmentTeam = ZRY6W7A7K7; }; 73238D071890AAC70047DDA0 = { TestTargetID = 73238CE61890AAC60047DDA0; diff --git a/ImagePicker/DoImagePicker/DoAlbumCell.m b/ImagePicker/DoImagePicker/DoAlbumCell.m index 5474ac7..6cdb9b8 100644 --- a/ImagePicker/DoImagePicker/DoAlbumCell.m +++ b/ImagePicker/DoImagePicker/DoAlbumCell.m @@ -28,14 +28,16 @@ - (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 = DO_ALBUM_NAME_TEXT_COLOR; + self.contentView.backgroundColor = DO_RGBA(0, 0, 0, 0.9); } else { _lbAlbumName.textColor = DO_ALBUM_NAME_TEXT_COLOR; _lbCount.textColor = DO_ALBUM_COUNT_TEXT_COLOR; - self.contentView.backgroundColor = [UIColor whiteColor]; + //self.contentView.backgroundColor = [UIColor whiteColor]; + self.contentView.backgroundColor = DO_RGBA(255, 255, 255, 0.9); } } diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.h b/ImagePicker/DoImagePicker/DoImagePickerController.h index ded8a56..4bb56cc 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.h +++ b/ImagePicker/DoImagePicker/DoImagePickerController.h @@ -10,11 +10,15 @@ #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_MENU_BACK_COLOR DO_RGBA(57, 185, 238, 0.98) +#define DO_MENU_BACK_COLOR DO_RGBA(0, 0, 0, 0.9) +//#define DO_SIDE_BUTTON_COLOR DO_RGBA(57, 185, 238, 0.9) +#define DO_SIDE_BUTTON_COLOR DO_RGBA(0, 0, 0, 0.9) + +//#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(57, 185, 238) +#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(0, 0, 0) +//#define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(247, 200, 142) +#define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(0, 0, 0) #define DO_BOTTOM_TEXT_COLOR DO_RGB(255, 255, 255) #define DO_PICKER_RESULT_UIIMAGE 0 diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.m b/ImagePicker/DoImagePicker/DoImagePickerController.m index 3b7bcde..fe1a3e8 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.m +++ b/ImagePicker/DoImagePicker/DoImagePickerController.m @@ -201,7 +201,8 @@ - (IBAction)onSelectAlbum:(id)sender _tvAlbumList.frame = CGRectMake(0, _vBottomMenu.frame.origin.y - _tvAlbumList.frame.size.height, _tvAlbumList.frame.size.width, _tvAlbumList.frame.size.height); - _tvAlbumList.alpha = 1.0; + //_tvAlbumList.alpha = 1.0; + _tvAlbumList.alpha = 0.7; _ivShowMark.transform = CGAffineTransformMakeRotation(M_PI); }]; From 2bca456dd7d98b232c4a8e50e9dea6820d24d873 Mon Sep 17 00:00:00 2001 From: xiaoming1114 <104156582@qq.com> Date: Sat, 9 May 2020 11:22:51 +0800 Subject: [PATCH 10/10] Update DoImagePickerController.podspec --- DoImagePickerController.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoImagePickerController.podspec b/DoImagePickerController.podspec index 3e0b696..555fffd 100644 --- a/DoImagePickerController.podspec +++ b/DoImagePickerController.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.version = '0.0.1' 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/donobono/DoImagePickerController' - s.license = 'MIT (example)' + s.license = 'MIT' s.author = { 'donobono' => 'email@address.com' } s.source = { :git => 'https://github.com/ljlin/DoImagePickerController.git', :tag => '0.0.1' } s.source_files = 'DoImagePicker', 'ImagePicker/DoImagePicker/*.{h,m}'