Browse Source

Change Image actionSheetShare

Marino Faggiana 8 years ago
parent
commit
13a8e17cf1

+ 0 - 1
iOSClient/CCStandardImages.h

@@ -140,7 +140,6 @@
 #define image_shareExtEncrypt                   @"shareExtEncrypt"
 #define image_shareLink                         @"shareLink"
 #define image_shareMounted                      @"shareMounted"
-#define image_shareUser                         @"shareUser"
 #define image_statusdownload                    @"statusdownload"
 #define image_statusdownloadcrypto              @"statusdownloadcrypto"
 #define image_statuserror                       @"statuserror"

+ 3 - 3
iOSClient/Images.xcassets/actionSheetShare.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "shareNextcloud@1x.png",
+      "filename" : "actionSheetShare.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "shareNextcloud@2x.png",
+      "filename" : "actionSheetShare@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "shareNextcloud@3x.png",
+      "filename" : "actionSheetShare@3x.png",
       "scale" : "3x"
     }
   ],

+ 0 - 0
iOSClient/Images.xcassets/shareUser.imageset/shareUser.png → iOSClient/Images.xcassets/actionSheetShare.imageset/actionSheetShare.png


+ 0 - 0
iOSClient/Images.xcassets/shareUser.imageset/shareUser@2x.png → iOSClient/Images.xcassets/actionSheetShare.imageset/actionSheetShare@2x.png


+ 0 - 0
iOSClient/Images.xcassets/shareUser.imageset/shareUser@3x.png → iOSClient/Images.xcassets/actionSheetShare.imageset/actionSheetShare@3x.png


BIN
iOSClient/Images.xcassets/actionSheetShare.imageset/shareNextcloud@1x.png


BIN
iOSClient/Images.xcassets/actionSheetShare.imageset/shareNextcloud@2x.png


BIN
iOSClient/Images.xcassets/actionSheetShare.imageset/shareNextcloud@3x.png


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

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

+ 1 - 1
iOSClient/Library/MWPhotoBrowser/MWPhotoBrowser.m

@@ -188,7 +188,7 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
     }
     
     if (self.displayShareButton) {
-        _shareButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"shareUser"] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
+        _shareButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"actionSheetShare"] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
     }
     
     // Update

+ 1 - 1
iOSClient/Main/CCDetail.m

@@ -181,7 +181,7 @@
     UIBarButtonItem *fixedSpaceMini = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:self action:nil];
     fixedSpaceMini.width = 25;
     _buttonAction = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_actionSheetOpenIn] style:UIBarButtonItemStylePlain target:self action:@selector(actionButtonPressed:)];
-    _buttonShare  = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_shareUser] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
+    _buttonShare  = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_actionSheetShare] style:UIBarButtonItemStylePlain target:self action:@selector(shareButtonPressed:)];
     _buttonDelete = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(deleteButtonPressed:)];
     
     [_toolbar setItems:[NSArray arrayWithObjects: flexible, _buttonDelete, fixedSpaceMini, _buttonShare, fixedSpaceMini, _buttonAction,  nil]];

+ 2 - 2
iOSClient/Main/CCMain.m

@@ -5308,7 +5308,7 @@
                 
             } else {
             
-                cell.sharedImageView.image = [UIImage imageNamed:image_shareUser];
+                cell.sharedImageView.image = [UIImage imageNamed:image_actionSheetShare];
             
                 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapActionConnectionMounted:)];
                 [tap setNumberOfTapsRequired:1];
@@ -5347,7 +5347,7 @@
             } else {
                 
                 if ([shareLink length] > 0) cell.sharedImageView.image = [UIImage imageNamed:image_shareLink];
-                if ([shareUserAndGroup length] > 0) cell.sharedImageView.image = [UIImage imageNamed:image_shareUser];
+                if ([shareUserAndGroup length] > 0) cell.sharedImageView.image = [UIImage imageNamed:image_actionSheetShare];
                 
                 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapActionShared:)];
                 [tap setNumberOfTapsRequired:1];