Merge remote-tracking branch 'origin/feature/sync_social_works' into feature/sync_social_works

This commit is contained in:
nixzhu
2015-11-20 16:57:00 +08:00
3 changed files with 16 additions and 8 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ DEPENDENCIES:
EXTERNAL SOURCES:
MZFayeClient:
:path: ../CatchLib-iOS/MZFayeClient/
:path: "../CatchLib-iOS/MZFayeClient/"
SPEC CHECKSUMS:
1PasswordExtension: 9f471645d378283cb88c6d4bf502e4381a42c0ad
+14 -6
View File
@@ -101,13 +101,21 @@ extension UIColor {
class func yepCellAccessoryImageViewTintColor() -> UIColor {
return UIColor.lightGrayColor()
}
class func isLightColor(color: UIColor) -> Bool{
var white: CGFloat = 0.0
color.getWhite(&white, alpha: nil)
if white >= 0.9 { return true }
else { return false }
}
var yep_inverseColor: UIColor {
var red: CGFloat = 0
var green: CGFloat = 0
var blue: CGFloat = 0
var alpha: CGFloat = 0
getRed(&red, green: &green, blue: &blue, alpha: &alpha)
return UIColor(red: 1 - red, green: 1 - green, blue: 1 - blue, alpha: alpha)
if UIColor.isLightColor(self) {
return UIColor.blackColor()
} else {
return UIColor.whiteColor()
}
}
}
+1 -1
View File
@@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>178</string>
<string>181</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>