From b7d295bd94fcecbf2ebf7eddbad588eacd49c0e0 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Fri, 6 Nov 2015 13:36:28 +0800 Subject: [PATCH] make sure SocialAccount use the same disabledColor --- Yep/ViewControllers/Profile/ProfileViewController.swift | 2 ++ .../ProfileSocialAccountGithubCell.swift | 5 +++-- .../ProfileSocialAccountImagesCell.swift | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift index a7c0e49b..1a3f6dbd 100644 --- a/Yep/ViewControllers/Profile/ProfileViewController.swift +++ b/Yep/ViewControllers/Profile/ProfileViewController.swift @@ -49,6 +49,8 @@ enum SocialAccount: String, CustomStringConvertible { return UIColor(red:0.15, green:0.36, blue:0.54, alpha:1) } } + + static let disabledColor: UIColor = UIColor.lightGrayColor() var iconName: String { diff --git a/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountGithubCell.swift b/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountGithubCell.swift index 4a586d42..2c38d47b 100644 --- a/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountGithubCell.swift +++ b/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountGithubCell.swift @@ -44,6 +44,7 @@ class ProfileSocialAccountGithubCell: UICollectionViewCell { override func awakeFromNib() { super.awakeFromNib() + reposImageView.tintColor = UIColor.darkGrayColor() starsImageView.tintColor = UIColor.darkGrayColor() @@ -81,8 +82,8 @@ class ProfileSocialAccountGithubCell: UICollectionViewCell { iconImageView.image = UIImage(named: socialAccount.iconName) nameLabel.text = socialAccount.description - iconImageView.tintColor = UIColor.grayColor() - nameLabel.textColor = UIColor.grayColor() + iconImageView.tintColor = SocialAccount.disabledColor + nameLabel.textColor = SocialAccount.disabledColor var accountEnabled = false diff --git a/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountImagesCell.swift b/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountImagesCell.swift index 0c66eb2f..37e928c0 100644 --- a/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountImagesCell.swift +++ b/Yep/Views/Cells/ProfileSocialAccount/ProfileSocialAccountImagesCell.swift @@ -129,8 +129,8 @@ class ProfileSocialAccountImagesCell: UICollectionViewCell { iconImageView.image = UIImage(named: socialAccount.iconName) nameLabel.text = socialAccount.description - iconImageView.tintColor = UIColor.lightGrayColor() - nameLabel.textColor = UIColor.lightGrayColor() + iconImageView.tintColor = SocialAccount.disabledColor + nameLabel.textColor = SocialAccount.disabledColor var accountEnabled = false