From c7b3f9e5b74b622edd3c48834cd9c2a38e3ba435 Mon Sep 17 00:00:00 2001 From: kevinzhow Date: Thu, 19 Nov 2015 16:05:06 +0800 Subject: [PATCH 1/3] Update --- Podfile.lock | 2 +- Yep/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index a5c3009f..00d4598a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -53,7 +53,7 @@ DEPENDENCIES: EXTERNAL SOURCES: MZFayeClient: - :path: ../CatchLib-iOS/MZFayeClient/ + :path: "../CatchLib-iOS/MZFayeClient/" SPEC CHECKSUMS: 1PasswordExtension: 9f471645d378283cb88c6d4bf502e4381a42c0ad diff --git a/Yep/Info.plist b/Yep/Info.plist index 7b25c828..f1e137c4 100644 --- a/Yep/Info.plist +++ b/Yep/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 178 + 180 Fabric APIKey From cf0a8f1b492752b4acec7b377fe78968353fbeab Mon Sep 17 00:00:00 2001 From: kevinzhow Date: Fri, 20 Nov 2015 05:42:32 +0800 Subject: [PATCH 2/3] Update version --- Yep/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yep/Info.plist b/Yep/Info.plist index f1e137c4..1a4e94cc 100644 --- a/Yep/Info.plist +++ b/Yep/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 180 + 181 Fabric APIKey From b670ada98549ba5c025a4ad875b4e7d12e5e2df4 Mon Sep 17 00:00:00 2001 From: kevinzhow Date: Fri, 20 Nov 2015 14:29:54 +0800 Subject: [PATCH 3/3] Use only black or white --- Yep/Extensions/UIColor+Yep.swift | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Yep/Extensions/UIColor+Yep.swift b/Yep/Extensions/UIColor+Yep.swift index e61b9444..b6c2f86f 100644 --- a/Yep/Extensions/UIColor+Yep.swift +++ b/Yep/Extensions/UIColor+Yep.swift @@ -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() + } } }