marinofaggiana 6 жил өмнө
parent
commit
f2d70d1c80

+ 1 - 1
iOSClient/AppDelegate.m

@@ -524,7 +524,7 @@
 {
     NSString *bundleId = [NSBundle mainBundle].bundleIdentifier;
     
-    UIApplicationShortcutIcon *shortcutMediaIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"file_photo"];
+    UIApplicationShortcutIcon *shortcutMediaIcon = [UIApplicationShortcutIcon iconWithTemplateImageName:@"media"];
     UIApplicationShortcutItem *shortcutMedia = [[UIApplicationShortcutItem alloc] initWithType:[NSString stringWithFormat:@"%@.media", bundleId] localizedTitle:NSLocalizedString(@"_media_", nil) localizedSubtitle:nil icon:shortcutMediaIcon userInfo:nil];
    
     // add the array to our app

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

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

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


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


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


+ 4 - 12
iOSClient/Images.xcassets/modifyPhoto.imageset/Contents.json

@@ -2,22 +2,14 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "modifyPhoto.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "modifyPhoto@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "modifyPhoto@3x.png",
-      "scale" : "3x"
+      "filename" : "modifyPhoto.pdf"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

BIN
iOSClient/Images.xcassets/modifyPhoto.imageset/modifyPhoto.pdf


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


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


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


+ 1 - 1
iOSClient/Main/CCMain.m

@@ -3535,7 +3535,7 @@
         if ([NCUtility.sharedInstance isEditImage:self.metadata.fileNameView] != nil && !_metadataFolder.e2eEncrypted && self.metadata.status == k_metadataStatusNormal) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_modify_photo_", nil)
-                                      image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"modifyPhoto"] multiplier:2 color:[NCBrandColor sharedInstance].icon]
+                                      image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"modifyPhoto"] width:50 height:50 color:[NCBrandColor sharedInstance].icon]
                             backgroundColor:[NCBrandColor sharedInstance].backgroundView
                                      height:50.0
                                        type:AHKActionSheetButtonTypeDefault