From 72ad8987aca595ff2030519f9ed9aa10478d5dae Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 6 Nov 2023 10:48:47 +0100
Subject: [PATCH] Provide dedicated, vendor-neutral icons (#9911)

* Provide dedicated, vendor-neutral icons

* Add changelog

* Add markdown icon

* add docf, oform
---
 .../unreleased/enhancement-provide-neutral-file-icons  |  6 ++++++
 .../src/assets/icons/resource-type-document-fill.svg   |  4 ++--
 .../src/assets/icons/resource-type-form-fill.svg       |  8 ++++++++
 .../src/assets/icons/resource-type-markdown-fill.svg   |  8 ++++++++
 .../assets/icons/resource-type-presentation-fill.svg   |  5 +++--
 .../assets/icons/resource-type-spreadsheet-fill.svg    |  9 +++++++--
 .../design-system/src/helpers/resourceIconMapping.json | 10 +++++++++-
 7 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-provide-neutral-file-icons
 create mode 100644 packages/design-system/src/assets/icons/resource-type-form-fill.svg
 create mode 100644 packages/design-system/src/assets/icons/resource-type-markdown-fill.svg

diff --git a/changelog/unreleased/enhancement-provide-neutral-file-icons b/changelog/unreleased/enhancement-provide-neutral-file-icons
new file mode 100644
index 00000000000..bae51121bd8
--- /dev/null
+++ b/changelog/unreleased/enhancement-provide-neutral-file-icons
@@ -0,0 +1,6 @@
+Enhancement: Provide vendor neutral file icons
+
+We replaced the icons for Document, Spreadsheet, Presentation, Forms and Markdown
+
+https://github.com/owncloud/web/pull/9911
+https://github.com/owncloud/web/issues/9847
diff --git a/packages/design-system/src/assets/icons/resource-type-document-fill.svg b/packages/design-system/src/assets/icons/resource-type-document-fill.svg
index c3f98fbae96..054cd11d14b 100644
--- a/packages/design-system/src/assets/icons/resource-type-document-fill.svg
+++ b/packages/design-system/src/assets/icons/resource-type-document-fill.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
     <!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
     <g>
-        <path fill="none" d="M0 0h24v24H0z"/>
-        <path d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm57.1 120H305c7.7 0 13.4 7.1 11.7 14.7l-38 168c-1.2 5.5-6.1 9.3-11.7 9.3h-38c-5.5 0-10.3-3.8-11.6-9.1-25.8-103.5-20.8-81.2-25.6-110.5h-.5c-1.1 14.3-2.4 17.4-25.6 110.5-1.3 5.3-6.1 9.1-11.6 9.1H117c-5.6 0-10.5-3.9-11.7-9.4l-37.8-168c-1.7-7.5 4-14.6 11.7-14.6h24.5c5.7 0 10.7 4 11.8 9.7 15.6 78 20.1 109.5 21 122.2 1.6-10.2 7.3-32.7 29.4-122.7 1.3-5.4 6.1-9.1 11.7-9.1h29.1c5.6 0 10.4 3.8 11.7 9.2 24 100.4 28.8 124 29.6 129.4-.2-11.2-2.6-17.8 21.6-129.2 1-5.6 5.9-9.5 11.5-9.5zM384 121.9v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"></path>
+<path d="M224 136V0H24C10.7 0 0 10.7 0 24V488C0 501.3 10.7 512 24 512H360C373.3 512 384 501.3 384 488V160H248C234.8 160 224 149.2 224 136ZM237 372C237 378.6 231.6 384 225 384H108C101.4 384 96 378.6 96 372V364C96 357.4 101.4 352 108 352H225C231.6 352 237 357.4 237 364V372ZM288 308C288 314.6 282.6 320 276 320H108C101.4 320 96 314.6 96 308V300C96 293.4 101.4 288 108 288H276C282.6 288 288 293.4 288 300V308ZM288 236V244C288 250.6 282.6 256 276 256H108C101.4 256 96 250.6 96 244V236C96 229.4 101.4 224 108 224H276C282.6 224 288 229.4 288 236ZM384 121.9V128H256V0H262.1C268.5 0 274.6 2.5 279.1 7L377 105C381.5 109.5 384 115.6 384 121.9Z" />
+
     </g>
 </svg>
diff --git a/packages/design-system/src/assets/icons/resource-type-form-fill.svg b/packages/design-system/src/assets/icons/resource-type-form-fill.svg
new file mode 100644
index 00000000000..f29685c1c0e
--- /dev/null
+++ b/packages/design-system/src/assets/icons/resource-type-form-fill.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
+    <!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+    <g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224 0V136C224 149.2 234.8 160 248 160H384V488C384 501.3 373.3 512 360 512H24C10.7 512 0 501.3 0 488V24C0 10.7 10.7 0 24 0H224ZM174.568 230.465L117.288 286.825C115.405 288.693 112.361 288.653 110.478 286.785L77.3921 253.677C75.5095 251.809 75.5495 248.788 77.4322 246.92L88.8081 235.712C90.6907 233.844 93.7349 233.884 95.6176 235.752L114.043 254.194L156.503 212.381C158.385 210.513 161.429 210.553 163.312 212.421L174.608 223.709C176.491 225.617 176.45 228.597 174.568 230.465ZM174.568 322.465L117.288 378.825C115.405 380.693 112.361 380.653 110.478 378.785L77.3921 345.677C75.5095 343.809 75.5495 340.788 77.4322 338.92L88.8081 327.712C90.6907 325.844 93.7349 325.884 95.6176 327.752L114.043 346.194L156.503 304.381C158.385 302.513 161.429 302.553 163.312 304.421L174.608 315.709C176.491 317.617 176.45 320.597 174.568 322.465ZM299 260V252C299 245.4 293.6 240 287 240H214C207.4 240 202 245.4 202 252V260C202 266.6 207.4 272 214 272H287C293.6 272 299 266.6 299 260ZM299 344V352C299 358.6 293.6 364 287 364H214C207.4 364 202 358.6 202 352V344C202 337.4 207.4 332 214 332H287C293.6 332 299 337.4 299 344Z" />
+<path d="M384 128V121.9C384 115.6 381.5 109.5 377 105L279.1 7C274.6 2.5 268.5 0 262.1 0H256V128H384Z" />
+    </g>
+</svg>
+
diff --git a/packages/design-system/src/assets/icons/resource-type-markdown-fill.svg b/packages/design-system/src/assets/icons/resource-type-markdown-fill.svg
new file mode 100644
index 00000000000..b4fcf0dddba
--- /dev/null
+++ b/packages/design-system/src/assets/icons/resource-type-markdown-fill.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
+    <!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+    <g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224 0V136C224 149.2 234.8 160 248 160H384V488C384 501.3 373.3 512 360 512H24C10.7 512 0 501.3 0 488V24C0 10.7 10.7 0 24 0H224ZM215.005 381.146H178.124V309.36L141.123 355.363L104.122 309.36V381.146H67V256H104.001L141.003 302.002L178.004 256H215.005V381.146ZM296.528 383L240.996 318.573H277.997V256H314.999V318.573H352L296.528 383Z" />
+<path d="M384 128V121.9C384 115.6 381.5 109.5 377 105L279.1 7C274.6 2.5 268.5 0 262.1 0H256V128H384Z" />
+    </g>
+</svg>
+
diff --git a/packages/design-system/src/assets/icons/resource-type-presentation-fill.svg b/packages/design-system/src/assets/icons/resource-type-presentation-fill.svg
index 74f2aec00bc..0d139665735 100644
--- a/packages/design-system/src/assets/icons/resource-type-presentation-fill.svg
+++ b/packages/design-system/src/assets/icons/resource-type-presentation-fill.svg
@@ -1,7 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
     <!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
     <g>
-        <path fill="none" d="M0 0h24v24H0z"/>
-        <path d="M193.7 271.2c8.8 0 15.5 2.7 20.3 8.1 9.6 10.9 9.8 32.7-.2 44.1-4.9 5.6-11.9 8.5-21.1 8.5h-26.9v-60.7h27.9zM377 105L279 7c-4.5-4.5-10.6-7-17-7h-6v128h128v-6.1c0-6.3-2.5-12.4-7-16.9zm-153 31V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm53 165.2c0 90.3-88.8 77.6-111.1 77.6V436c0 6.6-5.4 12-12 12h-30.8c-6.6 0-12-5.4-12-12V236.2c0-6.6 5.4-12 12-12h81c44.5 0 72.9 32.8 72.9 77z"></path>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224 136V0H24C10.7 0 0 10.7 0 24V488C0 501.3 10.7 512 24 512H360C373.3 512 384 501.3 384 488V160H248C234.8 160 224 149.2 224 136ZM288 244V236C288 229.4 282.6 224 276 224H253C246.4 224 241 229.4 241 236V244C241 250.6 246.4 256 253 256H276C282.6 256 288 250.6 288 244ZM288 308C288 314.6 282.6 320 276 320H253C246.4 320 241 314.6 241 308V300C241 293.4 246.4 288 253 288H276C282.6 288 288 293.4 288 300V308ZM288 372C288 378.6 282.6 384 276 384H108C101.4 384 96 378.6 96 372V364C96 357.4 101.4 352 108 352H276C282.6 352 288 357.4 288 364V372ZM149.5 200C112.221 200 82 230.22 82 267.5C82 304.78 112.221 335 149.5 335C186.779 335 217 304.78 217 267.5H149.5V200Z" />
+<path d="M384 121.9V128H256V0H262.1C268.5 0 274.6 2.5 279.1 7L377 105C381.5 109.5 384 115.6 384 121.9Z" />
+
     </g>
 </svg>
diff --git a/packages/design-system/src/assets/icons/resource-type-spreadsheet-fill.svg b/packages/design-system/src/assets/icons/resource-type-spreadsheet-fill.svg
index aa37d07a66c..19dd8de1104 100644
--- a/packages/design-system/src/assets/icons/resource-type-spreadsheet-fill.svg
+++ b/packages/design-system/src/assets/icons/resource-type-spreadsheet-fill.svg
@@ -1,7 +1,12 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
     <!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
     <g>
-        <path fill="none" d="M0 0h24v24H0z"/>
-        <path d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm60.1 106.5L224 336l60.1 93.5c5.1 8-.6 18.5-10.1 18.5h-34.9c-4.4 0-8.5-2.4-10.6-6.3C208.9 405.5 192 373 192 373c-6.4 14.8-10 20-36.6 68.8-2.1 3.9-6.1 6.3-10.5 6.3H110c-9.5 0-15.2-10.5-10.1-18.5l60.3-93.5-60.3-93.5c-5.2-8 .6-18.5 10.1-18.5h34.8c4.4 0 8.5 2.4 10.6 6.3 26.1 48.8 20 33.6 36.6 68.5 0 0 6.1-11.7 36.6-68.5 2.1-3.9 6.2-6.3 10.6-6.3H274c9.5-.1 15.2 10.4 10.1 18.4zM384 121.9v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"></path>
+<path d="M160 237H108V288H160V237Z" />
+<path d="M160 320H108V370H160V320Z" />
+<path d="M192 370V320H276V370H192Z" />
+<path d="M192 288V237H276V288H192Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224 0V136C224 149.2 234.8 160 248 160H384V488C384 501.3 373.3 512 360 512H24C10.7 512 0 501.3 0 488V24C0 10.7 10.7 0 24 0H224ZM87 205C80.9249 205 76 209.925 76 216V391C76 397.075 80.9249 402 87 402H297C303.075 402 308 397.075 308 391V216C308 209.925 303.075 205 297 205H87Z" />
+<path d="M384 128V121.9C384 115.6 381.5 109.5 377 105L279.1 7C274.6 2.5 268.5 0 262.1 0H256V128H384Z" />
     </g>
 </svg>
+
diff --git a/packages/design-system/src/helpers/resourceIconMapping.json b/packages/design-system/src/helpers/resourceIconMapping.json
index 1c6765c280e..5074af30d1e 100644
--- a/packages/design-system/src/helpers/resourceIconMapping.json
+++ b/packages/design-system/src/helpers/resourceIconMapping.json
@@ -87,6 +87,14 @@
     "name": "resource-type-document",
     "color": "var(--oc-color-icon-document)"
   },
+  "docf": {
+    "name": "resource-type-form",
+    "color": "var(--oc-color-icon-document)"
+  },
+  "oform": {
+    "name": "resource-type-form",
+    "color": "var(--oc-color-icon-document)"
+  },
   "docm": {
     "name": "resource-type-document",
     "color": "var(--oc-color-icon-document)"
@@ -196,7 +204,7 @@
     "color": "var(--oc-color-icon-document)"
   },
   "md": {
-    "name": "resource-type-file",
+    "name": "resource-type-markdown",
     "color": "var(--oc-color-text-default)"
   },
   "mdb": {