Эх сурвалжийг харах

fix XCode 14 - icon

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 жил өмнө
parent
commit
1e4911cc66

+ 1 - 1
Widget/Toolbar/ToolbarWidgetView.swift

@@ -50,7 +50,7 @@ struct ToolbarWidgetView: View {
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(14)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()

+ 4 - 1
iOSClient/Images.xcassets/addFolder.imageset/icons8-aggiungi-cartella-2.svg

@@ -1 +1,4 @@
-<?xml version="1.0"?><svg fill="#000000" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 30 30" width="30px" height="30px">    <path d="M 4 3 C 2.895 3 2 3.895 2 5 L 2 8 L 13 8 L 28 8 L 28 7 C 28 5.895 27.105 5 26 5 L 11.199219 5 L 10.582031 3.9707031 C 10.221031 3.3687031 9.5701875 3 8.8671875 3 L 4 3 z M 3 10 C 2.448 10 2 10.448 2 11 L 2 23 C 2 24.105 2.895 25 4 25 L 14.230469 25 C 14.083469 24.356 14 23.688 14 23 C 14 18.029 18.029 14 23 14 C 24.851 14 26.57 14.559578 28 15.517578 L 28 11 C 28 10.448 27.552 10 27 10 L 3 10 z M 23 16 C 19.134 16 16 19.134 16 23 C 16 26.866 19.134 30 23 30 C 26.866 30 30 26.866 30 23 C 30 19.134 26.866 16 23 16 z M 23 19 C 23.552 19 24 19.447 24 20 L 24 22 L 26 22 C 26.552 22 27 22.447 27 23 C 27 23.553 26.552 24 26 24 L 24 24 L 24 26 C 24 26.553 23.552 27 23 27 C 22.448 27 22 26.553 22 26 L 22 24 L 20 24 C 19.448 24 19 23.553 19 23 C 19 22.447 19.448 22 20 22 L 22 22 L 22 20 C 22 19.447 22.448 19 23 19 z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg fill="#000000" viewBox="0 0 30 30" width="30px" height="30px" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 3 1.5 C 1.895 1.5 1 2.395 1 3.5 L 1 6.5 L 12 6.5 L 27 6.5 L 27 5.5 C 27 4.395 26.105 3.5 25 3.5 L 10.199 3.5 L 9.582 2.471 C 9.221 1.869 8.57 1.5 7.867 1.5 L 3 1.5 Z M 2 8.5 C 1.448 8.5 1 8.948 1 9.5 L 1 21.5 C 1 22.605 1.895 23.5 3 23.5 L 13.23 23.5 C 13.083 22.856 13 22.188 13 21.5 C 13 16.529 17.029 12.5 22 12.5 C 23.851 12.5 25.57 13.06 27 14.018 L 27 9.5 C 27 8.948 26.552 8.5 26 8.5 L 2 8.5 Z M 22 14.5 C 18.134 14.5 15 17.634 15 21.5 C 15 25.366 18.134 28.5 22 28.5 C 25.866 28.5 29 25.366 29 21.5 C 29 17.634 25.866 14.5 22 14.5 Z M 22 17.5 C 22.552 17.5 23 17.947 23 18.5 L 23 20.5 L 25 20.5 C 25.552 20.5 26 20.947 26 21.5 C 26 22.053 25.552 22.5 25 22.5 L 23 22.5 L 23 24.5 C 23 25.053 22.552 25.5 22 25.5 C 21.448 25.5 21 25.053 21 24.5 L 21 22.5 L 19 22.5 C 18.448 22.5 18 22.053 18 21.5 C 18 20.947 18.448 20.5 19 20.5 L 21 20.5 L 21 18.5 C 21 17.947 21.448 17.5 22 17.5 Z"/>
+</svg>

+ 4 - 1
iOSClient/Images.xcassets/addImage.imageset/icons8-aggiungi-immagine.svg

@@ -1 +1,4 @@
-<svg fill="#000000" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 64 64" width="96px" height="96px"><path d="M 11 12 C 8.791 12 7 13.791 7 16 L 7 48 C 7 50.209 8.791 52 11 52 L 38.050781 52 C 38.024781 51.669 38 51.338 38 51 C 38 49.966 38.134281 48.965 38.363281 48 C 39.570281 42.918 43.761469 38.992828 48.980469 38.173828 L 44.224609 33.800781 C 42.307609 32.038781 39.361219 32.042594 37.449219 33.808594 L 29.085938 41.53125 L 24.505859 37.613281 C 22.628859 36.009281 19.863187 36.014953 17.992188 37.626953 L 11 43.650391 L 11 17 C 11 16.448 11.448 16 12 16 L 52 16 C 52.552 16 53 16.448 53 17 L 53 38.169922 C 54.422 38.390922 55.769 38.834516 57 39.478516 L 57 16 C 57 13.791 55.209 12 53 12 L 11 12 z M 23 20 C 20.791 20 19 21.791 19 24 C 19 26.209 20.791 28 23 28 C 25.209 28 27 26.209 27 24 C 27 21.791 25.209 20 23 20 z M 51 41 C 45.477 41 41 45.477 41 51 C 41 56.523 45.477 61 51 61 C 56.523 61 61 56.523 61 51 C 61 45.477 56.523 41 51 41 z M 51 45 C 51.553 45 52 45.448 52 46 L 52 50 L 56 50 C 56.553 50 57 50.448 57 51 C 57 51.552 56.553 52 56 52 L 52 52 L 52 56 C 52 56.552 51.553 57 51 57 C 50.447 57 50 56.552 50 56 L 50 52 L 46 52 C 45.447 52 45 51.552 45 51 C 45 50.448 45.447 50 46 50 L 50 50 L 50 46 C 50 45.448 50.447 45 51 45 z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg fill="#000000" viewBox="0 0 64 64" width="96px" height="96px" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 6.444 4.778 C 3.989 4.778 2 6.767 2 9.222 L 2 44.779 C 2 47.234 3.989 49.223 6.444 49.223 L 36.501 49.223 C 36.473 48.856 36.444 48.485 36.444 48.111 C 36.444 46.962 36.595 45.852 36.848 44.779 C 38.188 39.133 42.846 34.771 48.644 33.861 L 43.36 29.002 C 41.231 27.043 37.957 27.047 35.833 29.01 L 26.54 37.591 L 21.451 33.237 C 19.364 31.456 16.292 31.462 14.215 33.254 L 6.444 39.945 L 6.444 10.335 C 6.444 9.719 6.941 9.222 7.557 9.222 L 51.999 9.222 C 52.615 9.222 53.112 9.719 53.112 10.335 L 53.112 33.857 C 54.691 34.102 56.187 34.594 57.556 35.31 L 57.556 9.222 C 57.556 6.767 55.566 4.778 53.112 4.778 L 6.444 4.778 Z M 19.777 13.666 C 17.322 13.666 15.333 15.656 15.333 18.111 C 15.333 20.565 17.322 22.555 19.777 22.555 C 22.232 22.555 24.221 20.565 24.221 18.111 C 24.221 15.656 22.232 13.666 19.777 13.666 Z M 50.889 37 C 44.754 37 39.779 41.975 39.779 48.111 C 39.779 54.25 44.754 59.221 50.889 59.221 C 57.025 59.221 62 54.25 62 48.111 C 62 41.975 57.025 37 50.889 37 Z M 50.889 41.444 C 51.503 41.444 51.999 41.941 51.999 42.557 L 51.999 47.001 L 56.443 47.001 C 57.06 47.001 57.556 47.498 57.556 48.111 C 57.556 48.723 57.06 49.223 56.443 49.223 L 51.999 49.223 L 51.999 53.667 C 51.999 54.28 51.503 54.777 50.889 54.777 C 50.276 54.777 49.777 54.28 49.777 53.667 L 49.777 49.223 L 45.333 49.223 C 44.719 49.223 44.223 48.723 44.223 48.111 C 44.223 47.498 44.719 47.001 45.333 47.001 L 49.777 47.001 L 49.777 42.557 C 49.777 41.941 50.276 41.444 50.889 41.444 Z"/>
+</svg>

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

@@ -1680,7 +1680,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
                 header.delegate = self
                 if headerMenuButtonsCommand && !appDelegate.isSearchingMode {
-                    header.setButtonsCommand(heigt: NCGlobal.shared.heightButtonsCommand, imageButton1: UIImage(named: "addImage"), titleButton1: NSLocalizedString("_upload_", comment: ""), imageButton2: UIImage(named: "buttonAddFolder"), titleButton2: NSLocalizedString("_folder_", comment: ""), imageButton3: UIImage(named: "scan"), titleButton3: NSLocalizedString("_scan_", comment: ""))
+                    header.setButtonsCommand(heigt: NCGlobal.shared.heightButtonsCommand, imageButton1: UIImage(named: "addImage"), titleButton1: NSLocalizedString("_upload_", comment: ""), imageButton2: UIImage(named: "addFolder"), titleButton2: NSLocalizedString("_folder_", comment: ""), imageButton3: UIImage(named: "scan"), titleButton3: NSLocalizedString("_scan_", comment: ""))
                 } else {
                     header.setButtonsCommand(heigt: 0)
                 }