Ver Fonte

new icon

marinofaggiana há 4 anos atrás
pai
commit
d0697b254e

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

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

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


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


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


+ 0 - 0
iOSClient/Images.xcassets/selectFull.imageset/Contents.json → iOSClient/Images.xcassets/checkmark.circle.fill.imageset/Contents.json


+ 0 - 0
iOSClient/Images.xcassets/selectFull.imageset/selectFull.pdf → iOSClient/Images.xcassets/checkmark.circle.fill.imageset/selectFull.pdf


+ 15 - 0
iOSClient/Images.xcassets/xmark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "close.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

+ 1 - 0
iOSClient/Images.xcassets/xmark.imageset/close.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" /></svg>

+ 1 - 1
iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -378,7 +378,7 @@ extension NCCollectionViewCommon {
         actions.append(
             NCMenuAction(
                 title: NSLocalizedString("_select_all_", comment: ""),
-                icon: UIImage(named: "selectFull")!.image(color: NCBrandColor.shared.icon, size: 50),
+                icon: NCUtility.shared.loadImage(named: "checkmark.circle.fill"),
                 action: { menuAction in
                     self.collectionViewSelectAll()
                 }

+ 5 - 2
iOSClient/Menu/NCMedia+Menu.swift

@@ -35,7 +35,7 @@ extension NCMedia {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_select_", comment: ""),
-                        icon: UIImage(named: "selectFull")!.image(color: NCBrandColor.shared.icon, size: 50),
+                        icon: NCUtility.shared.loadImage(named: "checkmark.circle.fill"),
                         action: { menuAction in
                             self.isEditMode = true
                         }
@@ -134,10 +134,13 @@ extension NCMedia {
             
         } else {
            
+            //
+            // CANCEL
+            //
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_cancel_", comment: ""),
-                    icon: UIImage(named: "cancel")!.image(color: NCBrandColor.shared.icon, size: 50),
+                    icon: NCUtility.shared.loadImage(named: "xmark"),
                     action: { menuAction in
                         self.isEditMode = false
                         self.selectOcId.removeAll()

+ 1 - 1
iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -85,7 +85,7 @@
         
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"serviceActivated" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_e2e_settings_activated_", nil)];
         row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.shared.backgroundView;
-        [row.cellConfig setObject:[[UIImage imageNamed:@"selectFull"] imageWithColor:[UIColor greenColor] size:25] forKey:@"imageView.image"];
+        [row.cellConfig setObject:[[NCUtility shared] loadImageWithNamed:@"checkmark.circle.fill" color:[UIColor greenColor] size:25] forKey:@"imageView.image"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
         [row.cellConfig setObject:NCBrandColor.shared.textView forKey:@"textLabel.textColor"];
         [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];