Przeglądaj źródła

Merge pull request #2427 from nextcloud/images

Images
Marino Faggiana 1 rok temu
rodzic
commit
6727eab26f
51 zmienionych plików z 34 dodań i 534 usunięć
  1. 2 2
      Nextcloud.xcodeproj/project.pbxproj
  2. 0 15
      iOSClient/Images.xcassets/audioOff.imageset/Contents.json
  3. 0 53
      iOSClient/Images.xcassets/audioOff.imageset/audioOff.pdf
  4. 0 15
      iOSClient/Images.xcassets/audioOn.imageset/Contents.json
  5. 0 52
      iOSClient/Images.xcassets/audioOn.imageset/audioOn.pdf
  6. 0 15
      iOSClient/Images.xcassets/audioPlayFull.imageset/Contents.json
  7. BIN
      iOSClient/Images.xcassets/audioPlayFull.imageset/audioPlayFull.pdf
  8. 0 15
      iOSClient/Images.xcassets/doc.on.clipboard.imageset/Contents.json
  9. 0 1
      iOSClient/Images.xcassets/doc.on.clipboard.imageset/doc.on.clipboard.svg
  10. 0 15
      iOSClient/Images.xcassets/doc.on.doc.imageset/Contents.json
  11. 0 1
      iOSClient/Images.xcassets/doc.on.doc.imageset/copy.svg
  12. 0 15
      iOSClient/Images.xcassets/doc.text.viewfinder.imageset/Contents.json
  13. BIN
      iOSClient/Images.xcassets/doc.text.viewfinder.imageset/scan.pdf
  14. 0 26
      iOSClient/Images.xcassets/encrypted.imageset/Contents.json
  15. BIN
      iOSClient/Images.xcassets/encrypted.imageset/encrypted.png
  16. BIN
      iOSClient/Images.xcassets/encrypted.imageset/encrypted@2x.png
  17. BIN
      iOSClient/Images.xcassets/encrypted.imageset/encrypted@3x.png
  18. 0 15
      iOSClient/Images.xcassets/forward.imageset/Contents.json
  19. 0 1
      iOSClient/Images.xcassets/forward.imageset/forward.svg
  20. 0 15
      iOSClient/Images.xcassets/gobackward.10.imageset/Contents.json
  21. 0 4
      iOSClient/Images.xcassets/gobackward.10.imageset/gobackward.15.svg
  22. 0 15
      iOSClient/Images.xcassets/goforward.10.imageset/Contents.json
  23. 0 4
      iOSClient/Images.xcassets/goforward.10.imageset/goforward.15.svg
  24. 0 16
      iOSClient/Images.xcassets/plus-slash-minus.imageset/Contents.json
  25. BIN
      iOSClient/Images.xcassets/plus-slash-minus.imageset/plus-slash-minus.pdf
  26. 0 26
      iOSClient/Images.xcassets/plus.imageset/Contents.json
  27. BIN
      iOSClient/Images.xcassets/plus.imageset/add.png
  28. BIN
      iOSClient/Images.xcassets/plus.imageset/add@2x.png
  29. BIN
      iOSClient/Images.xcassets/plus.imageset/add@3x.png
  30. 0 15
      iOSClient/Images.xcassets/textRecognition.imageset/Contents.json
  31. BIN
      iOSClient/Images.xcassets/textRecognition.imageset/textRecognition.png
  32. 0 15
      iOSClient/Images.xcassets/themeLightDark.imageset/Contents.json
  33. BIN
      iOSClient/Images.xcassets/themeLightDark.imageset/themeLightDark.pdf
  34. 0 15
      iOSClient/Images.xcassets/transferDown.imageset/Contents.json
  35. 0 53
      iOSClient/Images.xcassets/transferDown.imageset/transferDown.pdf
  36. 0 15
      iOSClient/Images.xcassets/tray.and.arrow.down.imageset/Contents.json
  37. 0 1
      iOSClient/Images.xcassets/tray.and.arrow.down.imageset/archive-arrow-down-outline.svg
  38. 0 26
      iOSClient/Images.xcassets/utorrent.imageset/Contents.json
  39. BIN
      iOSClient/Images.xcassets/utorrent.imageset/utorrent.png
  40. BIN
      iOSClient/Images.xcassets/utorrent.imageset/utorrent@2x.png
  41. BIN
      iOSClient/Images.xcassets/utorrent.imageset/utorrent@3x.png
  42. 0 15
      iOSClient/Images.xcassets/video.imageset/Contents.json
  43. 0 1
      iOSClient/Images.xcassets/video.imageset/video.svg
  44. 0 16
      iOSClient/Images.xcassets/zoomInMedia.imageset/Contents.json
  45. BIN
      iOSClient/Images.xcassets/zoomInMedia.imageset/plus.pdf
  46. 0 16
      iOSClient/Images.xcassets/zoomOutMedia.imageset/Contents.json
  47. BIN
      iOSClient/Images.xcassets/zoomOutMedia.imageset/minus.pdf
  48. 21 19
      iOSClient/Media/NCMediaCommandView.xib
  49. 6 1
      iOSClient/Menu/NCContextMenu.swift
  50. 4 4
      iOSClient/Scan document/NCScan.swift
  51. 1 1
      iOSClient/Settings/CCManageAccount.m

