Update to new Fuchsia icon
Change-Id: I81b853819a06a2dcdd294eea7cf0518bad547c64
Reviewed-on: https://fuchsia-review.googlesource.com/c/intellij-language-fidl/+/627322
Reviewed-by: Alex Zaslavsky <azaslavsky@google.com>
diff --git a/BUILD b/BUILD
index 5580248..323cb4a 100644
--- a/BUILD
+++ b/BUILD
@@ -8,6 +8,8 @@
name = "config",
srcs = [
"resources/META-INF/plugin.xml",
+ "resources/META-INF/pluginIcon.svg",
+ "resources/META-INF/pluginIcon_dark.svg",
],
)
@@ -30,11 +32,10 @@
cmd =
""" absolutify() { [[ "$$1" =~ ^/ ]] && echo "$$1" || echo "$$PWD/$$1"; };
TMP=`absolutify $$(mktemp -d -p .)`;
- ICONS=`absolutify $(location //src/fuchsia/developer/plugin/fidl:icons)`;
JAR=`absolutify $(JAVABASE)`/bin/jar;
OUT=`absolutify $(@D)`;
PLUGIN=`absolutify $(location :fidlplugin_jar_deploy.jar)`;
- CONFIG=`absolutify $(locations :config)`;
+ CONFIG=`for i in $(locations :config); do absolutify $$i; done`;
JARJAR=`absolutify $(location //jarjar:jarjar_bin)`;
RULES_LOC=`absolutify $(location :jarjar_rules)`;
cd $${TMP};
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 43520ce..b495af0 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -23,6 +23,7 @@
<li>Enabled configurable style/formatting.</li>
<li>Fixed bug where syntax highlighting was applied incorrectly.</li>
<li>New checks for string literal correctness.</li>
+ <li>Use updated Fuchsia icon.</li>
</ul>
</li>
<li><b>0.17</b>
diff --git a/resources/META-INF/pluginIcon.svg b/resources/META-INF/pluginIcon.svg
new file mode 100644
index 0000000..c692d7e
--- /dev/null
+++ b/resources/META-INF/pluginIcon.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#2F2F31;}
+</style>
+<g>
+ <path class="st0" d="M124.92,112.55c19.04,1.48,37.89-6.83,40.18-27.69c0.06-0.7-0.23-1.52-0.93-1.84
+ c-0.74-0.35-1.8-0.29-2.47,1.01c-9.73,21.35-34.78,13.81-44.86,11.64c-11.94-2.52-24.31-5.09-40.97-5.28
+ c-19.04,0.46-31.47,5.69-42.82,19.81c-11.5,14.3-13.1,43.54,8.01,59.54c22.5,17.06,50.15,8.48,61.87-3.52
+ c14.28-14.62,18.86-33.96,16.6-51.37c-7.86-1.12-15.59-2.67-22.93-4.07c-27.16-5.16-43.46,0.03-51.23,15.99
+ c-3.8,7.8-3.78,16.61,0.04,24.17c4.02,7.96,11.58,13.33,21.27,15.12c11.73,2.16,22.78-0.58,31.12-7.72
+ c10-8.57,15.22-22.86,14.75-40.18l2.94,0.49c0.43,17.94-5.24,32.81-15.79,41.91c-6.15,5.31-17.24,11.21-33.55,8.38
+ c-11.97-2.08-19.68-9.4-23.35-16.67c-4.23-8.39-4.26-18.14-0.06-26.77c4.26-8.74,10.75-14.4,19.85-17.3
+ c8.95-2.85,20.25-2.99,34.54-0.29C107.4,109.85,119.63,112.14,124.92,112.55z M82.04,138.13c-5.53,10.54-19.64,12.38-26.31,5.2
+ c-6.79-7.31-2.92-17.37,3-22.5c6.87-5.95,17.09-8.15,27.17-6.33C85.72,124.46,84.96,132.57,82.04,138.13z"/>
+ <path class="st0" d="M83.67,87.73c6.52,0.2,20.58,2.04,33.57,5.04c-4.64-19.94,0.08-36.6,14.67-42.13
+ c15.81-5.99,30.43,3.82,33.21,19.04c0.27,1.51,1,1.96,2,2.09c0.98,0.13,2.06-0.43,2.4-1.63c4.48-17.91-3.64-31.32-11.9-38.31
+ c-10.75-9.1-24.84-10.03-34.55-8.01C93.99,29.87,82.15,57.08,83.67,87.73z M168.2,67.37c2.59-11.7-10.37-41.41-38.98-38.38
+ c-12.84,1.36-23.52,8.46-29.25,16.81c-6.71,9.77-9.19,22.68-9.19,38.53l-2.92-0.27c-0.04-10.08,0.52-26.43,9.15-39.14
+ c6.14-9.05,16.73-16.82,30.22-18.59C160.37,22,172.2,55.61,168.2,67.37z"/>
+</g>
+</svg>
diff --git a/resources/META-INF/pluginIcon_dark.svg b/resources/META-INF/pluginIcon_dark.svg
new file mode 100644
index 0000000..151a14d
--- /dev/null
+++ b/resources/META-INF/pluginIcon_dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-1{fill:#f1f3f4;}</style></defs><path class="cls-1" d="M176,156.75c20,1.56,39.83-7.18,42.23-29.1a1.93,1.93,0,0,0-1-1.94,1.89,1.89,0,0,0-2.6,1.06c-10.22,22.45-36.56,14.52-47.15,12.24-12.55-2.65-25.56-5.35-43.08-5.55-20,.49-33.08,6-45,20.82-12.09,15-13.77,45.77,8.42,62.59,23.65,17.94,52.72,8.92,65-3.7,15-15.37,19.83-35.7,17.45-54-8.26-1.18-16.39-2.81-24.1-4.28-28.56-5.42-45.69,0-53.86,16.81a28.4,28.4,0,0,0,0,25.41c4.23,8.38,12.17,14,22.36,15.9,12.34,2.27,24-.62,32.71-8.12,10.52-9,16-24,15.51-42.24l3.09.52c.45,18.85-5.52,34.48-16.6,44.05C143,212.8,131.35,219,114.2,216c-12.58-2.18-20.69-9.88-24.54-17.53a31.45,31.45,0,0,1-.06-28.14,33.51,33.51,0,0,1,20.87-18.19c9.4-3,21.29-3.15,36.31-.3C157.57,153.92,170.44,156.32,176,156.75Zm-45.09,26.9c-5.81,11.08-20.64,13-27.66,5.47s-3.07-18.26,3.15-23.66c7.22-6.26,18-8.56,28.57-6.65C134.78,169.27,134,177.8,130.91,183.65Z"/><path class="cls-1" d="M132.62,130.66c6.86.22,21.64,2.15,35.29,5.3-4.88-21,.08-38.48,15.43-44.3,16.62-6.3,32,4,34.91,20,.28,1.59,1.05,2.07,2.1,2.2a2.29,2.29,0,0,0,2.52-1.71c4.71-18.83-3.83-32.93-12.51-40.28-11.3-9.57-26.11-10.54-36.32-8.41C143.47,69.84,131,98.44,132.62,130.66Zm88.87-21.4c2.72-12.29-10.9-43.53-41-40.34-13.5,1.43-24.73,8.89-30.75,17.67-7.06,10.27-9.66,23.83-9.66,40.5l-3.08-.28c0-10.6.55-27.79,9.62-41.15a45.75,45.75,0,0,1,31.77-19.54C213.26,61.56,225.7,96.9,221.49,109.26Z"/></svg>
\ No newline at end of file
diff --git a/src/fuchsia/developer/plugin/fidl/BUILD b/src/fuchsia/developer/plugin/fidl/BUILD
index 5c8efac..7ad95f0 100644
--- a/src/fuchsia/developer/plugin/fidl/BUILD
+++ b/src/fuchsia/developer/plugin/fidl/BUILD
@@ -159,7 +159,10 @@
"icons/T.png",
"icons/U.png",
"icons/X.png",
- "icons/fuchsia-logo-16x16.png",
+ "icons/fuchsia-logo.svg",
+ "icons/fuchsia-logo@2x.svg",
+ "icons/fuchsia-logo@2x_dark.svg",
+ "icons/fuchsia-logo_dark.svg",
],
visibility = ["//visibility:public"],
deps = [
@@ -173,6 +176,11 @@
filegroup(
name = "icons",
- srcs = ["icons/fuchsia-logo-16x16.png"],
+ srcs = [
+ "icons/fuchsia-logo.svg",
+ "icons/fuchsia-logo@2x.svg",
+ "icons/fuchsia-logo@2x_dark.svg",
+ "icons/fuchsia-logo_dark.svg",
+ ],
visibility = ["//visibility:public"],
)
diff --git a/src/fuchsia/developer/plugin/fidl/Icons.java b/src/fuchsia/developer/plugin/fidl/Icons.java
index 1ef7e98..c31cd56 100644
--- a/src/fuchsia/developer/plugin/fidl/Icons.java
+++ b/src/fuchsia/developer/plugin/fidl/Icons.java
@@ -9,5 +9,5 @@
public class Icons {
public static final Icon FILE =
- IconLoader.getIcon("/fuchsia/developer/plugin/fidl/icons/fuchsia-logo-16x16.png");
+ IconLoader.getIcon("/fuchsia/developer/plugin/fidl/icons/fuchsia-logo.svg");
}
diff --git a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo-16x16.png b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo-16x16.png
deleted file mode 100644
index b984fdb..0000000
--- a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo-16x16.png
+++ /dev/null
Binary files differ
diff --git a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo.svg b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo.svg
new file mode 100644
index 0000000..c692d7e
--- /dev/null
+++ b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#2F2F31;}
+</style>
+<g>
+ <path class="st0" d="M124.92,112.55c19.04,1.48,37.89-6.83,40.18-27.69c0.06-0.7-0.23-1.52-0.93-1.84
+ c-0.74-0.35-1.8-0.29-2.47,1.01c-9.73,21.35-34.78,13.81-44.86,11.64c-11.94-2.52-24.31-5.09-40.97-5.28
+ c-19.04,0.46-31.47,5.69-42.82,19.81c-11.5,14.3-13.1,43.54,8.01,59.54c22.5,17.06,50.15,8.48,61.87-3.52
+ c14.28-14.62,18.86-33.96,16.6-51.37c-7.86-1.12-15.59-2.67-22.93-4.07c-27.16-5.16-43.46,0.03-51.23,15.99
+ c-3.8,7.8-3.78,16.61,0.04,24.17c4.02,7.96,11.58,13.33,21.27,15.12c11.73,2.16,22.78-0.58,31.12-7.72
+ c10-8.57,15.22-22.86,14.75-40.18l2.94,0.49c0.43,17.94-5.24,32.81-15.79,41.91c-6.15,5.31-17.24,11.21-33.55,8.38
+ c-11.97-2.08-19.68-9.4-23.35-16.67c-4.23-8.39-4.26-18.14-0.06-26.77c4.26-8.74,10.75-14.4,19.85-17.3
+ c8.95-2.85,20.25-2.99,34.54-0.29C107.4,109.85,119.63,112.14,124.92,112.55z M82.04,138.13c-5.53,10.54-19.64,12.38-26.31,5.2
+ c-6.79-7.31-2.92-17.37,3-22.5c6.87-5.95,17.09-8.15,27.17-6.33C85.72,124.46,84.96,132.57,82.04,138.13z"/>
+ <path class="st0" d="M83.67,87.73c6.52,0.2,20.58,2.04,33.57,5.04c-4.64-19.94,0.08-36.6,14.67-42.13
+ c15.81-5.99,30.43,3.82,33.21,19.04c0.27,1.51,1,1.96,2,2.09c0.98,0.13,2.06-0.43,2.4-1.63c4.48-17.91-3.64-31.32-11.9-38.31
+ c-10.75-9.1-24.84-10.03-34.55-8.01C93.99,29.87,82.15,57.08,83.67,87.73z M168.2,67.37c2.59-11.7-10.37-41.41-38.98-38.38
+ c-12.84,1.36-23.52,8.46-29.25,16.81c-6.71,9.77-9.19,22.68-9.19,38.53l-2.92-0.27c-0.04-10.08,0.52-26.43,9.15-39.14
+ c6.14-9.05,16.73-16.82,30.22-18.59C160.37,22,172.2,55.61,168.2,67.37z"/>
+</g>
+</svg>
diff --git a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x.svg b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x.svg
new file mode 100644
index 0000000..c692d7e
--- /dev/null
+++ b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#2F2F31;}
+</style>
+<g>
+ <path class="st0" d="M124.92,112.55c19.04,1.48,37.89-6.83,40.18-27.69c0.06-0.7-0.23-1.52-0.93-1.84
+ c-0.74-0.35-1.8-0.29-2.47,1.01c-9.73,21.35-34.78,13.81-44.86,11.64c-11.94-2.52-24.31-5.09-40.97-5.28
+ c-19.04,0.46-31.47,5.69-42.82,19.81c-11.5,14.3-13.1,43.54,8.01,59.54c22.5,17.06,50.15,8.48,61.87-3.52
+ c14.28-14.62,18.86-33.96,16.6-51.37c-7.86-1.12-15.59-2.67-22.93-4.07c-27.16-5.16-43.46,0.03-51.23,15.99
+ c-3.8,7.8-3.78,16.61,0.04,24.17c4.02,7.96,11.58,13.33,21.27,15.12c11.73,2.16,22.78-0.58,31.12-7.72
+ c10-8.57,15.22-22.86,14.75-40.18l2.94,0.49c0.43,17.94-5.24,32.81-15.79,41.91c-6.15,5.31-17.24,11.21-33.55,8.38
+ c-11.97-2.08-19.68-9.4-23.35-16.67c-4.23-8.39-4.26-18.14-0.06-26.77c4.26-8.74,10.75-14.4,19.85-17.3
+ c8.95-2.85,20.25-2.99,34.54-0.29C107.4,109.85,119.63,112.14,124.92,112.55z M82.04,138.13c-5.53,10.54-19.64,12.38-26.31,5.2
+ c-6.79-7.31-2.92-17.37,3-22.5c6.87-5.95,17.09-8.15,27.17-6.33C85.72,124.46,84.96,132.57,82.04,138.13z"/>
+ <path class="st0" d="M83.67,87.73c6.52,0.2,20.58,2.04,33.57,5.04c-4.64-19.94,0.08-36.6,14.67-42.13
+ c15.81-5.99,30.43,3.82,33.21,19.04c0.27,1.51,1,1.96,2,2.09c0.98,0.13,2.06-0.43,2.4-1.63c4.48-17.91-3.64-31.32-11.9-38.31
+ c-10.75-9.1-24.84-10.03-34.55-8.01C93.99,29.87,82.15,57.08,83.67,87.73z M168.2,67.37c2.59-11.7-10.37-41.41-38.98-38.38
+ c-12.84,1.36-23.52,8.46-29.25,16.81c-6.71,9.77-9.19,22.68-9.19,38.53l-2.92-0.27c-0.04-10.08,0.52-26.43,9.15-39.14
+ c6.14-9.05,16.73-16.82,30.22-18.59C160.37,22,172.2,55.61,168.2,67.37z"/>
+</g>
+</svg>
diff --git a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x_dark.svg b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x_dark.svg
new file mode 100644
index 0000000..151a14d
--- /dev/null
+++ b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo@2x_dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-1{fill:#f1f3f4;}</style></defs><path class="cls-1" d="M176,156.75c20,1.56,39.83-7.18,42.23-29.1a1.93,1.93,0,0,0-1-1.94,1.89,1.89,0,0,0-2.6,1.06c-10.22,22.45-36.56,14.52-47.15,12.24-12.55-2.65-25.56-5.35-43.08-5.55-20,.49-33.08,6-45,20.82-12.09,15-13.77,45.77,8.42,62.59,23.65,17.94,52.72,8.92,65-3.7,15-15.37,19.83-35.7,17.45-54-8.26-1.18-16.39-2.81-24.1-4.28-28.56-5.42-45.69,0-53.86,16.81a28.4,28.4,0,0,0,0,25.41c4.23,8.38,12.17,14,22.36,15.9,12.34,2.27,24-.62,32.71-8.12,10.52-9,16-24,15.51-42.24l3.09.52c.45,18.85-5.52,34.48-16.6,44.05C143,212.8,131.35,219,114.2,216c-12.58-2.18-20.69-9.88-24.54-17.53a31.45,31.45,0,0,1-.06-28.14,33.51,33.51,0,0,1,20.87-18.19c9.4-3,21.29-3.15,36.31-.3C157.57,153.92,170.44,156.32,176,156.75Zm-45.09,26.9c-5.81,11.08-20.64,13-27.66,5.47s-3.07-18.26,3.15-23.66c7.22-6.26,18-8.56,28.57-6.65C134.78,169.27,134,177.8,130.91,183.65Z"/><path class="cls-1" d="M132.62,130.66c6.86.22,21.64,2.15,35.29,5.3-4.88-21,.08-38.48,15.43-44.3,16.62-6.3,32,4,34.91,20,.28,1.59,1.05,2.07,2.1,2.2a2.29,2.29,0,0,0,2.52-1.71c4.71-18.83-3.83-32.93-12.51-40.28-11.3-9.57-26.11-10.54-36.32-8.41C143.47,69.84,131,98.44,132.62,130.66Zm88.87-21.4c2.72-12.29-10.9-43.53-41-40.34-13.5,1.43-24.73,8.89-30.75,17.67-7.06,10.27-9.66,23.83-9.66,40.5l-3.08-.28c0-10.6.55-27.79,9.62-41.15a45.75,45.75,0,0,1,31.77-19.54C213.26,61.56,225.7,96.9,221.49,109.26Z"/></svg>
\ No newline at end of file
diff --git a/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo_dark.svg b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo_dark.svg
new file mode 100644
index 0000000..151a14d
--- /dev/null
+++ b/src/fuchsia/developer/plugin/fidl/icons/fuchsia-logo_dark.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><style>.cls-1{fill:#f1f3f4;}</style></defs><path class="cls-1" d="M176,156.75c20,1.56,39.83-7.18,42.23-29.1a1.93,1.93,0,0,0-1-1.94,1.89,1.89,0,0,0-2.6,1.06c-10.22,22.45-36.56,14.52-47.15,12.24-12.55-2.65-25.56-5.35-43.08-5.55-20,.49-33.08,6-45,20.82-12.09,15-13.77,45.77,8.42,62.59,23.65,17.94,52.72,8.92,65-3.7,15-15.37,19.83-35.7,17.45-54-8.26-1.18-16.39-2.81-24.1-4.28-28.56-5.42-45.69,0-53.86,16.81a28.4,28.4,0,0,0,0,25.41c4.23,8.38,12.17,14,22.36,15.9,12.34,2.27,24-.62,32.71-8.12,10.52-9,16-24,15.51-42.24l3.09.52c.45,18.85-5.52,34.48-16.6,44.05C143,212.8,131.35,219,114.2,216c-12.58-2.18-20.69-9.88-24.54-17.53a31.45,31.45,0,0,1-.06-28.14,33.51,33.51,0,0,1,20.87-18.19c9.4-3,21.29-3.15,36.31-.3C157.57,153.92,170.44,156.32,176,156.75Zm-45.09,26.9c-5.81,11.08-20.64,13-27.66,5.47s-3.07-18.26,3.15-23.66c7.22-6.26,18-8.56,28.57-6.65C134.78,169.27,134,177.8,130.91,183.65Z"/><path class="cls-1" d="M132.62,130.66c6.86.22,21.64,2.15,35.29,5.3-4.88-21,.08-38.48,15.43-44.3,16.62-6.3,32,4,34.91,20,.28,1.59,1.05,2.07,2.1,2.2a2.29,2.29,0,0,0,2.52-1.71c4.71-18.83-3.83-32.93-12.51-40.28-11.3-9.57-26.11-10.54-36.32-8.41C143.47,69.84,131,98.44,132.62,130.66Zm88.87-21.4c2.72-12.29-10.9-43.53-41-40.34-13.5,1.43-24.73,8.89-30.75,17.67-7.06,10.27-9.66,23.83-9.66,40.5l-3.08-.28c0-10.6.55-27.79,9.62-41.15a45.75,45.75,0,0,1,31.77-19.54C213.26,61.56,225.7,96.9,221.49,109.26Z"/></svg>
\ No newline at end of file
