home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-20 18:26:34 +10:00
Code Issues Packages Projects Releases Wiki Activity

optional avatarURLString in UsernamePrefixMatchedUser

Browse Source
This commit is contained in:
nixzhu
2016-01-12 09:48:00 +08:00
parent 0b4b3e7369
commit f4d6527d2a
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
+6 -4
View File
@@ -3695,7 +3695,7 @@ struct UsernamePrefixMatchedUser {
let userID: String
let username: String
let nickname: String
let avatarURLString: String
let avatarURLString: String?
var mentionUsername: String {
return "@" + username
@@ -3709,7 +3709,7 @@ func usersMatchWithUsernamePrefix(usernamePrefix: String, failureHandler: ((Reas
]
let parse: JSONDictionary -> [UsernamePrefixMatchedUser]? = { data in
//println("usersMatchWithUsernamePrefix: \(data)")
println("usersMatchWithUsernamePrefix: \(data)")
if let usersData = data["users"] as? [JSONDictionary] {
let users: [UsernamePrefixMatchedUser] = usersData.map({ userInfo in
@@ -3717,12 +3717,14 @@ func usersMatchWithUsernamePrefix(usernamePrefix: String, failureHandler: ((Reas
userID = userInfo["id"] as? String,
username = userInfo["username"] as? String,
nickname = userInfo["nickname"] as? String,
avatarInfo = userInfo["avatar"] as? JSONDictionary,
avatarURLString = avatarInfo["thumb_url"] as? String
avatarInfo = userInfo["avatar"] as? JSONDictionary
//avatarURLString = avatarInfo["thumb_url"] as? String
else {
return nil
}
let avatarURLString = avatarInfo["thumb_url"] as? String
return UsernamePrefixMatchedUser(userID: userID, username: username, nickname: nickname, avatarURLString: avatarURLString)
}).flatMap({ $0 })
Yep/Views/Mention/MentionView.swift
+5 -1
View File
@@ -72,8 +72,12 @@ private class MentionUserCell: UITableViewCell {
func configureWithUsernamePrefixMatchedUser(user: UsernamePrefixMatchedUser) {
let plainAvatar = PlainAvatar(avatarURLString: user.avatarURLString, avatarStyle: picoAvatarStyle)
if let avatarURLString = user.avatarURLString {
let plainAvatar = PlainAvatar(avatarURLString: avatarURLString, avatarStyle: picoAvatarStyle)
avatarImageView.navi_setAvatar(plainAvatar, withFadeTransitionDuration: avatarFadeTransitionDuration)
} else {
avatarImageView.image = UIImage(named: "default_avatar_30")
}
nicknameLabel.text = user.nickname
mentionUsernameLabel.text = user.mentionUsername