Browse Source

Merge pull request #2156 from nextcloud/widget

Build 1
Marino Faggiana 2 years ago
parent
commit
3d3cf123bf
100 changed files with 623 additions and 387 deletions
  1. 18 10
      Nextcloud.xcodeproj/project.pbxproj
  2. 2 2
      Widget/Base.lproj/Dashboard.intentdefinition
  3. 17 6
      Widget/Dashboard/DashboardData.swift
  4. 2 1
      Widget/Dashboard/DashboardWidgetProvider.swift
  5. 5 5
      Widget/Dashboard/DashboardWidgetView.swift
  6. 8 2
      Widget/Files/FilesData.swift
  7. 1 0
      Widget/Files/FilesWidgetProvider.swift
  8. 3 3
      Widget/Files/FilesWidgetView.swift
  9. 4 5
      Widget/Toolbar/ToolbarWidgetView.swift
  10. 1 1
      iOSClient/Brand/iOSClient.plist
  11. 9 6
      iOSClient/Images.xcassets/MenuGroupByAlphabetic.imageset/Contents.json
  12. 9 6
      iOSClient/Images.xcassets/MenuGroupByDate.imageset/Contents.json
  13. 9 6
      iOSClient/Images.xcassets/MenuGroupByFile.imageset/Contents.json
  14. 9 6
      iOSClient/Images.xcassets/MenuOrderByFileName.imageset/Contents.json
  15. 9 6
      iOSClient/Images.xcassets/MenuOrdeyByDate.imageset/Contents.json
  16. 9 6
      iOSClient/Images.xcassets/MenuOrdinamentoAscendente.imageset/Contents.json
  17. 9 6
      iOSClient/Images.xcassets/MenuOrdinamentoDiscendente.imageset/Contents.json
  18. 11 8
      iOSClient/Images.xcassets/WiFiSmall.imageset/Contents.json
  19. 8 5
      iOSClient/Images.xcassets/acknowledgements.imageset/Contents.json
  20. 9 6
      iOSClient/Images.xcassets/actionSheetModify.imageset/Contents.json
  21. 9 6
      iOSClient/Images.xcassets/activityTypeFailure.imageset/Contents.json
  22. 9 6
      iOSClient/Images.xcassets/activityTypeInfo.imageset/Contents.json
  23. 9 6
      iOSClient/Images.xcassets/activityTypeInfoServer.imageset/Contents.json
  24. 9 6
      iOSClient/Images.xcassets/activityTypeSuccess.imageset/Contents.json
  25. 4 1
      iOSClient/Images.xcassets/addImage.imageset/Contents.json
  26. 4 0
      iOSClient/Images.xcassets/addImage.imageset/icons8-aggiungi-immagine.svg
  27. 3 0
      iOSClient/Images.xcassets/arrow.right.imageset/Contents.json
  28. 3 0
      iOSClient/Images.xcassets/arrow.up.right.square.imageset/Contents.json
  29. 3 0
      iOSClient/Images.xcassets/bell.imageset/Contents.json
  30. 0 23
      iOSClient/Images.xcassets/buttonAddFolder.imageset/Contents.json
  31. BIN
      iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-24(@1x).png
  32. BIN
      iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-48(@2x)-1.png
  33. BIN
      iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-72(@3x).png
  34. 0 4
      iOSClient/Images.xcassets/buttonAddImage.imageset/icons8-image.svg
  35. 0 4
      iOSClient/Images.xcassets/buttonAddScan.imageset/icons8-scan.svg
  36. 3 0
      iOSClient/Images.xcassets/captions.bubble.imageset/Contents.json
  37. 9 6
      iOSClient/Images.xcassets/create_file_document.imageset/Contents.json
  38. 9 6
      iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json
  39. 9 6
      iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json
  40. 9 6
      iOSClient/Images.xcassets/deleteScan.imageset/Contents.json
  41. 8 5
      iOSClient/Images.xcassets/disclosureIndicator.imageset/Contents.json
  42. 3 0
      iOSClient/Images.xcassets/doc.on.clipboard.imageset/Contents.json
  43. 9 6
      iOSClient/Images.xcassets/encrypted.imageset/Contents.json
  44. 5 5
      iOSClient/Images.xcassets/folderStarred.imageset/Contents.json
  45. 9 6
      iOSClient/Images.xcassets/foldersOnTop.imageset/Contents.json
  46. 3 0
      iOSClient/Images.xcassets/form-textbox.imageset/Contents.json
  47. 3 0
      iOSClient/Images.xcassets/gitHub.imageset/Contents.json
  48. 3 0
      iOSClient/Images.xcassets/gobackward.10.imageset/Contents.json
  49. 3 0
      iOSClient/Images.xcassets/goforward.10.imageset/Contents.json
  50. 3 0
      iOSClient/Images.xcassets/icon-calendar.imageset/Contents.json
  51. 3 0
      iOSClient/Images.xcassets/icon-confirm.imageset/Contents.json
  52. 3 0
      iOSClient/Images.xcassets/icon-contacts.imageset/Contents.json
  53. 3 0
      iOSClient/Images.xcassets/icon-deck.imageset/Contents.json
  54. 3 0
      iOSClient/Images.xcassets/icon-mail.imageset/Contents.json
  55. 3 0
      iOSClient/Images.xcassets/icon-pages.imageset/Contents.json
  56. 3 0
      iOSClient/Images.xcassets/icon-talk.imageset/Contents.json
  57. 7 4
      iOSClient/Images.xcassets/iconError.imageset/Contents.json
  58. 7 4
      iOSClient/Images.xcassets/iconInfo.imageset/Contents.json
  59. 7 4
      iOSClient/Images.xcassets/iconSuccess.imageset/Contents.json
  60. 8 5
      iOSClient/Images.xcassets/livePhoto.imageset/Contents.json
  61. 9 6
      iOSClient/Images.xcassets/local.imageset/Contents.json
  62. 11 8
      iOSClient/Images.xcassets/loginPassword.imageset/Contents.json
  63. 11 8
      iOSClient/Images.xcassets/loginURL.imageset/Contents.json
  64. 11 8
      iOSClient/Images.xcassets/loginUser.imageset/Contents.json
  65. 3 0
      iOSClient/Images.xcassets/mac.imageset/Contents.json
  66. 8 5
      iOSClient/Images.xcassets/mediaPlay.imageset/Contents.json
  67. 9 6
      iOSClient/Images.xcassets/menuLogoUser.imageset/Contents.json
  68. 9 6
      iOSClient/Images.xcassets/moreBig.imageset/Contents.json
  69. 9 6
      iOSClient/Images.xcassets/moreEmpty.imageset/Contents.json
  70. 3 0
      iOSClient/Images.xcassets/moreLock.imageset/Contents.json
  71. 5 4
      iOSClient/Images.xcassets/navigationMore.imageset/Contents.json
  72. 6 5
      iOSClient/Images.xcassets/navigationSort.imageset/Contents.json
  73. 3 0
      iOSClient/Images.xcassets/network.imageset/Contents.json
  74. 8 5
      iOSClient/Images.xcassets/networkInProgress.imageset/Contents.json
  75. 5 5
      iOSClient/Images.xcassets/nonetwork.imageset/Contents.json
  76. 9 6
      iOSClient/Images.xcassets/notaMusic.imageset/Contents.json
  77. 9 6
      iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json
  78. 3 0
      iOSClient/Images.xcassets/palette.imageset/Contents.json
  79. 12 9
      iOSClient/Images.xcassets/passcode.imageset/Contents.json
  80. 3 0
      iOSClient/Images.xcassets/pencil.imageset/Contents.json
  81. 3 0
      iOSClient/Images.xcassets/person.crop.circle.imageset/Contents.json
  82. 3 0
      iOSClient/Images.xcassets/pip.enter.imageset/Contents.json
  83. 9 6
      iOSClient/Images.xcassets/plus.imageset/Contents.json
  84. 8 5
      iOSClient/Images.xcassets/plus100.imageset/Contents.json
  85. 8 5
      iOSClient/Images.xcassets/qrcode.imageset/Contents.json
  86. 3 0
      iOSClient/Images.xcassets/repeat.imageset/Contents.json
  87. 9 6
      iOSClient/Images.xcassets/restore.imageset/Contents.json
  88. 3 0
      iOSClient/Images.xcassets/rgb.imageset/Contents.json
  89. 9 6
      iOSClient/Images.xcassets/rotate.imageset/Contents.json
  90. 3 0
      iOSClient/Images.xcassets/scan.imageset/Contents.json
  91. 1 0
      iOSClient/Images.xcassets/scan.imageset/icons8-scan.svg
  92. 9 6
      iOSClient/Images.xcassets/sharePhotoBrowser.imageset/Contents.json
  93. 9 6
      iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json
  94. 9 6
      iOSClient/Images.xcassets/sortDateMoreRecent.imageset/Contents.json
  95. 9 6
      iOSClient/Images.xcassets/sortFileNameAZ.imageset/Contents.json
  96. 9 6
      iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json
  97. 9 6
      iOSClient/Images.xcassets/sortLargest.imageset/Contents.json
  98. 9 6
      iOSClient/Images.xcassets/sortSmallest.imageset/Contents.json
  99. 3 0
      iOSClient/Images.xcassets/square.and.arrow.up.imageset/Contents.json
  100. 12 9
      iOSClient/Images.xcassets/statusdownload.imageset/Contents.json

