update icon handling code

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -66,7 +66,7 @@ class AndroidBuild extends JavaBuild {
   static public final String min_sdk_watchface = "21"; // Lollipop (5.0)
 
   // Hard-coded target SDK, no longer user-selected.
-  static public final String target_sdk      = "22";  // Lollipop (5.1)
+  static public final String target_sdk      = "23";  // Marshmallow (6.0)
   static public final String target_platform = "android-" + target_sdk;
 
   static public int appComponent = FRAGMENT;
@@ -941,6 +941,8 @@ private void writeLocalProps(final File file) {
     writer.close();
   }
 
+  static final String ICON_192 = "icon-192.png";
+  static final String ICON_144 = "icon-144.png"; 
   static final String ICON_96 = "icon-96.png";
   static final String ICON_72 = "icon-72.png";
   static final String ICON_48 = "icon-48.png";
@@ -974,18 +976,24 @@ private void writeRes(File resFolder,
     File localIcon48 = new File(sketchFolder, ICON_48);
     File localIcon72 = new File(sketchFolder, ICON_72);
     File localIcon96 = new File(sketchFolder, ICON_96);
+    File localIcon144 = new File(sketchFolder, ICON_144);
+    File localIcon192 = new File(sketchFolder, ICON_192);    
 
 //    File drawableFolder = new File(resFolder, "drawable");
 //    drawableFolder.mkdirs()
     File buildIcon48 = new File(resFolder, "drawable/icon.png");
     File buildIcon36 = new File(resFolder, "drawable-ldpi/icon.png");
     File buildIcon72 = new File(resFolder, "drawable-hdpi/icon.png");
     File buildIcon96 = new File(resFolder, "drawable-xhdpi/icon.png");
+    File buildIcon144 = new File(resFolder, "drawable-xxhdpi/icon.png");
+    File buildIcon192 = new File(resFolder, "drawable-xxxhdpi/icon.png");    
 
     if (!localIcon36.exists() &&
         !localIcon48.exists() &&
         !localIcon72.exists() &&
-        !localIcon96.exists()) {
+        !localIcon96.exists() &&
+        !localIcon144.exists() &&
+        !localIcon192.exists()) {
       try {
         // if no icons are in the sketch folder, then copy all the defaults
         if (buildIcon36.getParentFile().mkdirs()) {
@@ -1008,6 +1016,16 @@ private void writeRes(File resFolder,
         } else {
           System.err.println("Could not create \"drawable-xhdpi\" folder.");
         }
+        if (buildIcon144.getParentFile().mkdirs()) {
+          Util.copyFile(mode.getContentFile("icons/" + ICON_144), buildIcon144);
+        } else {
+          System.err.println("Could not create \"drawable-xxhdpi\" folder.");
+        }        
+        if (buildIcon192.getParentFile().mkdirs()) {
+          Util.copyFile(mode.getContentFile("icons/" + ICON_192), buildIcon192);
+        } else {
+          System.err.println("Could not create \"drawable-xxxhdpi\" folder.");
+        }            
       } catch (IOException e) {
         e.printStackTrace();
         //throw new SketchException("Could not get Android icons");
@@ -1035,6 +1053,16 @@ private void writeRes(File resFolder,
             Util.copyFile(localIcon96, buildIcon96);
           }
         }
+        if (localIcon144.exists()) {
+          if (new File(resFolder, "drawable-xxhdpi").mkdirs()) {
+            Util.copyFile(localIcon144, buildIcon144);
+          }
+        }
+        if (localIcon192.exists()) {
+          if (new File(resFolder, "drawable-xxxhdpi").mkdirs()) {
+            Util.copyFile(localIcon192, buildIcon192);
+          }
+        }        
       } catch (IOException e) {
         System.err.println("Problem while copying icons.");
         e.printStackTrace();