diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json index b266b09f3c..6126b598e0 100644 --- a/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json +++ b/iOSClient/Images.xcassets/create_file_document.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "description_black_48dp.svg", - "idiom" : "universal" + "filename" : "document_menu.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "create_file_document@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "document_menu@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png b/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png new file mode 100644 index 0000000000..d4b0623eb0 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_document.imageset/create_file_document@2x.png differ diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/description_black_48dp.svg b/iOSClient/Images.xcassets/create_file_document.imageset/description_black_48dp.svg deleted file mode 100644 index 467dacd270..0000000000 --- a/iOSClient/Images.xcassets/create_file_document.imageset/description_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png new file mode 100644 index 0000000000..de680454d4 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu.png differ diff --git a/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png new file mode 100644 index 0000000000..f300a8b58e Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_document.imageset/document_menu@3x.png differ diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json index 1faac13787..72118b7429 100644 --- a/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json +++ b/iOSClient/Images.xcassets/create_file_ppt.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "file-presentation-box.svg", - "idiom" : "universal" + "filename" : "file_ppt_menu.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "create_file_ppt@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "file_ppt_menu@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png new file mode 100644 index 0000000000..80aac7f831 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_ppt.imageset/create_file_ppt@2x.png differ diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file-presentation-box.svg b/iOSClient/Images.xcassets/create_file_ppt.imageset/file-presentation-box.svg deleted file mode 100644 index bcc45e9e1b..0000000000 --- a/iOSClient/Images.xcassets/create_file_ppt.imageset/file-presentation-box.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png new file mode 100644 index 0000000000..5287c637e7 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu.png differ diff --git a/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png new file mode 100644 index 0000000000..8407a73cb7 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_ppt.imageset/file_ppt_menu@3x.png differ diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json index f44a4b1521..32339f608f 100644 --- a/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json +++ b/iOSClient/Images.xcassets/create_file_xls.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "file-table-box.svg", - "idiom" : "universal" + "filename" : "file_xls_menu.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "create_file_xls@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "file_xls_menu@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png b/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png new file mode 100644 index 0000000000..73458d7755 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_xls.imageset/create_file_xls@2x.png differ diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file-table-box.svg b/iOSClient/Images.xcassets/create_file_xls.imageset/file-table-box.svg deleted file mode 100644 index 9067fa17c7..0000000000 --- a/iOSClient/Images.xcassets/create_file_xls.imageset/file-table-box.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png new file mode 100644 index 0000000000..474a66c601 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu.png differ diff --git a/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png new file mode 100644 index 0000000000..b959d7c9a8 Binary files /dev/null and b/iOSClient/Images.xcassets/create_file_xls.imageset/file_xls_menu@3x.png differ diff --git a/iOSClient/Images.xcassets/document.imageset/Contents.json b/iOSClient/Images.xcassets/document.imageset/Contents.json index b266b09f3c..847026cf24 100644 --- a/iOSClient/Images.xcassets/document.imageset/Contents.json +++ b/iOSClient/Images.xcassets/document.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "description_black_48dp.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "document.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/document.imageset/description_black_48dp.svg b/iOSClient/Images.xcassets/document.imageset/description_black_48dp.svg deleted file mode 100644 index 467dacd270..0000000000 --- a/iOSClient/Images.xcassets/document.imageset/description_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/document.imageset/document.pdf b/iOSClient/Images.xcassets/document.imageset/document.pdf new file mode 100644 index 0000000000..eed811dc9a Binary files /dev/null and b/iOSClient/Images.xcassets/document.imageset/document.pdf differ diff --git a/iOSClient/Images.xcassets/file_movie.imageset/Contents.json b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json index b3b8bdb5a4..fcb1da8f07 100644 --- a/iOSClient/Images.xcassets/file_movie.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_movie.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "movie_black_48dp.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "file_movie.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf b/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf new file mode 100644 index 0000000000..700d307684 Binary files /dev/null and b/iOSClient/Images.xcassets/file_movie.imageset/file_movie.pdf differ diff --git a/iOSClient/Images.xcassets/file_movie.imageset/movie_black_48dp.svg b/iOSClient/Images.xcassets/file_movie.imageset/movie_black_48dp.svg deleted file mode 100644 index 83a33a3b22..0000000000 --- a/iOSClient/Images.xcassets/file_movie.imageset/movie_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json index 2f5ac21398..a3f76c948d 100644 --- a/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_pdf.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { - "filename" : "picture_as_pdf_black_48dp.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "Untitled.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" + "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf b/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf new file mode 100644 index 0000000000..1b754ff9af Binary files /dev/null and b/iOSClient/Images.xcassets/file_pdf.imageset/Untitled.pdf differ diff --git a/iOSClient/Images.xcassets/file_pdf.imageset/picture_as_pdf_black_48dp.svg b/iOSClient/Images.xcassets/file_pdf.imageset/picture_as_pdf_black_48dp.svg deleted file mode 100644 index 20ad6c519e..0000000000 --- a/iOSClient/Images.xcassets/file_pdf.imageset/picture_as_pdf_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json index 16d9f471bc..ca8f401824 100644 --- a/iOSClient/Images.xcassets/file_photo.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_photo.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "image_black_48dp.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "file_photo.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "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 new file mode 100644 index 0000000000..a95c3f5577 Binary files /dev/null and b/iOSClient/Images.xcassets/file_photo.imageset/file_photo.pdf differ diff --git a/iOSClient/Images.xcassets/file_photo.imageset/image_black_48dp.svg b/iOSClient/Images.xcassets/file_photo.imageset/image_black_48dp.svg deleted file mode 100644 index 38d4842702..0000000000 --- a/iOSClient/Images.xcassets/file_photo.imageset/image_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json index 1faac13787..312d432284 100644 --- a/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_ppt.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "file-presentation-box.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "file_ppt.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_ppt.imageset/file-presentation-box.svg b/iOSClient/Images.xcassets/file_ppt.imageset/file-presentation-box.svg deleted file mode 100644 index bcc45e9e1b..0000000000 --- a/iOSClient/Images.xcassets/file_ppt.imageset/file-presentation-box.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file 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..ace5d3adfd 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 index 589b176e8b..00fadd1b1f 100644 --- a/iOSClient/Images.xcassets/file_txt.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_txt.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { - "filename" : "article_black_48dp.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "file_txt.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "original" + "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_txt.imageset/article_black_48dp.svg b/iOSClient/Images.xcassets/file_txt.imageset/article_black_48dp.svg deleted file mode 100644 index f65f16b7c5..0000000000 --- a/iOSClient/Images.xcassets/file_txt.imageset/article_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file 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..04dabb7faa Binary files /dev/null and b/iOSClient/Images.xcassets/file_txt.imageset/file_txt.pdf differ diff --git a/iOSClient/Images.xcassets/file_xls.imageset/Contents.json b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json index f44a4b1521..8c9182f8f7 100644 --- a/iOSClient/Images.xcassets/file_xls.imageset/Contents.json +++ b/iOSClient/Images.xcassets/file_xls.imageset/Contents.json @@ -1,15 +1,15 @@ { "images" : [ { - "filename" : "file-table-box.svg", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "file_xls.pdf" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" }, "properties" : { "preserves-vector-representation" : true } -} +} \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_xls.imageset/file-table-box.svg b/iOSClient/Images.xcassets/file_xls.imageset/file-table-box.svg deleted file mode 100644 index 9067fa17c7..0000000000 --- a/iOSClient/Images.xcassets/file_xls.imageset/file-table-box.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf b/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf new file mode 100644 index 0000000000..ec7222b8fc Binary files /dev/null and b/iOSClient/Images.xcassets/file_xls.imageset/file_xls.pdf differ diff --git a/iOSClient/Images.xcassets/text.imageset/Contents.json b/iOSClient/Images.xcassets/text.imageset/Contents.json index 07e1c2d13f..ceaab0a067 100644 --- a/iOSClient/Images.xcassets/text.imageset/Contents.json +++ b/iOSClient/Images.xcassets/text.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "article_black_48dp.svg", + "filename" : "text.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/text.imageset/article_black_48dp.svg b/iOSClient/Images.xcassets/text.imageset/article_black_48dp.svg deleted file mode 100644 index f65f16b7c5..0000000000 --- a/iOSClient/Images.xcassets/text.imageset/article_black_48dp.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/iOSClient/Images.xcassets/text.imageset/text.pdf b/iOSClient/Images.xcassets/text.imageset/text.pdf new file mode 100644 index 0000000000..2154ceece1 Binary files /dev/null and b/iOSClient/Images.xcassets/text.imageset/text.pdf differ