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

Rework the contact offers.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 7 years ago
parent 265bdce0ba
commit c2f9d7dcb2
1 changed files with 65 additions and 117 deletions
Show Stats Download Patch File Download Diff File

182
Signal/src/views/OWSContactOffersCell.m
Unescape Escape View File

@ -20,12 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic) UIButton *addToContactsButton;
@property (nonatomic) UIButton *addToProfileWhitelistButton;
@property (nonatomic) UIButton *blockButton;
//@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) NSArray<NSLayoutConstraint *> *layoutConstraints;
@end
@ -49,14 +45,11 @@ NS_ASSUME_NONNULL_BEGIN
[self setTranslatesAutoresizingMaskIntoConstraints:NO];
// self.backgroundColor = [UIColor whiteColor];
self.titleLabel = [UILabel new];
self.titleLabel.textColor = [UIColor blackColor];
self.titleLabel.font = [self titleFont];
self.titleLabel.text = NSLocalizedString(@"CONVERSATION_VIEW_CONTACTS_OFFER_TITLE",
@"Title for the group of buttons show for unknown contacts offering to add them to contacts, etc.");
// The subtitle may wrap to a second line.
self.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
self.titleLabel.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.titleLabel];
@ -64,51 +57,19 @@ NS_ASSUME_NONNULL_BEGIN
self.addToContactsButton = [self
createButtonWithTitle:
NSLocalizedString(@"CONVERSATION_VIEW_ADD_TO_CONTACTS_OFFER",
@"Message shown in conversation view that offers to add an unknown user to your phone's contacts.")];
self.addToProfileWhitelistButton =
[self createButtonWithTitle:
NSLocalizedString(@"CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER",
@"Message shown in conversation view that offers to share your profile with a user.")];
@"Message shown in conversation view that offers to add an unknown user to your phone's contacts.")
selector:@selector(addToContacts)];
self.addToProfileWhitelistButton = [self
createButtonWithTitle:NSLocalizedString(@"CONVERSATION_VIEW_ADD_USER_TO_PROFILE_WHITELIST_OFFER",
@"Message shown in conversation view that offers to share your profile with a user.")
selector:@selector(addToProfileWhitelist)];
self.blockButton =
[self createButtonWithTitle:NSLocalizedString(@"CONVERSATION_VIEW_UNKNOWN_CONTACT_BLOCK_OFFER",
@"Message shown in conversation view that offers to block an unknown user.")];
// 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.textColor = [UIColor colorWithRGBHex:0x403e3b];
// self.titleLabel.font = [self titleFont];
// [self.bannerView addSubview:self.titleLabel];
//
// self.subtitleLabel = [UILabel new];
// self.subtitleLabel.textColor = [UIColor ows_infoMessageBorderColor];
// self.subtitleLabel.font = [self subtitleFont];
// // The subtitle may wrap to a second line.
// self.subtitleLabel.numberOfLines = 0;
// self.subtitleLabel.lineBreakMode = NSLineBreakByWordWrapping;
// self.subtitleLabel.textAlignment = NSTextAlignmentCenter;
// [self.contentView addSubview:self.subtitleLabel];
UITapGestureRecognizer *tap =
[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
[self addGestureRecognizer:tap];
@"Message shown in conversation view that offers to block an unknown user.")
selector:@selector(block)];
}
- (UIButton *)createButtonWithTitle:(NSString *)title
- (UIButton *)createButtonWithTitle:(NSString *)title selector:(SEL)selector
{
UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
[button setTitle:title forState:UIControlStateNormal];
@ -117,6 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
button.titleLabel.textAlignment = NSTextAlignmentCenter;
[button setBackgroundColor:[UIColor colorWithRGBHex:0xf5f5f5]];
button.layer.cornerRadius = 5.f;
[button addTarget:self action:selector forControlEvents:UIControlEventTouchUpInside];
[self.contentView addSubview:button];
return button;
}
@ -135,6 +97,39 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(
interaction.hasBlockOffer || interaction.hasAddToContactsOffer || interaction.hasAddToProfileWhitelistOffer);
if (self.layoutConstraints) {
[NSLayoutConstraint deactivateConstraints:self.layoutConstraints];
}
NSMutableArray<NSLayoutConstraint *> *layoutConstraints = [NSMutableArray new];
[layoutConstraints addObject:[self.titleLabel autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.topVMargin]];
[layoutConstraints addObjectsFromArray:[self.titleLabel autoPinLeadingAndTrailingToSuperview]];
__block UIView *lastView = self.titleLabel;
void (^layoutButton)(UIButton *, BOOL) = ^(UIButton *button, bool isVisible) {
if (isVisible) {
button.hidden = NO;
[layoutConstraints addObject:[button autoPinEdge:ALEdgeTop
toEdge:ALEdgeBottom
ofView:lastView
withOffset:self.buttonVSpacing]];
[layoutConstraints addObject:[button autoSetDimension:ALDimensionHeight
toSize:ceil([button sizeThatFits:CGSizeZero].height
+ self.buttonVPadding)]];
[layoutConstraints addObjectsFromArray:[button autoPinLeadingAndTrailingToSuperview]];
lastView = button;
} else {
button.hidden = YES;
}
};
layoutButton(self.addToContactsButton, self.interaction.hasAddToContactsOffer);
layoutButton(self.addToProfileWhitelistButton, self.interaction.hasAddToProfileWhitelistOffer);
layoutButton(self.blockButton, self.interaction.hasBlockOffer);
self.layoutConstraints = layoutConstraints;
[self setNeedsLayout];
}
@ -173,68 +168,6 @@ NS_ASSUME_NONNULL_BEGIN
return 5.f;
}
- (void)setFrame:(CGRect)frame
{
BOOL needsLayout = !CGSizeEqualToSize(frame.size, self.frame.size);
[super setFrame:frame];
if (needsLayout) {
[self layoutSubviews];
}
}
- (void)setBounds:(CGRect)bounds
{
BOOL needsLayout = !CGSizeEqualToSize(bounds.size, self.bounds.size);
[super setBounds:bounds];
if (needsLayout) {
[self layoutSubviews];
}
}
- (void)layoutSubviews
{
[super layoutSubviews];
// JSQ won't
CGFloat contentWidth = floor(MIN(self.contentView.width, self.width - 2 * self.contentView.left));
DDLogError(@"---- %f %f %f %f", self.width, self.contentView.width, contentWidth, self.contentView.left);
CGRect titleFrame = self.contentView.bounds;
titleFrame.origin = CGPointMake(self.hMargin, self.topVMargin);
titleFrame.size.width = contentWidth - 2 * self.hMargin;
titleFrame.size.height = ceil([self.titleLabel sizeThatFits:CGSizeZero].height);
self.titleLabel.frame = titleFrame;
__block CGFloat y = round(self.titleLabel.bottom + self.buttonVSpacing);
DDLogError(@"first y: %f", y);
void (^layoutButton)(UIButton *, BOOL) = ^(UIButton *button, bool isVisible) {
if (isVisible) {
button.hidden = NO;
button.frame = CGRectMake(round(self.hMargin),
round(y),
floor(contentWidth - 2 * self.hMargin),
ceil([button sizeThatFits:CGSizeZero].height + self.buttonVPadding));
y = round(button.bottom + self.buttonVSpacing);
} else {
button.hidden = YES;
}
};
layoutButton(self.addToContactsButton, self.interaction.hasAddToContactsOffer);
layoutButton(self.addToProfileWhitelistButton, self.interaction.hasAddToProfileWhitelistOffer);
layoutButton(self.blockButton, self.interaction.hasBlockOffer);
[self.contentView addRedBorder];
[self.titleLabel addRedBorder];
[self.addToContactsButton addRedBorder];
[self.addToProfileWhitelistButton addRedBorder];
[self.blockButton addRedBorder];
}
- (CGSize)bubbleSizeForInteraction:(OWSContactOffersInteraction *)interaction
collectionViewWidth:(CGFloat)collectionViewWidth
{
@ -259,15 +192,30 @@ NS_ASSUME_NONNULL_BEGIN
self.interaction = nil;
}
#pragma mark - Gesture recognizers
#pragma mark - Events
- (void)handleTapGesture:(UITapGestureRecognizer *)sender
- (void)addToContacts
{
OWSAssert(self.contactOffersCellDelegate);
OWSAssert(self.interaction);
if (sender.state == UIGestureRecognizerStateRecognized) {
// [self.systemMessageCellDelegate didTapSystemMessageWithInteraction:self.interaction];
}
[self.contactOffersCellDelegate tappedAddToContactsOfferMessage:self.interaction];
}
- (void)addToProfileWhitelist
{
OWSAssert(self.contactOffersCellDelegate);
OWSAssert(self.interaction);
[self.contactOffersCellDelegate tappedAddToProfileWhitelistOfferMessage:self.interaction];
}
- (void)block
{
OWSAssert(self.contactOffersCellDelegate);
OWSAssert(self.interaction);
[self.contactOffersCellDelegate tappedUnknownContactBlockOfferMessage:self.interaction];
}
#pragma mark - Logging

Write Preview
Loading…
Cancel
Save