marinofaggiana 6 tahun lalu
induk
melakukan
427de31b9e
21 mengubah file dengan 7 tambahan dan 124 penghapusan
  1. 0 12
      iOSClient/Images.xcassets/createFolder.imageset/Contents.json
  2. TEMPAT SAMPAH
      iOSClient/Images.xcassets/createFolder.imageset/folder.png
  3. 0 12
      iOSClient/Images.xcassets/createMedia.imageset/Contents.json
  4. TEMPAT SAMPAH
      iOSClient/Images.xcassets/createMedia.imageset/media.png
  5. 0 23
      iOSClient/Images.xcassets/document_menu.imageset/Contents.json
  6. TEMPAT SAMPAH
      iOSClient/Images.xcassets/document_menu.imageset/document_menu.png
  7. TEMPAT SAMPAH
      iOSClient/Images.xcassets/document_menu.imageset/document_menu@2x.png
  8. TEMPAT SAMPAH
      iOSClient/Images.xcassets/document_menu.imageset/document_menu@3x.png
  9. 0 12
      iOSClient/Images.xcassets/file_menu.imageset/Contents.json
  10. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_menu.imageset/file_menu.png
  11. 0 23
      iOSClient/Images.xcassets/file_ppt_menu.imageset/Contents.json
  12. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu.png
  13. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu@2x.png
  14. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu@3x.png
  15. 0 12
      iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json
  16. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_txt_menu.imageset/file_txt_menu.png
  17. 0 23
      iOSClient/Images.xcassets/file_xls_menu.imageset/Contents.json
  18. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu.png
  19. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu@2x.png
  20. TEMPAT SAMPAH
      iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu@3x.png
  21. 7 7
      iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

+ 0 - 12
iOSClient/Images.xcassets/createFolder.imageset/Contents.json

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/createFolder.imageset/folder.png


+ 0 - 12
iOSClient/Images.xcassets/createMedia.imageset/Contents.json

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/createMedia.imageset/media.png


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

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/document_menu.imageset/document_menu.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/document_menu.imageset/document_menu@2x.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/document_menu.imageset/document_menu@3x.png


+ 0 - 12
iOSClient/Images.xcassets/file_menu.imageset/Contents.json

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/file_menu.imageset/file_menu.png


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

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu@2x.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/file_ppt_menu.imageset/file_ppt_menu@3x.png


+ 0 - 12
iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/file_txt_menu.imageset/file_txt_menu.png


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

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

TEMPAT SAMPAH
iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu@2x.png


TEMPAT SAMPAH
iOSClient/Images.xcassets/file_xls_menu.imageset/file_xls_menu@3x.png


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

@@ -45,11 +45,11 @@ class NCCreateMenuAdd: NSObject {
         
         var items = [ActionSheetItem]()
         
-        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_photos_videos_", comment: ""), value: 1, image: CCGraphics.changeThemingColorImage(UIImage.init(named: "file_photo"), width: 50, height: 50, scale: 2, color: NCBrandColor.sharedInstance.icon)))
         
-        items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_", comment: ""), value: 2, image: CCGraphics.changeThemingColorImage(UIImage(named: "file_menu"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
+        items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_", comment: ""), value: 2, image: CCGraphics.changeThemingColorImage(UIImage.init(named: "file"), width: 50, height: 50, scale: 2, color: NCBrandColor.sharedInstance.icon)))
         
-        items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_text_", comment: ""), value: 3, image: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt_menu"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
+        items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_text_", comment: ""), value: 3, image: CCGraphics.changeThemingColorImage(UIImage.init(named: "file_txt"), width: 50, height: 50, scale: 2, color: NCBrandColor.sharedInstance.icon)))
         
 #if !targetEnvironment(simulator)
         if #available(iOS 11.0, *) {
@@ -57,7 +57,7 @@ class NCCreateMenuAdd: NSObject {
         }
 #endif
         
-        items.append(ActionSheetItem(title: NSLocalizedString("_create_folder_", comment: ""), value: 5, image: CCGraphics.changeThemingColorImage(UIImage(named: "createFolder"), multiplier:1, color: colorIcon)))
+        items.append(ActionSheetItem(title: NSLocalizedString("_create_folder_", comment: ""), value: 5, image: CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 50, height: 50, scale: 2, color: colorIcon)))
         
         // items.append(ActionSheetSectionTitle(title: "Cheap"))
         // items.append(ActionSheetSectionMargin())
@@ -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: UIImage.init(named: "document_menu")))
-                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_spreadsheet_", comment: ""), value: 7, image: UIImage(named: "file_xls_menu")))
-                items.append(ActionSheetItem(title: NSLocalizedString("_create_new_presentation_", comment: ""), value: 8, image: UIImage(named: "file_ppt_menu")))
+                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)))
             }
         }