From f5e810e82ba6dec0023ef97a6b776929f9b2d1f1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 23 Apr 2018 12:15:21 -0400 Subject: [PATCH] CR: rename ThreadModel -> ThreadViewModel // FREEBIE --- Signal/src/Models/ThreadModel.swift | 2 +- .../ViewControllers/HomeView/HomeViewCell.h | 4 +-- .../ViewControllers/HomeView/HomeViewCell.m | 10 +++---- .../HomeView/HomeViewController.m | 26 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Signal/src/Models/ThreadModel.swift b/Signal/src/Models/ThreadModel.swift index 1722ac69c..33d73e657 100644 --- a/Signal/src/Models/ThreadModel.swift +++ b/Signal/src/Models/ThreadModel.swift @@ -5,7 +5,7 @@ import Foundation @objc -public class ThreadModel: NSObject { +public class ThreadViewModel: NSObject { let hasUnreadMessages: Bool let lastMessageDate: Date let isGroupThread: Bool diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.h b/Signal/src/ViewControllers/HomeView/HomeViewCell.h index 8456ed9cb..054b9fcb5 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.h +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @class OWSContactsManager; -@class ThreadModel; +@class ThreadViewModel; @class YapDatabaseReadTransaction; @interface HomeViewCell : UITableViewCell @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN + (NSString *)cellReuseIdentifier; -- (void)configureWithThread:(ThreadModel *)thread +- (void)configureWithThread:(ThreadViewModel *)thread contactsManager:(OWSContactsManager *)contactsManager blockedPhoneNumberSet:(NSSet *)blockedPhoneNumberSet; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index d0974c5bb..785c4cfc5 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) UIView *unreadBadge; @property (nonatomic) UILabel *unreadLabel; -@property (nonatomic, nullable) ThreadModel *thread; +@property (nonatomic, nullable) ThreadViewModel *thread; @property (nonatomic, nullable) OWSContactsManager *contactsManager; @property (nonatomic, readonly) NSMutableArray *viewConstraints; @@ -142,7 +142,7 @@ NS_ASSUME_NONNULL_BEGIN return NSStringFromClass(self.class); } -- (void)configureWithThread:(ThreadModel *)thread +- (void)configureWithThread:(ThreadViewModel *)thread contactsManager:(OWSContactsManager *)contactsManager blockedPhoneNumberSet:(NSSet *)blockedPhoneNumberSet { @@ -239,7 +239,7 @@ NS_ASSUME_NONNULL_BEGIN return; } - ThreadModel *thread = self.thread; + ThreadViewModel *thread = self.thread; if (thread == nil) { OWSFail(@"%@ thread should not be nil", self.logTag); self.avatarView.image = nil; @@ -251,7 +251,7 @@ NS_ASSUME_NONNULL_BEGIN contactsManager:contactsManager]; } -- (NSAttributedString *)attributedSnippetForThread:(ThreadModel *)thread +- (NSAttributedString *)attributedSnippetForThread:(ThreadViewModel *)thread blockedPhoneNumberSet:(NSSet *)blockedPhoneNumberSet { OWSAssert(thread); @@ -447,7 +447,7 @@ NS_ASSUME_NONNULL_BEGIN self.nameLabel.font = self.nameFont; - ThreadModel *thread = self.thread; + ThreadViewModel *thread = self.thread; if (thread == nil) { OWSFail(@"%@ thread should not be nil", self.logTag); self.nameLabel.attributedText = nil; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index bd7012831..1d507f74c 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -47,7 +47,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; @property (nonatomic) UISegmentedControl *segmentedControl; @property (nonatomic) id previewingContext; @property (nonatomic) NSSet *blockedPhoneNumberSet; -@property (nonatomic, readonly) NSCache *threadModelCache; +@property (nonatomic, readonly) NSCache *threadViewModelCache; @property (nonatomic) BOOL isViewVisible; @property (nonatomic) BOOL isAppInBackground; @property (nonatomic) BOOL shouldObserveDBModifications; @@ -108,7 +108,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; _messageSender = [Environment current].messageSender; _blockingManager = [OWSBlockingManager sharedManager]; _blockedPhoneNumberSet = [NSSet setWithArray:[_blockingManager blockedPhoneNumbers]]; - _threadModelCache = [NSCache new]; + _threadViewModelCache = [NSCache new]; // Ensure ExperienceUpgradeFinder has been initialized. [ExperienceUpgradeFinder sharedManager]; @@ -476,7 +476,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; - (void)reloadTableViewData { // PERF: come up with a more nuanced cache clearing scheme - [self.threadModelCache removeAllObjects]; + [self.threadViewModelCache removeAllObjects]; [self.tableView reloadData]; } @@ -604,21 +604,21 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; return (NSInteger)[self.threadMappings numberOfItemsInSection:(NSUInteger)section]; } -- (ThreadModel *)threadModelForIndexPath:(NSIndexPath *)indexPath +- (ThreadViewModel *)threadViewModelForIndexPath:(NSIndexPath *)indexPath { TSThread *threadRecord = [self threadForIndexPath:indexPath]; - ThreadModel *_Nullable cachedThreadModel = [self.threadModelCache objectForKey:threadRecord.uniqueId]; - if (cachedThreadModel) { - return cachedThreadModel; + ThreadViewModel *_Nullable cachedThreadViewModel = [self.threadViewModelCache objectForKey:threadRecord.uniqueId]; + if (cachedThreadViewModel) { + return cachedThreadViewModel; } - __block ThreadModel *_Nullable newThreadModel; + __block ThreadViewModel *_Nullable newThreadViewModel; [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) { - newThreadModel = [[ThreadModel alloc] initWithThread:threadRecord transaction:transaction]; + newThreadViewModel = [[ThreadViewModel alloc] initWithThread:threadRecord transaction:transaction]; }]; - [self.threadModelCache setObject:newThreadModel forKey:threadRecord.uniqueId]; - return newThreadModel; + [self.threadViewModelCache setObject:newThreadViewModel forKey:threadRecord.uniqueId]; + return newThreadViewModel; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath @@ -626,7 +626,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; HomeViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:HomeViewCell.cellReuseIdentifier]; OWSAssert(cell); - ThreadModel *thread = [self threadModelForIndexPath:indexPath]; + ThreadViewModel *thread = [self threadViewModelForIndexPath:indexPath]; [cell configureWithThread:thread contactsManager:self.contactsManager blockedPhoneNumberSet:self.blockedPhoneNumberSet]; @@ -1041,7 +1041,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; for (YapDatabaseViewRowChange *rowChange in rowChanges) { NSString *key = rowChange.collectionKey.key; OWSAssert(key); - [self.threadModelCache removeObjectForKey:key]; + [self.threadViewModelCache removeObjectForKey:key]; switch (rowChange.type) { case YapDatabaseViewChangeDelete: {