diff --git a/Brand/Custom.xcassets/introSlide1.imageset/Contents.json b/Brand/Custom.xcassets/introSlide1.imageset/Contents.json new file mode 100644 index 0000000000..65b05047b7 --- /dev/null +++ b/Brand/Custom.xcassets/introSlide1.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide1.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide1@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide1@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Portrait - first slide-1.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Portrait - first slide.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide-1.png b/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide-1.png new file mode 100644 index 0000000000..8a6354f8e9 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide.png b/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide.png new file mode 100644 index 0000000000..8a6354f8e9 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide1.imageset/Tablet Portrait - first slide.png differ diff --git a/Brand/Custom.xcassets/introSlide1.imageset/introSlide1.png b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1.png new file mode 100644 index 0000000000..7ad97b76bc Binary files /dev/null and b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1.png differ diff --git a/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@2x.png b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@2x.png new file mode 100644 index 0000000000..7ad97b76bc Binary files /dev/null and b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@2x.png differ diff --git a/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@3x.png b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@3x.png new file mode 100644 index 0000000000..271ec26fda Binary files /dev/null and b/Brand/Custom.xcassets/introSlide1.imageset/introSlide1@3x.png differ diff --git a/Brand/Custom.xcassets/introSlide2.imageset/Contents.json b/Brand/Custom.xcassets/introSlide2.imageset/Contents.json new file mode 100644 index 0000000000..6f14cfcd17 --- /dev/null +++ b/Brand/Custom.xcassets/introSlide2.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide2.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide2@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide2@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Portrait - third slide-1.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Portrait - third slide.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide-1.png b/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide-1.png new file mode 100644 index 0000000000..58357b3fb7 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide.png b/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide.png new file mode 100644 index 0000000000..58357b3fb7 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide2.imageset/Tablet Portrait - third slide.png differ diff --git a/Brand/Custom.xcassets/introSlide2.imageset/introSlide2.png b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2.png new file mode 100644 index 0000000000..df3e9d9339 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2.png differ diff --git a/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@2x.png b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@2x.png new file mode 100644 index 0000000000..df3e9d9339 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@2x.png differ diff --git a/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@3x.png b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@3x.png new file mode 100644 index 0000000000..17bf5d89a4 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide2.imageset/introSlide2@3x.png differ diff --git a/Brand/Custom.xcassets/introSlide3.imageset/Contents.json b/Brand/Custom.xcassets/introSlide3.imageset/Contents.json new file mode 100644 index 0000000000..e15a5bbe53 --- /dev/null +++ b/Brand/Custom.xcassets/introSlide3.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide3.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide3@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide3@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Portrait - second slide-1.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Portrait - second slide.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide-1.png b/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide-1.png new file mode 100644 index 0000000000..395767ba7f Binary files /dev/null and b/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide.png b/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide.png new file mode 100644 index 0000000000..395767ba7f Binary files /dev/null and b/Brand/Custom.xcassets/introSlide3.imageset/Tablet Portrait - second slide.png differ diff --git a/Brand/Custom.xcassets/introSlide3.imageset/introSlide3.png b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3.png new file mode 100644 index 0000000000..bd19e31a5b Binary files /dev/null and b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3.png differ diff --git a/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@2x.png b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@2x.png new file mode 100644 index 0000000000..bd19e31a5b Binary files /dev/null and b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@2x.png differ diff --git a/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@3x.png b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@3x.png new file mode 100644 index 0000000000..223fee7741 Binary files /dev/null and b/Brand/Custom.xcassets/introSlide3.imageset/introSlide3@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideEight1.imageset/Contents.json b/Brand/Custom.xcassets/introSlideEight1.imageset/Contents.json new file mode 100644 index 0000000000..56a179f397 --- /dev/null +++ b/Brand/Custom.xcassets/introSlideEight1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "introSlideEight1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideEight1.imageset/introSlideEight1@3x.png b/Brand/Custom.xcassets/introSlideEight1.imageset/introSlideEight1@3x.png new file mode 100644 index 0000000000..244802dfc2 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideEight1.imageset/introSlideEight1@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideEight2.imageset/Contents.json b/Brand/Custom.xcassets/introSlideEight2.imageset/Contents.json new file mode 100644 index 0000000000..4e7d271b20 --- /dev/null +++ b/Brand/Custom.xcassets/introSlideEight2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "introSlideEight2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideEight2.imageset/introSlideEight2@3x.png b/Brand/Custom.xcassets/introSlideEight2.imageset/introSlideEight2@3x.png new file mode 100644 index 0000000000..7cccb2c941 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideEight2.imageset/introSlideEight2@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideEight3.imageset/Contents.json b/Brand/Custom.xcassets/introSlideEight3.imageset/Contents.json new file mode 100644 index 0000000000..d1192931e8 --- /dev/null +++ b/Brand/Custom.xcassets/introSlideEight3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "introSlideEight3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideEight3.imageset/introSlideEight3@3x.png b/Brand/Custom.xcassets/introSlideEight3.imageset/introSlideEight3@3x.png new file mode 100644 index 0000000000..21adc87717 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideEight3.imageset/introSlideEight3@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/Contents.json b/Brand/Custom.xcassets/introSlideLand1.imageset/Contents.json new file mode 100644 index 0000000000..58788d977d --- /dev/null +++ b/Brand/Custom.xcassets/introSlideLand1.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide1.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide1@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide1@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Landscape - first slide.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Landscape - first slide-1.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide-1.png b/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide-1.png new file mode 100644 index 0000000000..6e3df04303 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide.png b/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide.png new file mode 100644 index 0000000000..6e3df04303 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand1.imageset/Tablet Landscape - first slide.png differ diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1.png b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1.png new file mode 100644 index 0000000000..7ad97b76bc Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1.png differ diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@2x.png b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@2x.png new file mode 100644 index 0000000000..7ad97b76bc Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@2x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@3x.png b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@3x.png new file mode 100644 index 0000000000..271ec26fda Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand1.imageset/introSlide1@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/Contents.json b/Brand/Custom.xcassets/introSlideLand2.imageset/Contents.json new file mode 100644 index 0000000000..efbfa73a66 --- /dev/null +++ b/Brand/Custom.xcassets/introSlideLand2.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide2.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide2@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide2@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Landscape - second slide.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Landscape - second slide-1.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide-1.png b/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide-1.png new file mode 100644 index 0000000000..c5e3bca8af Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide.png b/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide.png new file mode 100644 index 0000000000..c5e3bca8af Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand2.imageset/Tablet Landscape - second slide.png differ diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2.png b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2.png new file mode 100644 index 0000000000..df3e9d9339 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2.png differ diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@2x.png b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@2x.png new file mode 100644 index 0000000000..df3e9d9339 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@2x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@3x.png b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@3x.png new file mode 100644 index 0000000000..17bf5d89a4 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand2.imageset/introSlide2@3x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/Contents.json b/Brand/Custom.xcassets/introSlideLand3.imageset/Contents.json new file mode 100644 index 0000000000..fce5b583fd --- /dev/null +++ b/Brand/Custom.xcassets/introSlideLand3.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "introSlide3.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "introSlide3@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "introSlide3@3x.png", + "idiom" : "iphone", + "scale" : "3x" + }, + { + "filename" : "Tablet Landscape - third slide.png", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "Tablet Landscape - third slide-1.png", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide-1.png b/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide-1.png new file mode 100644 index 0000000000..faa2188a48 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide-1.png differ diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide.png b/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide.png new file mode 100644 index 0000000000..faa2188a48 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand3.imageset/Tablet Landscape - third slide.png differ diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3.png b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3.png new file mode 100644 index 0000000000..bd19e31a5b Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3.png differ diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@2x.png b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@2x.png new file mode 100644 index 0000000000..bd19e31a5b Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@2x.png differ diff --git a/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@3x.png b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@3x.png new file mode 100644 index 0000000000..223fee7741 Binary files /dev/null and b/Brand/Custom.xcassets/introSlideLand3.imageset/introSlide3@3x.png differ diff --git a/Brand/NCBrand.swift b/Brand/NCBrand.swift index e42ad9574d..047bd7a0c1 100755 --- a/Brand/NCBrand.swift +++ b/Brand/NCBrand.swift @@ -35,21 +35,25 @@ let userAgent: String = { return instance }() - var brand: String = "Nextcloud" - var textCopyrightNextcloudiOS: String = "Nextcloud Hydrogen for iOS %@ © 2024" - var textCopyrightNextcloudServer: String = "Nextcloud Server %@" - var loginBaseUrl: String = "https://cloud.nextcloud.com" - var pushNotificationServerProxy: String = "https://push-notifications.nextcloud.com" - var linkLoginHost: String = "https://nextcloud.com/install" - var linkloginPreferredProviders: String = "https://nextcloud.com/signup-ios" - var webLoginAutenticationProtocol: String = "nc://" // example "abc://" - var privacy: String = "https://nextcloud.com/privacy" - var sourceCode: String = "https://github.com/nextcloud/ios" - var mobileconfig: String = "/remote.php/dav/provisioning/apple-provisioning.mobileconfig" - var appStoreUrl: String = "https://apps.apple.com/in/app/nextcloud/id1125420102" + @objc public var brand: String = "Nextcloud" + @objc public var textCopyrightNextcloudiOS: String = "Nextcloud Hydrogen for iOS %@ © 2024" + @objc public var textCopyrightNextcloudServer: String = "Nextcloud Server %@" + @objc public var loginBaseUrl: String = "https://cloud.nextcloud.com" + @objc public var pushNotificationServerProxy: String = "https://push-notifications.nextcloud.com" + @objc public var linkLoginHost: String = "https://nextcloud.com/install" + @objc public var linkloginPreferredProviders: String = "https://nextcloud.com/signup-ios" + @objc public var webLoginAutenticationProtocol: String = "nc://" // example "abc://" + @objc public var privacy: String = "https://nextcloud.com/privacy" + @objc public var sourceCode: String = "https://github.com/nextcloud/ios" + @objc public var mobileconfig: String = "/remote.php/dav/provisioning/apple-provisioning.mobileconfig" + @objc public var appStoreUrl: String = "https://apps.apple.com/de/app/magentacloud-cloud-speicher/id312838242" + + // Personalized + @objc public var webCloseViewProtocolPersonalized: String = "" // example "abc://change/plan" Don't touch me !! + @objc public var folderBrandAutoUpload: String = "" // example "_auto_upload_folder_" Don't touch me !! // Auto Upload default folder - var folderDefaultAutoUpload: String = "Photos" + @objc public var folderDefaultAutoUpload: String = Locale.current.languageCode == "de" ? "Kamera-Medien" : "Camera-Media" // Capabilities Group var capabilitiesGroup: String = "group.it.twsweb.Crypto-Cloud" @@ -337,4 +341,62 @@ class NCBrandColor: NSObject { } return .white } + + @objc public var iconColor: UIColor{ + if #available(iOS 13.0, *) { + if UITraitCollection.current.userInterfaceStyle == .dark { + return UIColor(displayP3Red: 204.0/255.0, green: 204.0/255.0, blue: 204.0/255.0, alpha: 1.0) + }else { + return UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0) + } + } else { + return UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0) + } + } + + @objc public var notificationAction: UIColor { + return UIColor(red: 0/255.0, green: 153/255.0, blue: 255/255.0, alpha: 1.0) + } + + @objc public var secondarySystemGroupedBackground: UIColor = UIColor.secondarySystemGroupedBackground + @objc public var label: UIColor = UIColor.label + @objc public var backgroundForm: UIColor = UIColor(red: 244.0/255.0, green: 244.0/255.0, blue: 244.0/255.0, alpha: 1.0) + @objc public let graySoft: UIColor = UIColor(red: 162.0/255.0, green: 162.0/255.0, blue: 162.0/255.0, alpha: 0.5) + @objc public let systemGray4: UIColor = UIColor.systemGray4 + @objc public let systemBackground: UIColor = UIColor.systemBackground + @objc public let textInfo: UIColor = UIColor(red: 153.0/255.0, green: 153.0/255.0, blue: 153.0/255.0, alpha: 1.0) + @objc public let systemGray: UIColor = UIColor.systemGray + @objc public let customerDarkGrey: UIColor = UIColor(red: 38.0/255.0, green: 38.0/255.0, blue: 38.0/255.0, alpha: 1.0) + @objc public var fileFolderName: UIColor = UIColor(displayP3Red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0) + @objc public let optionItem: UIColor = UIColor(red: 178.0/255.0, green: 178.0/255.0, blue: 178.0/255.0, alpha: 1.0) + @objc public var singleTitleColorButton: UIColor = UIColor(red: 25.0/255.0, green: 25.0/255.0, blue: 25.0/255.0, alpha: 1.0) + @objc public var shareCellTitleColor: UIColor = UIColor(displayP3Red: 242.0/255.0, green: 242.0/255.0, blue: 242.0/255.0, alpha: 1.0) + @objc public var gray60: UIColor { + if UITraitCollection.current.userInterfaceStyle == .dark { + return UIColor(red: 178.0/255.0, green: 178.0/255.0, blue: 178.0/255.0, alpha: 1.0) + } else { + return UIColor(red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0) + } + } + @objc public var systemGray2: UIColor = UIColor.systemGray2 + @objc public var shareByEmailTextColor: UIColor = UIColor(displayP3Red: 13.0/255.0, green: 57.0/255.0, blue: 223.0/255.0, alpha: 1.0) + @objc public var memoryConsuptionBackground: UIColor { + if UITraitCollection.current.userInterfaceStyle == .dark { + return UIColor(red: 25.0/255.0, green: 25.0/255.0, blue: 25.0/255.0, alpha: 1.0) + } else { + return UIColor(red: 244.0/255.0, green: 244.0/255.0, blue: 244.0/255.0, alpha: 1.0) + } + } + @objc public var nmcGray0: UIColor{ + if UITraitCollection.current.userInterfaceStyle == .dark { + return UIColor(displayP3Red: 242.0/255.0, green: 242.0/255.0, blue: 242.0/255.0, alpha: 1.0) + }else { + return UIColor(red: 19.0/255.0, green: 19.0/255.0, blue: 19.0/255.0, alpha: 1.0) + } + } + @objc public var commonViewInfoText: UIColor = UIColor(displayP3Red: 102.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1.0) + @objc public let progressColorGreen60: UIColor = UIColor(red: 115.0/255.0, green: 195.0/255.0, blue: 84.0/255.0, alpha: 1.0) + @objc public var seperatorRename: UIColor = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0) + @objc public let gray: UIColor = UIColor(red: 104.0/255.0, green: 104.0/255.0, blue: 104.0/255.0, alpha: 1.0) + @objc public var nmcIconSharedWithMe: UIColor = UIColor(displayP3Red: 0.0/255.0, green: 153.0/255.0, blue: 255.0/255.0, alpha: 1.0) } diff --git a/iOSClient/Extensions/UIImage+Extension.swift b/iOSClient/Extensions/UIImage+Extension.swift index 3ea4d04296..8a8090475a 100644 --- a/iOSClient/Extensions/UIImage+Extension.swift +++ b/iOSClient/Extensions/UIImage+Extension.swift @@ -244,6 +244,17 @@ extension UIImage { guard CGImageDestinationFinalize(destination) else { return nil } return mutableData as Data } + + func imageColor(_ color: UIColor) -> UIImage { + if #available(iOS 13.0, *) { + return self.withTintColor(color, renderingMode: .alwaysOriginal) + } else { + return UIGraphicsImageRenderer(size: size, format: imageRendererFormat).image { _ in + color.set() + withRenderingMode(.alwaysTemplate).draw(at: .zero) + } + } + } } extension CGImagePropertyOrientation { diff --git a/iOSClient/Images.xcassets/InfoNetwork.imageset/Contents.json b/iOSClient/Images.xcassets/InfoNetwork.imageset/Contents.json index e8722c72c9..a946785164 100644 --- a/iOSClient/Images.xcassets/InfoNetwork.imageset/Contents.json +++ b/iOSClient/Images.xcassets/InfoNetwork.imageset/Contents.json @@ -8,5 +8,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/addFolder.imageset/Contents.json b/iOSClient/Images.xcassets/addFolder.imageset/Contents.json new file mode 100644 index 0000000000..c3efac3643 --- /dev/null +++ b/iOSClient/Images.xcassets/addFolder.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "addFolder.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "addFolderDark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "addFolder@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "addFolderDark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "addFolder@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "addFolderDark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png new file mode 100644 index 0000000000..01b4edc846 Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder.png differ diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png new file mode 100644 index 0000000000..36b5f67ed9 Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@2x.png differ diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png new file mode 100644 index 0000000000..63f36fef80 Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolder@3x.png differ diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png new file mode 100644 index 0000000000..021899fc7c Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark.png differ diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png new file mode 100644 index 0000000000..a4eede1fd9 Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@2x.png differ diff --git a/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png new file mode 100644 index 0000000000..bc59610706 Binary files /dev/null and b/iOSClient/Images.xcassets/addFolder.imageset/addFolderDark@3x.png differ diff --git a/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json b/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json new file mode 100644 index 0000000000..bfc9b6a226 --- /dev/null +++ b/iOSClient/Images.xcassets/addFolderInfo.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "addFolderInfo.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf b/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf new file mode 100644 index 0000000000..874d974e1b Binary files /dev/null and b/iOSClient/Images.xcassets/addFolderInfo.imageset/addFolderInfo.pdf differ diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json b/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json new file mode 100644 index 0000000000..0b5d3dafc8 --- /dev/null +++ b/iOSClient/Images.xcassets/checkedYes.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "green-white-filled@500w.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "green-Gray90-filled copy@500w.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf b/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf new file mode 100644 index 0000000000..a689619ff2 Binary files /dev/null and b/iOSClient/Images.xcassets/checkedYes.imageset/green-Gray90-filled copy@500w.pdf differ diff --git a/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf b/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf new file mode 100644 index 0000000000..f47e13070e Binary files /dev/null and b/iOSClient/Images.xcassets/checkedYes.imageset/green-white-filled@500w.pdf differ diff --git a/iOSClient/Images.xcassets/cloudUpload.imageset/Contents.json b/iOSClient/Images.xcassets/cloudUpload.imageset/Contents.json new file mode 100644 index 0000000000..486dcc3bcb --- /dev/null +++ b/iOSClient/Images.xcassets/cloudUpload.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "cloudUpload.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf b/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf new file mode 100644 index 0000000000..6985e202b0 Binary files /dev/null and b/iOSClient/Images.xcassets/cloudUpload.imageset/cloudUpload.pdf differ diff --git a/iOSClient/Images.xcassets/directory.imageset/Contents.json b/iOSClient/Images.xcassets/copy.imageset/Contents.json similarity index 84% rename from iOSClient/Images.xcassets/directory.imageset/Contents.json rename to iOSClient/Images.xcassets/copy.imageset/Contents.json index 30d89a66b2..f711ad67af 100644 --- a/iOSClient/Images.xcassets/directory.imageset/Contents.json +++ b/iOSClient/Images.xcassets/copy.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "directory.pdf", + "filename" : "copy.pdf", "idiom" : "universal" } ], diff --git a/iOSClient/Images.xcassets/copy.imageset/copy.pdf b/iOSClient/Images.xcassets/copy.imageset/copy.pdf new file mode 100644 index 0000000000..fb90c89c8e Binary files /dev/null and b/iOSClient/Images.xcassets/copy.imageset/copy.pdf differ diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json new file mode 100644 index 0000000000..356e75ee11 --- /dev/null +++ b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file_text 1.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf b/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf new file mode 100644 index 0000000000..95241831e1 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_document.imageset/file_text 1.pdf differ diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json new file mode 100644 index 0000000000..b976e2da22 --- /dev/null +++ b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file_ppt.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf new file mode 100644 index 0000000000..c127187374 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt.pdf differ diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json new file mode 100644 index 0000000000..72c7b90297 --- /dev/null +++ b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file-calculation.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf b/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf new file mode 100644 index 0000000000..1c9642dbab Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_xls.imageset/file-calculation.pdf differ diff --git a/iOSClient/Images.xcassets/diagram.imageset/Contents.json b/iOSClient/Images.xcassets/diagram.imageset/Contents.json new file mode 100644 index 0000000000..6cbdad9726 --- /dev/null +++ b/iOSClient/Images.xcassets/diagram.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "diagram.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/diagram.imageset/diagram.svg b/iOSClient/Images.xcassets/diagram.imageset/diagram.svg new file mode 100644 index 0000000000..ae5b35d9ef --- /dev/null +++ b/iOSClient/Images.xcassets/diagram.imageset/diagram.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iOSClient/Images.xcassets/directory.imageset/directory.pdf b/iOSClient/Images.xcassets/directory.imageset/directory.pdf deleted file mode 100644 index 2bab530b52..0000000000 Binary files a/iOSClient/Images.xcassets/directory.imageset/directory.pdf and /dev/null differ diff --git a/iOSClient/Images.xcassets/document.imageset/Contents.json b/iOSClient/Images.xcassets/document.imageset/Contents.json index 847026cf24..63f2a7bb2a 100644 --- a/iOSClient/Images.xcassets/document.imageset/Contents.json +++ b/iOSClient/Images.xcassets/document.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "document.pdf" + "filename" : "file_text.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/iOSClient/Images.xcassets/document.imageset/document.pdf b/iOSClient/Images.xcassets/document.imageset/document.pdf deleted file mode 100644 index eed811dc9a..0000000000 Binary files a/iOSClient/Images.xcassets/document.imageset/document.pdf and /dev/null differ diff --git a/iOSClient/Images.xcassets/document.imageset/file_text.pdf b/iOSClient/Images.xcassets/document.imageset/file_text.pdf new file mode 100644 index 0000000000..95241831e1 Binary files /dev/null and b/iOSClient/Images.xcassets/document.imageset/file_text.pdf differ diff --git a/iOSClient/Images.xcassets/downArrow.imageset/Contents.json b/iOSClient/Images.xcassets/downArrow.imageset/Contents.json new file mode 100644 index 0000000000..81ef9bbb37 --- /dev/null +++ b/iOSClient/Images.xcassets/downArrow.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "downArrow@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png b/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png new file mode 100644 index 0000000000..6da8c3c9c5 Binary files /dev/null and b/iOSClient/Images.xcassets/downArrow.imageset/downArrow@2x.png differ diff --git a/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json b/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json new file mode 100644 index 0000000000..37e424164b --- /dev/null +++ b/iOSClient/Images.xcassets/encryptedfolder.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "encrypted folder.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg b/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg new file mode 100644 index 0000000000..454ea06f3b --- /dev/null +++ b/iOSClient/Images.xcassets/encryptedfolder.imageset/encrypted folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file.imageset/Contents.json b/iOSClient/Images.xcassets/file.imageset/Contents.json index 48ca8dd53d..34568170ce 100644 --- a/iOSClient/Images.xcassets/file.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file.pdf" + "filename" : "file.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/iOSClient/Images.xcassets/file.imageset/file.pdf b/iOSClient/Images.xcassets/file.imageset/file.pdf index e629726c98..bdbe2682c2 100644 Binary files a/iOSClient/Images.xcassets/file.imageset/file.pdf and b/iOSClient/Images.xcassets/file.imageset/file.pdf differ diff --git a/iOSClient/Images.xcassets/file_audio.imageset/Contents.json b/iOSClient/Images.xcassets/file_audio.imageset/Contents.json new file mode 100644 index 0000000000..165f3569e0 --- /dev/null +++ b/iOSClient/Images.xcassets/file_audio.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file-audio.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf b/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf new file mode 100644 index 0000000000..ac39ce823a Binary files /dev/null and b/iOSClient/Images.xcassets/file_audio.imageset/file-audio.pdf differ diff --git a/iOSClient/Images.xcassets/file_compress.imageset/Contents.json b/iOSClient/Images.xcassets/file_compress.imageset/Contents.json new file mode 100644 index 0000000000..4a32eb8305 --- /dev/null +++ b/iOSClient/Images.xcassets/file_compress.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file_compress.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf b/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf new file mode 100644 index 0000000000..491b479d9d Binary files /dev/null and b/iOSClient/Images.xcassets/file_compress.imageset/file_compress.pdf differ diff --git a/iOSClient/Images.xcassets/file_movie.imageset/Contents.json b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json new file mode 100644 index 0000000000..7993c40c5b --- /dev/null +++ b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file-video.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf b/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf new file mode 100644 index 0000000000..6b6a451b42 Binary files /dev/null and b/iOSClient/Images.xcassets/file_movie.imageset/file-video.pdf differ diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json index 05026cff7f..2f97942cc1 100644 --- a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json @@ -1,12 +1,15 @@ { "images" : [ { - "filename" : "file_pdf.svg", + "filename" : "file-pdf.pdf", "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf b/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf new file mode 100644 index 0000000000..aea9e1e55e Binary files /dev/null and b/iOSClient/Images.xcassets/file_pdf.imageset/file-pdf.pdf differ diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/file_pdf.svg b/iOSClient/Images.xcassets/file_pdf.imageset/file_pdf.svg deleted file mode 100644 index 02fb207294..0000000000 --- a/iOSClient/Images.xcassets/file_pdf.imageset/file_pdf.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json index ca8f401824..b854b32ca4 100644 --- a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file_photo.pdf" + "filename" : "file_photo.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf b/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf index a95c3f5577..a47ec6136f 100644 Binary files a/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf and b/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf differ diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json b/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json new file mode 100644 index 0000000000..94f24bec38 --- /dev/null +++ b/iOSClient/Images.xcassets/file_photo_menu.imageset/Contents.json @@ -0,0 +1,52 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "file_photo_menu.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "default copy@500w.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf new file mode 100644 index 0000000000..47f3245514 Binary files /dev/null and b/iOSClient/Images.xcassets/file_photo_menu.imageset/default copy@500w.pdf differ diff --git a/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf b/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf new file mode 100644 index 0000000000..2439cdd6b2 Binary files /dev/null and b/iOSClient/Images.xcassets/file_photo_menu.imageset/file_photo_menu.pdf differ diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json new file mode 100644 index 0000000000..b976e2da22 --- /dev/null +++ b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file_ppt.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf b/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf new file mode 100644 index 0000000000..c127187374 Binary files /dev/null and b/iOSClient/Images.xcassets/file_ppt.imageset/file_ppt.pdf differ diff --git a/iOSClient/Images.xcassets/file_txt.imageset/Contents.json b/iOSClient/Images.xcassets/file_txt.imageset/Contents.json new file mode 100644 index 0000000000..5bdfa81f6a --- /dev/null +++ b/iOSClient/Images.xcassets/file_txt.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file_txt.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf b/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf new file mode 100644 index 0000000000..bdbe2682c2 Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json b/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json new file mode 100644 index 0000000000..6f4aef470f --- /dev/null +++ b/iOSClient/Images.xcassets/file_txt_menu.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "fileText.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "fileTextDark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fileText@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "fileTextDark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fileText@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "fileTextDark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png new file mode 100644 index 0000000000..2d13982ecd Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText.png differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png new file mode 100644 index 0000000000..be32ea9f60 Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@2x.png differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png new file mode 100644 index 0000000000..73f455751b Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileText@3x.png differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png new file mode 100644 index 0000000000..03c4b10325 Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark.png differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png new file mode 100644 index 0000000000..3d25bf1702 Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@2x.png differ diff --git a/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png new file mode 100644 index 0000000000..32ac4b3355 Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt_menu.imageset/fileTextDark@3x.png differ diff --git a/iOSClient/Images.xcassets/file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json new file mode 100644 index 0000000000..72c7b90297 --- /dev/null +++ b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "file-calculation.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf b/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf new file mode 100644 index 0000000000..1c9642dbab Binary files /dev/null and b/iOSClient/Images.xcassets/file_xls.imageset/file-calculation.pdf differ diff --git a/iOSClient/Images.xcassets/folder.imageset/Contents.json b/iOSClient/Images.xcassets/folder.imageset/Contents.json index 68fa26d8d7..6ceb844517 100644 --- a/iOSClient/Images.xcassets/folder.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folder.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder.svg", + "filename" : "folder.png", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folder.imageset/folder.png b/iOSClient/Images.xcassets/folder.imageset/folder.png new file mode 100644 index 0000000000..005b163e55 Binary files /dev/null and b/iOSClient/Images.xcassets/folder.imageset/folder.png differ diff --git a/iOSClient/Images.xcassets/folder.imageset/folder.svg b/iOSClient/Images.xcassets/folder.imageset/folder.svg deleted file mode 100644 index b3bf667783..0000000000 --- a/iOSClient/Images.xcassets/folder.imageset/folder.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/Contents.json b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/Contents.json index 51ff0d5d02..2786542100 100644 --- a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_photo.svg", + "filename" : "folder-photo.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf new file mode 100644 index 0000000000..f646199438 Binary files /dev/null and b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder-photo.pdf differ diff --git a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder_photo.svg b/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder_photo.svg deleted file mode 100644 index f46eb94656..0000000000 --- a/iOSClient/Images.xcassets/folderAutomaticUpload.imageset/folder_photo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json b/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json index d5a0abaa2c..d3a66aded2 100644 --- a/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folderEncrypted.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_encrypted.svg", + "filename" : "folder-encrypted.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf b/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf new file mode 100644 index 0000000000..f2754a18a9 Binary files /dev/null and b/iOSClient/Images.xcassets/folderEncrypted.imageset/folder-encrypted.pdf differ diff --git a/iOSClient/Images.xcassets/folderEncrypted.imageset/folder_encrypted.svg b/iOSClient/Images.xcassets/folderEncrypted.imageset/folder_encrypted.svg deleted file mode 100644 index 4f9e6b487e..0000000000 --- a/iOSClient/Images.xcassets/folderEncrypted.imageset/folder_encrypted.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folder_external.imageset/Contents.json b/iOSClient/Images.xcassets/folder_external.imageset/Contents.json index 741bbee824..63a3af51db 100644 --- a/iOSClient/Images.xcassets/folder_external.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folder_external.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_external.svg", + "filename" : "folder-share.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf new file mode 100644 index 0000000000..4a5832ff32 Binary files /dev/null and b/iOSClient/Images.xcassets/folder_external.imageset/folder-share.pdf differ diff --git a/iOSClient/Images.xcassets/folder_external.imageset/folder_external.svg b/iOSClient/Images.xcassets/folder_external.imageset/folder_external.svg deleted file mode 100644 index c6a0db5b35..0000000000 --- a/iOSClient/Images.xcassets/folder_external.imageset/folder_external.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folder_group.imageset/Contents.json b/iOSClient/Images.xcassets/folder_group.imageset/Contents.json index 2c54bdc970..63a3af51db 100644 --- a/iOSClient/Images.xcassets/folder_group.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folder_group.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_group.svg", + "filename" : "folder-share.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf new file mode 100644 index 0000000000..4a5832ff32 Binary files /dev/null and b/iOSClient/Images.xcassets/folder_group.imageset/folder-share.pdf differ diff --git a/iOSClient/Images.xcassets/folder_group.imageset/folder_group.svg b/iOSClient/Images.xcassets/folder_group.imageset/folder_group.svg deleted file mode 100644 index 960ab84ec1..0000000000 --- a/iOSClient/Images.xcassets/folder_group.imageset/folder_group.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json b/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json new file mode 100644 index 0000000000..54635c2f38 --- /dev/null +++ b/iOSClient/Images.xcassets/folder_nmcloud.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "folder_nmcloud.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf b/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf new file mode 100644 index 0000000000..b828c52c05 Binary files /dev/null and b/iOSClient/Images.xcassets/folder_nmcloud.imageset/folder_nmcloud.pdf differ diff --git a/iOSClient/Images.xcassets/folder_public.imageset/Contents.json b/iOSClient/Images.xcassets/folder_public.imageset/Contents.json index ce84569fca..63a3af51db 100644 --- a/iOSClient/Images.xcassets/folder_public.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folder_public.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_link.svg", + "filename" : "folder-share.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf new file mode 100644 index 0000000000..4a5832ff32 Binary files /dev/null and b/iOSClient/Images.xcassets/folder_public.imageset/folder-share.pdf differ diff --git a/iOSClient/Images.xcassets/folder_public.imageset/folder_link.svg b/iOSClient/Images.xcassets/folder_public.imageset/folder_link.svg deleted file mode 100644 index 8966f9a61a..0000000000 --- a/iOSClient/Images.xcassets/folder_public.imageset/folder_link.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/Contents.json b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/Contents.json index 8b5e688724..63a3af51db 100644 --- a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/Contents.json +++ b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "folder_shared_with_me.svg", + "filename" : "folder-share.pdf", "idiom" : "universal" } ], @@ -10,7 +10,6 @@ "version" : 1 }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } } diff --git a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf new file mode 100644 index 0000000000..4a5832ff32 Binary files /dev/null and b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder-share.pdf differ diff --git a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me.svg b/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me.svg deleted file mode 100644 index d115211941..0000000000 --- a/iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/iOSClient/Images.xcassets/foldersOnTop.imageset/Contents.json b/iOSClient/Images.xcassets/foldersOnTop.imageset/Contents.json new file mode 100644 index 0000000000..2f2e54e8c1 --- /dev/null +++ b/iOSClient/Images.xcassets/foldersOnTop.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "foldersOnTop.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "foldersOnTop@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "foldersOnTop@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop.png b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop.png new file mode 100644 index 0000000000..728ecfd3a1 Binary files /dev/null and b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop.png differ diff --git a/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@2x.png b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@2x.png new file mode 100644 index 0000000000..8c0bcb63c5 Binary files /dev/null and b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@2x.png differ diff --git a/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@3x.png b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@3x.png new file mode 100644 index 0000000000..45f64ca429 Binary files /dev/null and b/iOSClient/Images.xcassets/foldersOnTop.imageset/foldersOnTop@3x.png differ diff --git a/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json b/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json new file mode 100644 index 0000000000..684d965e60 --- /dev/null +++ b/iOSClient/Images.xcassets/go-to-page.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "go-to-page.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf b/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf new file mode 100644 index 0000000000..d9c8811dca Binary files /dev/null and b/iOSClient/Images.xcassets/go-to-page.imageset/go-to-page.pdf differ diff --git a/iOSClient/Images.xcassets/local.imageset/Contents.json b/iOSClient/Images.xcassets/local.imageset/Contents.json new file mode 100644 index 0000000000..5ffe3a6eed --- /dev/null +++ b/iOSClient/Images.xcassets/local.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "local.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "local@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "local@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/local.imageset/local.png b/iOSClient/Images.xcassets/local.imageset/local.png new file mode 100644 index 0000000000..7002ef11a0 Binary files /dev/null and b/iOSClient/Images.xcassets/local.imageset/local.png differ diff --git a/iOSClient/Images.xcassets/local.imageset/local@2x.png b/iOSClient/Images.xcassets/local.imageset/local@2x.png new file mode 100644 index 0000000000..c216a43f84 Binary files /dev/null and b/iOSClient/Images.xcassets/local.imageset/local@2x.png differ diff --git a/iOSClient/Images.xcassets/local.imageset/local@3x.png b/iOSClient/Images.xcassets/local.imageset/local@3x.png new file mode 100644 index 0000000000..744db900e2 Binary files /dev/null and b/iOSClient/Images.xcassets/local.imageset/local@3x.png differ diff --git a/iOSClient/Images.xcassets/logoPng.imageset/Contents.json b/iOSClient/Images.xcassets/logoPng.imageset/Contents.json new file mode 100644 index 0000000000..43967f1e4a --- /dev/null +++ b/iOSClient/Images.xcassets/logoPng.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "logoPng 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png b/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png new file mode 100644 index 0000000000..a0402be0f4 Binary files /dev/null and b/iOSClient/Images.xcassets/logoPng.imageset/logoPng 1.png differ diff --git a/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf b/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf index 515ca27a10..57ab2633a8 100644 Binary files a/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf and b/iOSClient/Images.xcassets/media.imageset/tabBarMedia.pdf differ diff --git a/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json b/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json new file mode 100644 index 0000000000..63e74b9485 --- /dev/null +++ b/iOSClient/Images.xcassets/mediaSelected.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mediaSelected.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf b/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf new file mode 100644 index 0000000000..f75f63eb82 Binary files /dev/null and b/iOSClient/Images.xcassets/mediaSelected.imageset/mediaSelected.pdf differ diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json b/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json new file mode 100644 index 0000000000..36303602eb --- /dev/null +++ b/iOSClient/Images.xcassets/microphoneMenu.imageset/Contents.json @@ -0,0 +1,52 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "microphoneMenu.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "default copy@500w.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf new file mode 100644 index 0000000000..2be53f66ca Binary files /dev/null and b/iOSClient/Images.xcassets/microphoneMenu.imageset/default copy@500w.pdf differ diff --git a/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf b/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf new file mode 100644 index 0000000000..9bfed5ddc2 Binary files /dev/null and b/iOSClient/Images.xcassets/microphoneMenu.imageset/microphoneMenu.pdf differ diff --git a/iOSClient/Images.xcassets/move.imageset/Contents.json b/iOSClient/Images.xcassets/move.imageset/Contents.json new file mode 100644 index 0000000000..e31439f23a --- /dev/null +++ b/iOSClient/Images.xcassets/move.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "actionSheetMove.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "actionSheetMove@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "actionSheetMove@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png new file mode 100644 index 0000000000..1bd5ec35e9 Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove.png differ diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png new file mode 100644 index 0000000000..d25c3fd724 Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@2x.png differ diff --git a/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png new file mode 100644 index 0000000000..afcc5b64fa Binary files /dev/null and b/iOSClient/Images.xcassets/move.imageset/actionSheetMove@3x.png differ diff --git a/iOSClient/Images.xcassets/nocamera.imageset/Contents.json b/iOSClient/Images.xcassets/nocamera.imageset/Contents.json new file mode 100644 index 0000000000..78fb1072de --- /dev/null +++ b/iOSClient/Images.xcassets/nocamera.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "default@500w.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf b/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf new file mode 100644 index 0000000000..429fd3fa2c Binary files /dev/null and b/iOSClient/Images.xcassets/nocamera.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/notification.imageset/Contents.json b/iOSClient/Images.xcassets/notification.imageset/Contents.json new file mode 100644 index 0000000000..da621b2a42 --- /dev/null +++ b/iOSClient/Images.xcassets/notification.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "bell.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/notification.imageset/bell.pdf b/iOSClient/Images.xcassets/notification.imageset/bell.pdf new file mode 100644 index 0000000000..a98f3182ab Binary files /dev/null and b/iOSClient/Images.xcassets/notification.imageset/bell.pdf differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json b/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json new file mode 100644 index 0000000000..a66d8bacff --- /dev/null +++ b/iOSClient/Images.xcassets/offlineFlag.imageset/Contents.json @@ -0,0 +1,59 @@ +{ + "images" : [ + { + "filename" : "offlineFlagD.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "offlineFlag 1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "offlineFlagD@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "offlineFlag@2x 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "offlineFlagD@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "offlineFlag@3x 1.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png new file mode 100644 index 0000000000..92508fbf3f Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag 1.png differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png new file mode 100644 index 0000000000..3bc47bb8f2 Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@2x 1.png differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png new file mode 100644 index 0000000000..306d0499ec Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlag@3x 1.png differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png new file mode 100644 index 0000000000..760a94c27f Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD.png differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png new file mode 100644 index 0000000000..ea83af70d5 Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@2x.png differ diff --git a/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png new file mode 100644 index 0000000000..1adf1bebdd Binary files /dev/null and b/iOSClient/Images.xcassets/offlineFlag.imageset/offlineFlagD@3x.png differ diff --git a/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json b/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json new file mode 100644 index 0000000000..8f3e754211 --- /dev/null +++ b/iOSClient/Images.xcassets/offlineMenu.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "default@500w.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf b/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf new file mode 100644 index 0000000000..8655164ae6 Binary files /dev/null and b/iOSClient/Images.xcassets/offlineMenu.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/open_file.imageset/Contents.json b/iOSClient/Images.xcassets/open_file.imageset/Contents.json new file mode 100644 index 0000000000..1712417fdc --- /dev/null +++ b/iOSClient/Images.xcassets/open_file.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "openFile.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "openFile@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "openFile@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile.png b/iOSClient/Images.xcassets/open_file.imageset/openFile.png new file mode 100644 index 0000000000..0f76ce12bc Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile.png differ diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png b/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png new file mode 100644 index 0000000000..2f4e286f6f Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile@2x.png differ diff --git a/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png b/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png new file mode 100644 index 0000000000..5a0f7be299 Binary files /dev/null and b/iOSClient/Images.xcassets/open_file.imageset/openFile@3x.png differ diff --git a/iOSClient/Images.xcassets/recent.imageset/Contents.json b/iOSClient/Images.xcassets/recent.imageset/Contents.json new file mode 100644 index 0000000000..59b0186b06 --- /dev/null +++ b/iOSClient/Images.xcassets/recent.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "recent.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/recent.imageset/recent.pdf b/iOSClient/Images.xcassets/recent.imageset/recent.pdf new file mode 100644 index 0000000000..496833c975 Binary files /dev/null and b/iOSClient/Images.xcassets/recent.imageset/recent.pdf differ diff --git a/iOSClient/Images.xcassets/rename.imageset/Contents.json b/iOSClient/Images.xcassets/rename.imageset/Contents.json new file mode 100644 index 0000000000..f361ec03e2 --- /dev/null +++ b/iOSClient/Images.xcassets/rename.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "actionSheetRename.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "actionSheetRename@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "actionSheetRename@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png new file mode 100644 index 0000000000..ff3bf49a82 Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename.png differ diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png new file mode 100644 index 0000000000..46415573f0 Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@2x.png differ diff --git a/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png new file mode 100644 index 0000000000..27f7dff1cf Binary files /dev/null and b/iOSClient/Images.xcassets/rename.imageset/actionSheetRename@3x.png differ diff --git a/iOSClient/Images.xcassets/save_files.imageset/Contents.json b/iOSClient/Images.xcassets/save_files.imageset/Contents.json new file mode 100644 index 0000000000..5d67bf067b --- /dev/null +++ b/iOSClient/Images.xcassets/save_files.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "saveSelectedFiles.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "saveSelectedFiles@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "saveSelectedFiles@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png new file mode 100644 index 0000000000..590c922f4e Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles.png differ diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png new file mode 100644 index 0000000000..589eeb56c2 Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@2x.png differ diff --git a/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png new file mode 100644 index 0000000000..4d1f750642 Binary files /dev/null and b/iOSClient/Images.xcassets/save_files.imageset/saveSelectedFiles@3x.png differ diff --git a/iOSClient/Images.xcassets/scan.imageset/Contents.json b/iOSClient/Images.xcassets/scan.imageset/Contents.json new file mode 100644 index 0000000000..8776a75678 --- /dev/null +++ b/iOSClient/Images.xcassets/scan.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "filename" : "default@500w.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "default copy@500w.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf new file mode 100644 index 0000000000..9731102ea6 Binary files /dev/null and b/iOSClient/Images.xcassets/scan.imageset/default copy@500w.pdf differ diff --git a/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf b/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf new file mode 100644 index 0000000000..118d570d99 Binary files /dev/null and b/iOSClient/Images.xcassets/scan.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/search.imageset/Contents.json b/iOSClient/Images.xcassets/search.imageset/Contents.json new file mode 100644 index 0000000000..8a79382902 --- /dev/null +++ b/iOSClient/Images.xcassets/search.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "filename" : "search.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "searchDark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "original" + } +} diff --git a/iOSClient/Images.xcassets/search.imageset/search.pdf b/iOSClient/Images.xcassets/search.imageset/search.pdf new file mode 100644 index 0000000000..b96af4459e Binary files /dev/null and b/iOSClient/Images.xcassets/search.imageset/search.pdf differ diff --git a/iOSClient/Images.xcassets/search.imageset/searchDark.pdf b/iOSClient/Images.xcassets/search.imageset/searchDark.pdf new file mode 100644 index 0000000000..313042ee07 Binary files /dev/null and b/iOSClient/Images.xcassets/search.imageset/searchDark.pdf differ diff --git a/iOSClient/Images.xcassets/selectFull.imageset/Contents.json b/iOSClient/Images.xcassets/selectFull.imageset/Contents.json new file mode 100644 index 0000000000..0fead39b1f --- /dev/null +++ b/iOSClient/Images.xcassets/selectFull.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "default@500w.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf b/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf new file mode 100644 index 0000000000..45d5146a5e Binary files /dev/null and b/iOSClient/Images.xcassets/selectFull.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/settings.imageset/Contents.json b/iOSClient/Images.xcassets/settings.imageset/Contents.json new file mode 100644 index 0000000000..8dfa77c79d --- /dev/null +++ b/iOSClient/Images.xcassets/settings.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "gear.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/settings.imageset/gear.pdf b/iOSClient/Images.xcassets/settings.imageset/gear.pdf new file mode 100644 index 0000000000..bc8c694124 Binary files /dev/null and b/iOSClient/Images.xcassets/settings.imageset/gear.pdf differ diff --git a/iOSClient/Images.xcassets/share.imageset/Contents.json b/iOSClient/Images.xcassets/share.imageset/Contents.json new file mode 100644 index 0000000000..5d0e2aab26 --- /dev/null +++ b/iOSClient/Images.xcassets/share.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "share.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/share.imageset/share.pdf b/iOSClient/Images.xcassets/share.imageset/share.pdf new file mode 100644 index 0000000000..a1a4c9c1a2 Binary files /dev/null and b/iOSClient/Images.xcassets/share.imageset/share.pdf differ diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json b/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json index 00298ac4b4..ffff08a617 100644 --- a/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json +++ b/iOSClient/Images.xcassets/shareTypeEmail.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "shareTypeEmail.pdf" + "filename" : "user.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf b/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf deleted file mode 100644 index 48b0f832f5..0000000000 Binary files a/iOSClient/Images.xcassets/shareTypeEmail.imageset/shareTypeEmail.pdf and /dev/null differ diff --git a/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf b/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf new file mode 100644 index 0000000000..6985e202b0 Binary files /dev/null and b/iOSClient/Images.xcassets/shareTypeEmail.imageset/user.pdf differ diff --git a/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json b/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json index 874a5b2007..11ca2fc9dd 100644 --- a/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json +++ b/iOSClient/Images.xcassets/shareTypeUser.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "shareTypeUser.pdf" + "filename" : "shareTypeUser.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf b/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf index 03d855dcc4..62d278bb89 100644 Binary files a/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf and b/iOSClient/Images.xcassets/shareTypeUser.imageset/shareTypeUser.pdf differ diff --git a/iOSClient/Images.xcassets/sharebylink.imageset/Contents.json b/iOSClient/Images.xcassets/sharebylink.imageset/Contents.json new file mode 100644 index 0000000000..3d40e6ef2a --- /dev/null +++ b/iOSClient/Images.xcassets/sharebylink.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "sharebylink.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/trash.imageset/trash.pdf b/iOSClient/Images.xcassets/sharebylink.imageset/sharebylink.pdf similarity index 94% rename from iOSClient/Images.xcassets/trash.imageset/trash.pdf rename to iOSClient/Images.xcassets/sharebylink.imageset/sharebylink.pdf index 9233b74c6f..40caf0cbcf 100644 Binary files a/iOSClient/Images.xcassets/trash.imageset/trash.pdf and b/iOSClient/Images.xcassets/sharebylink.imageset/sharebylink.pdf differ diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json new file mode 100644 index 0000000000..16f652eaab --- /dev/null +++ b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "sortDateLess.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortDateLess@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortDateLess@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png new file mode 100644 index 0000000000..7679833bfe Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess.png differ diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png new file mode 100644 index 0000000000..3c31183268 Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@2x.png differ diff --git a/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png new file mode 100644 index 0000000000..d607e5c1a4 Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateLessRecent.imageset/sortDateLess@3x.png differ diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/Contents.json b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/Contents.json new file mode 100644 index 0000000000..16f652eaab --- /dev/null +++ b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "sortDateLess.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortDateLess@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortDateLess@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png new file mode 100644 index 0000000000..7679833bfe Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess.png differ diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png new file mode 100644 index 0000000000..3c31183268 Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@2x.png differ diff --git a/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png new file mode 100644 index 0000000000..d607e5c1a4 Binary files /dev/null and b/iOSClient/Images.xcassets/sortDateMoreRecent.imageset/sortDateLess@3x.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/Contents.json b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/Contents.json new file mode 100644 index 0000000000..ab8789256f --- /dev/null +++ b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "sortFileNameAZ.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortFileNameAZ@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortFileNameAZ@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png new file mode 100644 index 0000000000..41c8ae8e25 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png new file mode 100644 index 0000000000..0532a1bf38 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@2x.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png new file mode 100644 index 0000000000..5cb93d7c25 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameAZ.imageset/sortFileNameAZ@3x.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json b/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json new file mode 100644 index 0000000000..33faa99868 --- /dev/null +++ b/iOSClient/Images.xcassets/sortFileNameZA.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "sortFileNameAZ.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortFileNameAZ@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortFileNameAZ@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png new file mode 100644 index 0000000000..41c8ae8e25 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png new file mode 100644 index 0000000000..0532a1bf38 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@2x.png differ diff --git a/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png new file mode 100644 index 0000000000..5cb93d7c25 Binary files /dev/null and b/iOSClient/Images.xcassets/sortFileNameZA.imageset/sortFileNameAZ@3x.png differ diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/Contents.json b/iOSClient/Images.xcassets/sortLargest.imageset/Contents.json new file mode 100644 index 0000000000..e92b17d4d0 --- /dev/null +++ b/iOSClient/Images.xcassets/sortLargest.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "sortLargest.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortLargest@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortLargest@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png new file mode 100644 index 0000000000..47a510c37b Binary files /dev/null and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest.png differ diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png new file mode 100644 index 0000000000..e77c5e3960 Binary files /dev/null and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@2x.png differ diff --git a/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png new file mode 100644 index 0000000000..8938830b7e Binary files /dev/null and b/iOSClient/Images.xcassets/sortLargest.imageset/sortLargest@3x.png differ diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/Contents.json b/iOSClient/Images.xcassets/sortSmallest.imageset/Contents.json new file mode 100644 index 0000000000..91698080a7 --- /dev/null +++ b/iOSClient/Images.xcassets/sortSmallest.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "sortSmallest.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sortSmallest@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sortSmallest@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png new file mode 100644 index 0000000000..24dda815e8 Binary files /dev/null and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest.png differ diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png new file mode 100644 index 0000000000..2977b318dd Binary files /dev/null and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@2x.png differ diff --git a/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png new file mode 100644 index 0000000000..834e834132 Binary files /dev/null and b/iOSClient/Images.xcassets/sortSmallest.imageset/sortSmallest@3x.png differ diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json new file mode 100644 index 0000000000..052394eece --- /dev/null +++ b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "saveSelectedFiles.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "saveSelectedFiles@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "saveSelectedFiles@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png new file mode 100644 index 0000000000..590c922f4e Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles.png differ diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png new file mode 100644 index 0000000000..589eeb56c2 Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@2x.png differ diff --git a/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png new file mode 100644 index 0000000000..4d1f750642 Binary files /dev/null and b/iOSClient/Images.xcassets/square.and.arrow.down.imageset/saveSelectedFiles@3x.png differ diff --git a/iOSClient/Images.xcassets/success.imageset/Contents.json b/iOSClient/Images.xcassets/success.imageset/Contents.json new file mode 100644 index 0000000000..858785f7a8 --- /dev/null +++ b/iOSClient/Images.xcassets/success.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "success.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "success@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "success@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/success.imageset/success.png b/iOSClient/Images.xcassets/success.imageset/success.png new file mode 100644 index 0000000000..b1d2459a4b Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success.png differ diff --git a/iOSClient/Images.xcassets/success.imageset/success@2x.png b/iOSClient/Images.xcassets/success.imageset/success@2x.png new file mode 100644 index 0000000000..9832eda028 Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success@2x.png differ diff --git a/iOSClient/Images.xcassets/success.imageset/success@3x.png b/iOSClient/Images.xcassets/success.imageset/success@3x.png new file mode 100644 index 0000000000..d89d2e4719 Binary files /dev/null and b/iOSClient/Images.xcassets/success.imageset/success@3x.png differ diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json b/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json new file mode 100644 index 0000000000..b1304ea08b --- /dev/null +++ b/iOSClient/Images.xcassets/switchGrid.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "switchGrid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "switchGrid@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "switchGrid@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png new file mode 100644 index 0000000000..ed000d793f Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid.png differ diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png new file mode 100644 index 0000000000..860729706b Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@2x.png differ diff --git a/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png new file mode 100644 index 0000000000..582b458a0a Binary files /dev/null and b/iOSClient/Images.xcassets/switchGrid.imageset/switchGrid@3x.png differ diff --git a/iOSClient/Images.xcassets/switchList.imageset/Contents.json b/iOSClient/Images.xcassets/switchList.imageset/Contents.json new file mode 100644 index 0000000000..d0a70e20e3 --- /dev/null +++ b/iOSClient/Images.xcassets/switchList.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "filename" : "switchList.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "switchList@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "switchList@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList.png b/iOSClient/Images.xcassets/switchList.imageset/switchList.png new file mode 100644 index 0000000000..e68e96d87e Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList.png differ diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png b/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png new file mode 100644 index 0000000000..1f387ae4e9 Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList@2x.png differ diff --git a/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png b/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png new file mode 100644 index 0000000000..5671a05ded Binary files /dev/null and b/iOSClient/Images.xcassets/switchList.imageset/switchList@3x.png differ diff --git a/iOSClient/Images.xcassets/trash.imageset/Contents.json b/iOSClient/Images.xcassets/trash.imageset/Contents.json index e98514534c..0fead39b1f 100644 --- a/iOSClient/Images.xcassets/trash.imageset/Contents.json +++ b/iOSClient/Images.xcassets/trash.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "trash.pdf", + "filename" : "default@500w.pdf", "idiom" : "universal" } ], diff --git a/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf b/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf new file mode 100644 index 0000000000..225c983dec Binary files /dev/null and b/iOSClient/Images.xcassets/trash.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json b/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json new file mode 100644 index 0000000000..5866e33b62 --- /dev/null +++ b/iOSClient/Images.xcassets/uploadFile.imageset/Contents.json @@ -0,0 +1,52 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "default@500w.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "default copy@500w.pdf", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf b/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf new file mode 100644 index 0000000000..568fb350d6 Binary files /dev/null and b/iOSClient/Images.xcassets/uploadFile.imageset/default copy@500w.pdf differ diff --git a/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf b/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf new file mode 100644 index 0000000000..49bbe6f285 Binary files /dev/null and b/iOSClient/Images.xcassets/uploadFile.imageset/default@500w.pdf differ diff --git a/iOSClient/Images.xcassets/user_settings.imageset/Contents.json b/iOSClient/Images.xcassets/user_settings.imageset/Contents.json new file mode 100644 index 0000000000..7e6128a816 --- /dev/null +++ b/iOSClient/Images.xcassets/user_settings.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "default@1,5x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "default@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "default@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png new file mode 100644 index 0000000000..a556ff9868 Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@1,5x.png differ diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png new file mode 100644 index 0000000000..c812343a8c Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@2x.png differ diff --git a/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png b/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png new file mode 100644 index 0000000000..eed7389198 Binary files /dev/null and b/iOSClient/Images.xcassets/user_settings.imageset/default@3x.png differ diff --git a/iOSClient/Images.xcassets/videono.imageset/Contents.json b/iOSClient/Images.xcassets/videono.imageset/Contents.json new file mode 100644 index 0000000000..5c7961ea2a --- /dev/null +++ b/iOSClient/Images.xcassets/videono.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "deviceNocamera.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf b/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf new file mode 100644 index 0000000000..09ff9e66eb Binary files /dev/null and b/iOSClient/Images.xcassets/videono.imageset/deviceNocamera.pdf differ diff --git a/iOSClient/Images.xcassets/videoyes.imageset/Contents.json b/iOSClient/Images.xcassets/videoyes.imageset/Contents.json new file mode 100644 index 0000000000..bfc956fce2 --- /dev/null +++ b/iOSClient/Images.xcassets/videoyes.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "deviceCamera.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf b/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf new file mode 100644 index 0000000000..807d6a30a8 Binary files /dev/null and b/iOSClient/Images.xcassets/videoyes.imageset/deviceCamera.pdf differ diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json b/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json new file mode 100644 index 0000000000..2ea287530d --- /dev/null +++ b/iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "viewInFolder-1.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "viewInFolderDark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf new file mode 100644 index 0000000000..bb8489ccd9 Binary files /dev/null and b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder-1.pdf differ diff --git a/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf new file mode 100644 index 0000000000..1f59694303 Binary files /dev/null and b/iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolderDark.pdf differ diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index b8738d0c6a..ea5d72488f 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -148,6 +148,7 @@ class NCGlobal: NSObject { let layoutViewShareExtension = "LayoutShareExtension" let layoutViewGroupfolders = "LayoutGroupfolders" let layoutViewMedia = "LayoutMedia" + let layoutViewMove = "LayoutMove" // Button Type in Cell list/grid // @@ -287,8 +288,14 @@ class NCGlobal: NSObject { // Notification Center // - let notificationCenterChangeUser = "changeUser" // userInfo: account, controller - let notificationCenterChangeTheming = "changeTheming" // userInfo: account + let notificationCenterChangeUser = "changeUser" + let notificationCenterChangeTheming = "changeTheming" + @objc let notificationCenterApplicationDidEnterBackground = "applicationDidEnterBackground" + @objc let notificationCenterApplicationDidBecomeActive = "applicationDidBecomeActive" + @objc let notificationCenterApplicationWillResignActive = "applicationWillResignActive" + @objc let notificationCenterApplicationWillEnterForeground = "applicationWillEnterForeground" + + @objc let notificationCenterInitialize = "initialize" let notificationCenterRichdocumentGrabFocus = "richdocumentGrabFocus" let notificationCenterReloadDataNCShare = "reloadDataNCShare" let notificationCenterCloseRichWorkspaceWebView = "closeRichWorkspaceWebView" diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift index 487927daf0..0e6748091c 100644 --- a/iOSClient/NCImageCache.swift +++ b/iOSClient/NCImageCache.swift @@ -27,8 +27,8 @@ import LRUCache import NextcloudKit import RealmSwift -class NCImageCache: NSObject { - static let shared = NCImageCache() +@objc class NCImageCache: NSObject { + @objc static let shared = NCImageCache() private let utility = NCUtility() private let global = NCGlobal.shared @@ -177,79 +177,90 @@ class NCImageCache: NSObject { // MARK: - - func getImageFile() -> UIImage { - return utility.loadImage(named: "doc", colors: [NCBrandColor.shared.iconImageColor2]) + struct images { + static var file = UIImage() + + static var shared = UIImage() + static var canShare = UIImage() + static var shareByLink = UIImage() + static var sharedWithMe = UIImage() + + static var favorite = UIImage() + static var livePhoto = UIImage() + static var offlineFlag = UIImage() + static var local = UIImage() + + static var folderEncrypted = UIImage() + static var folderSharedWithMe = UIImage() + static var folderPublic = UIImage() + static var folderGroup = UIImage() + static var folderExternal = UIImage() + static var folderAutomaticUpload = UIImage() + static var folder = UIImage() + + static var checkedYes = UIImage() + static var checkedNo = UIImage() + + static var buttonMore = UIImage() + static var buttonStop = UIImage() + static var buttonMoreLock = UIImage() + + static var iconContacts = UIImage() + static var iconTalk = UIImage() + static var iconCalendar = UIImage() + static var iconDeck = UIImage() + static var iconMail = UIImage() + static var iconConfirm = UIImage() + static var iconPages = UIImage() + static var iconFile = UIImage() } - func getImageShared() -> UIImage { - return utility.loadImage(named: "person.fill.badge.plus", colors: NCBrandColor.shared.iconImageMultiColors) - } - - func getImageCanShare() -> UIImage { - return utility.loadImage(named: "person.fill.badge.plus", colors: NCBrandColor.shared.iconImageMultiColors) - } - - func getImageShareByLink() -> UIImage { - return utility.loadImage(named: "link", colors: [NCBrandColor.shared.iconImageColor]) - } - - func getImageFavorite() -> UIImage { - return utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.yellowFavorite]) - } + func createImagesCache() { + let utility = NCUtility() - func getImageOfflineFlag() -> UIImage { - return utility.loadImage(named: "arrow.down.circle.fill", colors: [.systemGreen]) - } - - func getImageLocal() -> UIImage { - return utility.loadImage(named: "checkmark.circle.fill", colors: [.systemGreen]) - } + images.file = utility.loadImage(named: "doc", colors: [NCBrandColor.shared.iconImageColor2]) - func getImageCheckedYes() -> UIImage { - return utility.loadImage(named: "checkmark.circle.fill", colors: [NCBrandColor.shared.iconImageColor2]) - } + images.shared = UIImage(named: "share")!.image(color: .systemGray, size: 50) + images.canShare = UIImage(named: "share")!.image(color: .systemGray, size: 50) + images.shareByLink = UIImage(named: "sharebylink")!.image(color: .systemGray, size: 50) + images.sharedWithMe = UIImage.init(named: "cloudUpload")!.image(color: NCBrandColor.shared.nmcIconSharedWithMe, size: 50) + + images.favorite = utility.loadImage(named: "star.fill", colors: [NCBrandColor.shared.yellowFavorite]) + images.livePhoto = utility.loadImage(named: "livephoto", colors: [.label]) + images.offlineFlag = UIImage(named: "offlineFlag")! + images.local = utility.loadImage(named: "checkmark.circle.fill", colors: [.systemGreen]) - func getImageCheckedNo() -> UIImage { - return utility.loadImage(named: "circle", colors: [NCBrandColor.shared.iconImageColor]) - } - - func getImageButtonMore() -> UIImage { - return utility.loadImage(named: "ellipsis", colors: [NCBrandColor.shared.iconImageColor]) - } + images.checkedYes = UIImage(named: "checkedYes")! + images.checkedNo = UIImage(named: "local")! - func getImageButtonStop() -> UIImage { - return utility.loadImage(named: "stop.circle", colors: [NCBrandColor.shared.iconImageColor]) - } - - func getImageButtonMoreLock() -> UIImage { - return utility.loadImage(named: "lock.fill", colors: [NCBrandColor.shared.iconImageColor]) - } - - func getFolder(account: String) -> UIImage { - return UIImage(named: "folder")!.image(color: NCBrandColor.shared.getElement(account: account)) - } - - func getFolderEncrypted(account: String) -> UIImage { - return UIImage(named: "folderEncrypted")!.image(color: NCBrandColor.shared.getElement(account: account)) - } - - func getFolderSharedWithMe(account: String) -> UIImage { - return UIImage(named: "folder_shared_with_me")!.image(color: NCBrandColor.shared.getElement(account: account)) - } - - func getFolderPublic(account: String) -> UIImage { - return UIImage(named: "folder_public")!.image(color: NCBrandColor.shared.getElement(account: account)) - } - - func getFolderGroup(account: String) -> UIImage { - return UIImage(named: "folder_group")!.image(color: NCBrandColor.shared.getElement(account: account)) - } + images.buttonMore = utility.loadImage(named: "ellipsis", colors: [NCBrandColor.shared.iconImageColor]) + images.buttonStop = utility.loadImage(named: "stop.circle", colors: [NCBrandColor.shared.iconImageColor]) + images.buttonMoreLock = utility.loadImage(named: "lock.fill", colors: [NCBrandColor.shared.iconImageColor]) - func getFolderExternal(account: String) -> UIImage { - return UIImage(named: "folder_external")!.image(color: NCBrandColor.shared.getElement(account: account)) + createImagesBrandCache() } - func getFolderAutomaticUpload(account: String) -> UIImage { - return UIImage(named: "folderAutomaticUpload")!.image(color: NCBrandColor.shared.getElement(account: account)) + func createImagesBrandCache() { + + let brandElement = NCBrandColor.shared.brandElement + guard brandElement != self.brandElementColor else { return } + self.brandElementColor = brandElement + let utility = NCUtility() + + images.folderEncrypted = UIImage(named: "folderEncrypted")! + images.folderSharedWithMe = UIImage(named: "folder_shared_with_me")! + images.folderPublic = UIImage(named: "folder_public")! + images.folderGroup = UIImage(named: "folder_group")! + images.folderExternal = UIImage(named: "folder_external")! + images.folderAutomaticUpload = UIImage(named: "folderAutomaticUpload")! + images.folder = UIImage(named: "folder")! + images.iconContacts = utility.loadImage(named: "person.crop.rectangle.stack", colors: [NCBrandColor.shared.iconImageColor]) + images.iconTalk = UIImage(named: "talk-template")!.image(color: brandElement) + images.iconCalendar = utility.loadImage(named: "calendar", colors: [NCBrandColor.shared.iconImageColor]) + images.iconDeck = utility.loadImage(named: "square.stack.fill", colors: [NCBrandColor.shared.iconImageColor]) + images.iconMail = utility.loadImage(named: "mail", colors: [NCBrandColor.shared.iconImageColor]) + images.iconConfirm = utility.loadImage(named: "arrow.right", colors: [NCBrandColor.shared.iconImageColor]) + images.iconPages = utility.loadImage(named: "doc.richtext", colors: [NCBrandColor.shared.iconImageColor]) + images.iconFile = utility.loadImage(named: "doc", colors: [NCBrandColor.shared.iconImageColor]) } }