fix images

iOSClient/Images.xcassets/mediaNoRecord.imageset/Contents.json → iOSClient/Images.xcassets/createFolder.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "mediaNoRecord@2x.png"
+      "filename" : "folder.png"
     }
   ],
   "info" : {

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

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "media.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

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

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

@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "folderStarred.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "folderStarred@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "folderStarred@3x.png",
-      "scale" : "3x"
+      "filename" : "folderStarred.png"
     }
   ],
   "info" : {

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

@@ -2,18 +2,7 @@
   "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"
+      "filename" : "folder_external.png"
     }
   ],
   "info" : {

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

@@ -2,18 +2,7 @@
   "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"
+      "filename" : "folder_public.png"
     }
   ],
   "info" : {

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

@@ -2,18 +2,7 @@
   "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"
+      "filename" : "folder_shared_with_me.png"
     }
   ],
   "info" : {

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

@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "media.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "media@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "media@3x.png",
-      "scale" : "3x"
+      "filename" : "mediaNoRecord@2x.png"
     }
   ],
   "info" : {

iOSClient/Main/CCMain.m

@@ -75,9 +75,6 @@
     // Folder
     BOOL _loadingFolder;
     tableMetadata *_metadataFolder;
-    
-    // Image Title Segue
-    UIImage *imageTitleSegue;
 }
 @end
 
@@ -4159,7 +4156,6 @@
     
     if (self.metadata.directory) {
         
-        imageTitleSegue = cell.imageTitleSegue;
         [self performSegueDirectoryWithControlPasscode:true];
     }
 }

iOSClient/Main/Cell/CCCellMain.h

@@ -36,6 +36,4 @@
 @property(nonatomic, weak) IBOutlet UILabel *labelTitle;
 @property(nonatomic, weak) IBOutlet UILabel *labelInfoFile;
 
-@property(nonatomic, strong) UIImage *imageTitleSegue;
-
 @end

iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

@@ -45,7 +45,7 @@ class NCCreateMenuAdd: NSObject {
         
         var items = [ActionSheetItem]()
         
-        items.append(ActionSheetItem(title: NSLocalizedString("_upload_photos_videos_", comment: ""), value: 1, image: CCGraphics.changeThemingColorImage(UIImage(named: "media"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
+        items.append(ActionSheetItem(title: NSLocalizedString("_upload_photos_videos_", comment: ""), value: 1, image: CCGraphics.changeThemingColorImage(UIImage(named: "createMedia"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
         
         items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_", comment: ""), value: 2, image: CCGraphics.changeThemingColorImage(UIImage(named: "file"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
         
@@ -57,7 +57,7 @@ class NCCreateMenuAdd: NSObject {
         }
 #endif
         
-        items.append(ActionSheetItem(title: NSLocalizedString("_create_folder_", comment: ""), value: 5, image: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), multiplier:1, color: colorIcon)))
+        items.append(ActionSheetItem(title: NSLocalizedString("_create_folder_", comment: ""), value: 5, image: CCGraphics.changeThemingColorImage(UIImage(named: "createFolder"), multiplier:1, color: colorIcon)))
         
         // items.append(ActionSheetSectionTitle(title: "Cheap"))
         // items.append(ActionSheetSectionMargin())

iOSClient/Main/NCMainCommon.swift

@@ -524,7 +524,6 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
             cell.favorite.image = nil
             cell.shared.image = nil
             cell.local.image = nil
-            cell.imageTitleSegue = nil
             cell.shared.isUserInteractionEnabled = false
             
             cell.backgroundColor = NCBrandColor.sharedInstance.backgroundView
@@ -560,22 +559,16 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
                 // File Image & Image Title Segue
                 if metadata.e2eEncrypted {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folderEncrypted"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "lock")
                 } else if metadata.fileName == autoUploadFileName && serverUrl == autoUploadDirectory {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folderAutomaticUpload"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "media")
                 } else if isShare {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder_shared_with_me"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "share")
                 } else if isMounted {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder_external"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "shareMounted")
                 } else if (sharesUserAndGroup != nil) {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder_shared_with_me"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "share")
                 } else if (sharesLink != nil) {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder_public"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
-                    cell.imageTitleSegue = UIImage.init(named: "sharebylink")
                 } else {
                     cell.file.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), multiplier: 3, color: NCBrandColor.sharedInstance.brandElement)
                 }

iOSClient/Media/NCMedia.swift

@@ -163,7 +163,7 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
     }
     
     func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
-        return CCGraphics.changeThemingColorImage(UIImage.init(named: "mediaNoRecord"), multiplier: 2, color: NCBrandColor.sharedInstance.brandElement)
+        return CCGraphics.changeThemingColorImage(UIImage.init(named: "media"), multiplier: 1, color: NCBrandColor.sharedInstance.brandElement)
     }
     
     func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {