Marino Faggiana 6 年之前
父节点
当前提交
486d6903e6
共有 69 个文件被更改,包括 11 次插入263 次删除
  1. 1 0
      iOSClient/Brand/NCBrand.swift
  2. 0 23
      iOSClient/Images.xcassets/contocorrente.imageset/Contents.json
  3. 二进制
      iOSClient/Images.xcassets/contocorrente.imageset/contocorrente.png
  4. 二进制
      iOSClient/Images.xcassets/contocorrente.imageset/contocorrente@2x.png
  5. 二进制
      iOSClient/Images.xcassets/contocorrente.imageset/contocorrente@3x.png
  6. 0 23
      iOSClient/Images.xcassets/drag.imageset/Contents.json
  7. 二进制
      iOSClient/Images.xcassets/drag.imageset/dragNextcloud.png
  8. 二进制
      iOSClient/Images.xcassets/drag.imageset/dragNextcloud@2x.png
  9. 二进制
      iOSClient/Images.xcassets/drag.imageset/dragNextcloud@3x.png
  10. 0 23
      iOSClient/Images.xcassets/dragdown.imageset/Contents.json
  11. 二进制
      iOSClient/Images.xcassets/dragdown.imageset/dragdown.png
  12. 二进制
      iOSClient/Images.xcassets/dragdown.imageset/dragdown@2x.png
  13. 二进制
      iOSClient/Images.xcassets/dragdown.imageset/dragdown@3x.png
  14. 0 23
      iOSClient/Images.xcassets/dragup.imageset/Contents.json
  15. 二进制
      iOSClient/Images.xcassets/dragup.imageset/dragup.png
  16. 二进制
      iOSClient/Images.xcassets/dragup.imageset/dragup@2x.png
  17. 二进制
      iOSClient/Images.xcassets/dragup.imageset/dragup@3x.png
  18. 0 23
      iOSClient/Images.xcassets/menuTemplate.imageset/Contents.json
  19. 二进制
      iOSClient/Images.xcassets/menuTemplate.imageset/template@1x.png
  20. 二进制
      iOSClient/Images.xcassets/menuTemplate.imageset/template@2x.png
  21. 二进制
      iOSClient/Images.xcassets/menuTemplate.imageset/template@3x.png
  22. 0 23
      iOSClient/Images.xcassets/moreShares.imageset/Contents.json
  23. 二进制
      iOSClient/Images.xcassets/moreShares.imageset/moreShares.png
  24. 二进制
      iOSClient/Images.xcassets/moreShares.imageset/moreShares@2x.png
  25. 二进制
      iOSClient/Images.xcassets/moreShares.imageset/moreShares@3x.png
  26. 0 23
      iOSClient/Images.xcassets/note.imageset/Contents.json
  27. 二进制
      iOSClient/Images.xcassets/note.imageset/note.png
  28. 二进制
      iOSClient/Images.xcassets/note.imageset/note@2x.png
  29. 二进制
      iOSClient/Images.xcassets/note.imageset/note@3x.png
  30. 0 23
      iOSClient/Images.xcassets/patenteguida.imageset/Contents.json
  31. 二进制
      iOSClient/Images.xcassets/patenteguida.imageset/patenteguida.png
  32. 二进制
      iOSClient/Images.xcassets/patenteguida.imageset/patenteguida@2x.png
  33. 二进制
      iOSClient/Images.xcassets/patenteguida.imageset/patenteguida@3x.png
  34. 0 23
      iOSClient/Images.xcassets/plist.imageset/Contents.json
  35. 二进制
      iOSClient/Images.xcassets/plist.imageset/plist.png
  36. 二进制
      iOSClient/Images.xcassets/plist.imageset/plist@2x.png
  37. 二进制
      iOSClient/Images.xcassets/plist.imageset/plist@3x.png
  38. 二进制
      iOSClient/Images.xcassets/sharesNoFiles.imageset/sharesNoFiles@2x.png
  39. 二进制
      iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite.png
  40. 二进制
      iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite@2x.png
  41. 二进制
      iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite@3x.png
  42. 3 3
      iOSClient/Images.xcassets/tabBarFiles.imageset/Contents.json
  43. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud.png
  44. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud@2x.png
  45. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud@3x.png
  46. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles.png
  47. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@2x.png
  48. 二进制
      iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@3x.png
  49. 二进制
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore.png
  50. 二进制
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@2x.png
  51. 二进制
      iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@3x.png
  52. 3 3
      iOSClient/Images.xcassets/tabBarPhotos.imageset/Contents.json
  53. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto.png
  54. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto@2x.png
  55. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto@3x.png
  56. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos.png
  57. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos@2x.png
  58. 二进制
      iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos@3x.png
  59. 0 23
      iOSClient/Images.xcassets/threedots.imageset/Contents.json
  60. 二进制
      iOSClient/Images.xcassets/threedots.imageset/threedots.png
  61. 二进制
      iOSClient/Images.xcassets/threedots.imageset/threedots@2x.png
  62. 二进制
      iOSClient/Images.xcassets/threedots.imageset/threedots@3x.png
  63. 0 23
      iOSClient/Images.xcassets/thumbs.imageset/Contents.json
  64. 二进制
      iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud.png
  65. 二进制
      iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud@2x.png
  66. 二进制
      iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud@3x.png
  67. 2 2
      iOSClient/Main/CCMain.m
  68. 1 1
      iOSClient/Main/CCMore.swift
  69. 1 1
      iOSClient/Shares/NCShares.m

