some refactoring, moved getSurfaceHolder() to PSurface

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -232,7 +232,7 @@ public void endDraw() {
 //    }
 
     if (primaryGraphics) {
-      SurfaceHolder holder = parent.getSurfaceHolder();
+      SurfaceHolder holder = parent.surface.getSurfaceHolder();
       if (holder != null) {
         Canvas screen = null;
         try {
@@ -243,7 +243,7 @@ public void endDraw() {
         } finally {
           if (screen != null) {
             try {
-              parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+              holder.unlockCanvasAndPost(screen);
             } catch (IllegalStateException ex) {
             }
           }

core/src/processing/a2d/PSurfaceAndroid2D.java

@@ -46,13 +46,13 @@ public PSurfaceAndroid2D(PGraphics graphics, AppComponent component, SurfaceHold
     if (component.getKind() == AppComponent.FRAGMENT) {
       PFragment frag = (PFragment)component;
       activity = frag.getActivity();
-      surface = new SketchSurfaceView(activity, null);
+      surfaceView = new SketchSurfaceView(activity, null);
     } else if (component.getKind() == AppComponent.WALLPAPER) {
       wallpaper = (WallpaperService)component;
-      surface = new SketchSurfaceView(wallpaper, holder);
+      surfaceView = new SketchSurfaceView(wallpaper, holder);
     } else if (component.getKind() == AppComponent.WATCHFACE) {
       watchface = (CanvasWatchFaceService)component;
-      surface = null;
+      surfaceView = null;
     }
   }
 

core/src/processing/android/PFragment.java

@@ -110,8 +110,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     if (sketch != null) {
       sketch.initSurface(inflater, container, savedInstanceState, this, null);
-      sketch.startSurface();
-      return sketch.getRootView();
+      return sketch.surface.getRootView();
     } else {
       return null;
     }

core/src/processing/android/PWallpaper.java

@@ -149,7 +149,6 @@ public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
       sketch = createSketch();
       sketch.initSurface(PWallpaper.this, getSurfaceHolder());
-      sketch.startSurface();
       sketch.preview = isPreview();
       if (isPreview()) requestPermissions();
       setTouchEventsEnabled(true);

core/src/processing/android/PWatchFaceCanvas.java

@@ -172,7 +172,6 @@ public void onCreate(SurfaceHolder surfaceHolder) {
       sketch = createSketch();
       PGraphicsAndroid2D.useBitmap = false;
       sketch.initSurface(PWatchFaceCanvas.this, null);
-      sketch.startSurface();
       initComplications();
       requestPermissions();
     }

core/src/processing/android/PWatchFaceGLES.java

@@ -170,7 +170,6 @@ public void onCreate(SurfaceHolder surfaceHolder) {
               .build());
       sketch = createSketch();
       sketch.initSurface(PWatchFaceGLES.this, null);
-      sketch.startSurface();
       initComplications();
       requestPermissions();
     }

core/src/processing/core/PApplet.java

@@ -263,49 +263,20 @@ public class PApplet extends Object implements PConstants {
    */
   public boolean focused = false;
 
-  /**
-   * Use in watch faces to check if the device in in ambient mode or interactive mode.
-   */
+  ///////////////////////////////////////////////////////////////
+  // Wallpaper and watchface variables: these will go away soon...
   public boolean ambientMode = false;
-
-  /**
-   * Indicates whether the watch face is round or not.
-   */
   public boolean isRound = false;
-
-  /**
-   * Watch face insets
-   */
-  public int insetLeft, insetRight = 0;
-  public int insetTop, insetBottom = 0;
-
-  /**
-   * Use in watch faces to store information abou the device screen
-   * https://developer.android.com/training/wearables/watch-faces/drawing.html#Screen
-   */
+  public int insetLeft = 0;
+  public int insetRight = 0;
+  public int insetTop = 0;
+  public int insetBottom = 0;
   public boolean lowBitAmbient = false;
   public boolean burnInProtection = false;
-
-  /**
-   * Offset for wallpapers, when user swipes across home screens.
-   */
+  public boolean preview = false;
   public float homeScreenOffset = 0;
-//  public float offsetY = 0;
-
   public int homeScreenCount = 1;
-
-  /**
-   * Indicates if the wallpaper is in preview mode.
-   */
-  public boolean preview = false;
-
-  /**
-   * true if the applet is online.
-   * <P>
-   * This can be used to test how the applet should behave
-   * since online situations are different (no file writing, etc).
-   */
-//  public boolean online = false;
+  ///////////////////////////////////////////////////////////////
 
   /**
    * Time in milliseconds when the applet was started.
@@ -480,6 +451,7 @@ public void initSurface(AppComponent component, SurfaceHolder holder) {
     initSurface(null, null,  null, component, holder);
   }
 
+
   public void initSurface(LayoutInflater inflater, ViewGroup container,
                           Bundle savedInstanceState,
                           AppComponent component, SurfaceHolder holder) {
@@ -554,18 +526,12 @@ public void onGlobalLayout() {
 
     sketchPath = surface.getFilesDir().getAbsolutePath();
 
-    if (DEBUG) println("Done with init surface");
-  }
-
-
-  public void startSurface() {
     surface.startThread();
-  }
 
-  public View getRootView() {
-    return surface.getRootView();
+    if (DEBUG) println("Done with init surface");
   }
 
+
   private void setFullScreenVisibility() {
     if (fullScreen) {
       int visibility;
@@ -689,30 +655,6 @@ public void settings() {
   }
 
 
-  //////////////////////////////////////////////////////////////
-
-  // ANDROID SURFACE VIEW
-
-
-  // TODO this is only used by A2D, when finishing up a draw. but if the
-  // surfaceview has changed, then it might belong to an a3d surfaceview. hrm.
-  public SurfaceHolder getSurfaceHolder() {
-    SurfaceView view = surface.getSurfaceView();
-    if (view == null) {
-      // Watch faces don't have a surface view associated to them.
-      return null;
-    } else {
-      return view.getHolder();
-    }
-  }
-
-
-  /** Not official API, not guaranteed to work in the future. */
-  public SurfaceView getSurfaceView() {
-    return surface.getSurfaceView();
-  }
-
-
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 

core/src/processing/core/PSurface.java

@@ -32,6 +32,7 @@
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,6 +58,7 @@ public interface PSurface {
   public Rect getVisibleFrame();
 
   public SurfaceView getSurfaceView();
+  public SurfaceHolder getSurfaceHolder();
 
   public View getRootView();
   public void setRootView(View view);