Skip to content

Commit

Permalink
1.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lixiang1994 committed Nov 8, 2022
1 parent a3fec28 commit 138d05b
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 4 deletions.
2 changes: 1 addition & 1 deletion LEEAlert.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "LEEAlert"
s.version = "1.6.2"
s.version = "1.6.3"
s.summary = "优雅的Alert ActionSheet"

s.homepage = "https://github.com/lixiang1994/LEEAlert"
Expand Down
5 changes: 4 additions & 1 deletion LEEAlert/LEEAlert.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @author LEE
* @copyright Copyright © 2016 - 2020年 lee. All rights reserved.
* @version V1.6.2
* @version V1.6.3
*/

#import <Foundation/Foundation.h>
Expand Down Expand Up @@ -188,6 +188,9 @@ NS_ASSUME_NONNULL_BEGIN
/** 设置 是否可滑动 -> 格式: .LeeIsScrollEnabled(YES) */
@property (nonatomic, copy, readonly) LEEConfigToBool LeeIsScrollEnabled;

/** 设置 是否显示滑动指示器 -> 格式: .LeeIsShowsScrollIndicator(YES) */
@property (nonatomic, copy, readonly) LEEConfigToBool LeeIsShowsScrollIndicator;

/** 设置 Action是否跟随Item滑动 -> 格式: .LeeIsActionFollowScrollEnabled(YES) */
@property (nonatomic, copy, readonly) LEEConfigToBool LeeIsActionFollowScrollEnabled;

Expand Down
27 changes: 26 additions & 1 deletion LEEAlert/LEEAlert.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @author LEE
* @copyright Copyright © 2016 - 2020年 lee. All rights reserved.
* @version V1.6.2
* @version V1.6.3
*/

#import "LEEAlert.h"
Expand Down Expand Up @@ -62,6 +62,7 @@ @interface LEEBaseConfigModel ()
@property (nonatomic, assign) BOOL modelIsContinueQueueDisplay;
@property (nonatomic, assign) BOOL modelIsAvoidKeyboard;
@property (nonatomic, assign) BOOL modelIsScrollEnabled;
@property (nonatomic, assign) BOOL modelIsShowsScrollIndicator;

@property (nonatomic, assign) BOOL modelIsActionFollowScrollEnabled;

Expand Down Expand Up @@ -148,6 +149,7 @@ - (instancetype)init
_modelIsContinueQueueDisplay = YES; //默认继续队列显示
_modelIsAvoidKeyboard = YES; //默认闪避键盘
_modelIsScrollEnabled = YES; //默认可以滑动
_modelIsShowsScrollIndicator = YES; //默认显示滑动指示器

_modelIsActionFollowScrollEnabled = YES; //默认 Action 跟随 Item 滚动

Expand Down Expand Up @@ -592,6 +594,17 @@ - (LEEConfigToBool)LeeIsScrollEnabled{

}

- (LEEConfigToBool)LeeIsShowsScrollIndicator{

return ^(BOOL is){

self.modelIsShowsScrollIndicator = is;

return self;
};

}

- (LEEConfigToBool)LeeIsActionFollowScrollEnabled{

return ^(BOOL is){
Expand Down Expand Up @@ -2577,6 +2590,12 @@ - (void)configAlert{

self.itemsScrollView.scrollEnabled = self.config.modelIsScrollEnabled;

self.itemsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator;

self.actionsScrollView.scrollEnabled = self.config.modelIsScrollEnabled;

self.actionsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator;

[self.config.modelItemArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

void (^itemBlock)(LEEItem *) = obj;
Expand Down Expand Up @@ -3457,6 +3476,12 @@ - (void)configActionSheet{

self.itemsScrollView.scrollEnabled = self.config.modelIsScrollEnabled;

self.itemsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator;

self.actionsScrollView.scrollEnabled = self.config.modelIsScrollEnabled;

self.actionsScrollView.showsVerticalScrollIndicator = self.config.modelIsShowsScrollIndicator;

[self.config.modelItemArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

void (^itemBlock)(LEEItem *) = obj;
Expand Down
2 changes: 1 addition & 1 deletion LEEAlert/LEEAlertHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @author LEE
* @copyright Copyright © 2016 - 2020年 lee. All rights reserved.
* @version V1.6.2
* @version V1.6.3
*/

#ifndef LEEAlertHelper_h
Expand Down
4 changes: 4 additions & 0 deletions UPDATELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

# LEEAlert - 更新日志

V1.6.3
==============
增加 `.LeeIsShowsScrollIndicator(YES)` 设置是否显示滑动指示器

V1.6.2
==============
`leeShouldActionClickClose` 返回False时 Action的点击事件回调也会被调用
Expand Down

0 comments on commit 138d05b

Please sign in to comment.