+ 1 - 0
iOSClient/Brand/NCBrand.swift

@@ -47,6 +47,7 @@ class NCBrandColor: NSObject {
     @objc public var transferBackground:    UIColor = UIColor(red: 178.0/255.0, green: 244.0/255.0, blue: 258.0/255.0, alpha: 0.1)
     @objc public let nextcloud:             UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
     @objc public let gray:                  UIColor = UIColor(red: 152.0/255.0, green: 152.0/255.0, blue: 152.0/255.0, alpha: 1.0)
+    @objc public let graySoft:              UIColor = UIColor(red: 152.0/255.0, green: 152.0/255.0, blue: 152.0/255.0, alpha: 0.5)
 
     override init() {
         self.brand = self.customer

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

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

二进制
iOSClient/Images.xcassets/contocorrente.imageset/contocorrente.png


二进制
iOSClient/Images.xcassets/contocorrente.imageset/contocorrente@2x.png


二进制
iOSClient/Images.xcassets/contocorrente.imageset/contocorrente@3x.png


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

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

二进制
iOSClient/Images.xcassets/drag.imageset/dragNextcloud.png


二进制
iOSClient/Images.xcassets/drag.imageset/dragNextcloud@2x.png


二进制
iOSClient/Images.xcassets/drag.imageset/dragNextcloud@3x.png


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

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

二进制
iOSClient/Images.xcassets/dragdown.imageset/dragdown.png


二进制
iOSClient/Images.xcassets/dragdown.imageset/dragdown@2x.png


二进制
iOSClient/Images.xcassets/dragdown.imageset/dragdown@3x.png


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

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

二进制
iOSClient/Images.xcassets/dragup.imageset/dragup.png


二进制
iOSClient/Images.xcassets/dragup.imageset/dragup@2x.png


二进制
iOSClient/Images.xcassets/dragup.imageset/dragup@3x.png


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

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

二进制
iOSClient/Images.xcassets/menuTemplate.imageset/template@1x.png


二进制
iOSClient/Images.xcassets/menuTemplate.imageset/template@2x.png


二进制
iOSClient/Images.xcassets/menuTemplate.imageset/template@3x.png


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

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

二进制
iOSClient/Images.xcassets/moreShares.imageset/moreShares.png


二进制
iOSClient/Images.xcassets/moreShares.imageset/moreShares@2x.png


二进制
iOSClient/Images.xcassets/moreShares.imageset/moreShares@3x.png


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

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

二进制
iOSClient/Images.xcassets/note.imageset/note.png


二进制
iOSClient/Images.xcassets/note.imageset/note@2x.png


二进制
iOSClient/Images.xcassets/note.imageset/note@3x.png


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

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

二进制
iOSClient/Images.xcassets/patenteguida.imageset/patenteguida.png


二进制
iOSClient/Images.xcassets/patenteguida.imageset/patenteguida@2x.png


二进制
iOSClient/Images.xcassets/patenteguida.imageset/patenteguida@3x.png


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

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

二进制
iOSClient/Images.xcassets/plist.imageset/plist.png


二进制
iOSClient/Images.xcassets/plist.imageset/plist@2x.png


二进制
iOSClient/Images.xcassets/plist.imageset/plist@3x.png


二进制
iOSClient/Images.xcassets/sharesNoFiles.imageset/sharesNoFiles@2x.png


二进制
iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite.png


二进制
iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite@2x.png


二进制
iOSClient/Images.xcassets/tabBarFavorite.imageset/tabBarFavorite@3x.png


+ 3 - 3
iOSClient/Images.xcassets/tabBarFiles.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "fileNextcloud.png",
+      "filename" : "tabBarFiles.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "fileNextcloud@2x.png",
+      "filename" : "tabBarFiles@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "fileNextcloud@3x.png",
+      "filename" : "tabBarFiles@3x.png",
       "scale" : "3x"
     }
   ],

