From e709a45ab05ac354cfcec776f64ac5b6acb0ac32 Mon Sep 17 00:00:00 2001
From: "moxun.ljf" <moxun.ljf@alibaba-inc.com>
Date: Thu, 12 Nov 2020 00:33:21 +0800
Subject: [PATCH] compatible with Android Studio 4.1 Fix the
 #42,#43,#51,#52,#54

---
 build.gradle                               |  16 +++++--
 resources/META-INF/plugin.xml              |  11 +++--
 resources/icons/menu-open.png              | Bin 0 -> 247 bytes
 resources/icons/{icon.png => s2v_icon.png} | Bin
 resources/icons/s2v_icon.svg               |   1 +
 resources/icons/s2v_icon_16.svg            |   1 +
 src/com/moxun/s2v/GUI.form                 |  47 +++++++++++----------
 7 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 resources/icons/menu-open.png
 rename resources/icons/{icon.png => s2v_icon.png} (100%)
 create mode 100644 resources/icons/s2v_icon.svg
 create mode 100644 resources/icons/s2v_icon_16.svg

diff --git a/build.gradle b/build.gradle
index 0042e81..edf2aeb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 //http://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system.html
 
 buildscript {
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.3.72'
     repositories {
         maven {
             url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
@@ -14,7 +14,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.17"
+    id "org.jetbrains.intellij" version "0.6.3"
 }
 
 apply plugin: 'idea'
@@ -31,7 +31,9 @@ repositories {
 
 intellij {
     intellij.updateSinceUntilBuild false
-    version 'IC-2016.3'
+    version '201.8743.12'
+    type 'IC'
+    plugins = ['com.intellij.java','android', 'java']
 }
 
 sourceSets {
@@ -56,5 +58,11 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+
+runIde {
+    // Absolute path to installed target 3.5 Android Studio to use as IDE Development Instance
+    // The "Contents" directory is macOS specific.
+    ideDirectory '/Applications/Android Studio.app/Contents'
 }
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 26a2e4f..9643ee1 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,8 +1,8 @@
 <idea-plugin version="2">
     <id>com.moxun.plugin.s2v</id>
     <name>SVG2VectorDrawable</name>
-    <version>1.8.2</version>
-    <vcode>20</vcode>
+    <version>1.8.3</version>
+    <vcode>21</vcode>
     <vendor email="furmint@foxmail.com">moxun</vendor>
 
     <description><![CDATA[
@@ -14,6 +14,9 @@
     ]]></description>
 
     <change-notes><![CDATA[
+      <b>1.8.3</b><br>
+      Fix compatible issue with Android Studio 4.1. (#51,#54)<br>
+      New icon. (#52)<br>
       <b>1.8.2</b><br>
       Fix compatible issue with Android Studio 3.6+. (#47,#48)<br>
       Fix incorrect output name when source file name with numbers. (#46)<br>
@@ -73,6 +76,8 @@
     <!-- uncomment to enable plugin in all products
     <depends>com.intellij.modules.lang</depends>
     -->
+    <depends>org.jetbrains.android</depends>
+    <depends>com.intellij.modules.java</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- Add your extensions here -->
@@ -92,7 +97,7 @@
     <actions>
         <!-- Add your actions here -->
         <action class="com.moxun.s2v.S2V" id="moxun.s2v" text="SVG to VectorDrawable"
-                description="Tool for transforming SVG to VectorDrawable" icon="/icons/icon.png">
+                description="Tool for transforming SVG to VectorDrawable" icon="/icons/s2v_icon_16.svg">
             <add-to-group group-id="MainToolBar" anchor="last"/>
         </action>
         
diff --git a/resources/icons/menu-open.png b/resources/icons/menu-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ca21ad525ea30dfc2e48ef3edf720801c184379
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^@JY5_^
zEPAg78gel?^336Edb;(Rnb^O#0WKRhd}iLAom}~CTip>a$91A>Qq~KmbWUy0DP+qj
zS=FLqJelQ3^#{=@sVgJb_8IoAUbU-S(8E19LgeTZY4*7siXSF33s*(n>o{@3vV5b^
z6YVphTNQU2@=pGJt#Q>n#vD(%o=5x)o4>Is8L94MFfb5Wv-kV*YmFT;!Cuy<RZeQ3
s6#ek6b;>063+Aiz=N6kMzhD2Dvn<z8q+W_o1L$rBPgg&ebxsLQ03Tmq5dZ)H

literal 0
HcmV?d00001

diff --git a/resources/icons/icon.png b/resources/icons/s2v_icon.png
similarity index 100%
rename from resources/icons/icon.png
rename to resources/icons/s2v_icon.png
diff --git a/resources/icons/s2v_icon.svg b/resources/icons/s2v_icon.svg
new file mode 100644
index 0000000..d97519e
--- /dev/null
+++ b/resources/icons/s2v_icon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1605108356249" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9785" width="18" height="18" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M192 384h640a42.667 42.667 0 0 1 42.667 42.667v362.666A42.667 42.667 0 0 1 832 832H192v106.667A21.333 21.333 0 0 0 213.333 960h725.334A21.333 21.333 0 0 0 960 938.667V308.82l-10.09-10.154H823.38a98.048 98.048 0 0 1-98.048-98.048V72.66L716.715 64H213.333A21.333 21.333 0 0 0 192 85.333V384z m-64 448H42.667A42.667 42.667 0 0 1 0 789.333V426.667A42.667 42.667 0 0 1 42.667 384H128V85.333A85.333 85.333 0 0 1 213.333 0H743.36L1024 282.453v656.214A85.333 85.333 0 0 1 938.667 1024H213.333A85.333 85.333 0 0 1 128 938.667V832z m61.376-364.885c-27.435 0-49.899 6.528-67.712 19.968-19.221 13.824-28.501 33.024-28.501 57.216s9.621 42.624 29.226 55.296c7.467 4.608 27.094 12.288 58.432 23.04 28.139 9.216 44.523 15.36 49.515 18.048 15.68 8.448 23.872 19.968 23.872 34.56 0 11.52-5.696 20.352-16.384 27.264-10.688 6.528-25.664 9.984-44.181 9.984-21.014 0-36.352-4.224-46.315-11.904-11.05-8.832-17.813-23.808-20.672-44.544H85.333c1.792 34.944 13.547 60.288 34.923 76.416 17.45 13.056 42.027 19.584 73.387 19.584 32.426 0 57.706-7.296 75.52-21.12 17.813-14.208 26.73-33.792 26.73-58.368 0-25.344-11.05-44.928-33.13-59.136-9.984-6.144-32.064-15.36-66.624-26.88-23.51-8.064-38.123-13.824-43.478-16.896-12.096-6.912-17.813-16.512-17.813-28.032 0-13.056 4.992-22.656 15.68-28.416 8.555-4.992 20.672-7.296 36.693-7.296 18.539 0 32.79 3.456 42.048 11.136 9.259 7.296 16.022 19.584 19.584 36.48h41.344c-2.496-29.952-12.821-52.224-30.656-66.432-16.725-13.44-40.256-19.968-70.186-19.968z m118.976 5.376l90.496 274.176h50.24l90.496-274.176h-45.227l-69.845 223.488h-1.067L353.6 472.49h-45.227z m368.405-5.376c-37.76 0-67.69 13.824-89.792 42.24-21.013 26.496-31.36 60.288-31.36 101.376 0 40.704 10.347 74.112 31.36 99.84 22.443 27.648 53.803 41.472 94.422 41.472 22.805 0 43.093-3.072 61.632-9.216a143.83 143.83 0 0 0 46.314-26.112V600.747H680.32v38.4h67.328v56.448c-8.533 5.376-17.45 9.6-27.435 12.672a123.285 123.285 0 0 1-34.197 4.608c-30.997 0-53.803-9.216-68.416-27.648-13.525-17.28-20.31-42.24-20.31-74.496 0-33.792 7.489-59.52 22.827-77.952 13.867-17.664 32.768-26.112 56.64-26.112 19.222 0 34.902 4.224 46.656 13.056 11.414 8.832 19.243 21.888 22.827 39.552h42.027c-4.63-30.72-16.043-53.376-34.198-68.736-18.88-15.744-44.544-23.424-77.312-23.424z" p-id="9786" fill="#3ddc84" data-spm-anchor-id="a313x.7781069.0.i18" class="selected"></path></svg>
\ No newline at end of file
diff --git a/resources/icons/s2v_icon_16.svg b/resources/icons/s2v_icon_16.svg
new file mode 100644
index 0000000..db8bf9d
--- /dev/null
+++ b/resources/icons/s2v_icon_16.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1605108514049" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10094" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M192 384h640a42.667 42.667 0 0 1 42.667 42.667v362.666A42.667 42.667 0 0 1 832 832H192v106.667A21.333 21.333 0 0 0 213.333 960h725.334A21.333 21.333 0 0 0 960 938.667V308.82l-10.09-10.154H823.38a98.048 98.048 0 0 1-98.048-98.048V72.66L716.715 64H213.333A21.333 21.333 0 0 0 192 85.333V384z m-64 448H42.667A42.667 42.667 0 0 1 0 789.333V426.667A42.667 42.667 0 0 1 42.667 384H128V85.333A85.333 85.333 0 0 1 213.333 0H743.36L1024 282.453v656.214A85.333 85.333 0 0 1 938.667 1024H213.333A85.333 85.333 0 0 1 128 938.667V832z m61.376-364.885c-27.435 0-49.899 6.528-67.712 19.968-19.221 13.824-28.501 33.024-28.501 57.216s9.621 42.624 29.226 55.296c7.467 4.608 27.094 12.288 58.432 23.04 28.139 9.216 44.523 15.36 49.515 18.048 15.68 8.448 23.872 19.968 23.872 34.56 0 11.52-5.696 20.352-16.384 27.264-10.688 6.528-25.664 9.984-44.181 9.984-21.014 0-36.352-4.224-46.315-11.904-11.05-8.832-17.813-23.808-20.672-44.544H85.333c1.792 34.944 13.547 60.288 34.923 76.416 17.45 13.056 42.027 19.584 73.387 19.584 32.426 0 57.706-7.296 75.52-21.12 17.813-14.208 26.73-33.792 26.73-58.368 0-25.344-11.05-44.928-33.13-59.136-9.984-6.144-32.064-15.36-66.624-26.88-23.51-8.064-38.123-13.824-43.478-16.896-12.096-6.912-17.813-16.512-17.813-28.032 0-13.056 4.992-22.656 15.68-28.416 8.555-4.992 20.672-7.296 36.693-7.296 18.539 0 32.79 3.456 42.048 11.136 9.259 7.296 16.022 19.584 19.584 36.48h41.344c-2.496-29.952-12.821-52.224-30.656-66.432-16.725-13.44-40.256-19.968-70.186-19.968z m118.976 5.376l90.496 274.176h50.24l90.496-274.176h-45.227l-69.845 223.488h-1.067L353.6 472.49h-45.227z m368.405-5.376c-37.76 0-67.69 13.824-89.792 42.24-21.013 26.496-31.36 60.288-31.36 101.376 0 40.704 10.347 74.112 31.36 99.84 22.443 27.648 53.803 41.472 94.422 41.472 22.805 0 43.093-3.072 61.632-9.216a143.83 143.83 0 0 0 46.314-26.112V600.747H680.32v38.4h67.328v56.448c-8.533 5.376-17.45 9.6-27.435 12.672a123.285 123.285 0 0 1-34.197 4.608c-30.997 0-53.803-9.216-68.416-27.648-13.525-17.28-20.31-42.24-20.31-74.496 0-33.792 7.489-59.52 22.827-77.952 13.867-17.664 32.768-26.112 56.64-26.112 19.222 0 34.902 4.224 46.656 13.056 11.414 8.832 19.243 21.888 22.827 39.552h42.027c-4.63-30.72-16.043-53.376-34.198-68.736-18.88-15.744-44.544-23.424-77.312-23.424z" p-id="10095" fill="#3ddc84"></path></svg>
\ No newline at end of file
diff --git a/src/com/moxun/s2v/GUI.form b/src/com/moxun/s2v/GUI.form
index 3d0c71e..9b93253 100644
--- a/src/com/moxun/s2v/GUI.form
+++ b/src/com/moxun/s2v/GUI.form
@@ -3,16 +3,18 @@
   <grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="188" y="450" width="710" height="400"/>
+      <xy x="188" y="710" width="710" height="140"/>
     </constraints>
     <properties>
-      <preferredSize width="580" height="180"/>
+      <preferredSize width="580" height="120"/>
     </properties>
     <border type="none"/>
     <children>
       <component id="71544" class="javax.swing.JTextField" binding="svgPath">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
         </constraints>
         <properties>
           <background color="-1579033"/>
@@ -22,40 +24,37 @@
       </component>
       <component id="961ad" class="javax.swing.JLabel">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="SVG Path"/>
+          <text value="Path of svg:"/>
         </properties>
       </component>
       <component id="3d5bf" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="XML To"/>
+          <text value="Module to gen:"/>
         </properties>
       </component>
       <component id="babd5" class="javax.swing.JButton" binding="svgSelectBtn">
         <constraints>
-          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-            <minimum-size width="20" height="20"/>
-            <preferred-size width="25" height="25"/>
-            <maximum-size width="25" height="25"/>
+          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
+            <minimum-size width="24" height="24"/>
+            <preferred-size width="24" height="24"/>
+            <maximum-size width="24" height="24"/>
           </grid>
         </constraints>
         <properties>
-          <actionCommand value="···"/>
-          <alignmentY value="0.0"/>
-          <text value="···"/>
-          <verticalAlignment value="0"/>
+          <actionCommand value=""/>
+          <icon value="icons/menu-open.png"/>
+          <text value=""/>
         </properties>
       </component>
       <component id="29dea" class="javax.swing.JComboBox" binding="moduleChooser">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="184" height="27"/>
-          </grid>
+          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <model/>
@@ -63,10 +62,10 @@
       </component>
       <component id="e5369" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="XML Name"/>
+          <text value="Name of xml:"/>
         </properties>
       </component>
       <component id="20693" class="javax.swing.JTextField" binding="xmlName">
@@ -81,7 +80,7 @@
       </component>
       <component id="f4c65" class="javax.swing.JCheckBox" binding="batch">
         <constraints>
-          <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Batch"/>
@@ -89,7 +88,7 @@
       </component>
       <component id="22a9e" class="javax.swing.JComboBox" binding="dpiChooser">
         <constraints>
-          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <model>
@@ -105,9 +104,11 @@
       </component>
       <component id="78277" class="javax.swing.JButton" binding="generateButton" default-binding="true">
         <constraints>
-          <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <enabled value="true"/>
+          <hideActionText value="false"/>
           <text value="Generate"/>
         </properties>
       </component>