From 6d88d46ce42d400e62da85162fbb23300d4ec38a Mon Sep 17 00:00:00 2001 From: Michael Irigoyen Date: Thu, 21 Jul 2022 04:43:48 -0500 Subject: [PATCH] Update Material Design Icons to v7.0.96 (#13175) * Update Material Design Icons to v7.0.96 * Fetch updated MDI packages --- build-scripts/removedIcons.json | 31 ++++++++++- package.json | 4 +- src/common/const.ts | 4 +- src/components/ha-icon.ts | 97 ++++++++++++++++++++++++++++++++- yarn.lock | 20 +++---- 5 files changed, 140 insertions(+), 16 deletions(-) diff --git a/build-scripts/removedIcons.json b/build-scripts/removedIcons.json index fe51488c70..02499346dd 100644 --- a/build-scripts/removedIcons.json +++ b/build-scripts/removedIcons.json @@ -1 +1,30 @@ -[] +[ + { + "path": "M20,20H7A2,2 0 0,1 5,18V8.94L2.23,5.64C2.09,5.47 2,5.24 2,5A1,1 0 0,1 3,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M8.5,7A0.5,0.5 0 0,0 8,7.5V8.5A0.5,0.5 0 0,0 8.5,9H18.5A0.5,0.5 0 0,0 19,8.5V7.5A0.5,0.5 0 0,0 18.5,7H8.5M8.5,11A0.5,0.5 0 0,0 8,11.5V12.5A0.5,0.5 0 0,0 8.5,13H18.5A0.5,0.5 0 0,0 19,12.5V11.5A0.5,0.5 0 0,0 18.5,11H8.5M8.5,15A0.5,0.5 0 0,0 8,15.5V16.5A0.5,0.5 0 0,0 8.5,17H13.5A0.5,0.5 0 0,0 14,16.5V15.5A0.5,0.5 0 0,0 13.5,15H8.5Z", + "name": "android-messages" + }, + { + "path": "M4,6H2V20A2,2 0 0,0 4,22H18V20H4V6M20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2M20,12L17.5,10.5L15,12V4H20V12Z", + "name": "book-variant-multiple" + }, + { + "path": "M21,14H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10L8,21V22H16V21L14,18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z", + "name": "desktop-mac" + }, + { + "path": "M21,14V4H3V14H21M21,2A2,2 0 0,1 23,4V16A2,2 0 0,1 21,18H14L16,21V22H8V21L10,18H3C1.89,18 1,17.1 1,16V4C1,2.89 1.89,2 3,2H21M4,5H15V10H4V5M16,5H20V7H16V5M20,8V13H16V8H20M4,11H9V13H4V11M10,11H15V13H10V11Z", + "name": "desktop-mac-dashboard" + }, + { + "path": "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z", + "name": "discord" + }, + { + "path": "M8.06,7.78C7.5,7.78 7.17,7.73 7.08,7.64L6.66,13.73C7.19,14.05 7.88,14.3 8.72,14.5C9.56,14.71 10.78,14.77 12.38,14.67C13.97,14.58 15.63,14.23 17.34,13.64L16.55,4.22C15.67,5.09 14.38,5.91 12.66,6.66C11.13,7.31 9.81,7.69 8.72,7.78H8.06M7.97,5.34C7.28,5.94 7,6.34 7.13,6.56C7.22,6.78 7.7,6.84 8.58,6.75C9.67,6.66 10.91,6.31 12.28,5.72C13.22,5.31 14.03,4.88 14.72,4.41C15.41,3.94 15.88,3.55 16.13,3.23C16.38,2.92 16.47,2.7 16.41,2.58C16.34,2.42 16.03,2.34 15.47,2.34C14.34,2.34 12.94,2.7 11.25,3.42C9.81,4.05 8.72,4.69 7.97,5.34M17.34,2.2C17.41,2.33 17.44,2.47 17.44,2.63L18.61,17C18.61,18.73 18,20.09 16.83,21.07C15.64,22.05 14.03,22.55 12,22.55C10,22.55 8.4,22.04 7.2,21C6,20 5.39,18.64 5.39,16.92L6.09,6.47C6.09,6.22 6.2,5.94 6.42,5.63C6.64,5.31 6.84,5.06 7.03,4.88L7.36,4.59C8.33,3.78 9.5,3.08 10.88,2.5C11.81,2.08 12.73,1.77 13.62,1.57C14.5,1.37 15.3,1.3 16,1.38C16.71,1.46 17.16,1.73 17.34,2.2Z", + "name": "google-home" + }, + { + "path": "M19.25,19H4.75V3H19.25M14,22H10V21H14M18,0H6A3,3 0 0,0 3,3V21A3,3 0 0,0 6,24H18A3,3 0 0,0 21,21V3A3,3 0 0,0 18,0Z", + "name": "tablet-android" + } +] diff --git a/package.json b/package.json index b0f426ea1c..2b7bbf967a 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "@material/mwc-textfield": "0.25.3", "@material/mwc-top-app-bar-fixed": "^0.25.3", "@material/top-app-bar": "14.0.0-canary.261f2db59.0", - "@mdi/js": "6.9.96", - "@mdi/svg": "6.9.96", + "@mdi/js": "7.0.96", + "@mdi/svg": "7.0.96", "@polymer/app-layout": "^3.1.0", "@polymer/iron-flex-layout": "^3.0.1", "@polymer/iron-icon": "^3.0.1", diff --git a/src/common/const.ts b/src/common/const.ts index 0e16d6db32..68489f95d2 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -47,7 +47,7 @@ import { mdiRobotVacuum, mdiScriptText, mdiSineWave, - mdiTextToSpeech, + mdiMicrophoneMessage, mdiThermometer, mdiThermostat, mdiTimerOutline, @@ -74,7 +74,7 @@ export const FIXED_DOMAIN_ICONS = { camera: mdiVideo, climate: mdiThermostat, configurator: mdiCog, - conversation: mdiTextToSpeech, + conversation: mdiMicrophoneMessage, counter: mdiCounter, demo: mdiHomeAssistant, fan: mdiFan, diff --git a/src/components/ha-icon.ts b/src/components/ha-icon.ts index a35808ba92..412d590931 100644 --- a/src/components/ha-icon.ts +++ b/src/components/ha-icon.ts @@ -29,7 +29,102 @@ interface DeprecatedIcon { }; } -const mdiDeprecatedIcons: DeprecatedIcon = {}; +const mdiDeprecatedIcons: DeprecatedIcon = { + "android-messages": { + newName: "message-text", + removeIn: "2022.10", + }, + "book-variant-multiple": { + newName: "bookmark-box-multiple", + removeIn: "2022.10", + }, + "desktop-mac": { + newName: "monitor", + removeIn: "2022.10", + }, + "desktop-mac-dashboard": { + newName: "monitor-dashboard", + removeIn: "2022.10", + }, + discord: { + removeIn: "2022.10", + }, + "diving-scuba": { + newName: "diving-scuba-mask", + removeIn: "2022.10", + }, + "email-send": { + newName: "email-arrow-right", + removeIn: "2022.10", + }, + "email-send-outline": { + newName: "email-arrow-right-outline", + removeIn: "2022.10", + }, + "email-receive": { + newName: "email-arrow-left", + removeIn: "2022.10", + }, + "email-receive-outline": { + newName: "email-arrow-left-outline", + removeIn: "2022.10", + }, + "format-textdirection-r-to-l": { + newName: "format-pilcrow-arrow-left", + removeIn: "2022.10", + }, + "format-textdirection-l-to-r": { + newName: "format-pilcrow-arrow-right", + removeIn: "2022.10", + }, + "google-controller": { + newName: "controller", + removeIn: "2022.10", + }, + "google-controller-off": { + newName: "controller-off", + removeIn: "2022.10", + }, + "google-home": { + removeIn: "2022.10", + }, + lecturn: { + newName: "lectern", + removeIn: "2022.10", + }, + receipt: { + newName: "receipt-text", + removeIn: "2022.10", + }, + "receipt-outline": { + newName: "receipt-text-outline", + removeIn: "2022.10", + }, + "tablet-android": { + newName: "tablet", + removeIn: "2022.10", + }, + "text-to-speech": { + newName: "microphone-message", + removeIn: "2022.10", + }, + "text-to-speech-off": { + newName: "microphone-message-off", + removeIn: "2022.10", + }, + "timeline-help": { + newName: "timeline-question", + removeIn: "2022.10", + }, + "timeline-help-outline": { + newName: "timeline-question-outline", + removeIn: "2022.10", + }, + "vector-point": { + newName: "vector-point-select", + removeIn: "2022.10", + }, +}; const chunks: Chunks = {}; diff --git a/yarn.lock b/yarn.lock index d21c1833a5..d2ff85dab8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2975,17 +2975,17 @@ __metadata: languageName: node linkType: hard -"@mdi/js@npm:6.9.96": - version: 6.9.96 - resolution: "@mdi/js@npm:6.9.96" - checksum: 94c43271585981e7ebf8cc5e3ead11915eea1339b79e849b351fbaae58e9626aaca0a8b031f0e80754d880ea6b08fd715906588f3cf980603bb5f6871bff12cc +"@mdi/js@npm:7.0.96": + version: 7.0.96 + resolution: "@mdi/js@npm:7.0.96" + checksum: 4bcc4542a2d8ba9e706a754333e90ce2677616709d3776016b83be59c7219e7514308dbca6e62c7dd38436b3c5d251b8769679c90e354f971b090fa2ebcbc4fe languageName: node linkType: hard -"@mdi/svg@npm:6.9.96": - version: 6.9.96 - resolution: "@mdi/svg@npm:6.9.96" - checksum: 3e45f9a6632b0aa22f02ab0023d44131e3aea308bae85160445fe1f8f0b6d61df5c01e2756d18bd1461f7314fbf7c00a397bf99670f55803d90de5fa8e3fe33e +"@mdi/svg@npm:7.0.96": + version: 7.0.96 + resolution: "@mdi/svg@npm:7.0.96" + checksum: 434994401283e4f790dd9d7061d5781fc8eec24f85b7be33d07a32a9fecb9a268437b35fa3c30ee4fe433d49f7f69674571494510aaa9efade05fb4e8e71755f languageName: node linkType: hard @@ -9047,8 +9047,8 @@ fsevents@^1.2.7: "@material/mwc-textfield": 0.25.3 "@material/mwc-top-app-bar-fixed": ^0.25.3 "@material/top-app-bar": 14.0.0-canary.261f2db59.0 - "@mdi/js": 6.9.96 - "@mdi/svg": 6.9.96 + "@mdi/js": 7.0.96 + "@mdi/svg": 7.0.96 "@open-wc/dev-server-hmr": ^0.0.2 "@polymer/app-layout": ^3.1.0 "@polymer/iron-flex-layout": ^3.0.1