Эх сурвалжийг харах

Add image folder encrypted

Marino Faggiana 7 жил өмнө
parent
commit
dc9bbc3f4d

+ 3 - 3
iOSClient/Images.xcassets/foldercrypto.imageset/Contents.json → iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json

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

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


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


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


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


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


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


+ 3 - 7
iOSClient/Main/CCMain.m

@@ -4635,14 +4635,10 @@
         
         if (metadata.directory) {
             
-            /*
             if (metadata.encrypted)
-                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[UIColor redColor]];
+                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderEncrypted"] color:[NCBrandColor sharedInstance].brand];
             else
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[NCBrandColor sharedInstance].brand];
-            */
-            
-            cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[NCBrandColor sharedInstance].brand];
             
         } else {
             cell.file.image = [UIImage imageNamed:metadata.iconName];
@@ -4667,8 +4663,8 @@
     // Image Status Encrypted
     // ----------------------------------------------------------------------------------------------------------
     
-    if (metadata.encrypted)
-        cell.status.image = [UIImage imageNamed:@"encrypted"];
+   // if (metadata.encrypted)
+   //     cell.status.image = [UIImage imageNamed:@"encrypted"];
     
     // ----------------------------------------------------------------------------------------------------------
     // Favorite