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

.Consider state UI of FriendRequestView

Browse Source
This commit is contained in:
nixzhu
2015-08-17 17:31:27 +08:00
parent df892e0c7c
commit fd3946ef5b
3 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
+4 -3
View File
@@ -756,14 +756,15 @@ func stateOfFriendRequestWithUser(user: User, #failureHandler: ((Reason, String?
if let
receivedInfo = data["received"] as? JSONDictionary,
state = data["state"] as? String {
state = receivedInfo["state"] as? String {
if let state = FriendRequest.State(rawValue: state) {
receivedFriendRequestState = state
}
}
if let
receivedInfo = data["sent"] as? JSONDictionary,
state = data["state"] as? String {
sendInfo = data["sent"] as? JSONDictionary,
state = sendInfo["state"] as? String {
if let state = FriendRequest.State(rawValue: state) {
sentFriendRequestState = state
}
Yep/ViewControllers/Conversation/ConversationViewController.swift
+3 -3
View File
@@ -680,7 +680,7 @@ class ConversationViewController: BaseViewController {
dispatch_async(dispatch_get_main_queue()) { [weak self] in
if receivedFriendRequestState == .Pending {
self?.makeFriendRequestViewWithUser(user, state: .Consider(prompt: NSLocalizedString("try add you friend.", comment: "")))
self?.makeFriendRequestViewWithUser(user, state: .Consider(prompt: NSLocalizedString("try add you as friend.", comment: "")))
} else {
if sentFriendRequestState == .None {
@@ -859,7 +859,7 @@ class ConversationViewController: BaseViewController {
let userID = user.userID
friendRequestView.action = { [weak self] friendRequestView in
friendRequestView.addAction = { [weak self] friendRequestView in
println("try Send Friend Request")
sendFriendRequestToUser(user, failureHandler: { reason, errorMessage in
@@ -875,7 +875,7 @@ class ConversationViewController: BaseViewController {
user.friendState = UserFriendState.IssuedRequest.rawValue
}
friendRequestView.actionButton.enabled = false
friendRequestView.addButton.enabled = false
friendRequestView.stateLabel.text = NSLocalizedString("waiting to be accepted.", comment: "")
}
}
Yep/Views/FriendRequest/FriendRequestView.swift
+93 -17
View File
@@ -10,7 +10,7 @@ import UIKit
class FriendRequestView: UIView {
static let height: CGFloat = 70
static let height: CGFloat = 80
enum State {
case Add(prompt: String)
@@ -51,7 +51,9 @@ class FriendRequestView: UIView {
}
}
var action: (FriendRequestView -> Void)?
var addAction: (FriendRequestView -> Void)?
var acceptAction: (FriendRequestView -> Void)?
var rejectAction: (FriendRequestView -> Void)?
lazy var avatarImageView: UIImageView = {
let imageView = UIImageView()
@@ -69,28 +71,59 @@ class FriendRequestView: UIView {
lazy var stateLabel: UILabel = {
let label = UILabel()
label.font = UIFont.systemFontOfSize(14)
//label.text = state.prompt
label.numberOfLines = 0
label.textColor = UIColor.grayColor().colorWithAlphaComponent(0.9)
return label
}()
lazy var actionButton: UIButton = {
func baseButton() -> UIButton {
let button = UIButton()
button.setTitle(NSLocalizedString("Add", comment: ""), forState: .Normal)
button.setContentHuggingPriority(300, forAxis: UILayoutConstraintAxis.Horizontal)
//button.setContentCompressionResistancePriority(300, forAxis: UILayoutConstraintAxis.Horizontal)
button.contentEdgeInsets = UIEdgeInsets(top: 10, left: 15, bottom: 10, right: 15)
button.backgroundColor = UIColor.yepTintColor()
button.setTitleColor(UIColor.whiteColor(), forState: .Normal)
button.setTitleColor(UIColor.grayColor(), forState: .Highlighted)
button.setTitleColor(UIColor.lightGrayColor(), forState: .Disabled)
button.layer.cornerRadius = 5
button.addTarget(self, action: "tryAction", forControlEvents: .TouchUpInside)
return button
}
lazy var addButton: UIButton = {
let button = self.baseButton()
button.setTitle(NSLocalizedString("Add", comment: ""), forState: .Normal)
button.backgroundColor = UIColor.yepTintColor()
button.addTarget(self, action: "tryAddAction", forControlEvents: .TouchUpInside)
return button
}()
lazy var acceptButton: UIButton = {
let button = self.baseButton()
button.setTitle(NSLocalizedString("Accept", comment: ""), forState: .Normal)
button.backgroundColor = UIColor.yepTintColor()
button.addTarget(self, action: "tryAcceptAction", forControlEvents: .TouchUpInside)
return button
}()
lazy var rejectButton: UIButton = {
let button = self.baseButton()
button.setTitle(NSLocalizedString("Reject", comment: ""), forState: .Normal)
button.backgroundColor = UIColor.redColor()
button.addTarget(self, action: "tryRejectAction", forControlEvents: .TouchUpInside)
return button
}()
// MARK: Actions
func tryAction() {
action?(self)
func tryAddAction() {
addAction?(self)
}
func tryAcceptAction() {
acceptAction?(self)
}
func tryRejectAction() {
rejectAction?(self)
}
// MARK: UI
@@ -150,8 +183,6 @@ class FriendRequestView: UIView {
stateLabel.setTranslatesAutoresizingMaskIntoConstraints(false)
containerView.addSubview(stateLabel)
actionButton.setTranslatesAutoresizingMaskIntoConstraints(false)
containerView.addSubview(actionButton)
let viewsDictionary = [
"visualEffectView": visualEffectView,
@@ -192,17 +223,62 @@ class FriendRequestView: UIView {
// stateLabel
let stateLabelBottom = NSLayoutConstraint(item: stateLabel, attribute: .Bottom, relatedBy: .Equal, toItem: avatarImageView, attribute: .Bottom, multiplier: 1, constant: 0)
let stateLabelTop = NSLayoutConstraint(item: stateLabel, attribute: .Top, relatedBy: .Equal, toItem: nicknameLabel, attribute: .Bottom, multiplier: 1, constant: 0)
let stateLabelBottom = NSLayoutConstraint(item: stateLabel, attribute: .Bottom, relatedBy: .Equal, toItem: containerView, attribute: .Bottom, multiplier: 1, constant: -4)
let stateLabelLeft = NSLayoutConstraint(item: stateLabel, attribute: .Left, relatedBy: .Equal, toItem: nicknameLabel, attribute: .Left, multiplier: 1, constant: 0)
NSLayoutConstraint.activateConstraints([stateLabelBottom, stateLabelLeft])
NSLayoutConstraint.activateConstraints([stateLabelTop, stateLabelBottom, stateLabelLeft])
// actionButton
switch state {
let actionButtonTrailing = NSLayoutConstraint(item: actionButton, attribute: .Trailing, relatedBy: .Equal, toItem: containerView, attribute: .Trailing, multiplier: 1, constant: -YepConfig.chatCellGapBetweenWallAndAvatar())
let actionButtonCenterY = NSLayoutConstraint(item: actionButton, attribute: .CenterY, relatedBy: .Equal, toItem: containerView, attribute: .CenterY, multiplier: 1, constant: 0)
case .Add:
NSLayoutConstraint.activateConstraints([actionButtonTrailing, actionButtonCenterY])
// addButton
addButton.setTranslatesAutoresizingMaskIntoConstraints(false)
containerView.addSubview(addButton)
let addButtonTrailing = NSLayoutConstraint(item: addButton, attribute: .Trailing, relatedBy: .Equal, toItem: containerView, attribute: .Trailing, multiplier: 1, constant: -YepConfig.chatCellGapBetweenWallAndAvatar())
let addButtonCenterY = NSLayoutConstraint(item: addButton, attribute: .CenterY, relatedBy: .Equal, toItem: containerView, attribute: .CenterY, multiplier: 1, constant: 0)
NSLayoutConstraint.activateConstraints([addButtonTrailing, addButtonCenterY])
// labels' right
let nicknameLabelRight = NSLayoutConstraint(item: nicknameLabel, attribute: .Right, relatedBy: .Equal, toItem: addButton, attribute: .Left, multiplier: 1, constant: -8)
let stateLabelRight = NSLayoutConstraint(item: stateLabel, attribute: .Right, relatedBy: .Equal, toItem: addButton, attribute: .Left, multiplier: 1, constant: -8)
NSLayoutConstraint.activateConstraints([nicknameLabelRight, stateLabelRight])
case .Consider:
// acceptButton
acceptButton.setTranslatesAutoresizingMaskIntoConstraints(false)
containerView.addSubview(acceptButton)
let acceptButtonTrailing = NSLayoutConstraint(item: acceptButton, attribute: .Trailing, relatedBy: .Equal, toItem: containerView, attribute: .Trailing, multiplier: 1, constant: -YepConfig.chatCellGapBetweenWallAndAvatar())
let acceptButtonCenterY = NSLayoutConstraint(item: acceptButton, attribute: .CenterY, relatedBy: .Equal, toItem: containerView, attribute: .CenterY, multiplier: 1, constant: 0)
NSLayoutConstraint.activateConstraints([acceptButtonTrailing, acceptButtonCenterY])
// rejectButton
rejectButton.setTranslatesAutoresizingMaskIntoConstraints(false)
containerView.addSubview(rejectButton)
let rejectButtonRight = NSLayoutConstraint(item: rejectButton, attribute: .Right, relatedBy: .Equal, toItem: acceptButton, attribute: .Left, multiplier: 1, constant: -8)
let rejectButtonCenterY = NSLayoutConstraint(item: rejectButton, attribute: .CenterY, relatedBy: .Equal, toItem: containerView, attribute: .CenterY, multiplier: 1, constant: 0)
NSLayoutConstraint.activateConstraints([rejectButtonRight, rejectButtonCenterY])
// labels' right
let nicknameLabelRight = NSLayoutConstraint(item: nicknameLabel, attribute: .Right, relatedBy: .Equal, toItem: rejectButton, attribute: .Left, multiplier: 1, constant: -8)
let stateLabelRight = NSLayoutConstraint(item: stateLabel, attribute: .Right, relatedBy: .Equal, toItem: rejectButton, attribute: .Left, multiplier: 1, constant: -8)
NSLayoutConstraint.activateConstraints([nicknameLabelRight, stateLabelRight])
}
}
}