From 23beedcfd4fbe2d8344e2897e4365ed473a29104 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 27 Nov 2014 17:09:41 +0800 Subject: [PATCH 1/7] support to iPhone 6p --- ImagePicker/DoImagePicker/DoImagePickerController.m | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.m b/ImagePicker/DoImagePicker/DoImagePickerController.m index 3b7bcde..2291f2a 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.m +++ b/ImagePicker/DoImagePicker/DoImagePickerController.m @@ -339,14 +339,8 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (_nColumnCount == 2) - return CGSizeMake(158, 158); - else if (_nColumnCount == 3) - return CGSizeMake(104, 104); - else if (_nColumnCount == 4) - return CGSizeMake(77, 77); - - return CGSizeZero; + CGFloat width = ([UIScreen mainScreen].bounds.size.width-3*_nColumnCount)/_nColumnCount; + return CGSizeMake(width, width); } - (void)scrollViewDidScroll:(UIScrollView *)scrollView From 5d3012794588932200d2934c5c5c4b93550b4052 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 27 Nov 2014 17:16:33 +0800 Subject: [PATCH 2/7] add pod spec --- DoImagePicker.podspec | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 DoImagePicker.podspec diff --git a/DoImagePicker.podspec b/DoImagePicker.podspec new file mode 100644 index 0000000..64af4a7 --- /dev/null +++ b/DoImagePicker.podspec @@ -0,0 +1,7 @@ +Pod::Spec.new do |s| + s.name = 'DoImagePicker' + s.version = '0.0.1' + s.source_files = 'ImagePicker/DoImagePicker/*.{h,m}' + s.resources = 'ImagePicker/DoImagePicker/*.xib' + s.requires_arc = true +end From eafe0202856a66fc4a5d473a746e58af29bbb755 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 27 Nov 2014 17:32:21 +0800 Subject: [PATCH 3/7] add image resouces --- DoImagePicker.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoImagePicker.podspec b/DoImagePicker.podspec index 64af4a7..164ef5f 100644 --- a/DoImagePicker.podspec +++ b/DoImagePicker.podspec @@ -2,6 +2,6 @@ Pod::Spec.new do |s| s.name = 'DoImagePicker' s.version = '0.0.1' s.source_files = 'ImagePicker/DoImagePicker/*.{h,m}' - s.resources = 'ImagePicker/DoImagePicker/*.xib' + s.resources = {'ImagePicker/DoImagePicker/*.xib','Resources/Images/*.png'} s.requires_arc = true end From 927e2b2b0d2225978104f2015a5245cb3514fd09 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 27 Nov 2014 17:35:42 +0800 Subject: [PATCH 4/7] syntax fixed --- DoImagePicker.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoImagePicker.podspec b/DoImagePicker.podspec index 164ef5f..fff701f 100644 --- a/DoImagePicker.podspec +++ b/DoImagePicker.podspec @@ -2,6 +2,6 @@ Pod::Spec.new do |s| s.name = 'DoImagePicker' s.version = '0.0.1' s.source_files = 'ImagePicker/DoImagePicker/*.{h,m}' - s.resources = {'ImagePicker/DoImagePicker/*.xib','Resources/Images/*.png'} + s.resources = {'ImagePicker/DoImagePicker/*.xib'} s.requires_arc = true end From 246dcd89b13615b79478ee34ee79bda51d3d2470 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 27 Nov 2014 17:38:55 +0800 Subject: [PATCH 5/7] syntax fixed --- DoImagePicker.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoImagePicker.podspec b/DoImagePicker.podspec index fff701f..64af4a7 100644 --- a/DoImagePicker.podspec +++ b/DoImagePicker.podspec @@ -2,6 +2,6 @@ Pod::Spec.new do |s| s.name = 'DoImagePicker' s.version = '0.0.1' s.source_files = 'ImagePicker/DoImagePicker/*.{h,m}' - s.resources = {'ImagePicker/DoImagePicker/*.xib'} + s.resources = 'ImagePicker/DoImagePicker/*.xib' s.requires_arc = true end From 4568631f17c48bc6ed551814c19bbd64c5752e17 Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Thu, 18 Dec 2014 09:48:27 +0800 Subject: [PATCH 6/7] style changed. --- ImagePicker/DoImagePicker/DoImagePickerController.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.h b/ImagePicker/DoImagePicker/DoImagePickerController.h index ded8a56..473d9a1 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.h +++ b/ImagePicker/DoImagePicker/DoImagePickerController.h @@ -10,10 +10,10 @@ #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_MENU_BACK_COLOR DO_RGBA(254, 64, 128, 0.88) +#define DO_SIDE_BUTTON_COLOR DO_RGBA(254, 64, 128, 0.8) -#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(57, 185, 238) +#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(254, 64, 128) #define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(247, 200, 142) #define DO_BOTTOM_TEXT_COLOR DO_RGB(255, 255, 255) From 191087b06b0e02a320805f58c4e36e0c76f3bdbe Mon Sep 17 00:00:00 2001 From: Nicholas Tau Date: Fri, 26 Dec 2014 16:01:49 +0800 Subject: [PATCH 7/7] style changed --- ImagePicker/DoImagePicker/DoImagePickerController.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ImagePicker/DoImagePicker/DoImagePickerController.h b/ImagePicker/DoImagePicker/DoImagePickerController.h index 473d9a1..9978b8a 100644 --- a/ImagePicker/DoImagePicker/DoImagePickerController.h +++ b/ImagePicker/DoImagePicker/DoImagePickerController.h @@ -10,10 +10,10 @@ #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(254, 64, 128, 0.88) -#define DO_SIDE_BUTTON_COLOR DO_RGBA(254, 64, 128, 0.8) +#define DO_MENU_BACK_COLOR ([UINavigationBar appearance].barTintColor)//DO_RGBA(254, 64, 128, 0.88) +#define DO_SIDE_BUTTON_COLOR ([UINavigationBar appearance].barTintColor)//DO_RGBA(254, 64, 128, 0.8) -#define DO_ALBUM_NAME_TEXT_COLOR DO_RGB(254, 64, 128) +#define DO_ALBUM_NAME_TEXT_COLOR ([UINavigationBar appearance].barTintColor) //DO_RGB(254, 64, 128) #define DO_ALBUM_COUNT_TEXT_COLOR DO_RGB(247, 200, 142) #define DO_BOTTOM_TEXT_COLOR DO_RGB(255, 255, 255)