Skip to content

Commit f81e2d3

Browse files
wanghenghengwanghengheng
committed
FontAwesome+iOS
1 parent 14abff8 commit f81e2d3

4 files changed

Lines changed: 19 additions & 9 deletions

File tree

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>4.6.5.201710091015</string>
39+
<string>4.6.5.201710091430</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Views/Cell/ProjectItemsCell.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ - (UIButton *)itemWithFrame:(CGRect)frame icon:(NSString *)iconStr color:(NSStri
8686
UIButton *item = [[UIButton alloc] initWithFrame:frame];
8787

8888
CGFloat iconWidth = kScaleFrom_iPhone5_Desgin(46);
89-
90-
UIImage *itemImg = [UIImage imageWithIcon:iconStr backgroundColor:[UIColor clearColor] iconColor:[UIColor whiteColor] iconScale:1.0 andSize:CGSizeMake(iconWidth/2.8, iconWidth/2.8)];
89+
UIImage *itemImg = [UIImage imageWithIcon:iconStr backgroundColor:[UIColor clearColor] iconColor:[UIColor whiteColor] andSize:CGSizeMake(iconWidth/2.8, iconWidth/2.8)];
9190
UIImageView *itemImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, iconWidth, iconWidth)];
9291
itemImgView.tag = kProjectItemsCell_ItemIconTag;
9392
itemImgView.contentMode = UIViewContentModeCenter;

‎Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pod 'NYXImagesKit', '2.3'
1717
pod 'UIImage+BlurredFrame', '0.0.4'
1818
pod 'POP+MCAnimate', '2.0.1'
1919
pod 'PPiAwesomeButton', '1.5.2'
20+
pod 'FontAwesome+iOS', :git => 'https://github.com/alexdrone/ios-fontawesome'
2021
pod 'APParallaxHeader', '0.1.6'
2122
pod 'SDCAlertView', '2.5.2'
2223
pod 'MarqueeLabel', '2.5.0'

‎Podfile.lock‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PODS:
1717
- BlocksKit/DynamicDelegate
1818
- evernote-cloud-sdk-ios (2.0.2)
1919
- FLEX (2.1.1)
20-
- FontAwesome+iOS (0.1.4)
20+
- FontAwesome+iOS (0.0.1)
2121
- hpple (0.2.0)
2222
- iVersion (1.11.4)
2323
- JazzHands (2.0.0)
@@ -26,7 +26,7 @@ PODS:
2626
- MBProgressHUD (0.9)
2727
- MMMarkdown (0.3)
2828
- NYXImagesKit (2.3)
29-
- pop (1.0.9)
29+
- pop (1.0.10)
3030
- POP+MCAnimate (2.0.1):
3131
- pop (~> 1.0)
3232
- POP+MCAnimate/Animations (= 2.0.1)
@@ -78,6 +78,7 @@ DEPENDENCIES:
7878
- BlocksKit (= 2.2.5)
7979
- evernote-cloud-sdk-ios (= 2.0.2)
8080
- FLEX (~> 2.0)
81+
- FontAwesome+iOS (from `https://github.com/alexdrone/ios-fontawesome`)
8182
- hpple (= 0.2.0)
8283
- iVersion (= 1.11.4)
8384
- JazzHands (= 2.0.0)
@@ -87,7 +88,7 @@ DEPENDENCIES:
8788
- MMMarkdown (= 0.3)
8889
- NYXImagesKit (= 2.3)
8990
- POP+MCAnimate (= 2.0.1)
90-
- PPiAwesomeButton (= 1.5.2)
91+
- PPiAwesomeButton
9192
- ReactiveCocoa (= 2.3.1)
9293
- RegexKitLite-NoWarning (= 1.1.0)
9394
- SDAutoLayout (= 2.1.0)
@@ -100,12 +101,21 @@ DEPENDENCIES:
100101
- UMengAnalytics (= 3.5.10)
101102
- UMengSocial (= 4.2.3)
102103

104+
EXTERNAL SOURCES:
105+
FontAwesome+iOS:
106+
:git: https://github.com/alexdrone/ios-fontawesome
107+
108+
CHECKOUT OPTIONS:
109+
FontAwesome+iOS:
110+
:commit: 3ef4db504ffde636c1f8a5320f1e5b6183f6102c
111+
:git: https://github.com/alexdrone/ios-fontawesome
112+
103113
SPEC CHECKSUMS:
104114
APParallaxHeader: 854bc48a2487ca12c702f8a236fec0d89cdac5c3
105115
BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
106116
evernote-cloud-sdk-ios: 7a6e5402b837ea79ef0179caff5ffe7b4f235615
107117
FLEX: 27b768fcae23a313a1eb115076d429180ca9b472
108-
FontAwesome+iOS: 9070b682a9255ca0fdc34bcfb129ad0ba2b73b87
118+
FontAwesome+iOS: c6d3bbd2856b9633028d316d56133d45fb6a6cb0
109119
hpple: 3b765f96fc2cd56ad1a49aef6f7be5cb2aa64b57
110120
iVersion: 2b6ffe708672cb494ba3cab150a94800c2892e81
111121
JazzHands: 00002e9b1284e7fc1ac6555012e81b8942477242
@@ -114,7 +124,7 @@ SPEC CHECKSUMS:
114124
MBProgressHUD: d8e7ea388dc1549a42e0d219067cf5f2c898fb66
115125
MMMarkdown: 13af1af50e5f476f1097797f43ea2bd76c83067a
116126
NYXImagesKit: 8163e3335a40eaa173ca5bbbf81fafb57d3947eb
117-
pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
127+
pop: 82ca6b068ce9278fd350fd9dd09482a0ce9492e6
118128
POP+MCAnimate: a99e209148c602512de487f1160a44bf78572024
119129
PPiAwesomeButton: 16f7279582fd36f65186b24b83ef876217363eb5
120130
RBBAnimation: 4b2d66f6d993febce63cd564da934985313b9c59
@@ -131,6 +141,6 @@ SPEC CHECKSUMS:
131141
UMengAnalytics: 092c24aef47b6ac3c76ad51543f91156a8d7b645
132142
UMengSocial: 85882abe5b20aa38ad558ece71360e16b5d50909
133143

134-
PODFILE CHECKSUM: a94c62469770048a6401eeda5b117afbd57e75f0
144+
PODFILE CHECKSUM: 07a4f7debe58bcff1823b63f3147364a00a32151
135145

136146
COCOAPODS: 1.2.1

0 commit comments

Comments
 (0)