refactor services for consistency, addressing #237

Author: codeanticode

core/src/processing/android/PWallpaper.java

@@ -33,17 +33,10 @@
 import android.graphics.Point;
 
 public class PWallpaper extends WallpaperService implements AppComponent {
-  String TAG = "PWallpaper";
-
   protected Point size;
   private DisplayMetrics metrics;
-  protected PEngine engine;
-
-  public PWallpaper() {
-  }
+  protected WallpaperEngine engine;
 
-  public PWallpaper(PApplet sketch) {
-  }
 
   public void initDimensions() {
     WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
@@ -68,64 +61,89 @@ public void initDimensions() {
     }
   }
 
-  public int getKind() {
-    return WALLPAPER;
-  }
 
   public int getDisplayWidth() {
     return size.x;
 //    return metrics.widthPixels;
   }
 
+
   public int getDisplayHeight() {
     return size.y;
 //    return metrics.heightPixels;
   }
 
+
   public float getDisplayDensity() {
     return metrics.density;
   }
 
+
+  public int getKind() {
+    return WALLPAPER;
+  }
+
+
+  public PApplet createSketch() {
+    return new PApplet();
+  }
+
+
   public void setSketch(PApplet sketch) {
     engine.sketch = sketch;
   }
 
+
   public PApplet getSketch() {
     return engine.sketch;
   }
 
-  public PApplet createSketch() {
-    return new PApplet();
+
+  public Engine getEngine() {
+    return engine;
   }
 
-  public void requestDraw() {
 
+  public void requestDraw() {
   }
 
+
   public boolean canDraw() {
     return true;
   }
 
+
   public void dispose() {
   }
 
-  public void requestPermissions() {
 
+  public void requestPermissions() {
   }
 
+
   public void onPermissionsGranted() {
     if (engine != null) engine.onPermissionsGranted();
   }
 
+
   @Override
   public Engine onCreateEngine() {
-    engine = new PEngine();
+    engine = new WallpaperEngine();
     return engine;
   }
 
-  public class PEngine extends Engine {
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    if (engine != null) engine.onDestroy();
+  }
+
+
+  public class WallpaperEngine extends Engine {
     protected PApplet sketch;
 
+
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
@@ -137,11 +155,20 @@ public void onCreate(SurfaceHolder surfaceHolder) {
       setTouchEventsEnabled(true);
     }
 
+
+    private void onPermissionsGranted() {
+      if (sketch != null) {
+        sketch.onPermissionsGranted();
+      }
+    }
+
+
     @Override
     public void onSurfaceCreated(SurfaceHolder surfaceHolder) {
       super.onSurfaceCreated(surfaceHolder);
     }
 
+
     @Override
     public void onSurfaceChanged(final SurfaceHolder holder, final int format,
                                  final int width, final int height) {
@@ -151,6 +178,7 @@ public void onSurfaceChanged(final SurfaceHolder holder, final int format,
       super.onSurfaceChanged(holder, format, width, height);
     }
 
+
     @Override
     public void onVisibilityChanged(boolean visible) {
       if (sketch != null) {
@@ -163,6 +191,7 @@ public void onVisibilityChanged(boolean visible) {
       super.onVisibilityChanged(visible);
     }
 
+
     /*
      * Store the position of the touch event so we can use it for drawing
      * later
@@ -175,6 +204,7 @@ public void onTouchEvent(MotionEvent event) {
       }
     }
 
+
     @Override
     public void onOffsetsChanged(float xOffset, float yOffset,
                                  float xOffsetStep, float yOffsetStep,
@@ -190,6 +220,7 @@ public void onOffsetsChanged(float xOffset, float yOffset,
       }
     }
 
+
     @Override
     public void onSurfaceDestroyed(SurfaceHolder holder) {
       // This is called immediately before a surface is being destroyed.
@@ -200,18 +231,13 @@ public void onSurfaceDestroyed(SurfaceHolder holder) {
       super.onSurfaceDestroyed(holder);
     }
 
+
     @Override
     public void onDestroy() {
       super.onDestroy();
       if (sketch != null) {
         sketch.onDestroy();
       }
     }
-
-    public void onPermissionsGranted() {
-      if (sketch != null) {
-        sketch.onPermissionsGranted();
-      }
-    }
   }
 }