Code style, comments, remove nullable

Author: sunnyxx

Classes/UITableView+FDTemplateLayoutCell.h

@@ -23,10 +23,6 @@
 #import <UIKit/UIKit.h>
 #import "UITableView+FDTemplateLayoutCellDebug.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
-typedef void (^__nullable FDTemplateLayoutCellConfigurationBlock)(id cell);
-
 @interface UITableView (FDTemplateLayoutCell)
 
 /// Returns height of cell of type specifed by a reuse identifier and configured
@@ -43,7 +39,7 @@ typedef void (^__nullable FDTemplateLayoutCellConfigurationBlock)(id cell);
 ///        to the template cell. The configuration should be minimal for scrolling
 ///        performance yet sufficient for calculating cell's height.
 ///
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(FDTemplateLayoutCellConfigurationBlock)configuration;
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(void (^)(id cell))configuration;
 
 /// This method does what "-fd_heightForCellWithIdentifier:configuration" does, and
 /// calculated height will be cached by its index path, returns a cached height
@@ -55,11 +51,16 @@ typedef void (^__nullable FDTemplateLayoutCellConfigurationBlock)(id cell);
 ///
 /// @param indexPath where this cell's height cache belongs.
 ///
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByIndexPath:(NSIndexPath *)indexPath configuration:(FDTemplateLayoutCellConfigurationBlock)configuration;
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByIndexPath:(NSIndexPath *)indexPath configuration:(void (^)(id cell))configuration;
 
-/// TODO: +7
+/// This method caches height by your model entity's identifier.
+/// If your model's changed, call "- invalidateHeightForKey:(id <NSCopying>)key" to
+/// invalidate cache and re-calculate, it's much cheaper and effective than
+/// "cacheByIndexPath" version.
 ///
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByKey:(id<NSCopying>)key configuration:(FDTemplateLayoutCellConfigurationBlock)configuration;
+/// @param key model entity's identifier whose data configures a cell.
+///
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByKey:(id<NSCopying>)key configuration:(void (^)(id cell))configuration;
 
 @end
 
@@ -79,13 +80,9 @@ typedef void (^__nullable FDTemplateLayoutCellConfigurationBlock)(id cell);
 
 /// Enable to enforce this template layout cell to use "frame layout" rather than "auto layout",
 /// and will ask cell's height by calling "-sizeThatFits:", so you must override this method.
-/// Note:
-///   If no layout constraints have been added to cell's content view, it will automatically
-///   switch to "frame layout" mode. Use this property only when you want to manually control
-///   this template layout cell's height calculation mode. Default to NO.
+/// Use this property only when you want to manually control this template layout cell's height
+/// calculation mode, default to NO.
 ///
 @property (nonatomic, assign) BOOL fd_enforceFrameLayout;
 
 @end
-
-NS_ASSUME_NONNULL_END

Classes/UITableView+FDTemplateLayoutCell.m

@@ -22,14 +22,13 @@
 
 #import "UITableView+FDTemplateLayoutCell.h"
 #import "UITableView+FDTemplateLayoutCellHeightCache.h"
-#import "UITableView+FDTemplateLayoutCellAutoInvalidate.h"
+#import "UITableView+FDTemplateLayoutCellInvalidation.h"
 #import "UITableView+FDTemplateLayoutCellPrecache.h"
 #import <objc/runtime.h>
 
 @implementation UITableView (FDTemplateLayoutCell)
 
