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

Merge branch 'develop' of https://github.com/CatchChat/Yep into develop

Browse Source
This commit is contained in:
kevinzhow
2015-10-27 15:28:47 +08:00
parent cf083ec443 b3a7d94313
commit 5ee410b8f2
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
+5 -1
View File
@@ -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 {
Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.swift
+7 -2
View File
@@ -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)
Yep/Views/Cells/FeedSkillUsers/FeedSkillUsersCell.xib
+11 -10
View File
@@ -20,13 +20,6 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="c2h-Il-EtF">
<rect key="frame" x="177" y="29" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="ck6-eh-hSS"/>
<constraint firstAttribute="width" constant="30" id="kcl-3p-Y14"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0nL-ib-Q1c">
<rect key="frame" x="257" y="29" width="30" height="30"/>
<constraints>
@@ -34,9 +27,6 @@
<constraint firstAttribute="width" constant="30" id="eiw-PS-NDx"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="maH-pc-WxC" userLabel="Accessory Image View">
<rect key="frame" x="297" y="37" width="8" height="13"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="VhJ-f2-v5c">
<rect key="frame" x="217" y="29" width="30" height="30"/>
<constraints>
@@ -44,6 +34,16 @@
<constraint firstAttribute="width" constant="30" id="mjg-Wj-8XW"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="c2h-Il-EtF">
<rect key="frame" x="177" y="29" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="ck6-eh-hSS"/>
<constraint firstAttribute="width" constant="30" id="kcl-3p-Y14"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_accessory_mini" translatesAutoresizingMaskIntoConstraints="NO" id="maH-pc-WxC" userLabel="Accessory Image View">
<rect key="frame" x="297" y="37" width="8" height="13"/>
</imageView>
</subviews>
<constraints>
<constraint firstItem="maH-pc-WxC" firstAttribute="leading" secondItem="0nL-ib-Q1c" secondAttribute="trailing" constant="10" id="1TX-Op-of6"/>
@@ -59,6 +59,7 @@
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="accessoryImageView" destination="maH-pc-WxC" id="cJU-QW-3AM"/>
<outlet property="avatarImageView1" destination="0nL-ib-Q1c" id="zGK-6C-wrJ"/>
<outlet property="avatarImageView2" destination="VhJ-f2-v5c" id="ZRT-VJ-s7X"/>
<outlet property="avatarImageView3" destination="c2h-Il-EtF" id="vmU-Bc-dJE"/>
Yep/en.lproj/Localizable.strings
+2
View File
@@ -640,3 +640,5 @@
"Choose..." = "Choose...";
"People with this skill" = "People with this skill";
Yep/zh-Hans.lproj/Localizable.strings
+2
View File
@@ -650,3 +650,5 @@
"Choose..." = "选择…";
"People with this skill" = "与此技能相关的用户";