EaseToolBar

Author: wanghengheng

Coding_iOS/Controllers/FileListViewController.m

@@ -149,8 +149,8 @@ - (void)configuploadFiles{
 - (void)configToolBar{
     //添加底部ToolBar
     if (!_myToolBar) {
-        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
-        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 上传文件" image:@"button_file_upload_enable" disableImage:nil];
+        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
+        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"上传文件" image:@"button_file_upload_enable" disableImage:nil];
         _myToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2]];
         _myToolBar.delegate = self;
         [self.view addSubview:_myToolBar];
@@ -161,9 +161,9 @@ - (void)configToolBar{
     }
 
     if (!_myEditToolBar) {
-        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 下载" image:@"button_file_download_enable" disableImage:@"button_file_createFolder_unable"];
-        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 移动" image:@"button_file_move_enable" disableImage:nil];
-        EaseToolBarItem *item3 = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
+        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"下载" image:@"button_file_download_enable" disableImage:@"button_file_createFolder_unable"];
+        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"移动" image:@"button_file_move_enable" disableImage:nil];
+        EaseToolBarItem *item3 = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
         _myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2, item3]];
         _myEditToolBar.delegate = self;
         [self.view addSubview:_myEditToolBar];

Coding_iOS/Controllers/FileViewController.m

@@ -63,8 +63,8 @@ - (void)viewWillAppear:(BOOL)animated{
 
 - (EaseToolBar *)myToolBar{
     if (!_myToolBar) {
-        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 文件动态" image:@"button_file_activity" disableImage:nil];
-        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 历史版本" image:@"button_file_history" disableImage:nil];
+        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"文件动态" image:@"button_file_activity" disableImage:nil];
+        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"历史版本" image:@"button_file_history" disableImage:nil];
         _myToolBar = [EaseToolBar easeToolBarWithItems:@[item1, item2]];
         _myToolBar.delegate = self;
         [self.view addSubview:_myToolBar];

Coding_iOS/Controllers/FolderToMoveViewController.m

@@ -58,8 +58,8 @@ - (void)configToolBar{
     //添加底部ToolBar
     if (!_myToolBar) {
         //添加底部ToolBar
-        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@" 新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
-        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@" 移动到这里" image:@"button_file_move_enable" disableImage:@"button_file_move_unable"];
+        EaseToolBarItem *item1 = [EaseToolBarItem easeToolBarItemWithTitle:@"新建文件夹" image:@"button_file_createFolder_enable" disableImage:@"button_file_createFolder_unable"];
+        EaseToolBarItem *item2 = [EaseToolBarItem easeToolBarItemWithTitle:@"移动到这里" image:@"button_file_move_enable" disableImage:@"button_file_move_unable"];
         item1.enabled = [self canCreatNewFolder];
         item2.enabled = [self canMovedHere];
 

Coding_iOS/Controllers/LocalFilesViewController.m

@@ -141,7 +141,7 @@ - (void)reverseSelect{
 - (void)configToolBar{
     //添加底部ToolBar
     if (!_myEditToolBar) {
-        EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
+        EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
         _myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item]];
         _myEditToolBar.delegate = self;
         [self.view addSubview:_myEditToolBar];

Coding_iOS/Controllers/LocalFoldersViewController.m

@@ -236,7 +236,7 @@ - (void)reverseSelect{
 - (void)configToolBar{
     //添加底部ToolBar
     if (!_myEditToolBar) {
-        EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@" 删除" image:@"button_file_denete_enable" disableImage:nil];
+        EaseToolBarItem *item = [EaseToolBarItem easeToolBarItemWithTitle:@"删除" image:@"button_file_denete_enable" disableImage:nil];
         _myEditToolBar = [EaseToolBar easeToolBarWithItems:@[item]];
         _myEditToolBar.delegate = self;
         [self.view addSubview:_myEditToolBar];

Coding_iOS/Util/Common/EaseToolBar.m

@@ -86,6 +86,9 @@ + (instancetype)easeToolBarItemWithTitle:(NSString *)title image:(NSString *)ima
 - (instancetype)initWithTitle:(NSString *)title image:(NSString *)imageName disableImage:(NSString *)disableImageName{
     self = [super init];
     if (self) {
+        if ((imageName || disableImageName) && ![title hasPrefix:@"  "]) {
+            title = [NSString stringWithFormat:@"  %@", title];
+        }
         self.title = title;
         self.imageName = imageName;
         self.disableImageName = disableImageName;
@@ -102,13 +105,6 @@ - (instancetype)initWithTitle:(NSString *)title image:(NSString *)imageName disa
     }
     return self;
 }
-
-- (void)setTitle:(NSString *)title{
-    if (title) {
-        title = [NSString stringWithFormat:@" %@", title];
-    }
-    _title = title;
-}
 - (void)setEnabled:(BOOL)enabled{
     [super setEnabled:enabled];
     NSString *imageName = enabled? _imageName:(_disableImageName? _disableImageName: _imageName);