-- (id)fd_templateCellForReuseIdentifier:(NSString *)identifier
-{
+- (id)fd_templateCellForReuseIdentifier:(NSString *)identifier {
     NSAssert(identifier.length > 0, @"Expect a valid identifier - %@", identifier);
 
     NSMutableDictionary *templateCellsByIdentifiers = objc_getAssociatedObject(self, _cmd);
@@ -52,8 +51,7 @@ - (id)fd_templateCellForReuseIdentifier:(NSString *)identifier
     return templateCell;
 }
 
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier configuration:(FDTemplateLayoutCellConfigurationBlock)configuration
-{
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(void (^)(id cell))configuration {
     if (!identifier) {
         return 0;
     }
@@ -134,8 +132,7 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier confi
     return fittingSize.height;
 }
 
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier cacheByIndexPath:(NSIndexPath * __nonnull)indexPath configuration:(FDTemplateLayoutCellConfigurationBlock)configuration
-{
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByIndexPath:(NSIndexPath *)indexPath configuration:(void (^)(id cell))configuration {
     if (!identifier || !indexPath) {
         return 0;
     }
@@ -176,8 +173,7 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier cache
     return height;
 }
 
-- (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier cacheByKey:(id<NSCopying> __nonnull)key configuration:(FDTemplateLayoutCellConfigurationBlock)configuration
-{
+- (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier cacheByKey:(id<NSCopying>)key configuration:(void (^)(id cell))configuration {
     if (!identifier || !key) {
         return 0;
     }
@@ -200,23 +196,19 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString * __nonnull)identifier cache
 
 @implementation UITableViewCell (FDTemplateLayoutCell)
 
-- (BOOL)fd_isTemplateLayoutCell
-{
+- (BOOL)fd_isTemplateLayoutCell {
     return [objc_getAssociatedObject(self, _cmd) boolValue];
 }
 
-- (void)setFd_isTemplateLayoutCell:(BOOL)isTemplateLayoutCell
-{
+- (void)setFd_isTemplateLayoutCell:(BOOL)isTemplateLayoutCell {
     objc_setAssociatedObject(self, @selector(fd_isTemplateLayoutCell), @(isTemplateLayoutCell), OBJC_ASSOCIATION_RETAIN);
 }
 
-- (BOOL)fd_enforceFrameLayout
-{
+- (BOOL)fd_enforceFrameLayout {
     return [objc_getAssociatedObject(self, _cmd) boolValue];
 }
 
-- (void)setFd_enforceFrameLayout:(BOOL)enforceFrameLayout
-{
+- (void)setFd_enforceFrameLayout:(BOOL)enforceFrameLayout {
     objc_setAssociatedObject(self, @selector(fd_enforceFrameLayout), @(enforceFrameLayout), OBJC_ASSOCIATION_RETAIN);
 }
 

Classes/UITableView+FDTemplateLayoutCellDebug.h

@@ -27,11 +27,11 @@
 /// Helps to debug or inspect what is this "FDTemplateLayoutCell" extention doing,
 /// turning on to print logs when "creating", "calculating", "precaching" or "hitting cache".
 ///
-/// Default to "NO", log by "NSLog".
+/// Default to NO, log by NSLog.
 ///
 @property (nonatomic, assign) BOOL fd_debugLogEnabled;
 
 /// Debug log controlled by "fd_debugLogEnabled".
-- (void)fd_debugLog:(nullable NSString *)message;
+- (void)fd_debugLog:(NSString *)message;
 
 @end

Classes/UITableView+FDTemplateLayoutCellDebug.m

@@ -25,18 +25,15 @@
 
 @implementation UITableView (FDTemplateLayoutCellDebug)
 
-- (BOOL)fd_debugLogEnabled
-{
+- (BOOL)fd_debugLogEnabled {
     return [objc_getAssociatedObject(self, _cmd) boolValue];
 }
 
-- (void)setFd_debugLogEnabled:(BOOL)debugLogEnabled
-{
+- (void)setFd_debugLogEnabled:(BOOL)debugLogEnabled {
     objc_setAssociatedObject(self, @selector(fd_debugLogEnabled), @(debugLogEnabled), OBJC_ASSOCIATION_RETAIN);
 }
 
-- (void)fd_debugLog:(NSString *)message
-{
+- (void)fd_debugLog:(NSString *)message {
     if (!self.fd_debugLogEnabled) {
         return;
     }

Classes/UITableView+FDTemplateLayoutCellHeightCache.h

@@ -22,14 +22,12 @@
 
 #import <UIKit/UIKit.h>
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface FDTemplateLayoutCellIndexPathHeightCache : NSObject
 
 - (BOOL)existsHeightAtIndexPath:(NSIndexPath *)indexPath;
 - (void)cacheHeight:(CGFloat)height byIndexPath:(NSIndexPath *)indexPath;
 - (CGFloat)heightForIndexPath:(NSIndexPath *)indexPath;
-- (void)invalidateHeightAtIndexPath:(NSIndexPath *)indexPath;
+- (void)clearHeightAtIndexPath:(NSIndexPath *)indexPath;
 - (void)clearAllheightCaches;
 - (void)insertSection:(NSInteger)section;
 - (void)deleteSection:(NSInteger)section;
@@ -45,19 +43,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FDTemplateLayoutCellKeyHeightCache : NSObject
 
-- (BOOL)existsHeightForKey:(id <NSCopying>)key;
-- (void)cacheHeight:(CGFloat)height byKey:(id <NSCopying>)key;
-- (CGFloat)heightForKey:(id <NSCopying>)key;
-- (void)invalidateHeightForKey:(id <NSCopying>)key;
+- (BOOL)existsHeightForKey:(id<NSCopying>)key;
+- (void)cacheHeight:(CGFloat)height byKey:(id<NSCopying>)key;
+- (CGFloat)heightForKey:(id<NSCopying>)key;
+- (void)clearHeightForKey:(id<NSCopying>)key;
 - (void)clearAllheightCaches;
 
 @end
 
+/// Do not use directly.
 @interface UITableView (FDTemplateLayoutCellHeightCache)
 
 @property (nonatomic, strong, readonly) FDTemplateLayoutCellIndexPathHeightCache *fd_indexPathHeightCache;
 @property (nonatomic, strong, readonly) FDTemplateLayoutCellKeyHeightCache *fd_keyHeightCache;
 
 @end
-
-NS_ASSUME_NONNULL_END