+ 18 - 10
Nextcloud.xcodeproj/project.pbxproj

@@ -144,7 +144,6 @@
 		F718C24E254D507B00C5C256 /* NCViewerMediaDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F718C24D254D507B00C5C256 /* NCViewerMediaDetailView.swift */; };
 		F719D9E0288D37A300762E33 /* NCColorPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F719D9DF288D37A300762E33 /* NCColorPicker.storyboard */; };
 		F719D9E2288D396100762E33 /* NCColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F719D9E1288D396100762E33 /* NCColorPicker.swift */; };
-		F71EB73728CA81D1007FAB9D /* Dashboard.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F71EB73628CA81D1007FAB9D /* Dashboard.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; };
 		F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7226EDB1EE4089300EBECB1 /* Main.storyboard */; };
 		F723985C253C95CE00257F49 /* NCViewerRichdocument.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */; };
 		F7239871253D86B600257F49 /* NCEmptyDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7239870253D86B600257F49 /* NCEmptyDataSet.swift */; };
@@ -156,7 +155,6 @@
 		F7245927289BB59300474787 /* ThreadSafeDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7245923289BB50B00474787 /* ThreadSafeDictionary.swift */; };
 		F72685E727C78E490019EF5E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F72685E927C78E490019EF5E /* InfoPlist.strings */; };
 		F726EEEC1FED1C820030B9C8 /* NCEndToEndInitialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = F726EEEB1FED1C820030B9C8 /* NCEndToEndInitialize.swift */; };
