Merge pull request #318 from processing/wearapi

merge changes in Services API and permission handling

Author: codeanticode

.gitignore

@@ -11,3 +11,4 @@ release
 
 build/**
 .gradle
+/processing-core.zip

README.md

@@ -1,8 +1,4 @@
 Processing for Android
 ======================
 
-#New architecture branch
-
-This branch is meant to test the new architecture that will allow different app publishing options (fragment-based apps, wallpaper, watchfaces, etc)
-
-It is highly experimental and very likely will break your code, don't use it unless you want to help us with debugging.
+This is the main repository for Processing for Android. It includes the core library inside the core folder, and the mode itself in the root. See the [wiki](https://github.com/processing/processing-android/wiki) for build instructions.

build.gradle

@@ -14,7 +14,7 @@ allprojects {
     apply plugin: 'java'
 
     ext.android_platform = "$sdkdir/platforms/android-$sdkver"
-    ext.core_jar_path = "$rootDir/android-core.zip"
+    ext.core_jar_path = "$rootDir/processing-core.zip"
 
     repositories {
         jcenter()
@@ -66,8 +66,8 @@ task dist {
         Files.copy(file("$buildDir/libs/processing-android.jar").toPath(),
                    file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
 
-        Files.copy(file("core/build/libs/android-core.zip").toPath(),
-                   file("$root/android-core.zip").toPath(), REPLACE_EXISTING);
+        Files.copy(file("core/build/libs/processing-core.zip").toPath(),
+                   file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         Files.copy(file("mode.properties").toPath(),
                    file("$root/mode.properties").toPath(), REPLACE_EXISTING);

build.xml

@@ -5,7 +5,7 @@
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
 
-  <property name="core.jar.path" value="android-core.zip" />
+  <property name="core.jar.path" value="processing-core.zip" />
   <property name="mode.jar.path" value="mode/AndroidMode.jar" />
   <property name="mode.dist.path" value="release/AndroidMode.zip" />
   <property name="tools.jar.path" value="mode/tools.jar" />
@@ -58,15 +58,15 @@
 <!--
   <target name="android-dist-check">
 -->
-    <!-- ensure that the android-core.zip file has been built -->
+    <!-- ensure that the processing-core.zip file has been built -->
 <!--
     <available file="${core.jar.path}" 
 	       property="android-core-present" />
 -->
-    <!--<echo message="${target.path}/modes/android/android-core.zip" />-->
+    <!--<echo message="${target.path}/modes/android/processing-core.zip" />-->
 <!--
     <fail unless="android-core-present" 
-	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
+	  message="processing-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
   </target>
 -->
 
@@ -85,7 +85,7 @@
 
     <zip destfile="${mode.dist.path}">
       <zipfileset dir="." prefix="AndroidMode">
-	      <include name="android-core.zip" />
+	      <include name="processing-core.zip" />
         <include name="mode.properties" />	
         <include name="mode/**" />
         <include name="templates/**" />	

core/.classpath

@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="var" path="ANDROID_LIB"/>
-	<classpathentry kind="lib" path="library/android-support-v4.jar"/>
 	<classpathentry kind="lib" path="library/wearable-2.0.0.jar"/>
+	<classpathentry kind="lib" path="library/support-annotations-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-compat-25.2.0.jar"/>
+	<classpathentry kind="lib" path="library/support-fragment-25.2.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/build.gradle

@@ -10,7 +10,9 @@ buildscript {
 
 dependencies {
     compile name: 'android'
-    compile name: 'android-support-v4'
+    compile name: 'support-compat-25.2.0'
+    compile name: 'support-fragment-25.2.0'
+    compile name: 'support-annotations-25.2.0'
     compile name: 'wearable-2.0.0'
 }
 
@@ -46,7 +48,7 @@ task dist {
     doLast {
         // make copy of jar file as zip
         Files.copy(file("$buildDir/libs/core.jar").toPath(),
-                   file("$buildDir/libs/android-core.zip").toPath(), REPLACE_EXISTING);
+                   file("$buildDir/libs/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         // and copy it to root
         Files.copy(file("$buildDir/libs/core.jar").toPath(),

core/build.xml

@@ -7,19 +7,22 @@
   <property name="processing.dir" value="../../processing" />
 
   <!-- path to the core library -->
-  <property name="core.jar.path" value="../android-core.zip" />
+  <property name="core.jar.path" value="../processing-core.zip" />
 
   <!-- Android platform to build the core library -->
   <property name="android.platform" value="android-25" />
 
   <!-- Wear version to build the core library -->
   <property name="wear.version" value="2.0.0" />	
 
+  <!-- Support version to build the core library -->
+  <property name="support.version" value="25.2.0" />	
+	
   <!-- oh ant, you're so cute and convoluted -->
   <target name="build" depends="sdk_chatter,actual_build" />
 
   <target name="sdk_chatter" unless="env.ANDROID_SDK">
-    <echo message="ANDROID_SDK not set, skipping build of android-core.zip" />
+    <echo message="ANDROID_SDK not set, skipping build of processing-core.zip" />
   </target>
 
   <target name="sdk_whining">
@@ -41,7 +44,9 @@
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   bootclasspath="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar;
-    	              library/android-support-v4.jar;
+    	              library/support-compat-${support.version}.jar;
+    	              library/support-fragment-${support.version}.jar;
+    	              library/support-annotations-${support.version}.jar;
 	                  library/wearable-${wear.version}.jar"
 	   srcdir="src" destdir="bin" />
 

core/library/android-support-v4.jar

@@ -135,34 +135,6 @@ public PGraphicsAndroid2D() {
   //public void setPath(String path)
 
 
-  /**
-   * Called in response to a resize event, handles setting the
-   * new width and height internally, as well as re-allocating
-   * the pixel buffer for the new size.
-   *
-   * Note that this will nuke any cameraMode() settings.
-   */
-//  @Override
-//  public void setSize(int iwidth, int iheight) {  // ignore
-//    width = iwidth;
-//    height = iheight;
-//    width1 = width - 1;
-//    height1 = height - 1;
-//
-//    allocate();
-//    reapplySettings();
-//  }
-
-
-  @Override
-  protected void allocate() {
-    if (useBitmap) {
-      if (bitmap != null) bitmap.recycle();
-      bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
-      canvas = new Canvas(bitmap);
-    }
-  }
-
 
   @Override
   public void dispose() {
@@ -197,8 +169,20 @@ public void requestDraw() {
 //  }
 
 
+  protected Canvas checkCanvas() {
+    if (canvas == null && (useBitmap || !primaryGraphics)) {
+      if (bitmap != null) bitmap.recycle();
+      bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+      canvas = new Canvas(bitmap);
+    }
+    return canvas;
+  }
+
+
   @Override
   public void beginDraw() {
+    canvas = checkCanvas();
+
 //    if (primaryGraphics) {
 //      canvas = parent.getSurfaceHolder().lockCanvas(null);
 //      if (canvas == null) {
@@ -232,7 +216,7 @@ public void endDraw() {
 //    }
 
     if (primaryGraphics) {
-      SurfaceHolder holder = parent.surface.getSurfaceHolder();
+      SurfaceHolder holder = parent.getSurface().getSurfaceHolder();
       if (holder != null) {
         Canvas screen = null;
         try {
@@ -473,7 +457,6 @@ public void breakShape() {
   @Override
   public void endShape(int mode) {
     if (shape == POINTS && stroke && vertexCount > 0) {
-//      Matrix m = canvas.getMatrix();
       Matrix m = getMatrixImp();
       if (strokeWeight == 1 && m.isIdentity()) {
         if (screenPoint == null) {
@@ -519,15 +502,13 @@ public void endShape(int mode) {
 
   @Override
   protected void clipImpl(float x1, float y1, float x2, float y2) {
-//    canvas.save(Canvas.CLIP_SAVE_FLAG);
     canvas.clipRect(x1, y1, x2, y2);
   }
 
 
   @Override
   public void noClip() {
     canvas.clipRect(0, 0, width, height, Region.Op.REPLACE);
-//    canvas.restore();
   }
 
 

core/library/support-annotations-25.2.0.jar

@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2016 The Processing Foundation
+  Copyright (c) 2016-17 The Processing Foundation
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -38,12 +38,12 @@ abstract public interface AppComponent extends PConstants {
   public int getKind();
   public void setSketch(PApplet sketch);
   public PApplet getSketch();
+  public ServiceEngine getEngine();
 
   public void startActivity(Intent intent);
 
   public void requestDraw();
   public boolean canDraw();
 
   public void dispose();
-  public void onPermissionsGranted();
 }

core/library/support-compat-25.2.0.jar

@@ -22,10 +22,13 @@
 
 package processing.android;
 
+import android.support.annotation.IdRes;
+import android.support.annotation.LayoutRes;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.util.DisplayMetrics;
+
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -41,17 +44,21 @@
 
 public class PFragment extends Fragment implements AppComponent {
   private DisplayMetrics metrics;
-  protected Point size;
-  protected PApplet sketch;
+  private Point size;
+  private PApplet sketch;
 
   public PFragment() {
   }
 
-  public void init(int layout, FragmentManager fragmentManager) {
-    FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-    fragmentTransaction.add(layout, this);
-    fragmentTransaction.commit();
-  }
+//  public void setLayout(int layout, FragmentManager manager) {
+//    this.layout = layout;
+//    if (sketch != null) {
+//      sketch.parentLayout = layout;
+//    }
+//    FragmentTransaction transaction = manager.beginTransaction();
+//    transaction.add(layout, this);
+//    transaction.commit();
+//  }
 
   public void initDimensions() {
     WindowManager wm = getActivity().getWindowManager();
@@ -98,19 +105,40 @@ public void setSketch(PApplet sketch) {
     this.sketch = sketch;
   }
 
+  public void setSketch(PApplet sketch, @IdRes int id, @LayoutRes int layout,
+                        FragmentManager manager) {
+    this.sketch = sketch;
+    sketch.parentLayout = layout;
+    FragmentTransaction transaction = manager.beginTransaction();
+    transaction.add(id, this);
+    transaction.commit();
+  }
+
+  public void setSketch(PApplet sketch, View view, FragmentManager manager) {
+    this.sketch = sketch;
+    FragmentTransaction transaction = manager.beginTransaction();
+    transaction.add(view.getId(), this);
+    transaction.commit();
+  }
+
   public PApplet getSketch() {
     return sketch;
   }
 
+  public ServiceEngine getEngine() {
+    return null;
+  }
+
   public void dispose() {
   }
 
+
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     if (sketch != null) {
       sketch.initSurface(inflater, container, savedInstanceState, this, null);
-      return sketch.surface.getRootView();
+      return sketch.getSurface().getRootView();
     } else {
       return null;
     }
@@ -158,16 +186,6 @@ public void onConfigurationChanged(Configuration newConfig) {
   }
 
 
-//  public void onBackPressed() {
-//    sketch.exit();
-//  }
-
-
-  public void onPermissionsGranted() {
-    if (sketch != null) sketch.onPermissionsGranted();
-  }
-
-
   public void setOrientation(int which) {
     if (which == PORTRAIT) {
       getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -180,8 +198,14 @@ public void setOrientation(int which) {
   public void requestDraw() {
   }
 
+
   public boolean canDraw() {
     if (sketch == null) return false;
     return sketch.isLooping();
   }
+
+
+//public void onBackPressed() {
+//  sketch.exit();
+//}
 }