Browse Source

Start new image

marinofaggiana 6 years ago
parent
commit
942adb0d21

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

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

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


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

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

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


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


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


+ 1 - 1
iOSClient/Main/CCMain.m

@@ -404,7 +404,7 @@
     if (_isSearchMode)
         return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"searchBig"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     else
-        return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"filesNoFiles"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
+        return [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:1 color:[NCBrandColor sharedInstance].brandElement];
 }
 
 - (UIView *)customViewForEmptyDataSet:(UIScrollView *)scrollView

+ 1 - 1
iOSClient/Offline/NCOffline.swift

@@ -139,7 +139,7 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
     }
     
     func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
-        return CCGraphics.changeThemingColorImage(UIImage.init(named: "filesNoFiles"), multiplier: 2, color: NCBrandColor.sharedInstance.brandElement)
+        return CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), multiplier: 1, color: NCBrandColor.sharedInstance.brandElement)
     }
     
     func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {

+ 5 - 2
iOSClient/PeekPop/CCPeekPop.m

@@ -74,6 +74,9 @@
             
             self.imagePreview.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
             
+            self.imagePreview.contentMode = UIViewContentModeScaleToFill;
+            self.preferredContentSize = CGSizeMake(self.imagePreview.image.size.width, self.imagePreview.image.size.height);
+            
         } else {
             
             if (self.metadata.iconName.length > 0) {
@@ -81,9 +84,9 @@
             } else {
                 self.imagePreview.image = [UIImage imageNamed:@"file"];
             }
+            
+            self.imagePreview.contentMode = UIViewContentModeCenter;
         }
-        
-        self.imagePreview.contentMode = UIViewContentModeCenter;
     }
 }
 

+ 1 - 1
iOSClient/Select/NCSelect.swift

@@ -184,7 +184,7 @@ class NCSelect: UIViewController ,UICollectionViewDataSource, UICollectionViewDe
         if networkInProgress {
             return CCGraphics.changeThemingColorImage(UIImage.init(named: "networkInProgress"), multiplier: 2, color: UIColor.lightGray)
         } else {
-            return CCGraphics.changeThemingColorImage(UIImage.init(named: "filesNoFiles"), multiplier: 2, color: NCBrandColor.sharedInstance.brandElement)
+            return CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), multiplier: 1, color: NCBrandColor.sharedInstance.brandElement)
         }
     }