Skip to content

Commit b271348

Browse files
wanghenghengwanghengheng
committed
EaseToolBar
1 parent 308cd6b commit b271348

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

‎Coding_iOS/Controllers/FileListViewController.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ - (void)configuploadFiles{
149149
- (void)configToolBar{
150150
//添加底部ToolBar
151151
if (!_myToolBar) {
152-
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
153-
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 上传文件" image:@"button_file_upload_enable" disableImage:nil];
152+
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
153+
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"上传文件" image:@"button_file_upload_enable" disableImage:nil];
154154
_myToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2]];
155155
_myToolBar.delegate = self;
156156
[self.view addSubview:_myToolBar];
@@ -161,9 +161,9 @@ - (void)configToolBar{
161161
}
162162

163163
if (!_myEditToolBar) {
164-
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 下载" image:@"button_file_download_enable" disableImage:@"button_file_createFolder_unable"];
165-
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 移动" image:@"button_file_move_enable" disableImage:nil];
166-
EaseToolBarItem *item3 = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
164+
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"下载" image:@"button_file_download_enable" disableImage:@"button_file_createFolder_unable"];
165+
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"移动" image:@"button_file_move_enable" disableImage:nil];
166+
EaseToolBarItem *item3 = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
167167
_myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2, item3]];
168168
_myEditToolBar.delegate = self;
169169
[self.view addSubview:_myEditToolBar];

‎Coding_iOS/Controllers/FileViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ - (void)viewWillAppear:(BOOL)animated{
6363

6464
- (EaseToolBar *)myToolBar{
6565
if (!_myToolBar) {
66-
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 文件动态" image:@"button_file_activity" disableImage:nil];
67-
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 历史版本" image:@"button_file_history" disableImage:nil];
66+
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"文件动态" image:@"button_file_activity" disableImage:nil];
67+
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"历史版本" image:@"button_file_history" disableImage:nil];
6868
_myToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2]];
6969
_myToolBar.delegate = self;
7070
[self.view addSubview:_myToolBar];

‎Coding_iOS/Controllers/FolderToMoveViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ - (void)configToolBar{
5858
//添加底部ToolBar
5959
if (!_myToolBar) {
6060
//添加底部ToolBar
61-
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
62-
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 移动到这里" image:@"button_file_move_enable" disableImage:@"button_file_move_unable"];
61+
EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
62+
EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"移动到这里" image:@"button_file_move_enable" disableImage:@"button_file_move_unable"];
6363
item1.enabled = [self canCreatNewFolder];
6464
item2.enabled = [self canMovedHere];
6565

‎Coding_iOS/Controllers/LocalFilesViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ - (void)reverseSelect{
141141
- (void)configToolBar{
142142
//添加底部ToolBar
143143
if (!_myEditToolBar) {
144-
EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
144+
EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
145145
_myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item]];
146146
_myEditToolBar.delegate = self;
147147
[self.view addSubview:_myEditToolBar];

‎Coding_iOS/Controllers/LocalFoldersViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ - (void)reverseSelect{
236236
- (void)configToolBar{
237237
//添加底部ToolBar
238238
if (!_myEditToolBar) {
239-
EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
239+
EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
240240
_myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item]];
241241
_myEditToolBar.delegate = self;
242242
[self.view addSubview:_myEditToolBar];

‎Coding_iOS/Util/Common/EaseToolBar.m‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ + (instancetype)easeToolBarItemWithTitle:(NSString *)title image:(NSString *)ima
8686
- (instancetype)initWithTitle:(NSString *)title image:(NSString *)imageName disableImage:(NSString *)disableImageName{
8787
self = [super init];
8888
if (self) {
89+
if ((imageName || disableImageName) && ![title hasPrefix:@" "]) {
90+
title = [NSString stringWithFormat:@" %@", title];
91+
}
8992
self.title = title;
9093
self.imageName = imageName;
9194
self.disableImageName = disableImageName;
@@ -102,13 +105,6 @@ - (instancetype)initWithTitle:(NSString *)title image:(NSString *)imageName disa
102105
}
103106
return self;
104107
}
105-
106-
- (void)setTitle:(NSString *)title{
107-
if (title) {
108-
title = [NSString stringWithFormat:@" %@", title];
109-
}
110-
_title = title;
111-
}
112108
- (void)setEnabled:(BOOL)enabled{
113109
[super setEnabled:enabled];
114110
NSString *imageName = enabled? _imageName:(_disableImageName? _disableImageName: _imageName);

0 commit comments

Comments
 (0)