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

do Discover & Profile (UICollectionView)

Browse Source
This commit is contained in:
nixzhu
2015-11-02 11:11:57 +08:00
parent 70d40d736f
commit 2b7fa8ecdf
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep.xcodeproj/project.pbxproj
+4
View File
@@ -247,6 +247,7 @@
50DEE0361BE3720F00015741 /* LoadMoreCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DEE0341BE3720F00015741 /* LoadMoreCollectionViewCell.swift */; };
50DEE0371BE3720F00015741 /* LoadMoreCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0351BE3720F00015741 /* LoadMoreCollectionViewCell.xib */; };
50DEE0391BE7020900015741 /* UITableView+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DEE0381BE7020900015741 /* UITableView+Yep.swift */; };
50DEE03B1BE70B5100015741 /* UICollectionView+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DEE03A1BE70B5100015741 /* UICollectionView+Yep.swift */; };
50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; };
50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; };
50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; };
@@ -565,6 +566,7 @@
50DEE0341BE3720F00015741 /* LoadMoreCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadMoreCollectionViewCell.swift; path = Views/Cells/LoadMore/LoadMoreCollectionViewCell.swift; sourceTree = "<group>"; };
50DEE0351BE3720F00015741 /* LoadMoreCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LoadMoreCollectionViewCell.xib; path = Views/Cells/LoadMore/LoadMoreCollectionViewCell.xib; sourceTree = "<group>"; };
50DEE0381BE7020900015741 /* UITableView+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UITableView+Yep.swift"; path = "Extensions/UITableView+Yep.swift"; sourceTree = "<group>"; };
50DEE03A1BE70B5100015741 /* UICollectionView+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UICollectionView+Yep.swift"; path = "Extensions/UICollectionView+Yep.swift"; sourceTree = "<group>"; };
50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = "<group>"; };
50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = "<group>"; };
50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = "<group>"; };
@@ -990,6 +992,7 @@
50A820231B969B0F007CD30E /* NSTimeZone+Yep.swift */,
504F5E6E1B9F1F13006CE418 /* NSURLRequest+cURL.swift */,
50DEE0381BE7020900015741 /* UITableView+Yep.swift */,
50DEE03A1BE70B5100015741 /* UICollectionView+Yep.swift */,
);
name = Extensions;
sourceTree = "<group>";
@@ -2414,6 +2417,7 @@
502AE53D1AB87C0D005BD199 /* YepUserDefaults.swift in Sources */,
50F5AF881BBBB2AE0033C9BC /* HorizontalLineView.swift in Sources */,
50EB8CC41AE89F12001AC1EE /* ChatRightVideoCell.swift in Sources */,
50DEE03B1BE70B5100015741 /* UICollectionView+Yep.swift in Sources */,
50AACECF1BB93336004DD54B /* FeedMediaView.swift in Sources */,
50DEE02C1BE209FF00015741 /* DeletedFeedConversationCell.swift in Sources */,
50D4D0DB1AFA825B005AEB6F /* MediaControlView.swift in Sources */,
Yep/Extensions/UICollectionView+Yep.swift
+23
View File
@@ -0,0 +1,23 @@
//
// UICollectionView+Yep.swift
// Yep
//
// Created by nixzhu on 15/11/2.
// Copyright © 2015年 Catch Inc. All rights reserved.
//
import UIKit
extension UICollectionView {
var yep_isAtTop: Bool {
return contentOffset.y == -contentInset.top
}
func yep_scrollsToTop() {
let topPoint = CGPoint(x: 0, y: -contentInset.top)
setContentOffset(topPoint, animated: true)
}
}
Yep/ViewControllers/TabBar/YepTabBarController.swift
+10 -3
View File
@@ -119,11 +119,18 @@ extension YepTabBarController: UITabBarControllerDelegate {
}
case .Discover:
let vc = nvc.topViewController as? DiscoverViewController
if let vc = nvc.topViewController as? DiscoverViewController {
if !vc.discoveredUsersCollectionView.yep_isAtTop {
vc.discoveredUsersCollectionView.yep_scrollsToTop()
}
}
case .Profile:
let vc = nvc.topViewController as? ProfileViewController
if let vc = nvc.topViewController as? ProfileViewController {
if !vc.profileCollectionView.yep_isAtTop {
vc.profileCollectionView.yep_scrollsToTop()
}
}
}
/*