@ -32,7 +32,12 @@
#import < YapDatabase / YapDatabaseViewChange . h >
#import < YapDatabase / YapDatabaseViewChange . h >
#import < YapDatabase / YapDatabaseViewConnection . h >
#import < YapDatabase / YapDatabaseViewConnection . h >
typedef NS_ENUM ( NSInteger , CellState ) { kArchiveState , kInboxState } ; typedef NS_ENUM ( NSInteger , HomeViewMode ) {
HomeViewMode_Archive ,
HomeViewMode_Inbox ,
} ;
NSString * const kArchivedConversationsReuseIdentifier = @ "kArchivedConversationsReuseIdentifier ";
@ interface HomeViewController ( ) < UITableViewDelegate , UITableViewDataSource , UIViewControllerPreviewingDelegate > @ interface HomeViewController ( ) < UITableViewDelegate , UITableViewDataSource , UIViewControllerPreviewingDelegate >
@ -42,9 +47,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
@ property ( nonatomic ) YapDatabaseConnection * editingDbConnection ; @ property ( nonatomic ) YapDatabaseConnection * editingDbConnection ;
@ property ( nonatomic ) YapDatabaseConnection * uiDatabaseConnection ; @ property ( nonatomic ) YapDatabaseConnection * uiDatabaseConnection ;
@ property ( nonatomic ) YapDatabaseViewMappings * threadMappings ; @ property ( nonatomic ) YapDatabaseViewMappings * threadMappings ;
@ property ( nonatomic ) CellState viewingThreadsIn ; @ property ( nonatomic ) HomeViewMode homeViewMode ;
@ property ( nonatomic ) long inboxCount ;
@ property ( nonatomic ) UISegmentedControl * segmentedControl ;
@ property ( nonatomic ) id previewingContext ; @ property ( nonatomic ) id previewingContext ;
@ property ( nonatomic ) NSSet < NSString * > * blockedPhoneNumberSet ; @ property ( nonatomic ) NSSet < NSString * > * blockedPhoneNumberSet ;
@ property ( nonatomic , readonly ) NSCache < NSString * , ThreadViewModel * > * threadViewModelCache ; @ property ( nonatomic , readonly ) NSCache < NSString * , ThreadViewModel * > * threadViewModelCache ;
@ -82,6 +85,8 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
return self ;
return self ;
}
}
_homeViewMode = HomeViewMode_Inbox ;
[ self commonInit ] ;
[ self commonInit ] ;
return self ;
return self ;
@ -177,30 +182,21 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
/ / TODO : Remove this .
/ / TODO : Remove this .
[ SignalApp . sharedApp setHomeViewController : self ] ;
[ SignalApp . sharedApp setHomeViewController : self ] ;
self . navigationItem . rightBarButtonItem =
ReminderView * archiveReminderView =
[ [ UIBarButtonItem alloc ] initWithBarButtonSystemItem : UIBarButtonSystemItemCompose
[ ReminderView explanationWithText : NSLocalizedString ( @ "INBOX_VIEW_ARCHIVE_MODE_REMINDER ",
target : self
@ "Label reminding the user that they are in archive mode . ") ] ;
action : @ selector ( showNewConversationView ) ] ;
ReminderView * archiveReminderView = [ ReminderView new ] ;
archiveReminderView . text = NSLocalizedString (
@ "INBOX_VIEW_ARCHIVE_MODE_REMINDER ", @ "Label reminding the user that they are in archive mode . ") ;
__weak HomeViewController * weakSelf = self ;
archiveReminderView . tapAction = ^{
[ weakSelf showInboxGrouping ] ;
} ;
[ self . view addSubview : archiveReminderView ] ;
[ self . view addSubview : archiveReminderView ] ;
[ archiveReminderView autoPinWidthToSuperview ] ;
[ archiveReminderView autoPinWidthToSuperview ] ;
[ archiveReminderView autoPinToTopLayoutGuideOfViewController : self withInset : 0 ] ;
[ archiveReminderView autoPinToTopLayoutGuideOfViewController : self withInset : 0 ] ;
self . hideArchiveReminderViewConstraint = [ archiveReminderView autoSetDimension : ALDimensionHeight toSize : 0 ] ;
self . hideArchiveReminderViewConstraint = [ archiveReminderView autoSetDimension : ALDimensionHeight toSize : 0 ] ;
self . hideArchiveReminderViewConstraint . priority = UILayoutPriorityRequired ;
self . hideArchiveReminderViewConstraint . priority = UILayoutPriorityRequired ;
ReminderView * missingContactsPermissionView = [ ReminderView new ] ;
ReminderView * missingContactsPermissionView = [ ReminderView
missingContactsPermissionView . text = NSLocalizedString ( @ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION ",
nagWithText : NSLocalizedString ( @ "INBOX_VIEW_MISSING_CONTACTS_PERMISSION ",
@ "Multi - line label explaining how to show names instead of phone numbers in your inbox ") ;
@ "Multi - line label explaining how to show names instead of phone numbers in your inbox ")
missingContactsPermissionView . tapAction = {
tapAction : ^{
[ [ UIApplication sharedApplication ] openSystemSettings ] ;
[ [ UIApplication sharedApplication ] openSystemSettings ] ;
} ;
} ] ;
[ self . view addSubview : missingContactsPermissionView ] ;
[ self . view addSubview : missingContactsPermissionView ] ;
[ missingContactsPermissionView autoPinWidthToSuperview ] ;
[ missingContactsPermissionView autoPinWidthToSuperview ] ;
[ missingContactsPermissionView autoPinEdge : ALEdgeTop toEdge : ALEdgeBottom ofView : archiveReminderView ] ;
[ missingContactsPermissionView autoPinEdge : ALEdgeTop toEdge : ALEdgeBottom ofView : archiveReminderView ] ;
@ -213,6 +209,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
self . tableView . dataSource = self ;
self . tableView . dataSource = self ;
self . tableView . separatorStyle = UITableViewCellSeparatorStyleNone ;
self . tableView . separatorStyle = UITableViewCellSeparatorStyleNone ;
[ self . tableView registerClass : [ HomeViewCell class ] forCellReuseIdentifier : HomeViewCell . cellReuseIdentifier ] ;
[ self . tableView registerClass : [ HomeViewCell class ] forCellReuseIdentifier : HomeViewCell . cellReuseIdentifier ] ;
[ self . tableView registerClass : [ UITableViewCell class ] forCellReuseIdentifier : kArchivedConversationsReuseIdentifier ] ;
[ self . view addSubview : self . tableView ] ;
[ self . view addSubview : self . tableView ] ;
[ self . tableView autoPinWidthToSuperview ] ;
[ self . tableView autoPinWidthToSuperview ] ;
[ self . tableView autoPinEdgeToSuperviewEdge : ALEdgeBottom ] ;
[ self . tableView autoPinEdgeToSuperviewEdge : ALEdgeBottom ] ;
@ -237,7 +234,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( void ) updateReminderViews - ( void ) updateReminderViews
{ {
BOOL shouldHideArchiveReminderView = self . viewingThreadsIn != kArchiveStat e;
BOOL shouldHideArchiveReminderView = self . homeViewMode != HomeViewMode_Archiv e;
BOOL shouldHideMissingContactsPermissionView = !self . shouldShowMissingContactsPermissionView ;
BOOL shouldHideMissingContactsPermissionView = !self . shouldShowMissingContactsPermissionView ;
if ( self . hideArchiveReminderViewConstraint . active == shouldHideArchiveReminderView
if ( self . hideArchiveReminderViewConstraint . active == shouldHideArchiveReminderView
&& self . hideMissingContactsPermissionViewConstraint . active == shouldHideMissingContactsPermissionView ) {
&& self . hideMissingContactsPermissionViewConstraint . active == shouldHideMissingContactsPermissionView ) {
@ -259,25 +256,28 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
/ / Create the database connection .
/ / Create the database connection .
[ self uiDatabaseConnection ] ;
[ self uiDatabaseConnection ] ;
[ self showInboxGrouping ] ;
[ self updateMappings ] ;
[ self checkIfEmptyView ] ;
[ self updateReminderViews ] ;
/ / because this uses the table data source , `tableViewSetup ` must happen
/ / because this uses the table data source , `tableViewSetup ` must happen
/ / after mappings have been set up in `showInboxGrouping `
/ / after mappings have been set up in `showInboxGrouping `
[ self tableViewSetUp ] ;
[ self tableViewSetUp ] ;
self . segmentedControl = [ [ UISegmentedControl alloc ] initWithItems : @ [
switch ( self . homeViewMode ) {
NSLocalizedString ( @ "WHISPER_NAV_BAR_TITLE ", nil ) ,
case HomeViewMode_Inbox :
NSLocalizedString ( @ "ARCHIVE_NAV_BAR_TITLE ", nil )
/ / TODO : Should our app name be translated ? Probably not .
] ] ;
self . title = NSLocalizedString ( @ "HOME_VIEW_TITLE_INBOX ", @ "Title for the home view ' s default mode . ") ;
break ;
[ self . segmentedControl addTarget : self
case HomeViewMode_Archive :
action : @ selector ( swappedSegmentedControl )
self . title = NSLocalizedString ( @ "HOME_VIEW_TITLE_ARCHIVE ", @ "Title for the home view ' s ' archive' mode . ") ;
forControlEvents : UIControlEventValueChanged ] ;
break ;
UINavigationItem * navigationItem = self . navigationItem ;
}
navigationItem . titleView = self . segmentedControl ;
self . navigationItem . backBarButtonItem =
[ self . segmentedControl setSelectedSegmentIndex : 0 ] ;
[ [ UIBarButtonItem alloc ] initWithTitle : NSLocalizedString ( @ "BACK_BUTTON ", @ "button text for back button ")
navigationItem . leftBarButtonItem . accessibilityLabel
style : UIBarButtonItemStylePlain
= NSLocalizedString ( @ "SETTINGS_BUTTON_ACCESSIBILITY ", @ "Accessibility hint for the settings button ") ;
target : nil
action : nil ] ;
if ( [ self . traitCollection respondsToSelector : @ selector ( forceTouchCapability ) ]
if ( [ self . traitCollection respondsToSelector : @ selector ( forceTouchCapability ) ]
&& ( self . traitCollection . forceTouchCapability == UIForceTouchCapabilityAvailable ) ) {
&& ( self . traitCollection . forceTouchCapability == UIForceTouchCapabilityAvailable ) ) {
@ -296,6 +296,9 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( void ) updateBarButtonItems - ( void ) updateBarButtonItems
{ {
if ( self . homeViewMode != HomeViewMode_Inbox ) {
return ;
}
const CGFloat kBarButtonSize = 44 ;
const CGFloat kBarButtonSize = 44 ;
/ / We use UIButtons with [ UIBarButtonItem initWithCustomView : ...] instead of
/ / We use UIButtons with [ UIBarButtonItem initWithCustomView : ...] instead of
/ / UIBarButtonItem in order to ensure that these buttons are spaced tightly .
/ / UIBarButtonItem in order to ensure that these buttons are spaced tightly .
@ -327,7 +330,15 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
0 ,
0 ,
round ( image . size . width + imageEdgeInsets . left + imageEdgeInsets . right ) ,
round ( image . size . width + imageEdgeInsets . left + imageEdgeInsets . right ) ,
round ( image . size . height + imageEdgeInsets . top + imageEdgeInsets . bottom ) ) ;
round ( image . size . height + imageEdgeInsets . top + imageEdgeInsets . bottom ) ) ;
self . navigationItem . leftBarButtonItem = [ [ UIBarButtonItem alloc ] initWithCustomView : button ] ;
UIBarButtonItem * settingsButton = [ [ UIBarButtonItem alloc ] initWithCustomView : button ] ;
settingsButton . accessibilityLabel
= NSLocalizedString ( @ "SETTINGS_BUTTON_ACCESSIBILITY ", @ "Accessibility hint for the settings button ") ;
self . navigationItem . leftBarButtonItem = settingsButton ;
self . navigationItem . rightBarButtonItem =
[ [ UIBarButtonItem alloc ] initWithBarButtonSystemItem : UIBarButtonSystemItemCompose
target : self
action : @ selector ( showNewConversationView ) ] ;
} }
- ( void ) settingsButtonPressed : ( id ) sender - ( void ) settingsButtonPressed : ( id ) sender
@ -367,6 +378,10 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( void ) showNewConversationView - ( void ) showNewConversationView
{ {
OWSAssertIsOnMainThread ( ) ;
DDLogInfo ( @ "%@ %s", self.logTag, __PRETTY_FUNCTION__);
NewContactThreadViewController * viewController = [ NewContactThreadViewController new ] ;
NewContactThreadViewController * viewController = [ NewContactThreadViewController new ] ;
[ self . contactsManager requestSystemContactsOnceWithCompletion : ^( NSError * _Nullable error ) {
[ self . contactsManager requestSystemContactsOnceWithCompletion : ^( NSError * _Nullable error ) {
@ -384,15 +399,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
} ] ;
} ] ;
} }
- ( void ) swappedSegmentedControl
{
if ( self . segmentedControl . selectedSegmentIndex == 0 ) {
[ self showInboxGrouping ] ;
} else {
[ self showArchiveGrouping ] ;
}
}
- ( void ) viewWillAppear : ( BOOL ) animated - ( void ) viewWillAppear : ( BOOL ) animated
{ {
[ super viewWillAppear : animated ] ;
[ super viewWillAppear : animated ] ;
@ -408,8 +414,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
} ] ;
} ] ;
}
}
[ self updateInboxCountLabel ] ;
self . isViewVisible = YES ;
self . isViewVisible = YES ;
/ / When returning to home view , try to ensure that the "last " thread is still
/ / When returning to home view , try to ensure that the "last " thread is still
@ -499,7 +503,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
[ self reloadTableViewData ] ;
[ self reloadTableViewData ] ;
[ self checkIfEmptyView ] ;
[ self checkIfEmptyView ] ;
[ self updateInboxCountLabel ] ;
/ / If the user hasn ' t already granted contact access
/ / If the user hasn ' t already granted contact access
/ / we don ' t want to request until they receive a message .
/ / we don ' t want to request until they receive a message .
@ -601,7 +604,24 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( NSInteger ) tableView : ( UITableView * ) tableView numberOfRowsInSection : ( NSInteger ) section - ( NSInteger ) tableView : ( UITableView * ) tableView numberOfRowsInSection : ( NSInteger ) section
{ {
return ( NSInteger ) [ self . threadMappings numberOfItemsInSection : ( NSUInteger ) section ] ;
NSInteger result = ( NSInteger ) [ self . threadMappings numberOfItemsInSection : ( NSUInteger ) section ] ;
if ( self . homeViewMode == HomeViewMode_Inbox ) {
/ / Add the "archived conversations " row .
result + + ;
}
return result ;
}
- ( BOOL ) isIndexPathForArchivedConversations : ( NSIndexPath * ) indexPath
{
if ( self . homeViewMode != HomeViewMode_Inbox ) {
return NO ;
}
if ( indexPath . section != 0 ) {
return NO ;
}
NSInteger cellCount = ( NSInteger ) [ self . threadMappings numberOfItemsInSection : ( NSUInteger ) 0 ] ;
return indexPath . row == cellCount ;
} }
- ( ThreadViewModel * ) threadViewModelForIndexPath : ( NSIndexPath * ) indexPath - ( ThreadViewModel * ) threadViewModelForIndexPath : ( NSIndexPath * ) indexPath
@ -622,6 +642,15 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
} }
- ( UITableViewCell * ) tableView : ( UITableView * ) tableView cellForRowAtIndexPath : ( NSIndexPath * ) indexPath - ( UITableViewCell * ) tableView : ( UITableView * ) tableView cellForRowAtIndexPath : ( NSIndexPath * ) indexPath
{
if ( [ self isIndexPathForArchivedConversations : indexPath ] ) {
return [ self cellForArchivedConversationsRow : tableView ] ;
} else {
return [ self tableView : tableView cellForConversationAtIndexPath : indexPath ] ;
}
}
- ( UITableViewCell * ) tableView : ( UITableView * ) tableView cellForConversationAtIndexPath : ( NSIndexPath * ) indexPath
{ {
HomeViewCell * cell = [ self . tableView dequeueReusableCellWithIdentifier : HomeViewCell . cellReuseIdentifier ] ;
HomeViewCell * cell = [ self . tableView dequeueReusableCellWithIdentifier : HomeViewCell . cellReuseIdentifier ] ;
OWSAssert ( cell ) ;
OWSAssert ( cell ) ;
@ -638,6 +667,47 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
return cell ;
return cell ;
} }
- ( UITableViewCell * ) cellForArchivedConversationsRow : ( UITableView * ) tableView
{
UITableViewCell * cell = [ self . tableView dequeueReusableCellWithIdentifier : kArchivedConversationsReuseIdentifier ] ;
OWSAssert ( cell ) ;
for ( UIView * subview in cell . contentView . subviews ) {
[ subview removeFromSuperview ] ;
}
cell . backgroundColor = [ UIColor whiteColor ] ;
UIImage * disclosureImage = [ UIImage imageNamed : ( cell . isRTL ? @ "NavBarBack " : @ "NavBarBackRTL ") ] ;
OWSAssert ( disclosureImage ) ;
UIImageView * disclosureImageView = [ UIImageView new ] ;
disclosureImageView . image = [ disclosureImage imageWithRenderingMode : UIImageRenderingModeAlwaysTemplate ] ;
disclosureImageView . tintColor = [ UIColor colorWithRGBHex : 0 xd1d1d6 ] ;
[ disclosureImageView setContentHuggingHigh ] ;
[ disclosureImageView setCompressionResistanceHigh ] ;
UILabel * label = [ UILabel new ] ;
label . text = NSLocalizedString ( @ "HOME_VIEW_ARCHIVED_CONVERSATIONS ", @ "Label for ' archived conversations' button . ") ;
label . textAlignment = NSTextAlignmentCenter ;
label . font = [ UIFont ows_dynamicTypeBodyFont ] ;
label . textColor = [ UIColor blackColor ] ;
UIStackView * stackView = [ UIStackView new ] ;
stackView . axis = UILayoutConstraintAxisHorizontal ;
stackView . spacing = 5 ;
[ stackView addArrangedSubview : label ] ;
[ stackView addArrangedSubview : disclosureImageView ] ;
[ cell . contentView addSubview : stackView ] ;
[ stackView autoCenterInSuperview ] ;
/ / Constrain to cell margins .
[ stackView autoPinEdgeToSuperviewMargin : ALEdgeTop relation : NSLayoutRelationGreaterThanOrEqual ] ;
[ stackView autoPinEdgeToSuperviewMargin : ALEdgeBottom relation : NSLayoutRelationGreaterThanOrEqual ] ;
[ stackView autoPinEdgeToSuperviewMargin : ALEdgeLeading relation : NSLayoutRelationGreaterThanOrEqual ] ;
[ stackView autoPinEdgeToSuperviewMargin : ALEdgeTrailing relation : NSLayoutRelationGreaterThanOrEqual ] ;
return cell ;
}
- ( TSThread * ) threadForIndexPath : ( NSIndexPath * ) indexPath - ( TSThread * ) threadForIndexPath : ( NSIndexPath * ) indexPath
{ {
__block TSThread * thread = nil ;
__block TSThread * thread = nil ;
@ -675,6 +745,10 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( NSArray * ) tableView : ( UITableView * ) tableView editActionsForRowAtIndexPath : ( NSIndexPath * ) indexPath - ( NSArray * ) tableView : ( UITableView * ) tableView editActionsForRowAtIndexPath : ( NSIndexPath * ) indexPath
{ {
if ( [ self isIndexPathForArchivedConversations : indexPath ] ) {
return @ [ ] ;
}
UITableViewRowAction * deleteAction =
UITableViewRowAction * deleteAction =
[ UITableViewRowAction rowActionWithStyle : UITableViewRowActionStyleDefault
[ UITableViewRowAction rowActionWithStyle : UITableViewRowActionStyleDefault
title : NSLocalizedString ( @ "TXT_DELETE_TITLE ", nil )
title : NSLocalizedString ( @ "TXT_DELETE_TITLE ", nil )
@ -683,7 +757,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
} ] ;
} ] ;
UITableViewRowAction * archiveAction ;
UITableViewRowAction * archiveAction ;
if ( self . viewingThreadsIn == kInboxState ) {
if ( self . homeViewMode == HomeViewMode_Inbox ) {
archiveAction = [ UITableViewRowAction
archiveAction = [ UITableViewRowAction
rowActionWithStyle : UITableViewRowActionStyleNormal
rowActionWithStyle : UITableViewRowActionStyleNormal
title : NSLocalizedString ( @ "ARCHIVE_ACTION ",
title : NSLocalizedString ( @ "ARCHIVE_ACTION ",
@ -761,7 +835,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
[ thread removeWithTransaction : transaction ] ;
[ thread removeWithTransaction : transaction ] ;
} ] ;
} ] ;
_inboxCount - = ( self . viewingThreadsIn == kArchiveState ) ? 1 : 0 ;
[ self checkIfEmptyView ] ;
[ self checkIfEmptyView ] ;
} }
@ -769,31 +842,26 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
{ {
TSThread * thread = [ self threadForIndexPath : indexPath ] ;
TSThread * thread = [ self threadForIndexPath : indexPath ] ;
BOOL viewingThreadsIn = self . viewingThreadsIn ;
[ self . editingDbConnection readWriteWithBlock : ^( YapDatabaseReadWriteTransaction * transaction ) {
[ self . editingDbConnection readWriteWithBlock : ^( YapDatabaseReadWriteTransaction * transaction ) {
viewingThreadsIn == kInboxState ? [ thread archiveThreadWithTransaction : transaction ]
switch ( self . homeViewMode ) {
: [ thread unarchiveThreadWithTransaction : transaction ] ;
case HomeViewMode_Inbox :
[ thread archiveThreadWithTransaction : transaction ] ;
break ;
case HomeViewMode_Archive :
[ thread unarchiveThreadWithTransaction : transaction ] ;
break ;
}
} ] ;
} ] ;
[ self checkIfEmptyView ] ;
[ self checkIfEmptyView ] ;
} }
- ( void ) updateInboxCountLabel - ( void ) tableView: ( UITableView * ) tableView didSelectRowAtIndexPath : ( NSIndexPath * ) indexPath
{ {
NSUInteger numberOfItems = [ OWSMessageUtils . sharedManager unreadMessagesCount ] ;
if ( [ self isIndexPathForArchivedConversations : indexPath ] ) {
NSString * unreadString = NSLocalizedString ( @ "WHISPER_NAV_BAR_TITLE ", nil ) ;
[ self showArchivedConversations ] ;
return ;
if ( numberOfItems > 0 ) {
unreadString = [ unreadString stringByAppendingFormat : @ " ( %@)", [OWSFormat formatInt:(int)numberOfItems]];
}
}
[ _segmentedControl setTitle : unreadString forSegmentAtIndex : 0 ] ;
[ _segmentedControl sizeToFit ] ;
[ _segmentedControl . superview setNeedsLayout ] ;
[ _segmentedControl reloadInputViews ] ;
}
- ( void ) tableView : ( UITableView * ) tableView didSelectRowAtIndexPath : ( NSIndexPath * ) indexPath
{
TSThread * thread = [ self threadForIndexPath : indexPath ] ;
TSThread * thread = [ self threadForIndexPath : indexPath ] ;
[ self presentThread : thread keyboardOnViewAppearing : NO callOnViewAppearing : NO ] ;
[ self presentThread : thread keyboardOnViewAppearing : NO callOnViewAppearing : NO ] ;
[ tableView deselectRowAtIndexPath : indexPath animated : YES ] ;
[ tableView deselectRowAtIndexPath : indexPath animated : YES ] ;
@ -898,30 +966,29 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( void ) showInboxGrouping - ( void ) showInboxGrouping
{ {
self . viewingThreadsIn = kInboxState ;
OWSAssert ( self . homeViewMode == HomeViewMode_Archive ) ;
}
- ( void ) showArchiveGrouping [ self . navigationController popToRootViewControllerAnimated : YES ] ;
{
self . viewingThreadsIn = kArchiveState ;
} }
- ( void ) s etViewingThreadsIn: ( CellState ) viewingThreadsIn - ( void ) s howArchivedConversations
{ {
BOOL didChange = _viewingThreadsIn != viewingThreadsIn ;
OWSAssert ( self . homeViewMode == HomeViewMode_Inbox ) ;
_viewingThreadsIn = viewingThreadsIn ;
self . segmentedControl . selectedSegmentIndex = ( viewingThreadsIn == kInboxState ? 0 : 1 ) ;
/ / Push a separate instance of this view using "archive " mode .
if ( didChange || !self . threadMappings ) {
HomeViewController * homeView = [ HomeViewController new ] ;
[ self updateMappings ] ;
homeView . homeViewMode = HomeViewMode_Archive ;
} else {
[ self . navigationController pushViewController : homeView animated : YES ] ;
[ self checkIfEmptyView ] ;
[ self updateReminderViews ] ;
}
} }
- ( NSString * ) currentGrouping - ( NSString * ) currentGrouping
{ {
return self . viewingThreadsIn == kInboxState ? TSInboxGroup : TSArchiveGroup ;
switch ( self . homeViewMode ) {
case HomeViewMode_Inbox :
return TSInboxGroup ;
case HomeViewMode_Archive :
return TSArchiveGroup ;
}
} }
- ( void ) updateMappings - ( void ) updateMappings
@ -986,8 +1053,10 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
if ( ![ [ self . uiDatabaseConnection ext : TSThreadDatabaseViewExtensionName ] hasChangesForGroup : self . currentGrouping
if ( ![ [ self . uiDatabaseConnection ext : TSThreadDatabaseViewExtensionName ] hasChangesForGroup : self . currentGrouping
inNotifications : notifications ] ) {
inNotifications : notifications ] ) {
[ self . uiDatabaseConnection readWithBlock : ^( YapDatabaseReadTransaction * transaction ) {
[ self . uiDatabaseConnection readWithBlock : ^( YapDatabaseReadTransaction * transaction ) {
[ self . self. threadMappings updateWithTransaction : transaction ] ;
[ self . updateWithTransaction : transaction ] ;
} ] ;
} ] ;
[ self checkIfEmptyView ] ;
return ;
return ;
}
}
@ -1011,7 +1080,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
/ / We want this regardless of if we ' re currently viewing the archive .
/ / We want this regardless of if we ' re currently viewing the archive .
/ / So we run it before the early return
/ / So we run it before the early return
[ self updateInboxCountLabel ] ;
[ self checkIfEmptyView ] ;
[ self checkIfEmptyView ] ;
if ( [ sectionChanges count ] == 0 && [ rowChanges count ] == 0 ) {
if ( [ sectionChanges count ] == 0 && [ rowChanges count ] == 0 ) {
@ -1047,13 +1115,11 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
case YapDatabaseViewChangeDelete : {
case YapDatabaseViewChangeDelete : {
[ self . tableView deleteRowsAtIndexPaths : @ [ rowChange . indexPath ]
[ self . tableView deleteRowsAtIndexPaths : @ [ rowChange . indexPath ]
withRowAnimation : UITableViewRowAnimationAutomatic ] ;
withRowAnimation : UITableViewRowAnimationAutomatic ] ;
_inboxCount + = ( self . viewingThreadsIn == kArchiveState ) ? 1 : 0 ;
break ;
break ;
}
}
case YapDatabaseViewChangeInsert : {
case YapDatabaseViewChangeInsert : {
[ self . tableView insertRowsAtIndexPaths : @ [ rowChange . newIndexPath ]
[ self . tableView insertRowsAtIndexPaths : @ [ rowChange . newIndexPath ]
withRowAnimation : UITableViewRowAnimationAutomatic ] ;
withRowAnimation : UITableViewRowAnimationAutomatic ] ;
_inboxCount - = ( self . viewingThreadsIn == kArchiveState ) ? 1 : 0 ;
break ;
break ;
}
}
case YapDatabaseViewChangeMove : {
case YapDatabaseViewChangeMove : {
@ -1076,21 +1142,31 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
- ( void ) checkIfEmptyView - ( void ) checkIfEmptyView
{ {
[ _tableView setHidden : NO ] ;
/ / We need to consult the db view , not the mapping since the mapping only knows about
[ _emptyBoxLabel setHidden : NO ] ;
/ / the current group .
if ( self . viewingThreadsIn == kInboxState && [ self . threadMappings numberOfItemsInGroup : TSInboxGroup ] == 0 ) {
__block NSUInteger inboxCount ;
[ self setEmptyBoxText ] ;
__block NSUInteger archiveCount ;
[ self . uiDatabaseConnection readWithBlock : ^( YapDatabaseReadTransaction * transaction ) {
YapDatabaseViewTransaction * viewTransaction = [ transaction ext : TSThreadDatabaseViewExtensionName ] ;
inboxCount = [ viewTransaction numberOfItemsInGroup : TSInboxGroup ] ;
archiveCount = [ viewTransaction numberOfItemsInGroup : TSArchiveGroup ] ;
} ] ;
if ( self . homeViewMode == HomeViewMode_Inbox && inboxCount == 0 && archiveCount == 0 ) {
[ self updateEmptyBoxText ] ;
[ _tableView setHidden : YES ] ;
[ _tableView setHidden : YES ] ;
} else if ( self . viewingThreadsIn == kArchiveState &&
[ _emptyBoxLabel setHidden : NO ] ;
[ self . threadMappings numberOfItemsInGroup : TSArchiveGroup ] == 0 ) {
} else if ( self . homeViewMode == HomeViewMode_Archive && archiveCount == 0 ) {
[ self setEmptyBoxText ] ;
[ self update EmptyBoxText] ;
[ _tableView setHidden : YES ] ;
[ _tableView setHidden : YES ] ;
[ _emptyBoxLabel setHidden : NO ] ;
} else {
} else {
[ _emptyBoxLabel setHidden : YES ] ;
[ _emptyBoxLabel setHidden : YES ] ;
[ _tableView setHidden : NO ] ;
}
}
} }
- ( void ) set EmptyBoxText- ( void ) update EmptyBoxText
{ {
_emptyBoxLabel . textColor = [ UIColor grayColor ] ;
_emptyBoxLabel . textColor = [ UIColor grayColor ] ;
_emptyBoxLabel . font = [ UIFont ows_regularFontWithSize : 18. f ] ;
_emptyBoxLabel . font = [ UIFont ows_regularFontWithSize : 18. f ] ;
@ -1100,7 +1176,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
NSString * firstLine = @ "";
NSString * firstLine = @ "";
NSString * secondLine = @ "";
NSString * secondLine = @ "";
if ( self . viewingThreadsIn == kInboxState ) {
if ( self . homeViewMode == HomeViewMode_Inbox ) {
if ( [ Environment . preferences getHasSentAMessage ] ) {
if ( [ Environment . preferences getHasSentAMessage ] ) {
firstLine = NSLocalizedString ( @ "EMPTY_INBOX_FIRST_TITLE ", @ "") ;
firstLine = NSLocalizedString ( @ "EMPTY_INBOX_FIRST_TITLE ", @ "") ;
secondLine = NSLocalizedString ( @ "EMPTY_INBOX_FIRST_TEXT ", @ "") ;
secondLine = NSLocalizedString ( @ "EMPTY_INBOX_FIRST_TEXT ", @ "") ;
Matthew Chen
7 years ago