+ 2 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -3958,7 +3958,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4021,7 +4021,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

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

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

+ 0 - 53
iOSClient/Images.xcassets/audioOff.imageset/audioOff.pdf

@@ -1,53 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_7\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.42.2 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36)
-/Producer (Skia/PDF m83)
-/CreationDate (D:20201031065104+00'00')
-/ModDate (D:20201031065104+00'00')>>
-endobj
-3 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-4 0 obj
-<</Filter /FlateDecode
-/Length 174>> stream
-xœmNK1Ýs
-Ö&"Ж¶'píÊ?‹õþ‰´u̘I߃Â{�†ÚÙsK«RqÁÓh"Fæ‘lMŸg8nðî3‘Š‰kWú­\d·x}A"È"{ΠBÁ:—º°	œ×Ô¹2å²tÝߨ„A•ú^rÌTIú­Š¤Òl&â&ê—M¯é²Ñ�jFòñ¶Rä¡‘)å±÷™žà8x¾‡BL
-endstream
-endobj
-2 0 obj
-<</Type /Page
-/Resources <</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G3 3 0 R>>>>
-/MediaBox [0 0 28.08 28.08]
-/Contents 4 0 R
-/StructParents 0
-/Parent 5 0 R>>
-endobj
-5 0 obj
-<</Type /Pages
-/Count 1
-/Kids [2 0 R]>>
-endobj
-6 0 obj
-<</Type /Catalog
-/Pages 5 0 R>>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000582 00000 n 
-0000000301 00000 n 
-0000000338 00000 n 
-0000000774 00000 n 
-0000000829 00000 n 
-trailer
-<</Size 7
-/Root 6 0 R
-/Info 1 0 R>>
-startxref
-876
-%%EOF

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

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

+ 0 - 52
iOSClient/Images.xcassets/audioOn.imageset/audioOn.pdf

@@ -1,52 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_7\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.42.2 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36)
-/Producer (Skia/PDF m83)
-/CreationDate (D:20201031060355+00'00')
-/ModDate (D:20201031060355+00'00')>>
-endobj
-3 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-4 0 obj
-<</Filter /FlateDecode
-/Length 232>> stream
-xœU�MnÄ0…÷>ëJC
Ž
9Á¬»šXýY4•ÚÞ_ꃸÕÔ–‚	�Çg³¶=Uìߥê\�æQ>KÔD¬>î�_Ïåö@ÐlìCDª¦Óÿ&�×F¯ßE6jBGœ:ëNïnî9t°ôŠ%$;9»ž,HDi–ˆ�Å–ä¯MŒ}#Šó*Îð×Êf1Àa ¬hvª‡Î2kDc“°ƒØÁ/m
_Ä38{¨�uª¬	؃ªƒ×$ÔÆ{B´BF„@ò¾goc¼Ï¯ë,�vx7èÐag@Aë·üÖòûV^ÊöÄßVì
-endstream
-endobj
-2 0 obj
-<</Type /Page
-/Resources <</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G3 3 0 R>>>>
-/MediaBox [0 0 28.08 28.08]
-/Contents 4 0 R
-/StructParents 0
-/Parent 5 0 R>>
-endobj
-5 0 obj
-<</Type /Pages
-/Count 1
-/Kids [2 0 R]>>
-endobj
-6 0 obj
-<</Type /Catalog
-/Pages 5 0 R>>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000640 00000 n 
-0000000301 00000 n 
-0000000338 00000 n 
-0000000832 00000 n 
-0000000887 00000 n 
-trailer
-<</Size 7
-/Root 6 0 R
-/Info 1 0 R>>
-startxref
-934
-%%EOF

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

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

BIN
iOSClient/Images.xcassets/audioPlayFull.imageset/audioPlayFull.pdf


+ 0 - 15
iOSClient/Images.xcassets/doc.on.clipboard.imageset/Contents.json

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

+ 0 - 1
iOSClient/Images.xcassets/doc.on.clipboard.imageset/doc.on.clipboard.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="M15 23C13.9 23 13 22.11 13 21V12C13 10.9 13.9 10 15 10H19L23 14V21C23 22.11 22.11 23 21 23H15M15 21H21V14.83L18.17 12H15V21M19 3C20.1 3 21 3.9 21 5V9.17L19.83 8H19V5H17V7H7V5H5V19H11V21H5C3.9 21 3 20.1 3 19V5C3 3.9 3.9 3 5 3H9.18C9.6 1.84 10.7 1 12 1C13.3 1 14.4 1.84 14.82 3H19M12 3C11.45 3 11 3.45 11 4C11 4.55 11.45 5 12 5C12.55 5 13 4.55 13 4C13 3.45 12.55 3 12 3Z" /></svg>

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

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

+ 0 - 1
iOSClient/Images.xcassets/doc.on.doc.imageset/copy.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="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" /></svg>

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

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

BIN
iOSClient/Images.xcassets/doc.text.viewfinder.imageset/scan.pdf


+ 0 - 26
iOSClient/Images.xcassets/encrypted.imageset/Contents.json

@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "encrypted.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "encrypted@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "encrypted@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}

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


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


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


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

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

+ 0 - 1
iOSClient/Images.xcassets/forward.imageset/forward.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="M15,9.9L18,12L15,14.1V9.9M6,9.9L9,12L6,14.1V9.9M13,6V18L21.5,12L13,6M4,6V18L12.5,12L4,6Z" /></svg>

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

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

+ 0 - 4
iOSClient/Images.xcassets/gobackward.10.imageset/gobackward.15.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 13.5 3 C 8.529 3 4.5 7.029 4.5 12 L 1.5 12 L 5.5 16 L 9.5 12 L 6.5 12 C 6.5 8.134 9.634 5 13.5 5 C 17.366 5 20.5 8.134 20.5 12 C 20.5 15.866 17.366 19 13.5 19 C 12 19 10.59 18.5 9.44 17.7 L 8 19.14 C 9.54 20.3 11.44 21 13.5 21 C 18.471 21 22.5 16.971 22.5 12 C 22.5 7.029 18.471 3 13.5 3 M 15.5 12 C 15.5 10.895 14.605 10 13.5 10 C 12.395 10 11.5 10.895 11.5 12 C 11.5 13.105 12.395 14 13.5 14 C 14.605 14 15.5 13.105 15.5 12 Z"/>
-</svg>

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

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

+ 0 - 4
iOSClient/Images.xcassets/goforward.10.imageset/goforward.15.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 13.5 21 C 8.529 21 4.5 16.971 4.5 12 L 1.5 12 L 5.5 8 L 9.5 12 L 6.5 12 C 6.5 15.866 9.634 19 13.5 19 C 17.366 19 20.5 15.866 20.5 12 C 20.5 8.134 17.366 5 13.5 5 C 12 5 10.59 5.5 9.44 6.3 L 8 4.86 C 9.54 3.7 11.44 3 13.5 3 C 18.471 3 22.5 7.029 22.5 12 C 22.5 16.971 18.471 21 13.5 21 M 15.5 12 C 15.5 13.105 14.605 14 13.5 14 C 12.395 14 11.5 13.105 11.5 12 C 11.5 10.895 12.395 10 13.5 10 C 14.605 10 15.5 10.895 15.5 12 Z" transform="matrix(-1, 0, 0, -1, 24, 24)"/>
-</svg>

+ 0 - 16
iOSClient/Images.xcassets/plus-slash-minus.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "plus-slash-minus.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
-  }
-}

BIN
iOSClient/Images.xcassets/plus-slash-minus.imageset/plus-slash-minus.pdf


+ 0 - 26
iOSClient/Images.xcassets/plus.imageset/Contents.json

@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "add.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "add@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "add@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}

BIN
iOSClient/Images.xcassets/plus.imageset/add.png


BIN
iOSClient/Images.xcassets/plus.imageset/add@2x.png


BIN
iOSClient/Images.xcassets/plus.imageset/add@3x.png


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

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

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


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

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

BIN
iOSClient/Images.xcassets/themeLightDark.imageset/themeLightDark.pdf


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

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

+ 0 - 53
iOSClient/Images.xcassets/transferDown.imageset/transferDown.pdf

