Sfoglia il codice sorgente

new icon menu navigation controller

Marino Faggiana 8 anni fa
parent
commit
efcdbfc625

+ 1 - 1
iOSClient/CCStandardImages.h

@@ -90,7 +90,7 @@
 #define image_MenuUploadPhotoCrypto             @"menuUploadPhotoCrypto"
 #define image_MenuUploadPhotoCrypto             @"menuUploadPhotoCrypto"
 #define image_MenuUploadPlainMode               @"menuUploadPlainMode"
 #define image_MenuUploadPlainMode               @"menuUploadPlainMode"
 #define image_moveSelectedFiles                 @"moveSelectedFiles"
 #define image_moveSelectedFiles                 @"moveSelectedFiles"
-#define image_more                              @"more"
+#define image_navigationControllerMenu          @"navigationControllerMenu"
 
 
 #define image_navBarOffline                     @"navBarOffline"
 #define image_navBarOffline                     @"navBarOffline"
 #define image_navBarLocal                       @"navBarLocal"
 #define image_navBarLocal                       @"navBarLocal"

+ 23 - 0
iOSClient/Images.xcassets/navigationControllerMenu.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "navigationControllerMenu.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "navigationControllerMenu@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "navigationControllerMenu@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
iOSClient/Images.xcassets/navigationControllerMenu.imageset/navigationControllerMenu.png


BIN
iOSClient/Images.xcassets/navigationControllerMenu.imageset/navigationControllerMenu@2x.png


BIN
iOSClient/Images.xcassets/navigationControllerMenu.imageset/navigationControllerMenu@3x.png


+ 2 - 2
iOSClient/Main/CCMain.m

@@ -565,7 +565,7 @@
     UIBarButtonItem *buttonMore, *buttonNotification;
     UIBarButtonItem *buttonMore, *buttonNotification;
     
     
     // =
     // =
-    buttonMore = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_more] style:UIBarButtonItemStylePlain target:self action:@selector(toggleReMainMenu)];
+    buttonMore = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_navigationControllerMenu] style:UIBarButtonItemStylePlain target:self action:@selector(toggleReMainMenu)];
     buttonMore.enabled = true;
     buttonMore.enabled = true;
     
     
     // <
     // <
@@ -591,7 +591,7 @@
 {
 {
     [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
     
     
-    UIImage *icon = [UIImage imageNamed:image_more];
+    UIImage *icon = [UIImage imageNamed:image_navigationControllerMenu];
     UIBarButtonItem *buttonMore = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(toggleReSelectMenu)];
     UIBarButtonItem *buttonMore = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(toggleReSelectMenu)];
 
 
     UIBarButtonItem *leftButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"_cancel_", nil) style:UIBarButtonItemStylePlain target:self action:@selector(cancelSelect)];
     UIBarButtonItem *leftButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"_cancel_", nil) style:UIBarButtonItemStylePlain target:self action:@selector(cancelSelect)];