Skip to content

add spec file in project #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ljlin wants to merge 12 commits into
base: master
Choose a base branch
from
Open

add spec file in project #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
330a7fd
add podspec file
ljlin May 17, 2014
4ea87f9
spec
ljlin May 17, 2014
f0ce8d9
add xib in resources
ljlin May 17, 2014
f30ab63
move xib file
ljlin May 17, 2014
3fdebf3
no public setting
ljlin May 17, 2014
c707548
move xib back
ljlin May 17, 2014
3e97956
移动xib文件
ljlin May 20, 2014
04c06d1
move xib to resource
ljlin May 20, 2014
ac90165
Merge branch 'master_rollback'
ljlin May 20, 2014
a3f1e13
把蓝色改称黑色
liuyl0506 May 27, 2014
2bca456
Update DoImagePickerController.podspec
xiaoming1114 May 9, 2020
ae2f8d3
Merge pull request #1 from xiaoming1114/patch-1
ljlin May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions DoImagePickerController.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Pod::Spec.new do |s|
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'
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/Images/*.{png,xib}'
s.requires_arc = true

end
26 changes: 13 additions & 13 deletions ImagePicker.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */
Expand Down Expand Up @@ -77,15 +77,12 @@
73238D151890AAC70047DDA0 /* ImagePickerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImagePickerTests.m; sourceTree = "<group>"; };
73238D201890AD4B0047DDA0 /* DoImagePickerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoImagePickerController.h; sourceTree = "<group>"; };
73238D211890AD4B0047DDA0 /* DoImagePickerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoImagePickerController.m; sourceTree = "<group>"; };
73238D221890AD4B0047DDA0 /* DoImagePickerController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoImagePickerController.xib; sourceTree = "<group>"; };
73238D281890AF010047DDA0 /* DoAlbumCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoAlbumCell.h; sourceTree = "<group>"; };
73238D291890AF010047DDA0 /* DoAlbumCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoAlbumCell.m; sourceTree = "<group>"; };
73238D301890AF380047DDA0 /* DoAlbumCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoAlbumCell.xib; sourceTree = "<group>"; };
73238D321890C97F0047DDA0 /* AssetHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetHelper.h; sourceTree = "<group>"; };
73238D331890C97F0047DDA0 /* AssetHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssetHelper.m; sourceTree = "<group>"; };
73238D4B1890DC320047DDA0 /* DoPhotoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DoPhotoCell.h; sourceTree = "<group>"; };
73238D4C1890DC320047DDA0 /* DoPhotoCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DoPhotoCell.m; sourceTree = "<group>"; };
73238D4E1890DC4C0047DDA0 /* DoPhotoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoPhotoCell.xib; sourceTree = "<group>"; };
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 = "<group>"; };
73E1110918914C260011CBD3 /* close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "close@2x.png"; sourceTree = "<group>"; };
Expand All @@ -95,6 +92,9 @@
73E1111118915AEA0011CBD3 /* close.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = close.png; sourceTree = "<group>"; };
73E1111218915AEA0011CBD3 /* down.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = down.png; sourceTree = "<group>"; };
73E1111318915AEA0011CBD3 /* up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = up.png; sourceTree = "<group>"; };
BF577C97192BA47800E874E6 /* DoAlbumCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoAlbumCell.xib; sourceTree = "<group>"; };
BF577C98192BA47800E874E6 /* DoImagePickerController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoImagePickerController.xib; sourceTree = "<group>"; };
BF577C99192BA47800E874E6 /* DoPhotoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DoPhotoCell.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -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 = "<group>";
Expand All @@ -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 */,
Expand Down Expand Up @@ -290,7 +290,7 @@
ORGANIZATIONNAME = "Seungbo Cho";
TargetAttributes = {
73238CE61890AAC60047DDA0 = {
DevelopmentTeam = GXDY7L4VT8;
DevelopmentTeam = ZRY6W7A7K7;
};
73238D071890AAC70047DDA0 = {
TestTargetID = 73238CE61890AAC60047DDA0;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions ImagePicker/DoImagePicker/DoAlbumCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
14 changes: 9 additions & 5 deletions ImagePicker/DoImagePicker/DoImagePickerController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ImagePicker/DoImagePicker/DoImagePickerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}];
Expand Down
38 changes: 38 additions & 0 deletions Resources/Images/DoAlbumCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="fnV-fg-Jma" customClass="DoAlbumCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fnV-fg-Jma" id="tN4-1K-F2k">
<rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ed6-eU-lrq">
<rect key="frame" x="0.0" y="14" width="254" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Avenir-Medium" family="Avenir" pointSize="16"/>
<color key="textColor" red="0.94117653369999998" green="0.7254902124" blue="0.40392160420000001" alpha="1" colorSpace="deviceRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10,100" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fdn-DY-gwW">
<rect key="frame" x="262" y="15" width="58" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Avenir-Light" family="Avenir" pointSize="15"/>
<color key="textColor" red="0.96862751250000001" green="0.78431379800000001" blue="0.55686277149999996" alpha="1" colorSpace="deviceRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
<connections>
<outlet property="lbAlbumName" destination="ed6-eU-lrq" id="HcR-vk-wIj"/>
<outlet property="lbCount" destination="fdn-DY-gwW" id="Z4L-dn-HBj"/>
</connections>
</tableViewCell>
</objects>
</document>
Loading