-		F729027128CF503E00180CF4 /* Dashboard.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F71EB73628CA81D1007FAB9D /* Dashboard.intentdefinition */; };
 		F72928A0253B0937009CA4FD /* NCMainNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F729289F253B0937009CA4FD /* NCMainNavigationController.swift */; };
 		F72A17D828B221E300F3F159 /* DashboardWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72A17D728B221E300F3F159 /* DashboardWidgetView.swift */; };
 		F72A47EC2487B06B005AD489 /* NCOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72A47EB2487B06B005AD489 /* NCOperationQueue.swift */; };
@@ -477,6 +475,8 @@
 		F7F878AE1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F878AD1FB9E3B900599E4F /* NCEndToEndMetadata.swift */; };
 		F7F878AF1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F878AD1FB9E3B900599E4F /* NCEndToEndMetadata.swift */; };
 		F7F9D1BB25397CE000D9BFF5 /* NCViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F9D1BA25397CE000D9BFF5 /* NCViewer.swift */; };
+		F7FABE3628D1DAD00000A325 /* Dashboard.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F7FABE3928D1DAD00000A325 /* Dashboard.intentdefinition */; };
+		F7FABE3728D1DAD00000A325 /* Dashboard.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F7FABE3928D1DAD00000A325 /* Dashboard.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; };
 		F7FAFD3A28BFA948000777FE /* NCNotification+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7FAFD3928BFA947000777FE /* NCNotification+Menu.swift */; };
 		F7FF2CB12842159500EBB7A1 /* NCSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7FF2CB02842159500EBB7A1 /* NCSectionHeader.xib */; };
 /* End PBXBuildFile section */
@@ -710,7 +710,6 @@
 		F718C24D254D507B00C5C256 /* NCViewerMediaDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerMediaDetailView.swift; sourceTree = "<group>"; };
 		F719D9DF288D37A300762E33 /* NCColorPicker.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCColorPicker.storyboard; sourceTree = "<group>"; };
 		F719D9E1288D396100762E33 /* NCColorPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCColorPicker.swift; sourceTree = "<group>"; };
-		F71EB73628CA81D1007FAB9D /* Dashboard.intentdefinition */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.intentdefinition; path = Dashboard.intentdefinition; sourceTree = "<group>"; };
 		F7226EDB1EE4089300EBECB1 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerRichdocument.storyboard; sourceTree = "<group>"; };
 		F7239870253D86B600257F49 /* NCEmptyDataSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCEmptyDataSet.swift; sourceTree = "<group>"; };
@@ -1042,6 +1041,7 @@
 		F7F67BB81A24D27800EE80DA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		F7F878AD1FB9E3B900599E4F /* NCEndToEndMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCEndToEndMetadata.swift; sourceTree = "<group>"; };
 		F7F9D1BA25397CE000D9BFF5 /* NCViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewer.swift; sourceTree = "<group>"; };
+		F7FABE3828D1DAD00000A325 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Dashboard.intentdefinition; sourceTree = "<group>"; };
 		F7FAFD3928BFA947000777FE /* NCNotification+Menu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NCNotification+Menu.swift"; sourceTree = "<group>"; };
 		F7FC7D551DC1F93800BB2C6A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		F7FF2CB02842159500EBB7A1 /* NCSectionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCSectionHeader.xib; sourceTree = "<group>"; };
@@ -1391,7 +1391,7 @@
 				F72EA95628B7BAE700C88F0C /* Files */,
 				F77ED59628C9CEEE00E24ED0 /* Toolbar */,
 				F7346E2028B0FA3A006CE2D2 /* Widget-Brinding-header.h */,
-				F71EB73628CA81D1007FAB9D /* Dashboard.intentdefinition */,
+				F7FABE3928D1DAD00000A325 /* Dashboard.intentdefinition */,
 				F7346E1528B0EF5C006CE2D2 /* Widget.swift */,
 			);
 			path = Widget;
@@ -2704,7 +2704,7 @@
 				F72EA95A28B7BD0D00C88F0C /* FilesWidgetView.swift in Sources */,
 				F78302FE28B4C44700B84583 /* NCBrand.swift in Sources */,
 				F793E5A028B7651B005E4B02 /* NCViewCertificateDetails.swift in Sources */,
-				F71EB73728CA81D1007FAB9D /* Dashboard.intentdefinition in Sources */,
+				F7FABE3728D1DAD00000A325 /* Dashboard.intentdefinition in Sources */,
 				F793E59F28B764F6005E4B02 /* NCContentPresenter.swift in Sources */,
 				F78302FA28B4C3EA00B84583 /* NCManageDatabase+Metadata.swift in Sources */,
 				F783030728B4C52800B84583 /* UIColor+Extensions.swift in Sources */,
@@ -2931,7 +2931,7 @@
 				F7F4F11027ECDC4A008676F9 /* UIDevice+Extensions.swift in Sources */,
 				F77B0ED11D118A16002130FE /* Acknowledgements.m in Sources */,
 				F70D8D8124A4A9BF000A5756 /* NCNetworkingProcessUpload.swift in Sources */,
-				F729027128CF503E00180CF4 /* Dashboard.intentdefinition in Sources */,
+				F7FABE3628D1DAD00000A325 /* Dashboard.intentdefinition in Sources */,
 				F7D96FCC246ED7E200536D73 /* NCNetworkingCheckRemoteUser.swift in Sources */,
 				F7E4D9C422ED929B003675FD /* NCShareCommentsCell.swift in Sources */,
 				F717402E24F699A5000C87D5 /* NCFavorite.swift in Sources */,
@@ -3078,6 +3078,14 @@
 			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		F7FABE3928D1DAD00000A325 /* Dashboard.intentdefinition */ = {
+			isa = PBXVariantGroup;
+			children = (
+				F7FABE3828D1DAD00000A325 /* Base */,
+			);
+			name = Dashboard.intentdefinition;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -3197,7 +3205,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/iOSClient/Brand/Widget.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Nextcloud;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Nextcloud. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = it.twsweb.Nextcloud.Widget;
@@ -3231,7 +3239,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/iOSClient/Brand/Widget.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Nextcloud;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Nextcloud. All rights reserved.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = it.twsweb.Nextcloud.Widget;
@@ -3330,7 +3338,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3393,7 +3401,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

+ 2 - 2
Widget/Dashboard.intentdefinition → Widget/Base.lproj/Dashboard.intentdefinition

@@ -83,7 +83,7 @@
 	<key>INIntentDefinitionNamespace</key>
 	<string>88xZPY</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>21G83</string>
+	<string>21G115</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
 	<string>13F100</string>
 	<key>INIntentDefinitionToolsVersion</key>
@@ -185,7 +185,7 @@
 				<integer>1</integer>
 			</dict>
 			<key>INIntentTitle</key>
-			<string>titolo</string>
+			<string>Dashboard</string>
 			<key>INIntentTitleID</key>
 			<string>gpCwrM</string>
 			<key>INIntentType</key>

+ 17 - 6
Widget/Dashboard/DashboardData.swift

@@ -26,8 +26,6 @@ import NextcloudKit
 import Queuer
 import RealmSwift
 
-let dashboaardItems = 5
-
 struct DashboardDataEntry: TimelineEntry {
     let date: Date
     let datas: [DashboardData]
@@ -67,9 +65,22 @@ let dashboardDatasTest: [DashboardData] = [
     .init(id: 9, title: "title9", subTitle: "subTitle-description9", link: URL(string: "https://nextcloud.com/")!, icon: UIImage(named: "widget")!)
 ]
 
+func getDashboardItems(displaySize: CGSize, withButton: Bool) -> Int {
+    
+    if withButton {
+        let height = Int((displaySize.height - 80) / 50)
+        return height
+    } else {
+        let height = Int((displaySize.height - 55) / 50)
+        return height
+    }
+}
+
 func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: DashboardDataEntry) -> Void) {
 
-    let datasPlaceholder = Array(dashboardDatasTest[0...dashboaardItems - 1])
+    let dashboardItems = getDashboardItems(displaySize: displaySize, withButton: false)
+    let datasPlaceholder = Array(dashboardDatasTest[0...dashboardItems - 1])
+    
     var id = "recommendations"
     switch intent {
     case .unknown:
@@ -128,7 +139,7 @@ func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: C
     }
     
     let (tableDashboard, tableButton) = NCManageDatabase.shared.getDashboardWidget(account: account.account, id: id)
-    let existsButton: Int = tableButton == nil ? 0 : 1
+    let existsButton = (tableButton?.isEmpty ?? true) ? false : true
     let options = NKRequestOptions(queue: NKCommon.shared.backgroundQueue)
     let title = tableDashboard?.title ?? id
     var titleImage = UIImage(named: "widget")!
@@ -148,7 +159,7 @@ func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: C
             for result in results {
                 if let items = result.items {
                     var counter: Int = 0
-                    let maxCounter = dashboaardItems - existsButton
+                    let dashboardItems = getDashboardItems(displaySize: displaySize, withButton: existsButton)
                     for item in items {
                         counter += 1
                         let title = item.title ?? ""
@@ -181,7 +192,7 @@ func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: C
                         let data = DashboardData(id: counter, title: title, subTitle: subtitle, link: link, icon: icon)
                         datas.append(data)
                         
-                        if datas.count == maxCounter { break }
+                        if datas.count == dashboardItems { break }
                     }
                 }
             }

+ 2 - 1
Widget/Dashboard/DashboardWidgetProvider.swift

@@ -31,7 +31,8 @@ struct DashboardWidgetProvider: IntentTimelineProvider {
     typealias Entry = DashboardDataEntry
 
     func placeholder(in context: Context) -> Entry {
-        let datasPlaceholder = Array(dashboardDatasTest[0...dashboaardItems - 1])
+        let dashboardItems = getDashboardItems(displaySize: context.displaySize, withButton: false)
+        let datasPlaceholder = Array(dashboardDatasTest[0...dashboardItems])
         let title = "Dashboard"
         let titleImage = UIImage(named: "widget")!
         return Entry(date: Date(), datas: datasPlaceholder, tableDashboard: nil, tableButton: nil, isPlaceholder: true, titleImage: titleImage, title: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget")

+ 5 - 5
Widget/Dashboard/DashboardWidgetView.swift

@@ -95,14 +95,14 @@ struct DashboardWidgetView: View {
                                     Spacer()
                                 }
                                 .padding(.leading, 10)
-                                .frame(height: 45)
+                                .frame(height: 50)
                             }
                             Divider()
                                 .padding(.leading, 54)
                         }
                     }
                 }
