diff --git a/NextcloudTalk/BaseChatTableViewCell+File.swift b/NextcloudTalk/BaseChatTableViewCell+File.swift index e5ec587e5..4a1b4c904 100644 --- a/NextcloudTalk/BaseChatTableViewCell+File.swift +++ b/NextcloudTalk/BaseChatTableViewCell+File.swift @@ -178,13 +178,17 @@ extension BaseChatTableViewCell { } func showFallbackIcon(for message: NCChatMessage) { - let imageName = "\(NCUtils.previewImage(forMimeType: message.file().mimetype))-chat-preview" + let imageName = NCUtils.previewImage(forMimeType: message.file().mimetype) if let image = UIImage(named: imageName) { - self.filePreviewImageView?.image = image + let size = CGSize(width: fileMessageCellFileMaxPreviewWidth, height: fileMessageCellFileMaxPreviewHeight) - self.filePreviewImageViewHeightConstraint?.constant = image.size.height - self.filePreviewImageViewWidthConstraint?.constant = image.size.width + if let renderedImage = NCUtils.renderAspectImage(image: image, ofSize: size, centerImage: false) { + self.filePreviewImageView?.image = renderedImage + + self.filePreviewImageViewHeightConstraint?.constant = renderedImage.size.height + self.filePreviewImageViewWidthConstraint?.constant = renderedImage.size.width + } } self.filePreviewActivityIndicator?.isHidden = true diff --git a/NextcloudTalk/DetailedOptionsSelectorTableViewController.m b/NextcloudTalk/DetailedOptionsSelectorTableViewController.m index f033e09fd..2e0c105d9 100644 --- a/NextcloudTalk/DetailedOptionsSelectorTableViewController.m +++ b/NextcloudTalk/DetailedOptionsSelectorTableViewController.m @@ -81,7 +81,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N UITableViewCell *cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"DetailOptionIdentifier"]; if (_type == DetailedOptionsSelectorTypeAccounts) { - [cell.imageView setImage:[NCUtils renderAspectImageWithImage:option.image of:CGSizeMake(20, 20)]]; + [cell.imageView setImage:[NCUtils renderAspectImageWithImage:option.image ofSize:CGSizeMake(20, 20) centerImage:YES]]; [cell.detailTextLabel setText:[option.subtitle stringByReplacingOccurrencesOfString:@"https://" withString:@"" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [option.subtitle length])]]; [cell.detailTextLabel setTextColor:[UIColor secondaryLabelColor]]; } else { diff --git a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/Contents.json deleted file mode 100644 index 9cd7ad022..000000000 --- a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-audio-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-audio-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-audio-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview.png b/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview.png deleted file mode 100644 index 08a4fed61..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@2x.png b/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@2x.png deleted file mode 100644 index c0114c3ad..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@3x.png b/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@3x.png deleted file mode 100644 index d49e959d9..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio-chat-preview.imageset/file-audio-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-audio.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-audio.imageset/Contents.json index bcb35bfde..386cfedba 100644 --- a/NextcloudTalk/Images.xcassets/file-audio.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-audio.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-audio.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-audio@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-audio@3x.png", - "scale" : "3x" + "filename" : "file-audio.svg", + "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/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.png b/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.png deleted file mode 100644 index b58fa5e37..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.svg b/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.svg new file mode 100644 index 000000000..ca07b5437 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@2x.png b/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@2x.png deleted file mode 100644 index 8220a10f2..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@3x.png b/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@3x.png deleted file mode 100644 index b3a7c1a79..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-audio.imageset/file-audio@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/Contents.json deleted file mode 100644 index b73f71be0..000000000 --- a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-default-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-default-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-default-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview.png b/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview.png deleted file mode 100644 index 58d020f62..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@2x.png b/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@2x.png deleted file mode 100644 index 93650955c..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@3x.png b/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@3x.png deleted file mode 100644 index 7c1ac6acc..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-chat-preview.imageset/file-default-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/Contents.json deleted file mode 100644 index aea78aa3e..000000000 --- a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-document-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-document-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-document-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview.png b/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview.png deleted file mode 100644 index 43d1f1f56..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@2x.png deleted file mode 100644 index 1df18cb02..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@3x.png deleted file mode 100644 index be7f40bae..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document-chat-preview.imageset/file-document-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-document.imageset/Contents.json index 9d168f0b0..0bd82d10a 100644 --- a/NextcloudTalk/Images.xcassets/file-document.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-document.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "filename" : "file-document.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "file-document@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "file-document@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "file-document.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.png b/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.png deleted file mode 100644 index d40704f25..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.svg b/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.svg new file mode 100644 index 000000000..adc8454f6 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-document.imageset/file-document.svg @@ -0,0 +1,5 @@ + + + + diff --git a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@2x.png b/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@2x.png deleted file mode 100644 index 5ccfaa9ac..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@3x.png b/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@3x.png deleted file mode 100644 index e80c9b037..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-document.imageset/file-document@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/Contents.json deleted file mode 100644 index 55e1648ea..000000000 --- a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-image-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-image-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-image-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview.png b/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview.png deleted file mode 100644 index 7e0659117..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@2x.png deleted file mode 100644 index 2f66f7d0e..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@3x.png deleted file mode 100644 index e859c41b3..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image-chat-preview.imageset/file-image-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-image.imageset/Contents.json index fad77f75c..f35c97953 100644 --- a/NextcloudTalk/Images.xcassets/file-image.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-image.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-image.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-image@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-image@3x.png", - "scale" : "3x" + "filename" : "file-image.svg", + "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/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.png b/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.png deleted file mode 100644 index b47902898..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.svg b/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.svg new file mode 100644 index 000000000..91d622144 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-image.imageset/file-image.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@2x.png b/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@2x.png deleted file mode 100644 index 7206ddb8d..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@3x.png b/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@3x.png deleted file mode 100644 index 46a8088f7..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-image.imageset/file-image@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/Contents.json deleted file mode 100644 index 72a177fd5..000000000 --- a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-pdf-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-pdf-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-pdf-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview.png b/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview.png deleted file mode 100644 index 31aef17b6..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@2x.png deleted file mode 100644 index 84cff50f6..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@3x.png deleted file mode 100644 index 18ded0f16..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf-chat-preview.imageset/file-pdf-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-pdf.imageset/Contents.json index d73a785aa..cc66ec408 100644 --- a/NextcloudTalk/Images.xcassets/file-pdf.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-pdf.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-pdf.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-pdf@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-pdf@3x.png", - "scale" : "3x" + "filename" : "file-pdf.svg", + "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/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.png b/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.png deleted file mode 100644 index c93c1887e..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.svg b/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.svg new file mode 100644 index 000000000..af6f2c6f2 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf.svg @@ -0,0 +1,3 @@ + + + diff --git a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@2x.png b/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@2x.png deleted file mode 100644 index 6080169cc..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@3x.png b/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@3x.png deleted file mode 100644 index 09761ca6a..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-pdf.imageset/file-pdf@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/Contents.json deleted file mode 100644 index a7bb841df..000000000 --- a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-presentation-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-presentation-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-presentation-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview.png b/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview.png deleted file mode 100644 index 9c4db08de..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@2x.png deleted file mode 100644 index da86b2c10..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@3x.png deleted file mode 100644 index 6cf782020..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation-chat-preview.imageset/file-presentation-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-presentation.imageset/Contents.json index f132b546a..1915f4373 100644 --- a/NextcloudTalk/Images.xcassets/file-presentation.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-presentation.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-presentation.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-presentation@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-presentation@3x.png", - "scale" : "3x" + "filename" : "file-presentation.svg", + "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/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.png b/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.png deleted file mode 100644 index fb3e177a7..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.svg b/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.svg new file mode 100644 index 000000000..d7b61cba0 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation.svg @@ -0,0 +1,4 @@ + + + diff --git a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@2x.png b/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@2x.png deleted file mode 100644 index c09c0c035..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@3x.png b/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@3x.png deleted file mode 100644 index eed5d75a2..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-presentation.imageset/file-presentation@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/Contents.json deleted file mode 100644 index c66b78b71..000000000 --- a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-spreadsheet-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-spreadsheet-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-spreadsheet-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview.png b/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview.png deleted file mode 100644 index 6cc4137af..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@2x.png deleted file mode 100644 index 1fac25cff..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@3x.png deleted file mode 100644 index 30e3a0695..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet-chat-preview.imageset/file-spreadsheet-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/Contents.json index 3e820f4e2..a26db20c1 100644 --- a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-spreadsheet.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-spreadsheet@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-spreadsheet@3x.png", - "scale" : "3x" + "filename" : "file-spreadsheet.svg", + "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/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.png b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.png deleted file mode 100644 index e4f573f56..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.svg b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.svg new file mode 100644 index 000000000..5e29558fe --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet.svg @@ -0,0 +1,4 @@ + + + diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@2x.png b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@2x.png deleted file mode 100644 index 5483cf9b0..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@3x.png b/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@3x.png deleted file mode 100644 index 2d0aaa48c..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-spreadsheet.imageset/file-spreadsheet@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/Contents.json deleted file mode 100644 index 636e66e57..000000000 --- a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-text-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-text-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-text-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview.png b/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview.png deleted file mode 100644 index 7a9bc3c76..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@2x.png deleted file mode 100644 index 74a4acce1..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@3x.png deleted file mode 100644 index 659a8bb71..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text-chat-preview.imageset/file-text-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-text.imageset/Contents.json index b95473b61..4da63dcfb 100644 --- a/NextcloudTalk/Images.xcassets/file-text.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-text.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-text.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-text@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-text@3x.png", - "scale" : "3x" + "filename" : "file-text.svg", + "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/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.png b/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.png deleted file mode 100644 index 9474e19fd..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.svg b/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.svg new file mode 100644 index 000000000..1b2345a3b --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-text.imageset/file-text.svg @@ -0,0 +1,5 @@ + + + + diff --git a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@2x.png b/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@2x.png deleted file mode 100644 index ce20809a9..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@3x.png b/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@3x.png deleted file mode 100644 index 7ba1fecfa..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-text.imageset/file-text@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/Contents.json deleted file mode 100644 index 12856a044..000000000 --- a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "file-vcard-chat-preview.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "file-vcard-chat-preview@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "file-vcard-chat-preview@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview.png b/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview.png deleted file mode 100644 index a5bf53ce0..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@2x.png deleted file mode 100644 index 98478a986..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@3x.png deleted file mode 100644 index 2575649ab..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard-chat-preview.imageset/file-vcard-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-vcard.imageset/Contents.json index a3eaa4a97..7f8f0a3a7 100644 --- a/NextcloudTalk/Images.xcassets/file-vcard.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-vcard.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "filename" : "file-vcard.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "file-vcard@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "file-vcard@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "file-vcard.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true } } diff --git a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.png b/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.png deleted file mode 100644 index 67d3ca6f0..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.svg b/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.svg new file mode 100644 index 000000000..94aca85cf --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@2x.png b/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@2x.png deleted file mode 100644 index 648d8a4ef..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@3x.png b/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@3x.png deleted file mode 100644 index a5bf53ce0..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-vcard.imageset/file-vcard@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/Contents.json deleted file mode 100644 index 4523cbc73..000000000 --- a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-video-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-video-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-video-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview.png b/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview.png deleted file mode 100644 index b81911147..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@2x.png deleted file mode 100644 index 8180cbd52..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@3x.png deleted file mode 100644 index 8c5b7b337..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video-chat-preview.imageset/file-video-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-video.imageset/Contents.json index 2f1f7303c..92c67cb43 100644 --- a/NextcloudTalk/Images.xcassets/file-video.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-video.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-video.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-video@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-video@3x.png", - "scale" : "3x" + "filename" : "file-video.svg", + "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/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.png b/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.png deleted file mode 100644 index 22807648b..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.svg b/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.svg new file mode 100644 index 000000000..2d82d6d75 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-video.imageset/file-video.svg @@ -0,0 +1,5 @@ + + + + diff --git a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@2x.png b/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@2x.png deleted file mode 100644 index 48cbe71bd..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@3x.png b/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@3x.png deleted file mode 100644 index 97c0021ce..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-video.imageset/file-video@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/Contents.json deleted file mode 100644 index 9959c9efe..000000000 --- a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "file-zip-chat-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-zip-chat-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-zip-chat-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview.png b/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview.png deleted file mode 100644 index 0c15c9bb4..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@2x.png b/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@2x.png deleted file mode 100644 index ed60efc22..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@3x.png b/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@3x.png deleted file mode 100644 index 463099c38..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip-chat-preview.imageset/file-zip-chat-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file-zip.imageset/Contents.json index 6528c6603..ebfd69441 100644 --- a/NextcloudTalk/Images.xcassets/file-zip.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file-zip.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file-zip.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file-zip@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file-zip@3x.png", - "scale" : "3x" + "filename" : "file-zip.svg", + "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/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.png b/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.png deleted file mode 100644 index aa4052c8b..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.svg b/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.svg new file mode 100644 index 000000000..66f100581 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip.svg @@ -0,0 +1 @@ + diff --git a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@2x.png b/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@2x.png deleted file mode 100644 index a9a196cb4..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@3x.png b/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@3x.png deleted file mode 100644 index ecd204a3c..000000000 Binary files a/NextcloudTalk/Images.xcassets/file-zip.imageset/file-zip@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file.imageset/Contents.json b/NextcloudTalk/Images.xcassets/file.imageset/Contents.json index 434dbf91e..542397322 100644 --- a/NextcloudTalk/Images.xcassets/file.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/file.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "file.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "file@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "file@3x.png", - "scale" : "3x" + "filename" : "file.svg", + "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/NextcloudTalk/Images.xcassets/file.imageset/file.png b/NextcloudTalk/Images.xcassets/file.imageset/file.png deleted file mode 100644 index 0f6d118d4..000000000 Binary files a/NextcloudTalk/Images.xcassets/file.imageset/file.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file.imageset/file.svg b/NextcloudTalk/Images.xcassets/file.imageset/file.svg new file mode 100644 index 000000000..b4e387f3e --- /dev/null +++ b/NextcloudTalk/Images.xcassets/file.imageset/file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/file.imageset/file@2x.png b/NextcloudTalk/Images.xcassets/file.imageset/file@2x.png deleted file mode 100644 index 7dccd7104..000000000 Binary files a/NextcloudTalk/Images.xcassets/file.imageset/file@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/file.imageset/file@3x.png b/NextcloudTalk/Images.xcassets/file.imageset/file@3x.png deleted file mode 100644 index 58d020f62..000000000 Binary files a/NextcloudTalk/Images.xcassets/file.imageset/file@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/Contents.json b/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/Contents.json deleted file mode 100644 index bc48cc8b2..000000000 --- a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "folder-default-preview.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "folder-default-preview@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "folder-default-preview@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview.png b/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview.png deleted file mode 100644 index 7edf94b65..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@2x.png b/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@2x.png deleted file mode 100644 index 9a5a172a6..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@3x.png b/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@3x.png deleted file mode 100644 index 463115e24..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder-chat-preview.imageset/folder-default-preview@3x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder.imageset/Contents.json b/NextcloudTalk/Images.xcassets/folder.imageset/Contents.json index 07206c210..3c88b0c22 100644 --- a/NextcloudTalk/Images.xcassets/folder.imageset/Contents.json +++ b/NextcloudTalk/Images.xcassets/folder.imageset/Contents.json @@ -1,23 +1,15 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "folder.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "folder@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "folder@3x.png", - "scale" : "3x" + "filename" : "folder.svg", + "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/NextcloudTalk/Images.xcassets/folder.imageset/folder.png b/NextcloudTalk/Images.xcassets/folder.imageset/folder.png deleted file mode 100644 index 2d876f811..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder.imageset/folder.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder.imageset/folder.svg b/NextcloudTalk/Images.xcassets/folder.imageset/folder.svg new file mode 100644 index 000000000..15dfd0964 --- /dev/null +++ b/NextcloudTalk/Images.xcassets/folder.imageset/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/NextcloudTalk/Images.xcassets/folder.imageset/folder@2x.png b/NextcloudTalk/Images.xcassets/folder.imageset/folder@2x.png deleted file mode 100644 index c8be6482d..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder.imageset/folder@2x.png and /dev/null differ diff --git a/NextcloudTalk/Images.xcassets/folder.imageset/folder@3x.png b/NextcloudTalk/Images.xcassets/folder.imageset/folder@3x.png deleted file mode 100644 index 80b49e9e3..000000000 Binary files a/NextcloudTalk/Images.xcassets/folder.imageset/folder@3x.png and /dev/null differ diff --git a/NextcloudTalk/NCUtils.swift b/NextcloudTalk/NCUtils.swift index 19493abfd..00686c12e 100644 --- a/NextcloudTalk/NCUtils.swift +++ b/NextcloudTalk/NCUtils.swift @@ -28,7 +28,9 @@ import AVFoundation guard let fileType else { return "file" } if let mimeType = fileType.preferredMIMEType { - if mimeType.contains("org.openxmlformats") || mimeType.contains("org.oasis-open.opendocument") { + if mimeType.contains("org.openxmlformats") || mimeType.contains("org.oasis-open.opendocument") || + mimeType.contains("officedocument.wordprocessingml") { + return "file-document" } else if mimeType == "httpd/unix-directory" { return "folder" @@ -291,16 +293,20 @@ import AVFoundation return image } - public static func renderAspectImage(image: UIImage?, of size: CGSize) -> UIImage? { + public static func renderAspectImage(image: UIImage?, ofSize size: CGSize, centerImage center: Bool) -> UIImage? { guard let image else { return nil } let newRect = CGRect(x: 0, y: 0, width: size.width, height: size.height) UIGraphicsBeginImageContextWithOptions(newRect.size, false, 0.0) let aspectRatio = AVMakeRect(aspectRatio: image.size, insideRect: newRect) - let origin = CGPoint(x: newRect.maxX / 2 - aspectRatio.width / 2, y: newRect.maxY / 2 - aspectRatio.height / 2) + var targetOrigin: CGPoint = .zero + + if center { + targetOrigin = CGPoint(x: newRect.maxX / 2 - aspectRatio.width / 2, y: newRect.maxY / 2 - aspectRatio.height / 2) + } - image.draw(in: CGRect(origin: origin, size: aspectRatio.size)) + image.draw(in: CGRect(origin: targetOrigin, size: aspectRatio.size)) let newImage = UIGraphicsGetImageFromCurrentImageContext() UIGraphicsEndImageContext() diff --git a/NextcloudTalk/SettingsTableViewController.swift b/NextcloudTalk/SettingsTableViewController.swift index 62329b7b6..92f35b6da 100644 --- a/NextcloudTalk/SettingsTableViewController.swift +++ b/NextcloudTalk/SettingsTableViewController.swift @@ -833,7 +833,7 @@ class SettingsTableViewController: UITableViewController, UITextFieldDelegate, U private extension UITableViewCell { func setSettingsImage(image: UIImage?, renderingMode: UIImage.RenderingMode = .alwaysTemplate) { // Render all images to a size of 20x20 so all cells have the same width for the imageView - self.imageView?.image = NCUtils.renderAspectImage(image: image, of: .init(width: 20, height: 20))?.withRenderingMode(renderingMode) + self.imageView?.image = NCUtils.renderAspectImage(image: image, ofSize: .init(width: 20, height: 20), centerImage: true)?.withRenderingMode(renderingMode) self.imageView?.tintColor = .secondaryLabel self.imageView?.contentMode = .scaleAspectFit } diff --git a/ShareExtension/ShareConfirmationViewController.swift b/ShareExtension/ShareConfirmationViewController.swift index 3da5a4810..8506ed3fb 100644 --- a/ShareExtension/ShareConfirmationViewController.swift +++ b/ShareExtension/ShareConfirmationViewController.swift @@ -754,7 +754,7 @@ import AVFoundation let item = self.shareItemController.shareItems[indexPath.row] - // Setting placeholde rher in case we can't generate any other preview + // Setting placeholder here in case we can't generate any other preview cell.setPlaceHolderImage(item.placeholderImage) cell.setPlaceHolderText(item.fileName) diff --git a/ShareExtension/ShareItemController.m b/ShareExtension/ShareItemController.m index 3a1e04c54..e17ba88ba 100644 --- a/ShareExtension/ShareItemController.m +++ b/ShareExtension/ShareItemController.m @@ -240,8 +240,7 @@ - (void)removeAllItems - (UIImage *)getPlaceholderImageForFileURL:(NSURL *)fileURL { NSString *previewImage = [NCUtils previewImageForFileExtension:[fileURL pathExtension]]; - NSString *imageName = [previewImage stringByAppendingString:@"-chat-preview"]; - return [UIImage imageNamed:imageName]; + return [UIImage imageNamed:previewImage]; } @end