oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/gesturesVsBreaks' into release/2.28.0

Browse source
This commit is contained in:
Michael Kirk 2018-07-20 16:10:24 -06:00
parent 9049153c6c e271730f33
commit d8c247fc0e
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View file

@ -405,6 +405,10 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
if ([self isGestureInCellHeader:sender]) {
return;
}
if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
if (outgoingMessage.messageState == TSOutgoingMessageStateFailed) {
@ -427,6 +431,10 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
if ([self isGestureInCellHeader:sender]) {
return;
}
if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
if (outgoingMessage.messageState == TSOutgoingMessageStateFailed) {
@ -460,9 +468,26 @@ NS_ASSUME_NONNULL_BEGIN
{
OWSAssert(self.delegate);
if ([self isGestureInCellHeader:panRecognizer]) {
return;
}
[self.delegate didPanWithGestureRecognizer:panRecognizer viewItem:self.viewItem];
}
- (BOOL)isGestureInCellHeader:(UIGestureRecognizer *)sender
{
OWSAssert(self.viewItem);
if (!self.viewItem.hasCellHeader) {
return NO;
}
CGPoint location = [sender locationInView:self];
CGPoint headerBottom = [self convertPoint:CGPointMake(0, self.headerView.height) fromView:self.headerView];
return location.y <= headerBottom.y;
}
@end
NS_ASSUME_NONNULL_END

17
Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
View file

@ -556,6 +556,10 @@ typedef void (^SystemMessageActionBlock)(void);
{
OWSAssert(self.delegate);
if ([self isGestureInCellHeader:longPress]) {
return;
}
TSInteraction *interaction = self.viewItem.interaction;
OWSAssert(interaction);
@ -564,6 +568,19 @@ typedef void (^SystemMessageActionBlock)(void);
}
}
- (BOOL)isGestureInCellHeader:(UIGestureRecognizer *)sender
{
OWSAssert(self.viewItem);
if (!self.viewItem.hasCellHeader) {
return NO;
}
CGPoint location = [sender locationInView:self];
CGPoint headerBottom = [self convertPoint:CGPointMake(0, self.headerView.height) fromView:self.headerView];
return location.y <= headerBottom.y;
}
- (void)buttonWasPressed:(id)sender
{
if (!self.action.block) {