marinofaggiana 6 年 前
コミット
4ba729c8cb
23 ファイル変更16 行追加103 行削除
  1. 1 12
      iOSClient/Images.xcassets/file_movie.imageset/Contents.json
  2. BIN
      iOSClient/Images.xcassets/file_movie.imageset/file_movie.png
  3. BIN
      iOSClient/Images.xcassets/file_movie.imageset/file_movie@2x.png
  4. BIN
      iOSClient/Images.xcassets/file_movie.imageset/file_movie@3x.png
  5. 1 12
      iOSClient/Images.xcassets/file_photo.imageset/Contents.json
  6. BIN
      iOSClient/Images.xcassets/file_photo.imageset/file_photo.png
  7. BIN
      iOSClient/Images.xcassets/file_photo.imageset/file_photo@2x.png
  8. BIN
      iOSClient/Images.xcassets/file_photo.imageset/file_photo@3x.png
  9. 0 23
      iOSClient/Images.xcassets/file_photo_big.imageset/Contents.json
  10. BIN
      iOSClient/Images.xcassets/file_photo_big.imageset/file_photo_big.png
  11. BIN
      iOSClient/Images.xcassets/file_photo_big.imageset/file_photo_big@2x.png
  12. BIN
      iOSClient/Images.xcassets/file_photo_big.imageset/file_photo_big@3x.png
  13. 0 23
      iOSClient/Images.xcassets/file_video_big.imageset/Contents.json
  14. BIN
      iOSClient/Images.xcassets/file_video_big.imageset/file_video_big.png
  15. BIN
      iOSClient/Images.xcassets/file_video_big.imageset/file_video_big@2x.png
  16. BIN
      iOSClient/Images.xcassets/file_video_big.imageset/file_video_big@3x.png
  17. 0 23
      iOSClient/Images.xcassets/folderMedia.imageset/Contents.json
  18. BIN
      iOSClient/Images.xcassets/folderMedia.imageset/folder@2x.png
  19. BIN
      iOSClient/Images.xcassets/folderMedia.imageset/folder@3x.png
  20. 12 0
      iOSClient/Images.xcassets/selectFolderMedia.imageset/Contents.json
  21. 0 0
      iOSClient/Images.xcassets/selectFolderMedia.imageset/selectFolderMedia.png
  22. 1 9
      iOSClient/Main/NCMainCommon.swift
  23. 1 1
      iOSClient/Media/NCMedia.swift

+ 1 - 12
iOSClient/Images.xcassets/file_movie.imageset/Contents.json

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

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


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


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


+ 1 - 12
iOSClient/Images.xcassets/file_photo.imageset/Contents.json

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

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


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


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


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

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

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


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


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


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

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

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


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


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


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

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

BIN
iOSClient/Images.xcassets/folderMedia.imageset/folder@2x.png


BIN
iOSClient/Images.xcassets/folderMedia.imageset/folder@3x.png


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

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

+ 0 - 0
iOSClient/Images.xcassets/folderMedia.imageset/folder.png → iOSClient/Images.xcassets/selectFolderMedia.imageset/selectFolderMedia.png


+ 1 - 9
iOSClient/Main/NCMainCommon.swift

@@ -219,15 +219,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate {
             isImagePreviewLoaded = true
         } else {
             if metadata.iconName.count > 0 {
-                if cell is NCGridMediaCell {
-                    if metadata.typeFile == k_metadataTypeFile_video {
-                        image = UIImage.init(named: "file_video_big")
-                    } else {
-                        image = UIImage.init(named: "file_photo_big")
-                    }
-                } else {
-                    image = UIImage.init(named: metadata.iconName)
-                }
+                image = UIImage.init(named: metadata.iconName)
             } else {
                 image = UIImage.init(named: "file")
             }

+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -218,7 +218,7 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
         if !isEditMode {
             
             let item0 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "select"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_", comment: ""))
-            let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "folderMedia"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_media_folder_", comment: ""))
+            let item1 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "selectFolderMedia"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_select_media_folder_", comment: ""))
             var item2: DropdownItem
             if filterTypeFileImage {
                 item2 = DropdownItem(image: CCGraphics.changeThemingColorImage(UIImage.init(named: "imageno"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), title:  NSLocalizedString("_media_viewimage_show_", comment: ""))