瀏覽代碼

change icon

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 1 年之前
父節點
當前提交
6900b0d963

+ 1 - 1
iOSClient/Diagnostics/NCCapabilitiesViewController.swift

@@ -163,7 +163,7 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
         imageFileSharing.image = UIImage(named: "share")!.image(color: UIColor.systemGray, size: 50)
         imageFileSharing.image = UIImage(named: "share")!.image(color: UIColor.systemGray, size: 50)
         imageExternalSite.image = NCUtility.shared.loadImage(named: "network", color: UIColor.systemGray)
         imageExternalSite.image = NCUtility.shared.loadImage(named: "network", color: UIColor.systemGray)
         imageEndToEndEncryption.image = NCUtility.shared.loadImage(named: "lock", color: UIColor.systemGray)
         imageEndToEndEncryption.image = NCUtility.shared.loadImage(named: "lock", color: UIColor.systemGray)
-        imageActivity.image = UIImage(named: "bolt")!.image(color: UIColor.systemGray, size: 50)
+        imageActivity.image = NCUtility.shared.loadImage(named: "bolt", color: UIColor.systemGray)
         imageNotification.image = NCUtility.shared.loadImage(named: "bell", color: UIColor.systemGray)
         imageNotification.image = NCUtility.shared.loadImage(named: "bell", color: UIColor.systemGray)
         imageDeletedFiles.image = NCUtility.shared.loadImage(named: "trash", color: UIColor.systemGray)
         imageDeletedFiles.image = NCUtility.shared.loadImage(named: "trash", color: UIColor.systemGray)
         imageText.image = UIImage(named: "text")!.image(color: UIColor.systemGray, size: 50)
         imageText.image = UIImage(named: "text")!.image(color: UIColor.systemGray, size: 50)

+ 0 - 15
iOSClient/Images.xcassets/arrow.left.arrow.right.imageset/Contents.json

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

二進制
iOSClient/Images.xcassets/arrow.left.arrow.right.imageset/transfer.pdf


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

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

二進制
iOSClient/Images.xcassets/bell.imageset/bell-outline.pdf


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

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

+ 0 - 1
iOSClient/Images.xcassets/bolt.imageset/lightning-bolt-outline.svg

@@ -1 +0,0 @@
-<?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="M11 9.47V11H14.76L13 14.53V13H9.24L11 9.47M13 1L6 15H11V23L18 9H13V1Z" /></svg>

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

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

File diff suppressed because it is too large
+ 0 - 0
iOSClient/Images.xcassets/groupfolders.imageset/groupfolders.svg


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

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

二進制
iOSClient/Images.xcassets/recent.imageset/recent.pdf


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

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

+ 0 - 1
iOSClient/Images.xcassets/scan.imageset/icons8-scan.svg

@@ -1 +0,0 @@
-<svg fill="#000000" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 24 24" width="24px" height="24px"><path d="M 2,5 C 2,3.34 3.34,2 5,2 H 7.5 V 4 H 5 C 4.44,4 4,4.44 4,5 V 7.5 H 2 Z M 19,4 H 16.5 V 2 H 19 c 1.65,0 3,1.34 3,3 V 7.5 H 20 V 5 C 20,4.44 19.55,4 19,4 Z M 4,16.5 V 19 c 0,0.55 0.44,1 1,1 h 2.5 v 2 H 5 C 3.34,22 2,20.65 2,19 V 16.5 Z M 20,19 v -2.5 h 2 V 19 c 0,1.65 -1.35,3 -3,3 H 16.5 V 20 H 19 c 0.55,0 1,-0.45 1,-1 z M 17,13 H 7 v -2 h 10 z"/></svg>

+ 1 - 1
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1687,7 +1687,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 if headerMenuButtonsCommand && !isSearchingMode {
                 if headerMenuButtonsCommand && !isSearchingMode {
                     let imageButton2 = isDirectoryE2EE ? UIImage(named: "folderEncrypted") : UIImage(named: "folder")
                     let imageButton2 = isDirectoryE2EE ? UIImage(named: "folderEncrypted") : UIImage(named: "folder")
                     let titleButton2 = isDirectoryE2EE ? NSLocalizedString("_create_folder_e2ee_", comment: "") : NSLocalizedString("_create_folder_", comment: "")
                     let titleButton2 = isDirectoryE2EE ? NSLocalizedString("_create_folder_e2ee_", comment: "") : NSLocalizedString("_create_folder_", comment: "")
-                    header.setButtonsCommand(heigt: NCGlobal.shared.heightButtonsCommand, imageButton1: UIImage(named: "addImage"), titleButton1: NSLocalizedString("_upload_", comment: ""), imageButton2: imageButton2, titleButton2: titleButton2, imageButton3: UIImage(named: "scan"), titleButton3: NSLocalizedString("_scan_", comment: ""))
+                    header.setButtonsCommand(heigt: NCGlobal.shared.heightButtonsCommand, imageButton1: UIImage(named: "addImage"), titleButton1: NSLocalizedString("_upload_", comment: ""), imageButton2: imageButton2, titleButton2: titleButton2, imageButton3: UIImage(systemName: "doc.text.viewfinder"), titleButton3: NSLocalizedString("_scan_", comment: ""))
                 } else {
                 } else {
                     header.setButtonsCommand(heigt: 0)
                     header.setButtonsCommand(heigt: 0)
                 }
                 }

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

