removed wear, appcompat, and support-v4 packages from mode

Author: codeanticode

build.xml

@@ -75,12 +75,14 @@
 	  description="Create AndroidMode.zip and AndroidMode.txt">
     <mkdir dir="release" />
 
+<!--  	
     <copy todir="mode">
       <fileset dir="core/library">
 	    <include name="*.jar" />
       </fileset>
     </copy>
-
+-->
+  	
     <zip destfile="${mode.dist.path}">
       <zipfileset dir="." prefix="AndroidMode">
 	      <include name="android-core.zip" />

mode/android-support-v4.jar

@@ -310,11 +310,17 @@ public File createProject(boolean wear) throws IOException, SketchException {
         // Need to add appcompat as a library project (includes v4 support)
 
         ////////////////////////////////////////////////////////////////////////
-        // first step: unpack the cardboard packages in the project's 
-        // libs folder:        
-        File appCompatFile = mode.getContentFile("mode/appcompat.zip");
-        AndroidMode.extractFolder(appCompatFile, libsFolder, true);        
+        // first step: copy appcompat library project 
+        
+        // TODO: the support-v7 library project should be copied from the Android 
+        // Support Repository, and not from the Support Library.
+        File appCompatFolderSrc = new File(sdk.getSupportLibrary(), "v7/appcompat");
+        // Delete the project.properties files because Processing will regenerate 
+        // it when building the project
+        File propFile = new File(appCompatFolderSrc, "project.properties");
+        propFile.delete();
         File appCompatFolder = new File(libsFolder, "appcompat");
+        Util.copyDir(appCompatFolderSrc, appCompatFolder);
 
         ////////////////////////////////////////////////////////////////////////
         // second step: create library projects
@@ -339,7 +345,7 @@ public File createProject(boolean wear) throws IOException, SketchException {
       } else {
         // Copy the v4 support package only, needed for the permission handling
         // in all other components
-        File compatJarFile = mode.getContentFile("mode/android-support-v4.jar");
+        File compatJarFile = new File(sdk.getSupportLibrary(), "v4/android-support-v4.jar");
         Util.copyFile(compatJarFile, new File(libsFolder, "android-support-v4.jar"));        
       }
 
@@ -349,9 +355,9 @@ public File createProject(boolean wear) throws IOException, SketchException {
       // cannot be resolved.
       // TODO: temporary hack until I find a better way to include the wearable aar
       // package included in the SDK:      
-      File wearJarFile = mode.getContentFile("mode/wearable-" + wear_version + ".jar");
-//      System.out.println(wearJarFile.toString());
-      Util.copyFile(wearJarFile, new File(libsFolder, "wearable-" + wear_version + ".jar"));
+      File wearAarFile = new File(sdk.getWearableFolder(), wear_version + "/wearable-" + wear_version + ".aar");
+      File explodeDir = new File(tmpFolder, "aar");
+      AndroidMode.explodeAar(wearAarFile, explodeDir, new File(libsFolder, "wearable-" + wear_version + ".jar"));
 //    }      
 
       // Copy any imported libraries (their libs and assets),
@@ -472,7 +478,7 @@ public File createHandheldProject(File wearFolder, File wearPackage)
 
     // Copy the compatibility package, needed for the permission handling
     final File libsFolder = mkdirs(tmpFolder, "libs");
-    File compatJarFile = mode.getContentFile("mode/android-support-v4.jar");
+    File compatJarFile = new File(sdk.getSupportLibrary(), "v4/android-support-v4.jar");
     Util.copyFile(compatJarFile, new File(libsFolder, "android-support-v4.jar"));      
 
     // Create manifest file

mode/appcompat.zip

@@ -29,6 +29,7 @@
 import processing.app.RunnerListener;
 import processing.app.Sketch;
 import processing.app.SketchException;
+import processing.app.Util;
 import processing.app.ui.Editor;
 import processing.app.ui.EditorException;
 import processing.app.ui.EditorState;
@@ -442,6 +443,21 @@ public static void extractFolder(File file, File newPath,
     zip.close();
   }
 
+  
+  static public void explodeAar(File wearFile, File explodeDir, File jarFile) 
+      throws IOException {
+    explodeAar(wearFile, explodeDir, jarFile, true);
+  }
+  
+  
+  static public void explodeAar(File wearFile, File explodeDir, File jarFile, 
+      boolean removeDir) throws IOException {
+    extractFolder(wearFile, explodeDir, false);
+    File classFile = new File(explodeDir, "classes.jar");
+    Util.copyFile(classFile, jarFile);
+    Util.removeDir(explodeDir);
+  }
+  
 
   static public void showMessage(String title, String text) {
     if (title == null) title = "Message";

mode/wearable-2.0.0.jar

@@ -55,6 +55,8 @@ class AndroidSDK {
   private final File platformTools;
   private final File buildTools;
   private final File androidTool;
+  private final File wearablePath;
+  private final File supportLibPath;
 
   private static final String SDK_DOWNLOAD_URL = 
       "https://developer.android.com/studio/index.html#downloads";
@@ -148,6 +150,16 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
                                 AndroidBuild.target_sdk + " is missing from " + targetPlatform.getAbsolutePath());
     }
 
+    wearablePath = new File(folder, "extras/google/m2repository/com/google/android/support/wearable");
+    if (!wearablePath.exists()) {
+      throw new BadSDKException("There is no wearable folder in " + folder);
+    }
+    
+    supportLibPath = new File(folder, "extras/android/support");
+    if (!supportLibPath.exists()) {
+      throw new BadSDKException("There is no support library folder in " + folder);
+    }
+    
     androidTool = findAndroidTool(tools);
 
     String path = Platform.getenv("PATH");
@@ -251,6 +263,16 @@ public File getPlatformToolsFolder() {
     return platformTools;
   }
 
+  
+  public File getWearableFolder() {
+    return wearablePath;
+  }
+  
+
+  public File getSupportLibrary() {
+    return supportLibPath;
+  } 
+  
 
   /**
    * Checks a path to see if there's a tools/android file inside, a rough check

src/processing/mode/android/AndroidBuild.java

@@ -54,10 +54,13 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private static final String REPOSITORY_LIST = "repository-11.xml";
   private static final String ADDON_LIST = "addon.xml";
 
-  // The Android Support Repository does not include the android-support-v4 jar
-  // file, so downloading the latest support library package available.
+  // The Android Support Repository does not seem to include the 
+  // android-support-v4 jar file, even somewhere inside the aar packages, so 
+  // downloading the latest support library package available.
   // More info on the Support Library and latest releases:
   // https://developer.android.com/topic/libraries/support-library/index.html
+  // This probably needs to be fixed so the Support Repository is used moving 
+  // forward.
   private static final String LEGACY_SUPPORT_LIBRARY = "support_r23.2.1.zip";
   private static final int SUPPORT_LIBRARY_SIZE = 10850402;