home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-11 05:45:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix request friend view

Browse Source
This commit is contained in:
kevinzhow
2015-11-02 02:08:17 +08:00
parent ca68d89738
commit fcf32e8306
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Views/FriendRequest/FriendRequestView.swift
+4 -3
View File
@@ -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
}()
Yep/en.lproj/Localizable.strings
+1 -1
View File
@@ -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";
Yep/zh-Hans.lproj/Localizable.strings
+1 -1
View File
@@ -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" = "输入文字";