@@ -1,53 +0,0 @@
-%PDF-1.4
-%Óëéá
-1 0 obj
-<</Creator (Chromium)
-/Producer (Skia/PDF m69)
-/CreationDate (D:20190715105909+00'00')
-/ModDate (D:20190715105909+00'00')>>
-endobj
-2 0 obj
-<</Filter /FlateDecode
-/Length 132>> stream
-xœUŽK
-‚1„÷sŠ¬k“ØÖžÀµ+ >ýõþ`šZÑfÈ|h­þ(Ú¬ÃϪé´à�NXKò<㸢»å©©œóÖoÿ7;Üì#]_àLJK·D
»�ª©·2
-ÕÑÐ2‰óh°:œÆ_Ú`ßK½T»[,$2ã†.8ؼQ.Â
-endstream
-endobj
-3 0 obj
-<</Type /Catalog
-/Pages 4 0 R>>
-endobj
-4 0 obj
-<</Type /Pages
-/Count 1
-/Kids [5 0 R]>>
-endobj
-5 0 obj
-<</Type /Page
-/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <</G0 6 0 R>>>>
-/MediaBox [0 0 330 330]
-/Contents 2 0 R
-/Parent 4 0 R>>
-endobj
-6 0 obj
-<</ca 1
-/BM /Normal>>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000154 00000 n 
-0000000356 00000 n 
-0000000403 00000 n 
-0000000458 00000 n 
-0000000630 00000 n 
-trailer
-<</Size 7
-/Root 3 0 R
-/Info 1 0 R>>
-startxref
-667
-%%EOF

+ 0 - 15
iOSClient/Images.xcassets/tray.and.arrow.down.imageset/Contents.json

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

+ 0 - 1
iOSClient/Images.xcassets/tray.and.arrow.down.imageset/archive-arrow-down-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="M20 21H4V10H6V19H18V10H20V21M3 3H21V9H3V3M5 5V7H19V5M10.5 11V14H8L12 18L16 14H13.5V11" /></svg>

+ 0 - 26
iOSClient/Images.xcassets/utorrent.imageset/Contents.json

@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "utorrent.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "utorrent@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "utorrent@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}

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


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


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


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

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

+ 0 - 1
iOSClient/Images.xcassets/video.imageset/video.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="M15,8V16H5V8H15M16,6H4A1,1 0 0,0 3,7V17A1,1 0 0,0 4,18H16A1,1 0 0,0 17,17V13.5L21,17.5V6.5L17,10.5V7A1,1 0 0,0 16,6Z" /></svg>

+ 0 - 16
iOSClient/Images.xcassets/zoomInMedia.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "plus.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
-  }
-}

BIN
iOSClient/Images.xcassets/zoomInMedia.imageset/plus.pdf


+ 0 - 16
iOSClient/Images.xcassets/zoomOutMedia.imageset/Contents.json

@@ -1,16 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "minus.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
-  }
-}

BIN
iOSClient/Images.xcassets/zoomOutMedia.imageset/minus.pdf


+ 21 - 19
iOSClient/Media/NCMediaCommandView.xib

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina3_5" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,11 +12,11 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCMediaCommandView" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i1s-Qa-dG1">
-                    <rect key="frame" x="224" y="10" width="40" height="40"/>
+                    <rect key="frame" x="297" y="69" width="40" height="40"/>
                     <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="e3Q-e0-SQa">
                         <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -28,7 +29,7 @@
                                 </constraints>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
-                                <state key="normal" image="plus-slash-minus">
+                                <state key="normal" image="plus.slash.minus" catalog="system">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
                                 <state key="disabled">
@@ -39,10 +40,10 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZkU-dK-sp1">
-                                <rect key="frame" x="0.0" y="0.0" width="19.5" height="40"/>
+                                <rect key="frame" x="0.0" y="0.0" width="19.666666666666668" height="40"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
-                                <state key="normal" image="zoomInMedia">
+                                <state key="normal" image="plus" catalog="system">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
                                 <state key="disabled">
@@ -53,18 +54,19 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NwM-bk-QAK">
-                                <rect key="frame" x="19.5" y="8" width="1" height="24"/>
+                                <rect key="frame" x="19.666666666666686" y="8" width="1" height="24"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="1" id="1cE-rd-mYI"/>
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="swp-Cd-CbD">
-                                <rect key="frame" x="20.5" y="0.0" width="19.5" height="40"/>
+                                <rect key="frame" x="20.666666666666686" y="0.0" width="19.333333333333329" height="40"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
-                                <state key="normal" image="zoomOutMedia">
+                                <state key="normal">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <imageReference key="image" image="minus" catalog="system" symbolScale="default"/>
                                 </state>
                                 <state key="disabled">
                                     <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -97,7 +99,7 @@
                     <blurEffect style="regular"/>
                 </visualEffectView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IxY-xH-yZQ">
