Bladeren bron

lint to AddActionTable

Marino Faggiana 8 jaren geleden
bovenliggende
commit
70a95e781e
4 gewijzigde bestanden met toevoegingen van 12 en 2 verwijderingen
  1. 5 0
      iOSClient/AppDelegate.m
  2. 1 0
      iOSClient/Main/CCMain.h
  3. 5 1
      iOSClient/Main/CCMain.m
  4. 1 1
      iOSClient/Main/Main.storyboard

+ 5 - 0
iOSClient/AppDelegate.m

@@ -805,6 +805,10 @@
 
 - (void)handleTouchTabbarCenter:(id)sender
 {
+    if (_activeMain)
+        [_activeMain addActionTable];
+    
+    /*
     AHKActionSheet *actionSheet = [[AHKActionSheet alloc] initWithView:self.window.rootViewController.view title:nil];
     
     [actionSheet addButtonWithTitle:NSLocalizedString(@"Info", nil)
@@ -825,6 +829,7 @@
     
       
     [actionSheet show];
+    */
 }
 
 - (void)updateApplicationIconBadgeNumber

+ 1 - 0
iOSClient/Main/CCMain.h

@@ -86,6 +86,7 @@
 
 @property (nonatomic, weak) CCLoginNCOC *loginVC;
 
+- (void)addActionTable;
 - (void)returnCreate:(NSInteger)type;
 
 - (void)createFolderCameraUpload;

+ 5 - 1
iOSClient/Main/CCMain.m

@@ -514,10 +514,12 @@
 {
     [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
     
+    /*
     // +
     UIBarButtonItem *buttonAdd = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addActionTable)];
     buttonAdd.tintColor = COLOR_BRAND;
     buttonAdd.enabled = true;
+    */
     
     // =
     UIImage *icon = [UIImage imageNamed:image_more];
@@ -526,7 +528,9 @@
     
     // <
     self.navigationController.navigationBar.hidden = NO;
-    self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:buttonAdd, buttonMore, nil];
+    //self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:buttonAdd, buttonMore, nil];
+    self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:buttonMore, nil];
+
     self.navigationItem.leftBarButtonItem = nil;
     
     // close Menu

+ 1 - 1
iOSClient/Main/Main.storyboard

@@ -586,6 +586,6 @@
         <image name="tabBarSettings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="W5b-lw-8O1"/>
+        <segue reference="YTW-Kz-l02"/>
     </inferredMetricsTieBreakers>
 </document>