Enforce naming convention

pull/33/head
Niels Andriesse 6 years ago
parent a627923dfa
commit 037dde3cd8

@ -1,5 +1,6 @@
@objc final class FriendRequestView : UIView { @objc(LKFriendRequestView)
final class FriendRequestView : UIView {
private let message: TSMessage private let message: TSMessage
@objc weak var delegate: FriendRequestViewDelegate? @objc weak var delegate: FriendRequestViewDelegate?

@ -1,5 +1,6 @@
@objc protocol FriendRequestViewDelegate { @objc(LKFriendRequestViewDelegate)
protocol FriendRequestViewDelegate {
/// Implementations of this method should update the thread's friend request status /// Implementations of this method should update the thread's friend request status
/// and send a friend request accepted message. /// and send a friend request accepted message.
@objc func acceptFriendRequest(_ friendRequest: TSIncomingMessage) @objc func acceptFriendRequest(_ friendRequest: TSIncomingMessage)

@ -5,14 +5,14 @@
#import "ConversationViewCell.h" #import "ConversationViewCell.h"
@class OWSMessageBubbleView; @class OWSMessageBubbleView;
@protocol FriendRequestViewDelegate; @protocol LKFriendRequestViewDelegate;
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface OWSMessageCell : ConversationViewCell @interface OWSMessageCell : ConversationViewCell
@property (nonatomic, readonly) OWSMessageBubbleView *messageBubbleView; @property (nonatomic, readonly) OWSMessageBubbleView *messageBubbleView;
@property (nonatomic, nullable, weak) id<FriendRequestViewDelegate> friendRequestViewDelegate; @property (nonatomic, nullable, weak) id<LKFriendRequestViewDelegate> friendRequestViewDelegate;
+ (NSString *)cellReuseIdentifier; + (NSString *)cellReuseIdentifier;

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic) OWSMessageBubbleView *messageBubbleView; @property (nonatomic) OWSMessageBubbleView *messageBubbleView;
@property (nonatomic) NSLayoutConstraint *messageBubbleViewBottomConstraint; @property (nonatomic) NSLayoutConstraint *messageBubbleViewBottomConstraint;
@property (nonatomic) AvatarImageView *avatarView; @property (nonatomic) AvatarImageView *avatarView;
@property (nonatomic, nullable) FriendRequestView *friendRequestView; @property (nonatomic, nullable) LKFriendRequestView *friendRequestView;
@property (nonatomic, nullable) UIImageView *sendFailureBadgeView; @property (nonatomic, nullable) UIImageView *sendFailureBadgeView;
@property (nonatomic, nullable) NSMutableArray<NSLayoutConstraint *> *viewConstraints; @property (nonatomic, nullable) NSMutableArray<NSLayoutConstraint *> *viewConstraints;
@ -207,7 +207,7 @@ NS_ASSUME_NONNULL_BEGIN
} }
if (self.message.isFriendRequest) { if (self.message.isFriendRequest) {
self.friendRequestView = [[FriendRequestView alloc] initWithMessage:self.message]; self.friendRequestView = [[LKFriendRequestView alloc] initWithMessage:self.message];
self.friendRequestView.delegate = self.friendRequestViewDelegate; self.friendRequestView.delegate = self.friendRequestViewDelegate;
[self.contentView addSubview:self.friendRequestView]; [self.contentView addSubview:self.friendRequestView];
[self.messageBubbleViewBottomConstraint setActive:NO]; [self.messageBubbleViewBottomConstraint setActive:NO];
@ -357,7 +357,7 @@ NS_ASSUME_NONNULL_BEGIN
} }
if (self.message.isFriendRequest) { if (self.message.isFriendRequest) {
cellSize.height += [FriendRequestView calculateHeightWithMessage:self.message conversationStyle:self.conversationStyle]; cellSize.height += [LKFriendRequestView calculateHeightWithMessage:self.message conversationStyle:self.conversationStyle];
} }
cellSize = CGSizeCeil(cellSize); cellSize = CGSizeCeil(cellSize);

@ -124,7 +124,7 @@ typedef enum : NSUInteger {
ConversationViewCellDelegate, ConversationViewCellDelegate,
ConversationInputTextViewDelegate, ConversationInputTextViewDelegate,
ConversationSearchControllerDelegate, ConversationSearchControllerDelegate,
FriendRequestViewDelegate, LKFriendRequestViewDelegate,
LongTextViewDelegate, LongTextViewDelegate,
MessageActionsDelegate, MessageActionsDelegate,
MessageDetailViewDelegate, MessageDetailViewDelegate,

Loading…
Cancel
Save