diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 055f5b53..88903bf8 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -1088,7 +1088,7 @@ enum DiscoveredUserSortStyle: String {
}
}
-struct DiscoveredUser: Equatable {
+struct DiscoveredUser: Hashable {
struct SocialAccountProvider {
let name: String
@@ -1115,6 +1115,10 @@ struct DiscoveredUser: Equatable {
let socialAccountProviders: [SocialAccountProvider]
let recently_updated_provider: String?
+
+ var hashValue: Int {
+ return id.hashValue
+ }
}
func ==(lhs: DiscoveredUser, rhs: DiscoveredUser) -> Bool {
diff --git a/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.swift b/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.swift
index 33f9ad95..7b5a935d 100644
--- a/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.swift
+++ b/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.swift
@@ -16,9 +16,14 @@ class FeedSkillUsersCell: UITableViewCell {
@IBOutlet weak var avatarImageView2: UIImageView!
@IBOutlet weak var avatarImageView3: UIImageView!
+ @IBOutlet weak var accessoryImageView: UIImageView!
+
override func awakeFromNib() {
super.awakeFromNib()
- // Initialization code
+
+ promptLabel.text = NSLocalizedString("People with this skill", comment: "")
+
+ accessoryImageView.tintColor = UIColor.yepCellAccessoryImageViewTintColor()
}
override func setSelected(selected: Bool, animated: Bool) {
@@ -29,7 +34,7 @@ class FeedSkillUsersCell: UITableViewCell {
func configureWithFeeds(feeds: [DiscoveredFeed]) {
- let feedCreators = feeds.map({ $0.creator })
+ let feedCreators = Array(Set(feeds.map({ $0.creator }))).sort { $0.lastSignInUnixTime > $1.lastSignInUnixTime }
if let creator = feedCreators[safe: 0] {
let plainAvatar = PlainAvatar(avatarURLString: creator.avatarURLString, avatarStyle: nanoAvatarStyle)
diff --git a/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.xib b/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.xib
index aa1f688e..386caa7c 100644
--- a/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.xib
+++ b/Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.xib
@@ -20,13 +20,6 @@
-
-
-
-
-
-
-
@@ -34,9 +27,6 @@
-
-
-
@@ -44,6 +34,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -59,6 +59,7 @@
+
diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
index 0e4f6afb..0b3b71f3 100644
--- a/Yep/en.lproj/Localizable.strings
+++ b/Yep/en.lproj/Localizable.strings
@@ -640,3 +640,5 @@
"Choose..." = "Choose...";
+"People with this skill" = "People with this skill";
+
diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
index 10130ba7..9dc5cf20 100644
--- a/Yep/zh-Hans.lproj/Localizable.strings
+++ b/Yep/zh-Hans.lproj/Localizable.strings
@@ -650,3 +650,5 @@
"Choose..." = "选择…";
+"People with this skill" = "与此技能相关的用户";
+