From 70d40d736f994ecc351dbeb401cd900bd7ec9282 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Mon, 2 Nov 2015 11:08:30 +0800 Subject: [PATCH] do Conversations & Contacts --- Yep/Extensions/UITableView+Yep.swift | 2 +- Yep/ViewControllers/TabBar/YepTabBarController.swift | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Yep/Extensions/UITableView+Yep.swift b/Yep/Extensions/UITableView+Yep.swift index 4bfc1a37..9bedc1e4 100644 --- a/Yep/Extensions/UITableView+Yep.swift +++ b/Yep/Extensions/UITableView+Yep.swift @@ -11,7 +11,7 @@ import UIKit extension UITableView { var yep_isAtTop: Bool { - println("contentOffset.y: \(contentOffset.y), -contentInset.top: \(-contentInset.top)") + return contentOffset.y == -contentInset.top } diff --git a/Yep/ViewControllers/TabBar/YepTabBarController.swift b/Yep/ViewControllers/TabBar/YepTabBarController.swift index fe5671b2..8246ae0e 100644 --- a/Yep/ViewControllers/TabBar/YepTabBarController.swift +++ b/Yep/ViewControllers/TabBar/YepTabBarController.swift @@ -98,10 +98,18 @@ extension YepTabBarController: UITabBarControllerDelegate { switch tab { case .Conversations: - let vc = nvc.topViewController as? ConversationsViewController + if let vc = nvc.topViewController as? ConversationsViewController { + if !vc.conversationsTableView.yep_isAtTop { + vc.conversationsTableView.yep_scrollsToTop() + } + } case .Contacts: - let vc = nvc.topViewController as? ContactsViewController + if let vc = nvc.topViewController as? ContactsViewController { + if !vc.contactsTableView.yep_isAtTop { + vc.contactsTableView.yep_scrollsToTop() + } + } case .Feeds: if let vc = nvc.topViewController as? FeedsViewController {