二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud.png


二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud@2x.png


二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/fileNextcloud@3x.png


二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles.png


二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@2x.png


二进制
iOSClient/Images.xcassets/tabBarFiles.imageset/tabBarFiles@3x.png


二进制
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore.png


二进制
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@2x.png


二进制
iOSClient/Images.xcassets/tabBarMore.imageset/tabBarMore@3x.png


+ 3 - 3
iOSClient/Images.xcassets/tabBarPhotos.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabBarPhoto.png",
+      "filename" : "tabBarPhotos.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "tabBarPhoto@2x.png",
+      "filename" : "tabBarPhotos@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "tabBarPhoto@3x.png",
+      "filename" : "tabBarPhotos@3x.png",
       "scale" : "3x"
     }
   ],

二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto.png


二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto@2x.png


二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhoto@3x.png


二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos.png


二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos@2x.png


二进制
iOSClient/Images.xcassets/tabBarPhotos.imageset/tabBarPhotos@3x.png


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

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

二进制
iOSClient/Images.xcassets/threedots.imageset/threedots.png


二进制
iOSClient/Images.xcassets/threedots.imageset/threedots@2x.png


二进制
iOSClient/Images.xcassets/threedots.imageset/threedots@3x.png


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

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

二进制
iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud.png


二进制
iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud@2x.png


二进制
iOSClient/Images.xcassets/thumbs.imageset/thumbsNextcloud@3x.png


+ 2 - 2
iOSClient/Main/CCMain.m

@@ -4840,7 +4840,7 @@
     [cell.stopTaskButton addTarget:self action:@selector(stopTaskButton:withEvent:) forControlEvents:UIControlEventTouchUpInside];
 
     // ----------------------------------------------------------------------------------------------------------
-    // MGSwipe
+    // swipe
     // ----------------------------------------------------------------------------------------------------------
     
     // LEFT
@@ -4878,7 +4878,7 @@
     }
     
     // ----------------------------------------------------------------------------------------------------------
-    // More : 3 Dots
+    // more
     // ----------------------------------------------------------------------------------------------------------
     
     cell.more.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"more"] color:[NCBrandColor sharedInstance].gray];

+ 1 - 1
iOSClient/Main/CCMore.swift

@@ -102,7 +102,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         // ITEM : Shares
         item = OCExternalSites.init()
         item.name = "_list_shares_"
-        item.icon = "moreShares"
+        item.icon = "share"
         item.url = "segueShares"
         functionMenu.append(item)
         

+ 1 - 1
iOSClient/Shares/NCShares.m

@@ -114,7 +114,7 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sharesNoFiles"] color:[NCBrandColor sharedInstance].brandElement];
+    return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sharesNoFiles"] color:[NCBrandColor sharedInstance].graySoft];
 }
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView