Merge branch 'imilka-sdkSelector'

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -25,8 +25,10 @@
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
+
 import processing.app.Base;
 import processing.app.Library;
+import processing.app.Preferences;
 import processing.app.Sketch;
 import processing.app.SketchException;
 import processing.app.exec.ProcessHelper;
@@ -41,8 +43,8 @@
 class AndroidBuild extends JavaBuild {
   //  static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
   static final String basePackage = "processing.test";
-  static final String sdkName = "2.3.3";
-  static final String sdkVersion = "10";  // Android 2.3.3 (Gingerbread)
+  static String sdkName = "2.3.3";
+  static String sdkVersion = "10";  // Android 2.3.3 (Gingerbread)
   static final String sdkTarget = "android-" + sdkVersion;
 
   private final AndroidSDK sdk;
@@ -66,6 +68,15 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) {
     coreZipFile = mode.getCoreZipLocation();
   }
 
+  public static void setSdkTarget(AndroidSDK.SDKTarget target, Sketch sketch) {
+    sdkName = target.name;
+    sdkVersion = Integer.toString(target.version);
+
+    Manifest manifest = new Manifest(sketch);
+    manifest.setSdkTarget(sdkVersion);
+
+    Preferences.set("android.sdk.version", sdkVersion);
+  }
 
   /**
    * Build into temporary folders (needed for the Windows 8.3 bugs in the Android SDK).

src/processing/mode/android/AndroidEditor.java

@@ -32,6 +32,7 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.TimerTask;
 
 @SuppressWarnings("serial")
@@ -217,6 +218,29 @@ public void actionPerformed(ActionEvent e) {
 
     menu.addSeparator();
 
+    final JMenu sdkMenu = new JMenu("Select target SDK");
+    JMenuItem defaultItem = new JCheckBoxMenuItem("No available targets");
+    defaultItem.setEnabled(false);
+    sdkMenu.add(defaultItem);
+
+    new Thread() {
+      @Override
+      public void run() {
+        while(androidMode == null || androidMode.getSDK() == null) {
+          try {
+            Thread.sleep(3000);
+          } catch (InterruptedException e) {
+            e.printStackTrace();
+          }
+        }
+        updateSdkMenu(sdkMenu);
+      }
+    }.start();
+
+    menu.add(sdkMenu);
+
+    menu.addSeparator();
+
     item = new JMenuItem("Android SDK Manager");
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -251,6 +275,65 @@ public void actionPerformed(ActionEvent e) {
     return menu;
   }
 
+  private void updateSdkMenu(final JMenu sdkMenu) {
+    try {
+      ArrayList<AndroidSDK.SDKTarget> targets = androidMode.getSDK().getAvailableSdkTargets();
+
+      if(targets.size() != 0) sdkMenu.removeAll();
+
+      AndroidSDK.SDKTarget lowestTargetAvailable = null;
+      JCheckBoxMenuItem lowestTargetMenuItem = null;
+
+      String savedTargetVersion = Preferences.get("android.sdk.version");
+      boolean savedTargetSet = false;
+
+      for(final AndroidSDK.SDKTarget target : targets) {
+        final JCheckBoxMenuItem item = new JCheckBoxMenuItem("API " + target.name + " (" + target.version + ")");
+
+        if(savedTargetSet == false && (lowestTargetAvailable == null || lowestTargetAvailable.version > target.version)) {
+          lowestTargetAvailable = target;
+          lowestTargetMenuItem = item;
+        }
+
+        if(Integer.toString(target.version).equals(savedTargetVersion)) {
+          AndroidBuild.setSdkTarget(target, sketch);
+          item.setState(true);
+          savedTargetSet = true;
+        }
+
+        item.addChangeListener(new ChangeListener() {
+          @Override
+          public void stateChanged(ChangeEvent e) {
+            if (target.name.equals(AndroidBuild.sdkName)) item.setState(true);
+            else item.setState(false);
+          }
+        });
+
+        item.addActionListener(new ActionListener() {
+          @Override
+          public void actionPerformed(ActionEvent e) {
+            AndroidBuild.setSdkTarget(target, sketch);
+
+            for (int i = 0; i < sdkMenu.getItemCount(); i++) {
+              ((JCheckBoxMenuItem) sdkMenu.getItem(i)).setState(false);
+            }
+
+            item.setState(true);
+          }
+        });
+
+        sdkMenu.add(item);
+      }
+
+      if(!savedTargetSet) {
+        AndroidBuild.setSdkTarget(lowestTargetAvailable, sketch);
+        lowestTargetMenuItem.setState(true);
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+
 
   /**
    * Uses the main help menu, and adds a few extra options. If/when there's

src/processing/mode/android/AndroidSDK.java

@@ -1,7 +1,6 @@
 package processing.mode.android;
 
 import processing.app.Base;
-import processing.app.Editor;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.ProcessHelper;
@@ -10,16 +9,20 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 
 class AndroidSDK {
   private final File folder;
   private final File tools;
+  private final File platforms;
   private final File platformTools;
   private final File androidTool;
 
@@ -62,6 +65,11 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       throw new BadSDKException("There is no platform-tools folder in " + folder);
     }
 
+    platforms = new File(folder, "platforms");
+    if (!platforms.exists()) {
+      throw new BadSDKException("There is no platforms folder in " + folder);
+    }
+
     androidTool = findAndroidTool(tools);
 
     final Platform p = Base.getPlatform();
@@ -385,4 +393,39 @@ public static ProcessResult runADB(final String... cmd)
 //      throw ioe;
 //    }
   }
+
+  public static class SDKTarget {
+    public int version = 0;
+    public String name;
+  }
+
+  public ArrayList<SDKTarget> getAvailableSdkTargets() throws IOException {
+    ArrayList<SDKTarget> targets = new ArrayList<SDKTarget>();
+
+    for(File platform : platforms.listFiles()) {
+      File propFile = new File(platform, "build.prop");
+      if(!propFile.exists()) continue;
+
+      SDKTarget target = new SDKTarget();
+
+      BufferedReader br = new BufferedReader(new FileReader(propFile));
+      String line;
+      while ((line = br.readLine()) != null) {
+        String[] lineData = line.split("=");
+        if(lineData[0].equals("ro.build.version.sdk")) {
+          target.version = Integer.valueOf(lineData[1]);
+        }
+
+        if(lineData[0].equals("ro.build.version.release")) {
+          target.name = lineData[1];
+          break;
+        }
+      }
+      br.close();
+
+      if(target.version != 0 && target.name != null) targets.add(target);
+    }
+
+    return targets;
+  }
 }

src/processing/mode/android/Manifest.java

@@ -21,19 +21,18 @@
 
 package processing.mode.android;
 
+import org.xml.sax.SAXException;
+import processing.app.Base;
+import processing.app.Sketch;
+import processing.core.PApplet;
+import processing.data.XML;
+
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.SAXException;
-
-import processing.app.*;
-import processing.core.PApplet;
-import processing.data.XML;
-
 
 public class Manifest {
   static final String MANIFEST_XML = "AndroidManifest.xml";
@@ -90,6 +89,11 @@ public void setPackageName(String packageName) {
     save();
   }
 
+  public void setSdkTarget(String version) {
+    XML usesSdk = xml.getChild("uses-sdk");
+    usesSdk.setString("android:minSdkVersion", version);
+    save();
+  }
 
 //writer.println("  <uses-permission android:name=\"android.permission.INTERNET\" />");
 //writer.println("  <uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />");