marinofaggiana 4 rokov pred
rodič
commit
bbd9e1ca09

+ 0 - 0
iOSClient/Images.xcassets/scan.imageset/Contents.json → iOSClient/Images.xcassets/doc.text.viewfinder.imageset/Contents.json


+ 0 - 0
iOSClient/Images.xcassets/scan.imageset/scan.pdf → iOSClient/Images.xcassets/doc.text.viewfinder.imageset/scan.pdf


+ 5 - 2
iOSClient/Main/Colleaction Common/NCCollectionCommon.swift

@@ -93,12 +93,15 @@ class NCCollectionCommon: NSObject, NCSelectDelegate {
         images.buttonStop = UIImage(named: "stop")!.image(color: NCBrandColor.shared.graySoft, size: 50)
     }
     
-    func loadImage(named: String, systemName: String, color: UIColor, size: CGFloat) -> UIImage {
+    func loadImage(named: String, color: UIColor = NCBrandColor.shared.icon, size: CGFloat = 50) -> UIImage {
         
         var image: UIImage?
         
         if #available(iOS 13.0, *) {
-            image = UIImage(systemName: systemName)
+            image = UIImage(systemName: named)
+            if image == nil {
+                image = UIImage(named: named)
+            }
         } else {
             image = UIImage(named: named)
         }

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

@@ -87,7 +87,7 @@ extension AppDelegate {
         if #available(iOS 13.0, *) {
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString("_scans_document_", comment: ""), icon: NCCollectionCommon.shared.loadImage(named: "scan", systemName: "doc.text.viewfinder", color: NCBrandColor.shared.icon, size: 50), action: { menuAction in
+                    title: NSLocalizedString("_scans_document_", comment: ""), icon: NCCollectionCommon.shared.loadImage(named: "doc.text.viewfinder"), action: { menuAction in
                         if let viewController = appDelegate.window?.rootViewController {
                             NCCreateScanDocument.shared.openScannerDocument(viewController: viewController)
                         }

+ 2 - 2
iOSClient/More/NCMore.swift

@@ -150,7 +150,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         if #available(iOS 13.0, *) {
             item = NCCommunicationExternalSite()
             item.name = "_scanned_images_"
-            item.icon = "scan"
+            item.icon = "doc.text.viewfinder"
             item.url = "openStoryboardScan"
             functionMenu.append(item)
         }
@@ -374,7 +374,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
                 item = settingsMenu[indexPath.row]
             }
 
-            cell.imageIcon?.image = UIImage.init(named: item.icon)?.image(color: NCBrandColor.shared.icon, size: 25)
+            cell.imageIcon?.image = NCCollectionCommon.shared.loadImage(named: item.icon)
             cell.labelText?.text = NSLocalizedString(item.name, comment: "")
             cell.labelText.textColor = NCBrandColor.shared.textView