@@ -86,7 +86,7 @@ extension AppDelegate {
 
 
         actions.append(
         actions.append(
             NCMenuAction(
             NCMenuAction(
-                title: NSLocalizedString("_scans_document_", comment: ""), icon: NCUtility.shared.loadImage(named: "scan"), action: { _ in
+                title: NSLocalizedString("_scans_document_", comment: ""), icon: NCUtility.shared.loadImage(named: "doc.text.viewfinder"), action: { _ in
                     if let viewController = appDelegate.window?.rootViewController {
                     if let viewController = appDelegate.window?.rootViewController {
                         NCDocumentCamera.shared.openScannerDocument(viewController: viewController)
                         NCDocumentCamera.shared.openScannerDocument(viewController: viewController)
                     }
                     }

+ 3 - 3
iOSClient/More/NCMore.swift

@@ -109,7 +109,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         // ITEM : Recent
         // ITEM : Recent
         item = NKExternalSite()
         item = NKExternalSite()
         item.name = "_recent_"
         item.name = "_recent_"
-        item.icon = "recent"
+        item.icon = "clock.arrow.circlepath"
         item.url = "segueRecent"
         item.url = "segueRecent"
         item.order = 20
         item.order = 20
         functionMenu.append(item)
         functionMenu.append(item)
@@ -154,7 +154,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         if hasAccessibleGroupFolders {
         if hasAccessibleGroupFolders {
             item = NKExternalSite()
             item = NKExternalSite()
             item.name = "_group_folders_"
             item.name = "_group_folders_"
-            item.icon = "groupfolders"
+            item.icon = "person.2"
             item.url = "segueGroupfolders"
             item.url = "segueGroupfolders"
             item.order = 61
             item.order = 61
             functionMenu.append(item)
             functionMenu.append(item)
@@ -162,7 +162,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         // ITEM : Scan
         // ITEM : Scan
         item = NKExternalSite()
         item = NKExternalSite()
         item.name = "_scanned_images_"
         item.name = "_scanned_images_"
-        item.icon = "scan"
+        item.icon = "doc.text.viewfinder"
         item.url = "openStoryboardNCScan"
         item.url = "openStoryboardNCScan"
         item.order = 70
         item.order = 70
         functionMenu.append(item)
         functionMenu.append(item)

+ 1 - 1
iOSClient/Notification/NCNotification.swift

@@ -87,7 +87,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
 
     func emptyDataSetView(_ view: NCEmptyView) {
     func emptyDataSetView(_ view: NCEmptyView) {
 
 
-        view.emptyImage.image = UIImage(named: "bell")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        view.emptyImage.image = NCUtility.shared.loadImage(named: "bell", color: .gray, size: UIScreen.main.bounds.width)
         view.emptyTitle.text = NSLocalizedString("_no_notification_", comment: "")
         view.emptyTitle.text = NSLocalizedString("_no_notification_", comment: "")
         view.emptyDescription.text = ""
         view.emptyDescription.text = ""
     }
     }

+ 1 - 1
iOSClient/Recent/NCRecent.swift

@@ -37,7 +37,7 @@ class NCRecent: NCCollectionViewCommon {
         headerMenuButtonsCommand = false
         headerMenuButtonsCommand = false
         headerMenuButtonsView = false
         headerMenuButtonsView = false
         headerRichWorkspaceDisable = true
         headerRichWorkspaceDisable = true
-        emptyImage = UIImage(named: "recent")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        emptyImage = NCUtility.shared.loadImage(named: "clock.arrow.circlepath", color: .gray, size: UIScreen.main.bounds.width)
         emptyTitle = "_files_no_files_"
         emptyTitle = "_files_no_files_"
         emptyDescription = ""
         emptyDescription = ""
     }
     }

+ 1 - 1
iOSClient/Transfers/NCTransfers.swift

@@ -40,7 +40,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         headerMenuButtonsCommand = false
         headerMenuButtonsCommand = false
         headerMenuButtonsView = false
         headerMenuButtonsView = false
         headerRichWorkspaceDisable = true
         headerRichWorkspaceDisable = true
-        emptyImage = UIImage(named: "arrow.left.arrow.right")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        emptyImage = NCUtility.shared.loadImage(named: "arrow.left.arrow.right", color: .gray, size: UIScreen.main.bounds.width)
         emptyTitle = "_no_transfer_"
         emptyTitle = "_no_transfer_"
         emptyDescription = "_no_transfer_sub_"
         emptyDescription = "_no_transfer_sub_"
     }
     }

Some files were not shown because too many files changed in this diff