marinofaggiana 6 years ago
parent
commit
81b678278b

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

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

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


BIN
iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png


BIN
iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png


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

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

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


BIN
iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png


BIN
iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png


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

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

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


BIN
iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png


BIN
iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png


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

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

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


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


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


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


+ 4 - 4
iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

@@ -53,7 +53,7 @@ class NCCreateMenuAdd: NSObject {
         
 #if !targetEnvironment(simulator)
         if #available(iOS 11.0, *) {
-            items.append(ActionSheetItem(title: NSLocalizedString("_scans_document_", comment: ""), value: 4, image: CCGraphics.changeThemingColorImage(UIImage(named: "scan"), multiplier:2, color: NCBrandColor.sharedInstance.icon)))
+            items.append(ActionSheetItem(title: NSLocalizedString("_scans_document_", comment: ""), value: 4, image: CCGraphics.changeThemingColorImage(UIImage.init(named: "scan"), width: 50, height: 50, scale: 2, color: NCBrandColor.sharedInstance.icon)))
         }
 #endif
         
@@ -73,9 +73,9 @@ class NCCreateMenuAdd: NSObject {
         
         if let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getRichdocumentsMimetypes(account: appDelegate.activeAccount) {
             if richdocumentsMimetypes.count > 0 {
-                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_document_", comment: ""), value: 6, image: CCGraphics.scale(UIImage.init(named: "document"), to: CGSize(width: 25, height: 25), isAspectRation: true)))
-                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_spreadsheet_", comment: ""), value: 7, image: CCGraphics.scale(UIImage.init(named: "file_xls"), to: CGSize(width: 25, height: 25), isAspectRation: true)))
-                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_presentation_", comment: ""), value: 8, image: CCGraphics.scale(UIImage.init(named: "file_ppt"), to: CGSize(width: 25, height: 25), isAspectRation: true)))
+                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_document_", comment: ""), value: 6, image: UIImage.init(named: "create_file_document")))
+                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_spreadsheet_", comment: ""), value: 7, image: UIImage(named: "create_file_xls")))
+                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_presentation_", comment: ""), value: 8, image: UIImage(named: "create_file_ppt")))
             }
         }