warn about default pacakge name and missing icons, fixes #327

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -627,7 +627,7 @@ public File exportProject() throws IOException, SketchException {
   }
 
   public File exportPackage(String keyStorePassword) throws Exception {
-    File projectFolder = null;       
+    File projectFolder = null;
     if (appComponent == WATCHFACE) {
       this.target = "release";
       String targetID = getTargetID();

src/processing/mode/android/AndroidEditor.java

@@ -194,6 +194,21 @@ public EditorToolbar createToolbar() {
     return new AndroidToolbar(this, base);
   }
 
+  
+  /*
+  // Not for now, it is unclear if the package name should be reset after save
+  // as, i.e.: sketch_1 -> sketch_2 ... 
+  @Override
+  public boolean handleSaveAs() {
+    boolean saved = super.handleSaveAs();
+    if (saved) {
+      // Reset the manifest so package name and versions are blank 
+      androidMode.resetManifest(sketch, appComponent);
+    }
+    return saved;
+  }
+  */
+  
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
@@ -494,10 +509,10 @@ public JMenu buildHelpMenu() {
 
     menu.addSeparator();
 
-    item = new JMenuItem("Processing for Android Wiki");
+    item = new JMenuItem("Processing for Android Site");
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        Platform.openURL("http://wiki.processing.org/w/Android");
+        Platform.openURL("http://android.processing.org/");
       }
     });
     menu.add(item);
@@ -727,10 +742,8 @@ public void run() {
    * attached device.
    */
   public void handleExportPackage() {
-    // Need to implement an entire signing setup first
-    // http://dev.processing.org/bugs/show_bug.cgi?id=1430
-    if (handleExportCheckModified()) {
-//      deactivateExport();
+    if (androidMode.checkPackageName(sketch, appComponent) &&
+        androidMode.checkAppIcons(sketch) && handleExportCheckModified()) {
       new KeyStoreManager(this);
     }
   }

src/processing/mode/android/AndroidMode.java

@@ -90,6 +90,34 @@ public class AndroidMode extends JavaMode {
       "You need to open the wallpaper picker in the device in order "+ 
       "to select it as the new background.";
 
+  private static final String DISTRIBUTING_APPS_TUT_URL = 
+      "http://android.processing.org/tutorials/distributing/index.html";  
+  
+  private static final String EXPORT_DEFAULT_PACKAGE_TITLE =
+      "Cannot export package...";
+
+  private static final String EXPORT_DEFAULT_PACKAGE_MESSAGE =
+      "The sketch still has the default package name. " +
+      "Not good, since this name will uniquely identify your app on the Play store... for ever!<br>" +
+      "Come up with a different package name and write in the AndroidManifest.xml file in the sketch folder, " +
+      "after the \"package=\" attribute inside the manifest tag, which also contains version code and name. " +
+      "Once you have done that, try exporting the sketch again.<br><br>" +
+      "For more info on distributing apps from Processing,<br>" +
+      "check <a href=\"" + DISTRIBUTING_APPS_TUT_URL + "\">this online tutorial</a>.";
+  
+  private static final String EXPORT_DEFAULT_ICONS_TITLE =
+      "Cannot export package...";
+
+  private static final String EXPORT_DEFAULT_ICONS_MESSAGE =
+      "The sketch does not include any app icons. " +
+      "Processing could use use its default set of Android icons, which are okay " +
+      "to test the app on your devices, but a bad idea to distribute on the Play store. " +
+      "Create a full set of unique icons for your app, and copy them into the sketch folder. " +
+      "Once you have done that, try exporting the sketch again.<br><br>" +
+      "For more info on distributing apps from Processing,<br>" +
+      "check <a href=\"" + DISTRIBUTING_APPS_TUT_URL + "\">this online tutorial</a>.";  
+    
+  
   public AndroidMode(Base base, File folder) {
     super(base, folder);
   }
@@ -352,6 +380,42 @@ public void handleStop(RunnerListener listener) {
   }
 
 
+  public boolean checkPackageName(Sketch sketch, int comp) {
+    Manifest manifest = new Manifest(sketch, comp, getFolder(), false);
+    String defName = AndroidBuild.basePackage + "." + sketch.getName().toLowerCase();    
+    String name = manifest.getPackageName();
+    if (name.toLowerCase().equals(defName.toLowerCase())) {
+      // The user did not set the package name, show error and stop
+      AndroidMode.showMessage(EXPORT_DEFAULT_PACKAGE_TITLE, EXPORT_DEFAULT_PACKAGE_MESSAGE);
+      return false;
+    }
+    return true;
+  }
+  
+  
+  public boolean checkAppIcons(Sketch sketch) {
+    File sketchFolder = sketch.getFolder();
+    File localIcon36 = new File(sketchFolder, AndroidBuild.ICON_36);
+    File localIcon48 = new File(sketchFolder, AndroidBuild.ICON_48);
+    File localIcon72 = new File(sketchFolder, AndroidBuild.ICON_72);
+    File localIcon96 = new File(sketchFolder, AndroidBuild.ICON_96);
+    File localIcon144 = new File(sketchFolder, AndroidBuild.ICON_144);
+    File localIcon192 = new File(sketchFolder, AndroidBuild.ICON_192);    
+    boolean allExist = localIcon36.exists() &&
+                       localIcon48.exists() &&
+                       localIcon72.exists() &&
+                       localIcon96.exists() &&
+                       localIcon144.exists() &&
+                       localIcon192.exists();    
+    if (!allExist) {
+      // The user did not set custom icons, show error and stop
+      AndroidMode.showMessage(EXPORT_DEFAULT_ICONS_TITLE, EXPORT_DEFAULT_ICONS_MESSAGE);
+      return false;      
+    }
+    return true;
+  }
+  
+  
   public void initManifest(Sketch sketch, int comp) {
     new Manifest(sketch, comp, getFolder(), false);
   }  

src/processing/mode/android/Manifest.java

@@ -72,11 +72,6 @@ public class Manifest {
   private XML xml;
 
 
-//  public Manifest(Editor editor) {
-//    this.editor = editor;
-//    this.sketch = editor.getSketch();
-//    load();
-//  }
   public Manifest(Sketch sketch, int appComp, File modeFolder, boolean forceNew) {
     this.sketch = sketch;
     this.appComp = appComp;
@@ -86,7 +81,6 @@ public Manifest(Sketch sketch, int appComp, File modeFolder, boolean forceNew) {
 
 
   private String defaultPackageName() {
-//    Sketch sketch = editor.getSketch();
     return AndroidBuild.basePackage + "." + sketch.getName().toLowerCase();
   }
 
@@ -301,7 +295,7 @@ protected void load(boolean forceNew) {
     String versionCode = null;
     String versionName = null;
     if (xml != null && forceNew) {
-      permissionNames = getPermissions();    
+      permissionNames = getPermissions();
       pkgName = getPackageName();
       versionCode = getVersionCode();
       versionName = getVersionName();