Skip to content

massive warning and typo fixes #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
2E89D018208C569700D038D6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2E89D016208C569700D038D6 /* LaunchScreen.storyboard */; };
2E89D01B208C569700D038D6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E89D01A208C569700D038D6 /* main.m */; };
2E89D02E208C5A1100D038D6 /* YNPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E89D02D208C5A1100D038D6 /* YNPageViewController.m */; };
2E89D031208C5AFE00D038D6 /* YNPageConfigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E89D030208C5AFE00D038D6 /* YNPageConfigration.m */; };
2E89D031208C5AFE00D038D6 /* YNPageConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E89D030208C5AFE00D038D6 /* YNPageConfiguration.m */; };
2EFDC1D520E0E9B10018455F /* YNScrollMenuStyleVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EFDC1D420E0E9B10018455F /* YNScrollMenuStyleVC.m */; };
2EFDC1D920E213440018455F /* YNLoadPageVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EFDC1D820E213440018455F /* YNLoadPageVC.m */; };
2EFDC1DC20E2156E0018455F /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EFDC1DB20E2156E0018455F /* BaseViewController.m */; };
Expand Down Expand Up @@ -261,8 +261,8 @@
2E89D01A208C569700D038D6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2E89D02C208C5A1100D038D6 /* YNPageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YNPageViewController.h; sourceTree = "<group>"; };
2E89D02D208C5A1100D038D6 /* YNPageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YNPageViewController.m; sourceTree = "<group>"; };
2E89D02F208C5AFE00D038D6 /* YNPageConfigration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YNPageConfigration.h; sourceTree = "<group>"; };
2E89D030208C5AFE00D038D6 /* YNPageConfigration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YNPageConfigration.m; sourceTree = "<group>"; };
2E89D02F208C5AFE00D038D6 /* YNPageConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YNPageConfiguration.h; sourceTree = "<group>"; };
2E89D030208C5AFE00D038D6 /* YNPageConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YNPageConfiguration.m; sourceTree = "<group>"; };
2EFDC1D320E0E9B10018455F /* YNScrollMenuStyleVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YNScrollMenuStyleVC.h; sourceTree = "<group>"; };
2EFDC1D420E0E9B10018455F /* YNScrollMenuStyleVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YNScrollMenuStyleVC.m; sourceTree = "<group>"; };
2EFDC1D720E213440018455F /* YNLoadPageVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YNLoadPageVC.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -702,8 +702,8 @@
2E3F8DCE20F9FA6A009FDA84 /* View */,
2E89D02C208C5A1100D038D6 /* YNPageViewController.h */,
2E89D02D208C5A1100D038D6 /* YNPageViewController.m */,
2E89D02F208C5AFE00D038D6 /* YNPageConfigration.h */,
2E89D030208C5AFE00D038D6 /* YNPageConfigration.m */,
2E89D02F208C5AFE00D038D6 /* YNPageConfiguration.h */,
2E89D030208C5AFE00D038D6 /* YNPageConfiguration.m */,
);
path = YNPageViewController;
sourceTree = "<group>";
Expand Down Expand Up @@ -752,7 +752,7 @@
2E89D000208C569700D038D6 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1250;
ORGANIZATIONNAME = yongneng;
TargetAttributes = {
2E89D007208C569700D038D6 = {
Expand Down Expand Up @@ -808,7 +808,7 @@
2E5F7E8520DCA5860069962B /* SDCycleScrollView.m in Sources */,
2E7FFF6021F16E2A00F29750 /* UITouch+MemoryLeak.m in Sources */,
2E5F7E8720DCA5860069962B /* NSData+ImageContentType.m in Sources */,
2E89D031208C5AFE00D038D6 /* YNPageConfigration.m in Sources */,
2E89D031208C5AFE00D038D6 /* YNPageConfiguration.m in Sources */,
2E5F7EA020DCAC840069962B /* YNSuspendCenterPageVC.m in Sources */,
2E5F7E7220DCA5860069962B /* MJRefreshAutoNormalFooter.m in Sources */,
2E5F7E6F20DCA5860069962B /* MJRefreshFooter.m in Sources */,
Expand Down Expand Up @@ -919,15 +919,18 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -974,15 +977,18 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
/**
* FTPopOverMenuDoneBlock
*
* @param index SlectedIndex
* @param selectedIndex SlectedIndex
*/
typedef void (^FTPopOverMenuDoneBlock)(NSInteger selectedIndex);
/**
* FTPopOverMenuDismissBlock
*/
typedef void (^FTPopOverMenuDismissBlock)();
typedef void (^FTPopOverMenuDismissBlock)(void);

/**
* -----------------------FTPopOverMenuConfiguration-----------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ -(void)setupWithMenuName:(NSString *)menuName menuImage:(id )menuImage
if (configuration.ignoreImageOriginalColor) {
image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
}
_iconImageView.image = image;
self->_iconImageView.image = image;
}];
[self.contentView addSubview:self.iconImageView];
}
Expand All @@ -166,7 +166,7 @@ -(void)setupWithMenuName:(NSString *)menuName menuImage:(id )menuImage
get image from local or remote

@param resource image reource
@param doneBlock get image back
@param completion get image back
*/
-(void)getImageWithResource:(id)resource completion:(void (^)(UIImage *image))completion
{
Expand All @@ -181,7 +181,7 @@ -(void)getImageWithResource:(id)resource completion:(void (^)(UIImage *image))co
}else if ([resource isKindOfClass:[NSURL class]]) {
[self downloadImageWithURL:resource completion:completion];
}else{
NSLog(@"Image resource not recougnized.");
NSLog(@"Image resource not recognized.");
completion(nil);
}
}
Expand All @@ -190,7 +190,7 @@ -(void)getImageWithResource:(id)resource completion:(void (^)(UIImage *image))co
download image if needed, cache image into disk if needed.

@param url imageURL
@param doneBlock get image back
@param completion get image back
*/
-(void)downloadImageWithURL:(NSURL *)url completion:(void (^)(UIImage *image))completion
{
Expand Down Expand Up @@ -224,7 +224,7 @@ -(BOOL)isExitImageForImageURL:(NSURL *)url
}

/**
get local disk cash filePath for imageurl
get local disk cash filePath for image url

@param url imageURL
@return filePath
Expand Down Expand Up @@ -765,8 +765,8 @@ - (void)show
self.isCurrentlyOnScreen = YES;
[UIView animateWithDuration:FTDefaultAnimationDuration
animations:^{
_popMenuView.alpha = 1;
_popMenuView.transform = CGAffineTransformMakeScale(1, 1);
self->_popMenuView.alpha = 1;
self->_popMenuView.transform = CGAffineTransformMakeScale(1, 1);
}];
}

Expand All @@ -784,8 +784,8 @@ -(void)doneActionWithSelectedIndex:(NSInteger)selectedIndex
{
[UIView animateWithDuration:FTDefaultAnimationDuration
animations:^{
_popMenuView.alpha = 0;
_popMenuView.transform = CGAffineTransformMakeScale(0.1, 0.1);
self->_popMenuView.alpha = 0;
self->_popMenuView.transform = CGAffineTransformMakeScale(0.1, 0.1);
}completion:^(BOOL finished) {
if (finished) {
[self.popMenuView removeFromSuperview];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ typedef NS_ENUM(NSInteger, MJRefreshState) {
};

/** 进入刷新状态的回调 */
typedef void (^MJRefreshComponentRefreshingBlock)();
typedef void (^MJRefreshComponentRefreshingBlock)(void);
/** 开始刷新后的回调(进入刷新状态后的回调) */
typedef void (^MJRefreshComponentbeginRefreshingCompletionBlock)();
typedef void (^MJRefreshComponentbeginRefreshingCompletionBlock)(void);
/** 结束刷新后的回调 */
typedef void (^MJRefreshComponentEndRefreshingCompletionBlock)();
typedef void (^MJRefreshComponentEndRefreshingCompletionBlock)(void);

/** 刷新控件的基类 */
@interface MJRefreshComponent : UIView
Expand All @@ -59,14 +59,14 @@ typedef void (^MJRefreshComponentEndRefreshingCompletionBlock)();
#pragma mark - 刷新状态控制
/** 进入刷新状态 */
- (void)beginRefreshing;
- (void)beginRefreshingWithCompletionBlock:(void (^)())completionBlock;
- (void)beginRefreshingWithCompletionBlock:(void (^)(void))completionBlock;
/** 开始刷新后的回调(进入刷新状态后的回调) */
@property (copy, nonatomic) MJRefreshComponentbeginRefreshingCompletionBlock beginRefreshingCompletionBlock;
/** 结束刷新的回调 */
@property (copy, nonatomic) MJRefreshComponentEndRefreshingCompletionBlock endRefreshingCompletionBlock;
/** 结束刷新状态 */
- (void)endRefreshing;
- (void)endRefreshingWithCompletionBlock:(void (^)())completionBlock;
- (void)endRefreshingWithCompletionBlock:(void (^)(void))completionBlock;
/** 是否正在刷新 */
- (BOOL)isRefreshing;
/** 刷新状态 一般交给子类内部实现 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ - (void)beginRefreshing
}
}

- (void)beginRefreshingWithCompletionBlock:(void (^)())completionBlock
- (void)beginRefreshingWithCompletionBlock:(void (^)(void))completionBlock
{
self.beginRefreshingCompletionBlock = completionBlock;

Expand All @@ -174,7 +174,7 @@ - (void)endRefreshing
self.state = MJRefreshStateIdle;
}

- (void)endRefreshingWithCompletionBlock:(void (^)())completionBlock
- (void)endRefreshingWithCompletionBlock:(void (^)(void))completionBlock
{
self.endRefreshingCompletionBlock = completionBlock;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ - (instancetype)initWithFrame:(CGRect)frame

- (void)awakeFromNib
{
[super awakeFromNib];
[self initialization];
[self setupMainView];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,12 @@ - (BOOL)diskImageExistsWithKey:(NSString *)key {

- (void)diskImageExistsWithKey:(NSString *)key completion:(SDWebImageCheckCacheCompletionBlock)completionBlock {
dispatch_async(_ioQueue, ^{
BOOL exists = [_fileManager fileExistsAtPath:[self defaultCachePathForKey:key]];
BOOL exists = [self->_fileManager fileExistsAtPath:[self defaultCachePathForKey:key]];

// fallback because of https://github.com/rs/SDWebImage/pull/976 that added the extension to the disk file name
// checking the key with and without the extension
if (!exists) {
exists = [_fileManager fileExistsAtPath:[[self defaultCachePathForKey:key] stringByDeletingPathExtension]];
exists = [self->_fileManager fileExistsAtPath:[[self defaultCachePathForKey:key] stringByDeletingPathExtension]];
}

if (completionBlock) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

extern UIImage *SDScaledImageForKey(NSString *key, UIImage *image);

typedef void(^SDWebImageNoParamsBlock)();
typedef void(^SDWebImageNoParamsBlock)(void);

extern NSString *const SDWebImageErrorDomain;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

typedef void(^YNPageScrollViewDidScrollView)(UIScrollView *scrollView);

typedef void(^YNPageScrollViewBeginDragginScrollView)(UIScrollView *scrollView);
typedef void(^YNPageScrollViewBeginDraggingScrollView)(UIScrollView *scrollView);

@interface UIScrollView (YNPageExtend)

@property (nonatomic, assign) BOOL yn_observerDidScrollView;

@property (nonatomic, copy) YNPageScrollViewDidScrollView yn_pageScrollViewDidScrollView;

@property (nonatomic, copy) YNPageScrollViewBeginDragginScrollView yn_pageScrollViewBeginDragginScrollView;
@property (nonatomic, copy) YNPageScrollViewBeginDraggingScrollView yn_pageScrollViewBeginDraggingScrollView;

- (void)yn_setContentOffsetY:(CGFloat)offsetY;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ - (void)yn_scrollViewDidScrollView {

- (void)yn_scrollViewWillBeginDragging {
[self yn_scrollViewWillBeginDragging];
if (self.yn_observerDidScrollView && self.yn_pageScrollViewBeginDragginScrollView) {
self.yn_pageScrollViewBeginDragginScrollView(self);
if (self.yn_observerDidScrollView && self.yn_pageScrollViewBeginDraggingScrollView) {
self.yn_pageScrollViewBeginDraggingScrollView(self);
}
}

Expand All @@ -51,12 +51,12 @@ - (void)setYn_pageScrollViewDidScrollView:(YNPageScrollViewDidScrollView)yn_page
objc_setAssociatedObject(self, @selector(yn_pageScrollViewDidScrollView), yn_pageScrollViewDidScrollView, OBJC_ASSOCIATION_COPY_NONATOMIC);
}

- (YNPageScrollViewBeginDragginScrollView)yn_pageScrollViewBeginDragginScrollView {
- (YNPageScrollViewBeginDraggingScrollView)yn_pageScrollViewBeginDraggingScrollView {
return objc_getAssociatedObject(self, _cmd);
}

- (void)setYn_pageScrollViewBeginDragginScrollView:(YNPageScrollViewBeginDragginScrollView)yn_pageScrollViewBeginDragginScrollView {
objc_setAssociatedObject(self, @selector(yn_pageScrollViewBeginDragginScrollView), yn_pageScrollViewBeginDragginScrollView, OBJC_ASSOCIATION_COPY_NONATOMIC);
- (void)setYn_pageScrollViewBeginDraggingScrollView:(YNPageScrollViewBeginDraggingScrollView)yn_pageScrollViewBeginDraggingScrollView {
objc_setAssociatedObject(self, @selector(yn_pageScrollViewBeginDraggingScrollView), yn_pageScrollViewBeginDraggingScrollView, OBJC_ASSOCIATION_COPY_NONATOMIC);
}

#pragma amrk - Swizzle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

- (YNPageViewController *)yn_pageViewController;

- (YNPageConfigration *)config;
- (YNPageConfiguration *)config;

- (YNPageScrollView *)bgScrollView;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ - (YNPageViewController *)yn_pageViewController {
return (YNPageViewController *)self.parentViewController;
}

- (YNPageConfigration *)config {
- (YNPageConfiguration *)config {
return self.yn_pageViewController.config;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

#import <UIKit/UIKit.h>

@class YNPageConfigration;
@class YNPageConfiguration;

@protocol YNPageScrollMenuViewDelegate <NSObject>
@optional
/// 点击item
- (void)pagescrollMenuViewItemOnClick:(UIButton *)button index:(NSInteger)index;
- (void)pageScrollMenuViewItemOnClick:(UIButton *)button index:(NSInteger)index;

/// 点击Add按钮
- (void)pagescrollMenuViewAddButtonAction:(UIButton *)button;
- (void)pageScrollMenuViewAddButtonAction:(UIButton *)button;

@end

Expand All @@ -36,13 +36,13 @@

@param frame 大小
@param titles 标题
@param configration 配置信息
@param configuration 配置信息
@param delegate 代理
@param currentIndex 当前选中下标
*/
+ (instancetype)pagescrollMenuViewWithFrame:(CGRect)frame
+ (instancetype)pageScrollMenuViewWithFrame:(CGRect)frame
titles:(NSMutableArray *)titles
configration:(YNPageConfigration *)configration
configuration:(YNPageConfiguration *)configuration
delegate:(id<YNPageScrollMenuViewDelegate>)delegate
currentIndex:(NSInteger)currentIndex;

Expand Down
Loading