https://github.com/nextcloud/ios/issues/132

Share Ext/ShareViewController.m

@@ -505,8 +505,8 @@
     CFStringRef fileExtension = (__bridge CFStringRef)[fileName pathExtension];
     CFStringRef fileUTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, fileExtension, NULL);
 
-    if (UTTypeConformsTo(fileUTI, kUTTypeZipArchive) && [(__bridge NSString *)fileUTI containsString:@"org.openxmlformats"] == NO) image = [UIImage imageNamed:image_typeFileCompress];
-    else if (UTTypeConformsTo(fileUTI, kUTTypeAudio)) image = [UIImage imageNamed:image_audio];
+    if (UTTypeConformsTo(fileUTI, kUTTypeZipArchive) && [(__bridge NSString *)fileUTI containsString:@"org.openxmlformats"] == NO) image = [UIImage imageNamed:image_file_compress];
+    else if (UTTypeConformsTo(fileUTI, kUTTypeAudio)) image = [UIImage imageNamed:image_file_audio];
     else if ((UTTypeConformsTo(fileUTI, kUTTypeImage)) || (UTTypeConformsTo(fileUTI, kUTTypeMovie))) {
         
         image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.ico", self.directoryUser, fileName]];
@@ -518,9 +518,9 @@
         
         NSString *typeFile = (__bridge NSString *)fileUTI;
         
-        if ([typeFile isEqualToString:@"com.adobe.pdf"]) image = [UIImage imageNamed:image_pdf];
-        if ([typeFile isEqualToString:@"org.openxmlformats.spreadsheetml.sheet"]) image = [UIImage imageNamed:image_xls];
-        if ([typeFile isEqualToString:@"public.plain-text"]) image = [UIImage imageNamed:image_txt];
+        if ([typeFile isEqualToString:@"com.adobe.pdf"]) image = [UIImage imageNamed:image_file_pdf];
+        if ([typeFile isEqualToString:@"org.openxmlformats.spreadsheetml.sheet"]) image = [UIImage imageNamed:image_file_xls];
+        if ([typeFile isEqualToString:@"public.plain-text"]) image = [UIImage imageNamed:image_file_txt];
     }
     else image = [UIImage imageNamed:image_file];
     

iOSClient/CCStandardImages.h

@@ -34,7 +34,6 @@
 #define image_actionSheetRemoveLocal            @"actionSheetRemoveLocal"
 #define image_activeCameraUpload                @"activeCameraUpload"
 #define image_attention                         @"attention"
-#define image_audio                             @"audio"
 #define image_avatar                            @"avatar"
 
 #define image_bkfull                            @"bkfull"
@@ -53,10 +52,16 @@
 
 #define image_favorite                          @"favorite"
 #define image_file                              @"file"
+#define image_file_audio                        @"file_audio"
+#define image_file_compress                     @"file_compress"
+#define image_file_pdf                          @"file_pdf"
+#define image_file_photo                        @"file_photo"
 #define image_filePreviewDownload               @"filePreviewDownload"
 #define image_filePreviewDownloadCrypto         @"filePreviewDownloadCrypto"
 #define image_filePreviewError                  @"filePreviewError"
-#define image_filetype_htlm                     @"filetype_html"
+#define image_file_code                         @"file_code"
+#define image_file_txt                          @"file_txt"
+#define image_file_movie                        @"file_movie"
 #define image_folderphotocamera                 @"folderphotocamera"
 #define image_folder                            @"folder"
 #define image_foldercrypto                      @"foldercrypto"
@@ -82,7 +87,6 @@
 #define image_MenuUploadPlainMode               @"menuUploadPlainMode"
 #define image_moveSelectedFiles                 @"moveSelectedFiles"
 #define image_more                              @"more"
-#define image_movie                             @"movie"
 
 #define image_navBarOffline                     @"navBarOffline"
 #define image_navBarLocal                       @"navBarLocal"
@@ -93,8 +97,6 @@
 #define image_openSelectedFiles                 @"openSelectedFiles"
 
 #define image_passcode                          @"passcode"
-#define image_pdf                               @"pdf"
-#define image_photo                             @"photo"
 #define image_plist                             @"plist"
 
 #define image_quickActionPhotos                 @"quickActionPhotos"
@@ -155,8 +157,6 @@
 #define image_tabBarLocal                       @"tabBarLocal"
 #define image_tabBarPhotos                      @"tabBarPhotos"
 #define image_tabBarSettings                    @"tabBarSettings"
-#define image_typeFileCompress                  @"typeFileCompress"
-#define image_txt                               @"txt"
 #define image_thumbs                            @"thumbs"
 
 #define image_user                              @"loginUser"
@@ -168,4 +168,4 @@
 
 #define image_WiFiSmall                         @"WiFiSmall"
 
-#define image_xls                               @"xls"
+#define image_file_xls                          @"file_xls"

iOSClient/Images.xcassets/folder_external.imageset/Contents.json

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

iOSClient/Images.xcassets/folder_public.imageset/Contents.json

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

iOSClient/Images.xcassets/folder_shared_with_me.imageset/Contents.json

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

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -667,7 +667,7 @@
     } else {
         
         // Thumbnail not present
-        imageView.image = [UIImage imageNamed:image_photo];
+        imageView.image = [UIImage imageNamed:image_file_photo];
         
         if (metadata.thumbnailExists)
             [[CCActions sharedInstance] downloadTumbnail:metadata delegate:self];

iOSClient/Utility/CCUtility.m

@@ -852,23 +852,22 @@
         // Type compress
         if (UTTypeConformsTo(fileUTI, kUTTypeZipArchive) && [(__bridge NSString *)fileUTI containsString:@"org.openxmlformats"] == NO && [(__bridge NSString *)fileUTI containsString:@"oasis"] == NO) {
             metadata.typeFile = k_metadataTypeFile_compress;
-            if (metadata.cryptated) metadata.iconName = image_typeFileCompress;
-            else metadata.iconName = image_typeFileCompress;
+            metadata.iconName = image_file_compress;
         }
         // Type image
         else if (UTTypeConformsTo(fileUTI, kUTTypeImage)) {
             metadata.typeFile = k_metadataTypeFile_image;
-            metadata.iconName = image_photo;
+            metadata.iconName = image_file_photo;
         }
         // Type Video
         else if (UTTypeConformsTo(fileUTI, kUTTypeMovie)) {
             metadata.typeFile = k_metadataTypeFile_video;
-            metadata.iconName = image_movie;
+            metadata.iconName = image_file_movie;
         }
         // Type Audio
         else if (UTTypeConformsTo(fileUTI, kUTTypeAudio)) {
             metadata.typeFile = k_metadataTypeFile_audio;
-            metadata.iconName = image_audio;
+            metadata.iconName = image_file_audio;
         }
         // Type Document [DOC] [PDF] [XLS] [TXT] (RTF = "public.rtf" - ODT = "org.oasis-open.opendocument.text") [MD]
         else if (UTTypeConformsTo(fileUTI, kUTTypeContent) || [ext isEqualToString:@"MD"]) {
@@ -879,23 +878,23 @@
             NSString *typeFile = (__bridge NSString *)fileUTI;
             
             if ([typeFile isEqualToString:@"com.adobe.pdf"]) {
-                metadata.iconName = image_pdf;
+                metadata.iconName = image_file_pdf;
             }
             
             if ([typeFile isEqualToString:@"org.openxmlformats.spreadsheetml.sheet"]) {
-                metadata.iconName = image_xls;
+                metadata.iconName = image_file_xls;
             }
             
             if ([typeFile isEqualToString:@"com.microsoft.excel.xls"]) {
-                metadata.iconName = image_xls;
+                metadata.iconName = image_file_xls;
             }
             
             if ([typeFile isEqualToString:@"public.plain-text"] || [ext isEqualToString:@"MD"]) {
-                metadata.iconName = image_txt;
+                metadata.iconName = image_file_txt;
             }
             
             if ([typeFile isEqualToString:@"public.html"]) {
-                metadata.iconName = image_filetype_htlm;
+                metadata.iconName = image_file_code;
             }
             
         } else {