-                    <rect key="frame" x="8" y="10" width="208" height="40"/>
+                    <rect key="frame" x="8" y="69" width="281" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="S6o-Pa-sxy"/>
                     </constraints>
@@ -106,7 +108,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="enp-xt-Y5y">
-                    <rect key="frame" x="272" y="10" width="40" height="40"/>
+                    <rect key="frame" x="345" y="69" width="40" height="40"/>
                     <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="KKR-Hr-av8">
                         <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -115,7 +117,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="imageEdgeInsets" minX="4" minY="4" maxX="4" maxY="4"/>
-                                <state key="normal" image="more"/>
+                                <state key="normal" image="ellipsis" catalog="system"/>
                                 <connections>
                                     <action selector="moreButtonPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="EeF-Eg-Pqi"/>
                                 </connections>
@@ -135,7 +137,7 @@
                     <blurEffect style="regular"/>
                 </visualEffectView>
                 <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="XVj-jD-9KA">
-                    <rect key="frame" x="150" y="-9" width="20" height="20"/>
+                    <rect key="frame" x="186.66666666666666" y="50" width="20" height="20"/>
                     <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </activityIndicatorView>
             </subviews>
@@ -168,9 +170,9 @@
         </view>
     </objects>
     <resources>
-        <image name="more" width="425" height="425"/>
-        <image name="plus-slash-minus" width="512" height="512"/>
-        <image name="zoomInMedia" width="512" height="512"/>
-        <image name="zoomOutMedia" width="512" height="512"/>
+        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="minus" catalog="system" width="128" height="26"/>
+        <image name="plus" catalog="system" width="128" height="113"/>
+        <image name="plus.slash.minus" catalog="system" width="128" height="115"/>
     </resources>
 </document>

+ 6 - 1
iOSClient/Menu/NCContextMenu.swift

@@ -151,7 +151,12 @@ class NCContextMenu: NSObject {
 
         let deleteConfirmFile = UIAction(title: titleDeleteConfirmFile,
                                          image: UIImage(systemName: "trash"), attributes: .destructive) { _ in
-            let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
+
+            var alertStyle = UIAlertController.Style.actionSheet
+            if UIDevice.current.userInterfaceIdiom == .pad {
+                alertStyle = .alert
+            }
+            let alertController = UIAlertController(title: nil, message: nil, preferredStyle: alertStyle)
             alertController.addAction(UIAlertAction(title: NSLocalizedString("_delete_file_", comment: ""), style: .destructive) { _ in
                 Task {
                     var ocId: [String] = []

+ 4 - 4
iOSClient/Scan document/NCScan.swift

@@ -84,8 +84,8 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
         segmentControlFilter.setTitle(NSLocalizedString("_filter_grayscale_", comment: ""), forSegmentAt: 1)
         segmentControlFilter.setTitle(NSLocalizedString("_filter_bn_", comment: ""), forSegmentAt: 2)
 
-        add.setImage(UIImage(named: "plus")?.image(color: .label, size: 25), for: .normal)
-        transferDown.setImage(UIImage(named: "transferDown")?.image(color: .label, size: 25), for: .normal)
+        add.setImage(UIImage(systemName: "plus")?.image(color: .label, size: 25), for: .normal)
+        transferDown.setImage(UIImage(systemName: "arrow.down")?.image(color: .label, size: 25), for: .normal)
 
         let longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPressGesture(recognizer:)))
         collectionViewSource.addGestureRecognizer(longPressRecognizer)
@@ -145,8 +145,8 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 
-        add.setImage(UIImage(named: "plus")?.image(color: .label, size: 25), for: .normal)
-        transferDown.setImage(UIImage(named: "transferDown")?.image(color: .label, size: 25), for: .normal)
+        add.setImage(UIImage(systemName: "plus")?.image(color: .label, size: 25), for: .normal)
+        transferDown.setImage(UIImage(systemName: "arrow.down")?.image(color: .label, size: 25), for: .normal)
     }
 
     override var canBecomeFirstResponder: Bool { return true }

+ 1 - 1
iOSClient/Settings/CCManageAccount.m

@@ -94,7 +94,7 @@
             row = [XLFormRowDescriptor formRowDescriptorWithTag:@"addAccount" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_account_", nil)];
             row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
             [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-            [row.cellConfig setObject:[[UIImage imageNamed:@"plus"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
+            [row.cellConfig setObject:[[UIImage systemImageNamed:@"plus"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
             [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
             [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
             row.action.formSelector = @selector(addAccount:);