Pārlūkot izejas kodu

Fix select menu

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann 5 gadi atpakaļ
vecāks
revīzija
8aa02a686c
1 mainītis faili ar 19 papildinājumiem un 14 dzēšanām
  1. 19 14
      iOSClient/Main/CCMain.m

+ 19 - 14
iOSClient/Main/CCMain.m

@@ -653,7 +653,7 @@
     buttonMore = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"navigationSort"] style:UIBarButtonItemStylePlain target:self action:@selector(toggleReMainMenu)];
     buttonMore.enabled = true;
     
-    buttonSelect = [[UIBarButtonItem alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"select"] width:50 height:50 color:NCBrandColor.sharedInstance.textView] style:UIBarButtonItemStylePlain target:self action:@selector(tableViewSelect)];
+    buttonSelect = [[UIBarButtonItem alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"select"] width:50 height:50 color:NCBrandColor.sharedInstance.textView] style:UIBarButtonItemStylePlain target:self action:@selector(tableViewToggle)];
     buttonSelect.enabled = true;
     
     // <
@@ -688,7 +688,7 @@
 
 - (void)cancelSelect
 {
-    [self tableViewSelect];
+    [self tableViewSelect:false];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -916,7 +916,7 @@
         [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl ocId:nil action:k_action_NULL];
     });
     
-    [self tableViewSelect];
+    [self tableViewSelect:false];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -1005,7 +1005,7 @@
         [_hud hideHud];
     });
     
-    [self tableViewSelect];
+    [self tableViewSelect:false];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -1444,7 +1444,7 @@
     }];
     
     // End Select Table View
-    [self tableViewSelect];
+    [self tableViewSelect:false];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -1606,8 +1606,8 @@
             [self presentViewController:alert animated:YES completion:nil];
             
             // End Select Table View
-            [self tableViewSelect];
-            
+            [self tableViewSelect:false];
+
             // reload Datasource
             [self readFileReloadFolder];
             
@@ -1645,8 +1645,8 @@
                         } else {
                             
                             // End Select Table View
-                            [self tableViewSelect];
-                            
+                            [self tableViewSelect:false];
+
                             // reload Datasource
                             if (self.searchController.isActive)
                                 [self readFolder:metadata.serverUrl];
@@ -1659,8 +1659,8 @@
                         [[NCContentPresenter shared] messageNotification:@"_move_" description:message delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
                         
                         // End Select Table View
-                        [self tableViewSelect];
-                        
+                        [self tableViewSelect:false];
+
                         // reload Datasource
                         if (self.searchController.isActive)
                             [self readFolder:metadata.serverUrl];
@@ -2344,7 +2344,7 @@
         }
     }
     
-    [self tableViewSelect];
+    [self tableViewSelect:false];
 }
 
 - (void)copyFileToPasteboard:(tableMetadata *)metadata
@@ -2851,9 +2851,14 @@
 #pragma mark - ==== Table ==== 
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)tableViewSelect
+- (void)tableViewToggle
+{
+    [self tableViewSelect:!_isSelectedMode];
+}
+
+- (void)tableViewSelect:(BOOL)toggle
 {
-    _isSelectedMode = !_isSelectedMode;
+    _isSelectedMode = toggle;
     // chiudiamo eventuali swipe aperti
     if (_isSelectedMode)
         [self.tableView setEditing:NO animated:NO];