From fcf32e83061d4eaf63ce366ec95b4b10f5df5ca3 Mon Sep 17 00:00:00 2001 From: kevinzhow Date: Mon, 2 Nov 2015 02:08:17 +0800 Subject: [PATCH] Fix request friend view --- Yep/Views/FriendRequest/FriendRequestView.swift | 7 ++++--- Yep/en.lproj/Localizable.strings | 2 +- Yep/zh-Hans.lproj/Localizable.strings | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Yep/Views/FriendRequest/FriendRequestView.swift b/Yep/Views/FriendRequest/FriendRequestView.swift index 16b081ce..c7cfdd15 100644 --- a/Yep/Views/FriendRequest/FriendRequestView.swift +++ b/Yep/Views/FriendRequest/FriendRequestView.swift @@ -10,7 +10,7 @@ import UIKit class FriendRequestView: UIView { - static let height: CGFloat = 80 + static let height: CGFloat = 60 enum State { case Add(prompt: String) @@ -88,7 +88,7 @@ class FriendRequestView: UIView { let button = UIButton() button.setContentHuggingPriority(300, forAxis: UILayoutConstraintAxis.Horizontal) //button.setContentCompressionResistancePriority(300, forAxis: UILayoutConstraintAxis.Horizontal) - button.contentEdgeInsets = UIEdgeInsets(top: 10, left: 15, bottom: 10, right: 15) + button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 15, bottom: 5, right: 15) button.setTitleColor(UIColor.whiteColor(), forState: .Normal) button.setTitleColor(UIColor.grayColor(), forState: .Highlighted) button.setTitleColor(UIColor.lightGrayColor(), forState: .Disabled) @@ -115,7 +115,8 @@ class FriendRequestView: UIView { lazy var rejectButton: UIButton = { let button = self.baseButton() button.setTitle(NSLocalizedString("Reject", comment: ""), forState: .Normal) - button.backgroundColor = UIColor.redColor() + button.backgroundColor = UIColor(red: 230/255.0, green: 230/255.0, blue: 230/255.0, alpha: 1.0) + button.setTitleColor(UIColor.darkGrayColor(), forState: UIControlState.Normal) button.addTarget(self, action: "tryRejectAction", forControlEvents: .TouchUpInside) return button }() diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings index bc0413da..4784d749 100644 --- a/Yep/en.lproj/Localizable.strings +++ b/Yep/en.lproj/Localizable.strings @@ -462,7 +462,7 @@ "terms" = "terms"; /* No comment provided by engineer. */ -"try add you as friend." = "try add you as friend."; +"try add you as friend." = "is not your friend"; /* No comment provided by engineer. */ "typing" = "typing"; diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings index 9bafba26..ccf12cc3 100644 --- a/Yep/zh-Hans.lproj/Localizable.strings +++ b/Yep/zh-Hans.lproj/Localizable.strings @@ -458,7 +458,7 @@ "terms" = "条款"; /* No comment provided by engineer. */ -"try add you as friend." = "想添加您为好友。"; +"try add you as friend." = "对方不是好友"; /* No comment provided by engineer. */ "typing" = "输入文字";