coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Widget/Files/FilesWidgetView.swift

@@ -101,7 +101,7 @@ struct FilesWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding(11)
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -113,7 +113,7 @@ struct FilesWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding(11)
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -125,7 +125,7 @@ struct FilesWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding(11)
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -137,7 +137,7 @@ struct FilesWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding(11)
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()

Widget/Toolbar/ToolbarWidgetView.swift

@@ -50,7 +50,7 @@ struct ToolbarWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -62,7 +62,7 @@ struct ToolbarWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -74,7 +74,7 @@ struct ToolbarWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -85,7 +85,7 @@ struct ToolbarWidgetView: View {
                         Image("microphone")
                             .resizable()
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(10)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()

iOSClient/Images.xcassets/buttonAddImage.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "icons8-image-upload-24(@1x).png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icons8-image-upload-48(@2x).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icons8-image-upload-72(@3x).png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "icons8-photo.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/buttonAddImage.imageset/icons8-photo.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 60 60" width="512px" height="512px" xmlns="http://www.w3.org/2000/svg">
+  <path d="M60,28.16937V5c0-1.6543-1.3457-3-3-3H3C1.3457,2,0,3.3457,0,5v38c0,1.6543,1.3457,3,3,3h25.52655 C30.30988,52.8894,36.56104,58,44,58c8.82227,0,16-7.17773,16-16V28.16998C60,28.16974,60,28.16962,60,28.16937z M3,4h54 c0.55127,0,1,0.44873,1,1v20.75659L45.12158,12.88721c-1.13379-1.14746-3.11377-1.14258-4.23877-0.00488L25.29346,28.46289 l-1.29358,1.29352l-9.8783-9.8692c-1.13379-1.14746-3.11377-1.14307-4.23877-0.00439L2,27.76605V5C2,4.44873,2.44873,4,3,4z M2,43 V30.59424l9.30127-9.30176c0.37598-0.38086,1.0166-0.38574,1.40234,0.00488l9.8822,9.87311L9.75586,44H3C2.44873,44,2,43.55127,2,43 z M44,56c-7.71973,0-14-6.28027-14-14s6.28027-14,14-14s14,6.28027,14,14S51.71973,56,44,56z M44,26c-8.82227,0-16,7.17773-16,16 c0,0.67871,0.0564,1.34326,0.13885,2H12.58417l14.12335-14.12207l15.59375-15.58545 c0.37598-0.38086,1.01709-0.38574,1.40186,0.00488L58,28.58466v5.68665C55.26947,29.34515,50.01996,26,44,26z" style="fill: rgb(255, 255, 255);"/>
+  <path d="M24,21c3.30859,0,6-2.69141,6-6s-2.69141-6-6-6s-6,2.69141-6,6S20.69141,21,24,21z M24,11 c2.20557,0,4,1.79443,4,4s-1.79443,4-4,4s-4-1.79443-4-4S21.79443,11,24,11z" style="fill: rgb(255, 255, 255);"/>
+  <path d="M52,41h-7v-7c0-0.55225-0.44775-1-1-1s-1,0.44775-1,1v7h-7c-0.55225,0-1,0.44775-1,1s0.44775,1,1,1h7v7 c0,0.55225,0.44775,1,1,1s1-0.44775,1-1v-7h7c0.55225,0,1-0.44775,1-1S52.55225,41,52,41z" style="fill: rgb(255, 255, 255);"/>
+</svg>

iOSClient/Images.xcassets/buttonAddScan.imageset/Contents.json

@@ -1,19 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "icons8-scan-24(@1x).png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icons8-scan-48(@2x).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icons8-scan-72(@3x).png",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "icons8-riacquisisci-documento-500.svg",
+      "idiom" : "universal"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/buttonAddScan.imageset/icons8-riacquisisci-documento-500.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg fill="#000000" viewBox="0 0 50 50" width="500px" height="500px" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 4 4 L 4 10 A 1.0001 1.0001 0 1 0 6 10 L 6 6 L 10 6 A 1.0001 1.0001 0 1 0 10 4 L 4 4 z M 40 4 A 1.0001 1.0001 0 1 0 40 6 L 44 6 L 44 10 A 1.0001 1.0001 0 1 0 46 10 L 46 4 L 40 4 z M 27.984375 9.9863281 A 1.0001 1.0001 0 0 0 27.839844 10 L 13 10 L 13 31 L 5 31 A 1.0001 1.0001 0 1 0 5 33 L 13.832031 33 A 1.0001 1.0001 0 0 0 14.158203 33 L 35.832031 33 A 1.0001 1.0001 0 0 0 36.158203 33 L 45 33 A 1.0001 1.0001 0 1 0 45 31 L 37 31 L 37 19.167969 A 1.0001 1.0001 0 0 0 37 18.841797 L 37 18.585938 L 36.806641 18.392578 A 1.0001 1.0001 0 0 0 36.617188 18.203125 L 28.791016 10.376953 A 1.0001 1.0001 0 0 0 28.603516 10.189453 L 28.414062 10 L 28.154297 10 A 1.0001 1.0001 0 0 0 27.984375 9.9863281 z M 15 12 L 27 12 L 27 20 L 35 20 L 35 31 L 15 31 L 15 12 z M 29 13.414062 L 33.585938 18 L 29 18 L 29 13.414062 z M 19 23 L 19 25 L 31 25 L 31 23 L 19 23 z M 19 27 L 19 29 L 31 29 L 31 27 L 19 27 z M 13 35 L 13 40 L 37 40 L 37 35 L 35 35 L 35 38 L 15 38 L 15 35 L 13 35 z M 4.984375 38.986328 A 1.0001 1.0001 0 0 0 4 40 L 4 46 L 10 46 A 1.0001 1.0001 0 1 0 10 44 L 6 44 L 6 40 A 1.0001 1.0001 0 0 0 4.984375 38.986328 z M 44.984375 38.986328 A 1.0001 1.0001 0 0 0 44 40 L 44 44 L 40 44 A 1.0001 1.0001 0 1 0 40 46 L 46 46 L 46 40 A 1.0001 1.0001 0 0 0 44.984375 38.986328 z" style="fill: rgb(255, 255, 255);"/>
+</svg>

iOSClient/Menu/AppDelegate+Menu.swift

@@ -85,7 +85,7 @@ extension AppDelegate {
         if #available(iOS 13.0, *) {
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString("_scans_document_", comment: ""), icon: NCUtility.shared.loadImage(named: "doc.text.viewfinder"), action: { _ in
+                    title: NSLocalizedString("_scans_document_", comment: ""), icon: NCUtility.shared.loadImage(named: "buttonAddScan"), action: { _ in
                         if let viewController = appDelegate.window?.rootViewController {
                             NCCreateScanDocument.shared.openScannerDocument(viewController: viewController)
                         }

iOSClient/More/NCMore.swift

@@ -144,7 +144,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         if #available(iOS 13.0, *) {
             item = NKExternalSite()
             item.name = "_scanned_images_"
-            item.icon = "doc.text.viewfinder"
+            item.icon = "buttonAddScan"
             item.url = "openStoryboardNCScan"
             functionMenu.append(item)
         }