From 8ab892240a6fcbcd4eff3002a73af4425590623f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthieu=20D=C3=A9glon?= Date: Tue, 25 Feb 2025 08:28:57 +0100 Subject: [PATCH 1/4] chore: Add font and mail --- .../file-font.imageset/Contents.json | 15 +++++++++++++++ .../file-font.imageset/Kdrive Icon Font.svg | 4 ++++ .../file-mail.imageset/Contents.json | 15 +++++++++++++++ .../file-mail.imageset/Kdrive Icon.svg | 6 ++++++ kDriveCore/Data/Models/File.swift | 9 +++++++-- 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 kDrive/Resources/Assets.xcassets/file-font.imageset/Contents.json create mode 100644 kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg create mode 100644 kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json create mode 100644 kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg diff --git a/kDrive/Resources/Assets.xcassets/file-font.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/file-font.imageset/Contents.json new file mode 100644 index 000000000..dd60b4261 --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-font.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "Kdrive Icon Font.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg b/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg new file mode 100644 index 000000000..286f60d34 --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg @@ -0,0 +1,4 @@ + + + + diff --git a/kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json new file mode 100644 index 000000000..4e86b9439 --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "Kdrive Icon.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg b/kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg new file mode 100644 index 000000000..104e58141 --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift index 2efa71c48..5565aa6e8 100644 --- a/kDriveCore/Data/Models/File.swift +++ b/kDriveCore/Data/Models/File.swift @@ -35,6 +35,7 @@ public enum ConvertedType: String, CaseIterable { case font case form case image + case mail case pdf case presentation case spreadsheet @@ -55,11 +56,13 @@ public enum ConvertedType: String, CaseIterable { case .folder: return KDriveResourcesAsset.folderFilled.image case .font: - return KDriveResourcesAsset.fileDefault.image + return KDriveResourcesAsset.fileFont.image case .form: return KDriveResourcesAsset.fileForm.image case .image: return KDriveResourcesAsset.fileImage.image + case .mail: + return KDriveResourcesAsset.fileMail.image case .pdf: return KDriveResourcesAsset.filePdf.image case .presentation: @@ -110,7 +113,7 @@ public enum ConvertedType: String, CaseIterable { return KDriveResourcesStrings.Localizable.allOfficeGrids case .text: return KDriveResourcesStrings.Localizable.allOfficeDocs - case .unknown, .url, .font: + case .unknown, .url, .font, .mail: return "" case .video: return KDriveResourcesStrings.Localizable.allVideo @@ -135,6 +138,8 @@ public enum ConvertedType: String, CaseIterable { return .data case .image: return .image + case .mail: + return .message case .pdf: return .pdf case .presentation: From c6ae62d68c19b207211825699b3f8b481736baeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthieu=20D=C3=A9glon?= Date: Tue, 25 Feb 2025 09:02:35 +0100 Subject: [PATCH 2/4] refactor: Change type --- kDriveCore/Data/Models/File.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift index 5565aa6e8..7c142d542 100644 --- a/kDriveCore/Data/Models/File.swift +++ b/kDriveCore/Data/Models/File.swift @@ -139,7 +139,7 @@ public enum ConvertedType: String, CaseIterable { case .image: return .image case .mail: - return .message + return .emailMessage case .pdf: return .pdf case .presentation: From d275e187c3fb89adf628d83a05ebd3f0dda9c019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthieu=20D=C3=A9glon?= Date: Tue, 25 Feb 2025 10:56:35 +0100 Subject: [PATCH 3/4] feat: Add 3d model --- .../Contents.json | 0 .../Kdrive Icon.svg | 10 +++++----- .../file-font.imageset/Kdrive Icon Font.svg | 6 +++--- kDriveCore/Data/Models/File.swift | 17 +++++++++++------ 4 files changed, 19 insertions(+), 14 deletions(-) rename kDrive/Resources/Assets.xcassets/{file-mail.imageset => file-3dmodel.imageset}/Contents.json (100%) rename kDrive/Resources/Assets.xcassets/{file-mail.imageset => file-3dmodel.imageset}/Kdrive Icon.svg (94%) diff --git a/kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/file-3dmodel.imageset/Contents.json similarity index 100% rename from kDrive/Resources/Assets.xcassets/file-mail.imageset/Contents.json rename to kDrive/Resources/Assets.xcassets/file-3dmodel.imageset/Contents.json diff --git a/kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg b/kDrive/Resources/Assets.xcassets/file-3dmodel.imageset/Kdrive Icon.svg similarity index 94% rename from kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg rename to kDrive/Resources/Assets.xcassets/file-3dmodel.imageset/Kdrive Icon.svg index 104e58141..135773d0f 100644 --- a/kDrive/Resources/Assets.xcassets/file-mail.imageset/Kdrive Icon.svg +++ b/kDrive/Resources/Assets.xcassets/file-3dmodel.imageset/Kdrive Icon.svg @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg b/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg index 286f60d34..81fae0dc2 100644 --- a/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg +++ b/kDrive/Resources/Assets.xcassets/file-font.imageset/Kdrive Icon Font.svg @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift index 7c142d542..3516f07bd 100644 --- a/kDriveCore/Data/Models/File.swift +++ b/kDriveCore/Data/Models/File.swift @@ -31,11 +31,12 @@ public enum ConvertedType: String, CaseIterable { case archive case audio case code + case email case folder = "dir" case font case form case image - case mail + case model case pdf case presentation case spreadsheet @@ -53,6 +54,8 @@ public enum ConvertedType: String, CaseIterable { return KDriveResourcesAsset.fileAudio.image case .code: return KDriveResourcesAsset.fileCode.image + case .email: + return KDriveResourcesAsset.file3dmodel.image case .folder: return KDriveResourcesAsset.folderFilled.image case .font: @@ -61,8 +64,8 @@ public enum ConvertedType: String, CaseIterable { return KDriveResourcesAsset.fileForm.image case .image: return KDriveResourcesAsset.fileImage.image - case .mail: - return KDriveResourcesAsset.fileMail.image + case .model: + return KDriveResourcesAsset.file3dmodel.image case .pdf: return KDriveResourcesAsset.filePdf.image case .presentation: @@ -113,7 +116,7 @@ public enum ConvertedType: String, CaseIterable { return KDriveResourcesStrings.Localizable.allOfficeGrids case .text: return KDriveResourcesStrings.Localizable.allOfficeDocs - case .unknown, .url, .font, .mail: + case .unknown, .url, .font, .email, .model: return "" case .video: return KDriveResourcesStrings.Localizable.allVideo @@ -130,6 +133,8 @@ public enum ConvertedType: String, CaseIterable { return .audio case .code: return .sourceCode + case .email: + return .emailMessage case .folder: return .folder case .font: @@ -138,8 +143,8 @@ public enum ConvertedType: String, CaseIterable { return .data case .image: return .image - case .mail: - return .emailMessage + case .model: + return .threeDContent case .pdf: return .pdf case .presentation: From b12ad7acb7098c6520bbc0d609200fe850fffd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthieu=20D=C3=A9glon?= Date: Wed, 26 Feb 2025 13:49:23 +0100 Subject: [PATCH 4/4] feat: Add email icon --- .../file-email.imageset/Contents.json | 15 +++++++++++++++ .../file-email.imageset/enveloppe.svg | 3 +++ kDriveCore/Data/Models/File.swift | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 kDrive/Resources/Assets.xcassets/file-email.imageset/Contents.json create mode 100644 kDrive/Resources/Assets.xcassets/file-email.imageset/enveloppe.svg diff --git a/kDrive/Resources/Assets.xcassets/file-email.imageset/Contents.json b/kDrive/Resources/Assets.xcassets/file-email.imageset/Contents.json new file mode 100644 index 000000000..b6737a01f --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-email.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "enveloppe.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/kDrive/Resources/Assets.xcassets/file-email.imageset/enveloppe.svg b/kDrive/Resources/Assets.xcassets/file-email.imageset/enveloppe.svg new file mode 100644 index 000000000..0dbf6d5c6 --- /dev/null +++ b/kDrive/Resources/Assets.xcassets/file-email.imageset/enveloppe.svg @@ -0,0 +1,3 @@ + + + diff --git a/kDriveCore/Data/Models/File.swift b/kDriveCore/Data/Models/File.swift index 3516f07bd..2b740b3fc 100644 --- a/kDriveCore/Data/Models/File.swift +++ b/kDriveCore/Data/Models/File.swift @@ -55,7 +55,7 @@ public enum ConvertedType: String, CaseIterable { case .code: return KDriveResourcesAsset.fileCode.image case .email: - return KDriveResourcesAsset.file3dmodel.image + return KDriveResourcesAsset.fileEmail.image case .folder: return KDriveResourcesAsset.folderFilled.image case .font: