Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

[models] Add nullability annotations to the cell catalog. #726

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[models] Add nullability annotations to the cell catalog. #726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/models/src/NICellCatalog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import "NICellFactory.h"

typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, id object, UITableViewCell* cell);
typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, _Nonnull id object, UITableViewCell* cell);

/**
* An object that will draw the contents of the cell using a provided block.
Expand All @@ -25,10 +25,10 @@ typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, id object, UITableViewCell*
*/
@interface NIDrawRectBlockCellObject : NICellObject
// Designated initializer.
- (id)initWithBlock:(NICellDrawRectBlock)block object:(id)object;
+ (id)objectWithBlock:(NICellDrawRectBlock)block object:(id)object;
@property (nonatomic, copy) NICellDrawRectBlock block;
@property (nonatomic, strong) id object;
- (nonnull id)initWithBlock:(nonnull NICellDrawRectBlock)block object:(nonnull id)object;
+ (nonnull id)objectWithBlock:(nonnull NICellDrawRectBlock)block object:(nonnull id)object;
@property (nonatomic, copy, nonnull) NICellDrawRectBlock block;
@property (nonatomic, strong, nonnull) id object;
@end

/**
Expand All @@ -42,13 +42,13 @@ typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, id object, UITableViewCell*
*/
@interface NITitleCellObject : NICellObject
// Designated initializer.
- (id)initWithTitle:(NSString *)title image:(UIImage *)image;
- (id)initWithTitle:(NSString *)title;
- (id)initWithTitle:(NSString *)title image:(UIImage *)image cellClass:(Class)cellClass userInfo:(id)userInfo;
+ (id)objectWithTitle:(NSString *)title image:(UIImage *)image;
+ (id)objectWithTitle:(NSString *)title;
@property (nonatomic, copy) NSString* title;
@property (nonatomic, strong) UIImage* image;
- (nonnull id)initWithTitle:(nullable NSString *)title image:(nullable UIImage *)image;
- (nonnull id)initWithTitle:(nullable NSString *)title;
- (nonnull id)initWithTitle:(nullable NSString *)title image:(nullable UIImage *)image cellClass:(Class)cellClass userInfo:(nullable id)userInfo;
+ (nonnull id)objectWithTitle:(NSString *)title image:(nullable UIImage *)image;
+ (nonnull id)objectWithTitle:(NSString *)title;
@property (nonatomic, copy, nullable) NSString* title;
@property (nonatomic, strong, nullable) UIImage* image;
@end

/**
Expand All @@ -62,12 +62,12 @@ typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, id object, UITableViewCell*
*/
@interface NISubtitleCellObject : NITitleCellObject
// Designated initializer.
- (id)initWithTitle:(NSString *)title subtitle:(NSString *)subtitle image:(UIImage *)image;
- (id)initWithTitle:(NSString *)title subtitle:(NSString *)subtitle;
- (id)initWithTitle:(NSString *)title subtitle:(NSString *)subtitle image:(UIImage *)image cellClass:(Class)cellClass userInfo:(id)userInfo;
+ (id)objectWithTitle:(NSString *)title subtitle:(NSString *)subtitle image:(UIImage *)image;
+ (id)objectWithTitle:(NSString *)title subtitle:(NSString *)subtitle;
@property (nonatomic, copy) NSString* subtitle;
- (nonnull id)initWithTitle:(nullable NSString *)title subtitle:(nullable NSString *)subtitle image:(nullable UIImage *)image;
- (nonnull id)initWithTitle:(nullable NSString *)title subtitle:(nullable NSString *)subtitle;
- (nonnull id)initWithTitle:(nullable NSString *)title subtitle:(nullable NSString *)subtitle image:(nullable UIImage *)image cellClass:(Class)cellClass userInfo:(nullable id)userInfo;
+ (nonnull id)objectWithTitle:(nullable NSString *)title subtitle:(nullable NSString *)subtitle image:(nullable UIImage *)image;
+ (nonnull id)objectWithTitle:(nullable NSString *)title subtitle:(nullable NSString *)subtitle;
@property (nonatomic, copy, nullable) NSString* subtitle;
@property (nonatomic, assign) UITableViewCellStyle cellStyle;
@end

Expand All @@ -88,7 +88,7 @@ typedef CGFloat (^NICellDrawRectBlock)(CGRect rect, id object, UITableViewCell*
* @ingroup TableCellCatalog
*/
@interface NIDrawRectBlockCell : UITableViewCell <NICell>
@property (nonatomic, strong) UIView* blockView;
@property (nonatomic, strong, nonnull) UIView* blockView;
@end

/**
Expand Down