-                .padding(.top, 40)
+                .padding(.top, 30)
                 .redacted(reason: entry.isPlaceholder ? .placeholder : [])
 
                 if let tableButton = entry.tableButton, !tableButton.isEmpty {
@@ -121,11 +121,11 @@ struct DashboardWidgetView: View {
                                     .background(brandColor)
                                     .foregroundColor(brandTextColor)
                                     .border(brandColor, width: 1)
-                                    .cornerRadius(17)
+                                    .cornerRadius(18)
                             })
                         }
                     }
-                    .frame(width: geo.size.width - 10, height: geo.size.height - 28, alignment: .bottomTrailing)
+                    .frame(width: geo.size.width - 10, height: geo.size.height - 25, alignment: .bottomTrailing)
                 }
                 
                 HStack {
@@ -152,7 +152,7 @@ struct DashboardWidgetView: View {
 
 struct DashboardWidget_Previews: PreviewProvider {
     static var previews: some View {
-        let datas = Array(dashboardDatasTest[0...dashboaardItems - 1])
+        let datas = Array(dashboardDatasTest[0...4])
         let title = "Dashboard"
         let titleImage = UIImage(named: "widget")!
         let entry = DashboardDataEntry(date: Date(), datas: datas, tableDashboard: nil, tableButton: nil, isPlaceholder: false, titleImage: titleImage, title: title, footerImage: "checkmark.icloud", footerText: "Nextcloud widget")

+ 8 - 2
Widget/Files/FilesData.swift

@@ -24,8 +24,6 @@
 import WidgetKit
 import NextcloudKit
 
-let filesItems = 4
-
 struct FilesDataEntry: TimelineEntry {
     let date: Date
     let datas: [FilesData]
@@ -71,11 +69,19 @@ func getTitleFilesWidget() -> String {
     }
 }
 
+func getFilesItems(displaySize: CGSize) -> Int {
+    
+    let height = Int((displaySize.height - 100) / 50)
+    return height
+}
+
 func getFilesDataEntry(isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: FilesDataEntry) -> Void) {
 
+    let filesItems = getFilesItems(displaySize: displaySize)
     let datasPlaceholder = Array(filesDatasTest[0...filesItems - 1])
     let title = getTitleFilesWidget()
     
+    
     if isPreview {
         return completion(FilesDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " files"))
     }

+ 1 - 0
Widget/Files/FilesWidgetProvider.swift

@@ -29,6 +29,7 @@ struct FilesWidgetProvider: TimelineProvider {
     typealias Entry = FilesDataEntry
 
     func placeholder(in context: Context) -> Entry {
+        let filesItems = getFilesItems(displaySize: context.displaySize)
         let datasPlaceholder = Array(filesDatasTest[0...filesItems - 1])
         let title = getTitleFilesWidget()
         return Entry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " files")

+ 3 - 3
Widget/Files/FilesWidgetView.swift

@@ -97,7 +97,7 @@ struct FilesWidgetView: View {
                     let brandTextColor = Color(NCBrandColor.shared.brandText)
                     
                     Link(destination: entry.isPlaceholder ? NCGlobal.shared.widgetActionNoAction : NCGlobal.shared.widgetActionUploadAsset, label: {
-                        Image("buttonAddImage")
+                        Image("addImage")
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
@@ -109,7 +109,7 @@ struct FilesWidgetView: View {
                     })
 
                     Link(destination: entry.isPlaceholder ? NCGlobal.shared.widgetActionNoAction : NCGlobal.shared.widgetActionScanDocument, label: {
-                        Image("buttonAddScan")
+                        Image("scan")
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
@@ -171,7 +171,7 @@ struct FilesWidgetView: View {
 
 struct FilesWidget_Previews: PreviewProvider {
     static var previews: some View {
-        let datas = Array(filesDatasTest[0...filesItems-1])
+        let datas = Array(filesDatasTest[0...5])
         let entry = FilesDataEntry(date: Date(), datas: datas, isPlaceholder: false, tile: "Good afternoon, Marino Faggiana", footerImage: "checkmark.icloud", footerText: "Nextcloud files")
         FilesWidgetView(entry: entry).previewContext(WidgetPreviewContext(family: .systemLarge))
     }

+ 4 - 5
Widget/Toolbar/ToolbarWidgetView.swift

@@ -34,8 +34,7 @@ struct ToolbarWidgetView: View {
 
             ZStack(alignment: .topLeading) {
 
-                // Color.init(.sRGB, red: 0.89, green: 0.89, blue: 0.89, opacity: 0.75)
-                Color(.black)
+                Color(.black).opacity(0.9)
                     .ignoresSafeArea()
 
                 HStack(spacing: 0) {
@@ -46,11 +45,11 @@ struct ToolbarWidgetView: View {
                     let brandTextColor = Color(NCBrandColor.shared.brandText)
 
                     Link(destination: entry.isPlaceholder ? NCGlobal.shared.widgetActionNoAction : NCGlobal.shared.widgetActionUploadAsset, label: {
-                        Image("buttonAddImage")
+                        Image("addImage")
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
-                            .padding(14)
+                            .padding()
                             .background(entry.isPlaceholder ? placeholderColor : brandColor)
                             .clipShape(Circle())
                             .scaledToFit()
@@ -58,7 +57,7 @@ struct ToolbarWidgetView: View {
                     })
 
                     Link(destination: entry.isPlaceholder ? NCGlobal.shared.widgetActionNoAction : NCGlobal.shared.widgetActionScanDocument, label: {
-                        Image("buttonAddScan")
+                        Image("scan")
                             .resizable()
                             .renderingMode(.template)
                             .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)

+ 1 - 1
iOSClient/Brand/iOSClient.plist

@@ -44,7 +44,7 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>INIntentsSupported</key>
 	<array>
-		<string>Dashboard</string>
+		<string>DashboardIntent</string>
 	</array>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>

+ 9 - 6
iOSClient/Images.xcassets/MenuGroupByAlphabetic.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuGroupByDate.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuGroupByFile.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuOrderByFileName.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuOrdeyByDate.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuOrdinamentoAscendente.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/MenuOrdinamentoDiscendente.imageset/Contents.json

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

+ 11 - 8
iOSClient/Images.xcassets/WiFiSmall.imageset/Contents.json

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

+ 8 - 5
iOSClient/Images.xcassets/acknowledgements.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/actionSheetModify.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/activityTypeFailure.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/activityTypeInfo.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/activityTypeInfoServer.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/activityTypeSuccess.imageset/Contents.json

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

+ 4 - 1
iOSClient/Images.xcassets/buttonAddImage.imageset/Contents.json → iOSClient/Images.xcassets/addImage.imageset/Contents.json

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

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

@@ -0,0 +1,4 @@
+<?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>

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

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/arrow.up.right.square.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

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

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 0 - 23
iOSClient/Images.xcassets/buttonAddFolder.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icons8-add-folder-24(@1x).png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icons8-add-folder-48(@2x)-1.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icons8-add-folder-72(@3x).png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-24(@1x).png


BIN
iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-48(@2x)-1.png


BIN
iOSClient/Images.xcassets/buttonAddFolder.imageset/icons8-add-folder-72(@3x).png


+ 0 - 4
iOSClient/Images.xcassets/buttonAddImage.imageset/icons8-image.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg fill="#000000" viewBox="0 0 512 512" width="512px" height="512px" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 40 30 A 40.045 40.045 0 0 0 0 70 L 0 334.91211 A 40.121 40.121 0 0 0 40 375 L 240.32617 375 C 254.22017 436 309.08489 482.04492 374.46289 482.04492 C 450.30189 482.04492 512.16211 420.32337 512.16211 344.48438 C 512.16111 304.09238 494 267.69281 467 242.50781 L 467 70 C 467 47.944 448.73373 30 426.67773 30 L 40 30 z M 40 50 L 426.67773 50 A 20.3 20.3 0 0 1 447 70 L 447 227.45703 A 137.255 137.255 0 0 0 374.62305 206.92383 A 138.761 138.761 0 0 0 351.53906 208.85742 A 61.651 61.651 0 0 0 280.14453 213.59961 L 209.92383 272.19922 A 41.068 41.068 0 0 1 163.57227 276.37695 L 20 195.92383 L 20 70 A 20.024 20.024 0 0 1 40 50 z M 166.64648 80.462891 C 130.66548 80.462891 101.39258 108.64516 101.39258 143.28516 C 101.39258 177.92516 130.66548 206.10742 166.64648 206.10742 C 202.62748 206.10742 231.90039 177.92516 231.90039 143.28516 C 231.90039 108.64516 202.62748 80.462891 166.64648 80.462891 z M 166.64648 100.46289 C 191.59948 100.46289 211.90039 119.67316 211.90039 143.28516 C 211.90039 166.89716 191.60048 186.10742 166.64648 186.10742 C 141.69248 186.10742 121.39258 166.89716 121.39258 143.28516 C 121.39258 119.67316 141.69348 100.46289 166.64648 100.46289 z M 20 218.84961 L 153.80078 293.83203 A 60.969 60.969 0 0 0 222.66211 287.59961 L 292.86133 228.99805 A 41.216 41.216 0 0 1 316.54883 219.72852 A 137.781 137.781 0 0 0 236.91992 344.50586 C 236.91992 348.02086 237.05431 351 237.32031 355 L 40 355 A 20.1 20.1 0 0 1 20 334.91211 L 20 218.84961 z M 369.57227 227.02344 A 117.539 117.539 0 0 1 492 344.46289 A 117.672 117.672 0 0 1 374.46289 462 A 117.539 117.539 0 0 1 369.57227 227.02344 z M 374.69727 288.78516 A 10 10 0 0 0 368.03906 291.59961 L 329.89062 328.57617 A 10.000059 10.000059 0 1 0 343.81055 342.9375 L 365 322.40039 L 365 391.2207 A 10 10 0 0 0 385 391.2207 L 385 322.40039 L 406.18945 342.9375 A 10.000059 10.000059 0 0 0 420.10938 328.57617 L 381.96094 291.59961 A 10 10 0 0 0 374.69727 288.78516 z" style="fill: rgb(255, 255, 255);"/>
-</svg>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg fill="#000000" viewBox="0 0 24 24" width="384px" height="384px" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 4 1.25 C 2.481 1.25 1.25 2.481 1.25 4 L 1.25 8 C 1.25 8.414 1.586 8.75 2 8.75 C 2.414 8.75 2.75 8.414 2.75 8 L 2.75 4 C 2.75 3.31 3.31 2.75 4 2.75 L 8 2.75 C 8.414 2.75 8.75 2.414 8.75 2 C 8.75 1.586 8.414 1.25 8 1.25 L 4 1.25 z M 16 1.25 C 15.586 1.25 15.25 1.586 15.25 2 C 15.25 2.414 15.586 2.75 16 2.75 L 20 2.75 C 20.69 2.75 21.25 3.31 21.25 4 L 21.25 8 C 21.25 8.414 21.586 8.75 22 8.75 C 22.414 8.75 22.75 8.414 22.75 8 L 22.75 4 C 22.75 2.481 21.519 1.25 20 1.25 L 16 1.25 z M 8 5.25 C 7.536 5.25 7.0916719 5.4346719 6.7636719 5.7636719 C 6.4346719 6.0916719 6.25 6.536 6.25 7 L 6.25 17 C 6.25 17.966 7.033 18.75 8 18.75 L 16 18.75 C 16.967 18.75 17.75 17.966 17.75 17 L 17.75 10.414062 C 17.75 9.9500625 17.565328 9.5057344 17.236328 9.1777344 C 16.497328 8.4377344 14.562266 6.5026719 13.822266 5.7636719 C 13.494266 5.4346719 13.049938 5.25 12.585938 5.25 L 8 5.25 z M 8 6.75 L 12.25 6.75 L 12.25 9 C 12.25 9.464 12.434672 9.9083281 12.763672 10.236328 C 13.091672 10.565328 13.536 10.75 14 10.75 L 16.25 10.75 L 16.25 17 C 16.25 17.138 16.138 17.25 16 17.25 L 8 17.25 C 7.862 17.25 7.75 17.138 7.75 17 L 7.75 7 C 7.75 6.934 7.7752656 6.8692656 7.8222656 6.8222656 C 7.8692656 6.7752656 7.934 6.75 8 6.75 z M 13.75 7.8085938 L 15.191406 9.25 L 14 9.25 C 13.934 9.25 13.869266 9.2247344 13.822266 9.1777344 C 13.775266 9.1307344 13.75 9.066 13.75 9 L 13.75 7.8085938 z M 2 15.25 C 1.586 15.25 1.25 15.586 1.25 16 L 1.25 20 C 1.25 21.519 2.481 22.75 4 22.75 L 8 22.75 C 8.414 22.75 8.75 22.414 8.75 22 C 8.75 21.586 8.414 21.25 8 21.25 L 4 21.25 C 3.31 21.25 2.75 20.69 2.75 20 L 2.75 16 C 2.75 15.586 2.414 15.25 2 15.25 z M 22 15.25 C 21.586 15.25 21.25 15.586 21.25 16 L 21.25 20 C 21.25 20.69 20.69 21.25 20 21.25 L 16 21.25 C 15.586 21.25 15.25 21.586 15.25 22 C 15.25 22.414 15.586 22.75 16 22.75 L 20 22.75 C 21.519 22.75 22.75 21.519 22.75 20 L 22.75 16 C 22.75 15.586 22.414 15.25 22 15.25 z" style="fill: rgb(255, 255, 255);"/>
-</svg>

+ 3 - 0
iOSClient/Images.xcassets/captions.bubble.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 9 - 6
iOSClient/Images.xcassets/create_file_document.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/deleteScan.imageset/Contents.json

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

+ 8 - 5
iOSClient/Images.xcassets/disclosureIndicator.imageset/Contents.json

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

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

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 9 - 6
iOSClient/Images.xcassets/encrypted.imageset/Contents.json

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

+ 5 - 5
iOSClient/Images.xcassets/folderStarred.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/foldersOnTop.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/form-textbox.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/gitHub.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

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

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

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

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-calendar.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-confirm.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-contacts.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-deck.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-mail.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-pages.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/icon-talk.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 7 - 4
iOSClient/Images.xcassets/iconError.imageset/Contents.json

@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "iconError@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,10 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
+}

+ 7 - 4
iOSClient/Images.xcassets/iconInfo.imageset/Contents.json

@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "iconInfo@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,10 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
+}

+ 7 - 4
iOSClient/Images.xcassets/iconSuccess.imageset/Contents.json

@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "iconSuccess@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,10 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
-}
+}

+ 8 - 5
iOSClient/Images.xcassets/livePhoto.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/local.imageset/Contents.json

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

+ 11 - 8
iOSClient/Images.xcassets/loginPassword.imageset/Contents.json

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

+ 11 - 8
iOSClient/Images.xcassets/loginURL.imageset/Contents.json

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

+ 11 - 8
iOSClient/Images.xcassets/loginUser.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/mac.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 8 - 5
iOSClient/Images.xcassets/mediaPlay.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/menuLogoUser.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/moreBig.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/moreEmpty.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/moreLock.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 5 - 4
iOSClient/Images.xcassets/navigationMore.imageset/Contents.json

@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "more-round.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
@@ -15,10 +15,11 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
+    "preserves-vector-representation" : true,
     "template-rendering-intent" : "template"
   }
-}
+}

+ 6 - 5
iOSClient/Images.xcassets/navigationSort.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/network.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 8 - 5
iOSClient/Images.xcassets/networkInProgress.imageset/Contents.json

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

+ 5 - 5
iOSClient/Images.xcassets/nonetwork.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/notaMusic.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/palette.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 12 - 9
iOSClient/Images.xcassets/passcode.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/pencil.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/person.crop.circle.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 3 - 0
iOSClient/Images.xcassets/pip.enter.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 9 - 6
iOSClient/Images.xcassets/plus.imageset/Contents.json

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

+ 8 - 5
iOSClient/Images.xcassets/plus100.imageset/Contents.json

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

+ 8 - 5
iOSClient/Images.xcassets/qrcode.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/repeat.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 9 - 6
iOSClient/Images.xcassets/restore.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/rgb.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 9 - 6
iOSClient/Images.xcassets/rotate.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/buttonAddScan.imageset/Contents.json → iOSClient/Images.xcassets/scan.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

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

@@ -0,0 +1 @@
+<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>

+ 9 - 6
iOSClient/Images.xcassets/sharePhotoBrowser.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortDateMoreRecent.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortFileNameAZ.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortLargest.imageset/Contents.json

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

+ 9 - 6
iOSClient/Images.xcassets/sortSmallest.imageset/Contents.json

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

+ 3 - 0
iOSClient/Images.xcassets/square.and.arrow.up.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

+ 12 - 9
iOSClient/Images.xcassets/statusdownload.imageset/Contents.json

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

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