added ServiceEngine interface

It encapsulates getters specific to wallpapers and watch faces

Author: codeanticode

core/src/processing/android/AppComponent.java

@@ -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

core/src/processing/android/PWallpaper.java

@@ -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
@@ -33,9 +33,9 @@
 import android.graphics.Point;
 
 public class PWallpaper extends WallpaperService implements AppComponent {
-  protected Point size;
+  private Point size;
   private DisplayMetrics metrics;
-  protected WallpaperEngine engine;
+  private WallpaperEngine engine;
 
 
   public void initDimensions() {
@@ -140,8 +140,9 @@ public void onDestroy() {
   }
 
 
-  public class WallpaperEngine extends Engine {
-    protected PApplet sketch;
+  public class WallpaperEngine extends Engine implements ServiceEngine {
+    private PApplet sketch;
+    private float xOffset, xOffsetStep;
 
 
     @Override
@@ -210,6 +211,9 @@ public void onOffsetsChanged(float xOffset, float yOffset,
                                  int xPixelOffset, int yPixelOffset) {
 
       if (sketch != null) {
+        this.xOffset = xOffset;
+        this.xOffsetStep = xOffsetStep;
+
         sketch.homeScreenOffset = xOffset;
         if (0 < xOffsetStep) {
           sketch.homeScreenCount = (int)(1 + 1 / xOffsetStep);
@@ -238,5 +242,69 @@ public void onDestroy() {
         sketch.onDestroy();
       }
     }
+
+
+    @Override
+    public float homeScreenOffset() {
+      return xOffset;
+    }
+
+
+    @Override
+    public int homeScreenCount() {
+      if (0 < xOffsetStep) {
+        return (int)(1 + 1 / xOffsetStep);
+      } else {
+        return 1;
+      }
+    }
+
+
+    @Override
+    public boolean ambientMode() {
+      return false;
+    }
+
+
+    @Override
+    public boolean isRound() {
+      return false;
+    }
+
+
+    @Override
+    public int insetLeft() {
+      return 0;
+    }
+
+
+    @Override
+    public int insetRight() {
+      return 0;
+    }
+
+
+    @Override
+    public int insetTop() {
+      return 0;
+    }
+
+
+    @Override
+    public int insetBottom() {
+      return 0;
+    }
+
+
+    @Override
+    public boolean lowBitAmbient() {
+      return false;
+    }
+
+
+    @Override
+    public boolean burnInProtection() {
+      return false;
+    }
   }
 }

core/src/processing/android/PWatchFaceCanvas.java

@@ -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
@@ -44,9 +44,9 @@
 import processing.event.MouseEvent;
 
 public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppComponent {
-  protected Point size;
+  private Point size;
   private DisplayMetrics metrics;
-  protected CanvasEngine engine;
+  private CanvasEngine engine;
 
 
   public void initDimensions() {
@@ -154,9 +154,16 @@ public void onDestroy() {
   }
 
 
-  private class CanvasEngine extends CanvasWatchFaceService.Engine {
+  private class CanvasEngine extends CanvasWatchFaceService.Engine implements ServiceEngine {
     private PApplet sketch;
     private Method compUpdatedMethod;
+    private boolean isRound = false;
+    private int insetLeft = 0;
+    private int insetRight = 0;
+    private int insetTop = 0;
+    private int insetBottom = 0;
+    private boolean lowBitAmbient = false;
+    private boolean burnInProtection = false;
 
     @SuppressWarnings("deprecation")
     @Override
@@ -213,6 +220,8 @@ public void onAmbientModeChanged(boolean inAmbientMode) {
     @Override
     public void onPropertiesChanged(Bundle properties) {
       super.onPropertiesChanged(properties);
+      lowBitAmbient = properties.getBoolean(PROPERTY_LOW_BIT_AMBIENT, false);
+      burnInProtection = properties.getBoolean(PROPERTY_BURN_IN_PROTECTION, false);
       if (sketch != null) {
         sketch.lowBitAmbient = properties.getBoolean(PROPERTY_LOW_BIT_AMBIENT, false);
         sketch.burnInProtection = properties.getBoolean(PROPERTY_BURN_IN_PROTECTION, false);
@@ -223,6 +232,11 @@ public void onPropertiesChanged(Bundle properties) {
     @Override
     public void onApplyWindowInsets(WindowInsets insets) {
       super.onApplyWindowInsets(insets);
+      isRound = insets.isRound();
+      insetLeft = insets.getSystemWindowInsetLeft();
+      insetRight = insets.getSystemWindowInsetRight();
+      insetTop = insets.getSystemWindowInsetTop();
+      insetBottom = insets.getSystemWindowInsetBottom();
       if (sketch != null) {
         sketch.isRound = insets.isRound();
         sketch.insetLeft = insets.getSystemWindowInsetLeft();
@@ -362,5 +376,65 @@ public void onDestroy() {
       super.onDestroy();
       if (sketch != null) sketch.onDestroy();
     }
+
+
+    @Override
+    public float homeScreenOffset() {
+      return 0;
+    }
+
+
+    @Override
+    public int homeScreenCount() {
+      return 0;
+    }
+
+
+    @Override
+    public boolean ambientMode() {
+      return isInAmbientMode();
+    }
+
+
+    @Override
+    public boolean isRound() {
+      return isRound;
+    }
+
+
+    @Override
+    public int insetLeft() {
+      return insetLeft;
+    }
+
+
+    @Override
+    public int insetRight() {
+      return insetRight;
+    }
+
+
+    @Override
+    public int insetTop() {
+      return insetTop;
+    }
+
+
+    @Override
+    public int insetBottom() {
+      return insetBottom;
+    }
+
+
+    @Override
+    public boolean lowBitAmbient() {
+      return lowBitAmbient;
+    }
+
+
+    @Override
+    public boolean burnInProtection() {
+      return burnInProtection;
+    }
   }
 }