oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/reworkUnreadIndicator2'

This commit is contained in:
Michael Kirk 2018-07-11 17:23:11 -06:00
parent 04da18c7fd a505c2a89e
commit 68ad2dde54
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
View File

@ -78,6 +78,7 @@ const CGFloat OWSMessageHeaderViewDateHeaderVMargin = 23;
{
OWSAssert(viewItem);
OWSAssert(conversationStyle);
OWSAssert(viewItem.unreadIndicator || viewItem.shouldShowDate);
[self configureLabelsWithViewItem:viewItem];
@ -130,9 +131,12 @@ const CGFloat OWSMessageHeaderViewDateHeaderVMargin = 23;
if (viewItem.unreadIndicator) {
self.titleLabel.font = UIFont.ows_dynamicTypeCaption1Font.ows_mediumWeight;
NSString *unreadTitle = NSLocalizedString(
NSString *title = NSLocalizedString(
@"MESSAGES_VIEW_UNREAD_INDICATOR", @"Indicator that separates read from unread messages.");
self.titleLabel.text = [[dateString rtlSafeAppend:@" • "] rtlSafeAppend:unreadTitle].localizedUppercaseString;
if (viewItem.shouldShowDate) {
title = [[dateString rtlSafeAppend:@" • "] rtlSafeAppend:title];
}
self.titleLabel.text = title.localizedUppercaseString;
if (!viewItem.unreadIndicator.hasMoreUnseenMessages) {
self.subtitleLabel.text = nil;
@ -157,6 +161,7 @@ const CGFloat OWSMessageHeaderViewDateHeaderVMargin = 23;
{
OWSAssert(viewItem);
OWSAssert(conversationStyle);
OWSAssert(viewItem.unreadIndicator || viewItem.shouldShowDate);
[self configureLabelsWithViewItem:viewItem];