diff --git a/Yep/ViewControllers/Conversations/ConversationsViewController.swift b/Yep/ViewControllers/Conversations/ConversationsViewController.swift index 5423cac4..037ca6ad 100644 --- a/Yep/ViewControllers/Conversations/ConversationsViewController.swift +++ b/Yep/ViewControllers/Conversations/ConversationsViewController.swift @@ -52,9 +52,8 @@ class ConversationsViewController: UIViewController { } lazy var conversations: Results = { - //return self.realm.objects(Conversation).sorted("updatedUnixTime", ascending: false) -// let predicate = NSPredicate(format: "type = %d", ConversationType.OneToOne.rawValue) - return self.realm.objects(Conversation).sorted("updatedUnixTime", ascending: false) + let predicate = NSPredicate(format: "type = %d", ConversationType.OneToOne.rawValue) + return self.realm.objects(Conversation).filter(predicate).sorted("updatedUnixTime", ascending: false) }() struct Listener { diff --git a/Yep/ViewControllers/FeedConversations/FeedConversationsViewController.swift b/Yep/ViewControllers/FeedConversations/FeedConversationsViewController.swift index f5c1b7f4..c9514ca2 100644 --- a/Yep/ViewControllers/FeedConversations/FeedConversationsViewController.swift +++ b/Yep/ViewControllers/FeedConversations/FeedConversationsViewController.swift @@ -7,11 +7,19 @@ // import UIKit +import RealmSwift class FeedConversationsViewController: UIViewController { @IBOutlet weak var feedConversationsTableView: UITableView! + var realm: Realm! + + lazy var feedConversations: Results = { + let predicate = NSPredicate(format: "type = %d", ConversationType.Group.rawValue) + return self.realm.objects(Conversation).filter(predicate).sorted("updatedUnixTime", ascending: false) + }() + let feedConversationCellID = "FeedConversationCell" override func viewDidLoad() { @@ -19,8 +27,11 @@ class FeedConversationsViewController: UIViewController { title = "Feeds" + realm = try! Realm() + feedConversationsTableView.registerNib(UINib(nibName: feedConversationCellID, bundle: nil), forCellReuseIdentifier: feedConversationCellID) feedConversationsTableView.rowHeight = 80 + feedConversationsTableView.tableFooterView = UIView() } } @@ -29,11 +40,14 @@ class FeedConversationsViewController: UIViewController { extension FeedConversationsViewController: UITableViewDataSource, UITableViewDelegate { func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return 15 + return feedConversations.count } func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCellWithIdentifier(feedConversationCellID) as! FeedConversationCell + if let conversation = feedConversations[safe: indexPath.row] { + cell.configureWithConversation(conversation) + } return cell } } diff --git a/Yep/Views/Cells/FeedConversation/FeedConversationCell.swift b/Yep/Views/Cells/FeedConversation/FeedConversationCell.swift index 7e17bf49..8364128d 100644 --- a/Yep/Views/Cells/FeedConversation/FeedConversationCell.swift +++ b/Yep/Views/Cells/FeedConversation/FeedConversationCell.swift @@ -24,5 +24,14 @@ class FeedConversationCell: UITableViewCell { // Configure the view for the selected state } - + + + func configureWithConversation(conversation: Conversation) { + + //self.conversation = conversation + + //countOfUnreadMessages = countOfUnreadMessagesInConversation(conversation) + + nameLabel.text = conversation.withGroup?.withFeed?.body + } }