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/unreadIndicatorAppearance2'

This commit is contained in:
Matthew Chen 2017-06-05 17:16:16 -04:00
parent 1bbae071f1 74209561cc
commit ca527951fd
2 changed files with 126 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Signal/src/ViewControllers/ConversationView/MessagesViewController.m
View File

@ -59,6 +59,7 @@
#import <JSQMessagesViewController/JSQMessagesBubbleImage.h>
#import <JSQMessagesViewController/JSQMessagesBubbleImageFactory.h>
#import <JSQMessagesViewController/JSQMessagesCollectionViewFlowLayoutInvalidationContext.h>
#import <JSQMessagesViewController/JSQMessagesCollectionViewLayoutAttributes.h>
#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
#import <JSQMessagesViewController/JSQSystemSoundPlayer+JSQMessages.h>
#import <JSQMessagesViewController/UIColor+JSQMessages.h>
@ -109,6 +110,38 @@ typedef enum : NSUInteger {
kMediaTypeVideo,
} kMediaTypes;
@protocol OWSMessagesCollectionViewFlowLayoutDelegate <NSObject>
- (BOOL)isSpecialItemAtIndexPath:(NSIndexPath *)indexPath;
@end
#pragma mark -
@interface OWSMessagesCollectionViewFlowLayout : JSQMessagesCollectionViewFlowLayout
@property (nonatomic, weak) id<OWSMessagesCollectionViewFlowLayoutDelegate> delegate;
@end
#pragma mark -
@implementation OWSMessagesCollectionViewFlowLayout
- (CGSize)sizeForItemAtIndexPath:(NSIndexPath *)indexPath
{
// The unread indicator should be sized according to its desired size.
if ([self.delegate isSpecialItemAtIndexPath:indexPath]) {
CGSize messageBubbleSize = [self messageBubbleSizeForItemAtIndexPath:indexPath];
CGFloat finalHeight = messageBubbleSize.height;
return CGSizeMake(CGRectGetWidth(self.collectionView.frame), ceilf((float)finalHeight));
} else {
return [super sizeForItemAtIndexPath:indexPath];
}
}
@end
#pragma mark -
@interface MessagesViewController () <AVAudioPlayerDelegate,
@ -117,6 +150,7 @@ typedef enum : NSUInteger {
CNContactViewControllerDelegate,
JSQMessagesComposerTextViewPasteDelegate,
OWSConversationSettingsViewDelegate,
OWSMessagesCollectionViewFlowLayoutDelegate,
OWSTextViewPasteDelegate,
OWSVoiceMemoGestureDelegate,
UIDocumentMenuDelegate,
@ -1097,6 +1131,9 @@ typedef enum : NSUInteger {
self.view.frame = viewFrame;
self.collectionView.frame = viewFrame;
OWSMessagesCollectionViewFlowLayout *layout = [OWSMessagesCollectionViewFlowLayout new];
layout.delegate = self;
self.collectionView.collectionViewLayout = layout;
[self.collectionView.collectionViewLayout setMessageBubbleFont:[UIFont ows_dynamicTypeBodyFont]];
self.collectionView.showsVerticalScrollIndicator = NO;
@ -3867,6 +3904,14 @@ typedef enum : NSUInteger {
}
}
#pragma mark - OWSMessagesCollectionViewFlowLayoutDelegate
- (BOOL)isSpecialItemAtIndexPath:(NSIndexPath *)indexPath
{
TSInteraction *interaction = [self interactionAtIndexPath:indexPath];
return [interaction isKindOfClass:[TSUnreadIndicatorInteraction class]];
}
#pragma mark - Class methods
+ (UINib *)nib

131
Signal/src/views/OWSUnreadIndicatorCell.m
View File

@ -4,7 +4,6 @@
#import "OWSUnreadIndicatorCell.h"
#import "NSBundle+JSQMessages.h"
#import "OWSBezierPathView.h"
#import "TSUnreadIndicatorInteraction.h"
#import "UIColor+OWS.h"
#import "UIFont+OWS.h"
@ -13,10 +12,12 @@
@interface OWSUnreadIndicatorCell ()
@property (nonatomic) UIView *bannerView;
@property (nonatomic) UIView *bannerTopHighlightView;
@property (nonatomic) UIView *bannerBottomHighlightView1;
@property (nonatomic) UIView *bannerBottomHighlightView2;
@property (nonatomic) UILabel *titleLabel;
@property (nonatomic) UILabel *subtitleLabel;
@property (nonatomic) OWSBezierPathView *leftPathView;
@property (nonatomic) OWSBezierPathView *rightPathView;
@end
@ -34,52 +35,53 @@
self.backgroundColor = [UIColor whiteColor];
if (!self.titleLabel) {
self.bannerView = [UIView new];
self.bannerView.backgroundColor = [UIColor colorWithRGBHex:0xf6eee3];
[self.contentView addSubview:self.bannerView];
self.bannerTopHighlightView = [UIView new];
self.bannerTopHighlightView.backgroundColor = [UIColor colorWithRGBHex:0xf9f3eb];
[self.bannerView addSubview:self.bannerTopHighlightView];
self.bannerBottomHighlightView1 = [UIView new];
self.bannerBottomHighlightView1.backgroundColor = [UIColor colorWithRGBHex:0xd1c6b8];
[self.bannerView addSubview:self.bannerBottomHighlightView1];
self.bannerBottomHighlightView2 = [UIView new];
self.bannerBottomHighlightView2.backgroundColor = [UIColor colorWithRGBHex:0xdbcfc0];
[self.bannerView addSubview:self.bannerBottomHighlightView2];
self.titleLabel = [UILabel new];
self.titleLabel.text = [OWSUnreadIndicatorCell titleForInteraction:self.interaction];
self.titleLabel.textColor = [UIColor ows_infoMessageBorderColor];
self.titleLabel.font = [OWSUnreadIndicatorCell textFont];
[self.contentView addSubview:self.titleLabel];
self.titleLabel.textColor = [UIColor colorWithRGBHex:0x403e3b];
self.titleLabel.font = [OWSUnreadIndicatorCell titleFont];
[self.bannerView addSubview:self.titleLabel];
self.subtitleLabel = [UILabel new];
self.subtitleLabel.text = [OWSUnreadIndicatorCell subtitleForInteraction:self.interaction];
self.subtitleLabel.textColor = [UIColor ows_infoMessageBorderColor];
self.subtitleLabel.font = [OWSUnreadIndicatorCell textFont];
self.subtitleLabel.font = [OWSUnreadIndicatorCell subtitleFont];
self.subtitleLabel.numberOfLines = 0;
self.subtitleLabel.lineBreakMode = NSLineBreakByWordWrapping;
self.subtitleLabel.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.subtitleLabel];
CGFloat kLineThickness = 0.5f;
CGFloat kLineMargin = 5.f;
ConfigureShapeLayerBlock configureShapeLayerBlock = ^(CAShapeLayer *layer, CGRect bounds) {
OWSCAssert(layer);
CGRect pathBounds
= CGRectMake(0, (bounds.size.height - kLineThickness) * 0.5f, bounds.size.width, kLineThickness);
pathBounds = CGRectInset(pathBounds, kLineMargin, 0);
UIBezierPath *path = [UIBezierPath bezierPathWithRect:pathBounds];
layer.path = path.CGPath;
layer.fillColor = [[UIColor ows_infoMessageBorderColor] colorWithAlphaComponent:0.5f].CGColor;
};
self.leftPathView = [OWSBezierPathView new];
self.leftPathView.configureShapeLayerBlock = configureShapeLayerBlock;
[self.contentView addSubview:self.leftPathView];
self.rightPathView = [OWSBezierPathView new];
self.rightPathView.configureShapeLayerBlock = configureShapeLayerBlock;
[self.contentView addSubview:self.rightPathView];
}
}
+ (UIFont *)textFont
+ (UIFont *)titleFont
{
return [UIFont ows_mediumFontWithSize:12.f];
return [UIFont ows_regularFontWithSize:16.f];
}
+ (UIFont *)subtitleFont
{
return [UIFont ows_regularFontWithSize:12.f];
}
+ (NSString *)titleForInteraction:(TSUnreadIndicatorInteraction *)interaction
{
return NSLocalizedString(@"MESSAGES_VIEW_UNREAD_INDICATOR", @"Indicator that separates read from unread messages.");
return NSLocalizedString(@"MESSAGES_VIEW_UNREAD_INDICATOR", @"Indicator that separates read from unread messages.")
.uppercaseString;
}
+ (NSString *)subtitleForInteraction:(TSUnreadIndicatorInteraction *)interaction
@ -110,7 +112,22 @@
return 3.f;
}
+ (CGFloat)vMargin
+ (CGFloat)titleInnerHMargin
{
return 10.f;
}
+ (CGFloat)titleVMargin
{
return 5.5f;
}
+ (CGFloat)topVMargin
{
return 5.f;
}
+ (CGFloat)bottomVMargin
{
return 5.f;
}
@ -120,35 +137,48 @@
[super layoutSubviews];
[self.titleLabel sizeToFit];
if (self.subtitleLabel.text.length < 1) {
[self.titleLabel centerOnSuperview];
} else {
// It's a bit of a hack, but we use a view that extends _outside_ the cell's bounds
// to draw its background, since we want the background to extend to the edges of the
// collection view.
//
// This layout logic assumes that the cell insets are symmetrical and can be deduced
// from the cell frame.
CGRect bannerViewFrame = CGRectMake(-self.left,
round(OWSUnreadIndicatorCell.topVMargin),
round(self.width + self.left * 2.f),
round(self.titleLabel.height + OWSUnreadIndicatorCell.titleVMargin * 2.f));
self.bannerView.frame = [self convertRect:bannerViewFrame toView:self.contentView];
// The highlights should be 1px (not 1pt), so adapt their thickness to
// the device resolution.
CGFloat kHighlightThickness = 1.f / [UIScreen mainScreen].scale;
self.bannerTopHighlightView.frame = CGRectMake(0, 0, self.bannerView.width, kHighlightThickness);
self.bannerBottomHighlightView1.frame
= CGRectMake(0, self.bannerView.height - kHighlightThickness * 2.f, self.bannerView.width, kHighlightThickness);
self.bannerBottomHighlightView2.frame
= CGRectMake(0, self.bannerView.height - kHighlightThickness * 1.f, self.bannerView.width, kHighlightThickness);
[self.titleLabel centerOnSuperview];
if (self.subtitleLabel.text.length > 0) {
CGSize subtitleSize = [self.subtitleLabel
sizeThatFits:CGSizeMake(
self.contentView.width - [OWSUnreadIndicatorCell subtitleHMargin] * 2.f, CGFLOAT_MAX)];
CGFloat contentHeight
= ceil(self.titleLabel.height) + OWSUnreadIndicatorCell.subtitleVSpacing + ceil(subtitleSize.height);
self.titleLabel.frame = CGRectMake(round((self.titleLabel.superview.width - self.titleLabel.width) * 0.5f),
round((self.titleLabel.superview.height - contentHeight) * 0.5f),
ceil(self.titleLabel.width),
ceil(self.titleLabel.height));
self.subtitleLabel.frame = CGRectMake(round((self.titleLabel.superview.width - subtitleSize.width) * 0.5f),
round(self.titleLabel.bottom + OWSUnreadIndicatorCell.subtitleVSpacing),
self.subtitleLabel.frame = CGRectMake(round((self.contentView.width - subtitleSize.width) * 0.5f),
round(self.bannerView.bottom + OWSUnreadIndicatorCell.subtitleVSpacing),
ceil(subtitleSize.width),
ceil(subtitleSize.height));
}
self.leftPathView.frame = CGRectMake(0, self.titleLabel.top, self.titleLabel.left, self.titleLabel.height);
self.rightPathView.frame = CGRectMake(
self.titleLabel.right, self.titleLabel.top, self.width - self.titleLabel.right, self.titleLabel.height);
}
+ (CGSize)cellSizeForInteraction:(TSUnreadIndicatorInteraction *)interaction
collectionViewWidth:(CGFloat)collectionViewWidth
{
CGSize result = CGSizeMake(collectionViewWidth, 0);
result.height += self.vMargin * 2.f;
result.height += self.titleVMargin * 2.f;
result.height += self.topVMargin;
result.height += self.bottomVMargin;
NSString *title = [self titleForInteraction:interaction];
NSString *subtitle = [self subtitleForInteraction:interaction];
@ -156,13 +186,14 @@
// Creating a UILabel to measure the layout is expensive, but it's the only
// reliable way to do it. Unread indicators should be rare, so this is acceptable.
UILabel *label = [UILabel new];
label.font = [self textFont];
label.font = [self titleFont];
label.text = title;
result.height += ceil([label sizeThatFits:CGSizeZero].height);
if (subtitle.length > 0) {
result.height += self.subtitleVSpacing;
label.font = [self subtitleFont];
label.text = subtitle;
// The subtitle may wrap to a second line.
label.lineBreakMode = NSLineBreakByWordWrapping;