Move renderers to their own package

diff --git a/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java b/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
index da75bc77f85fca849ed0965f962cda79d981087f..55e1458d79f3b267e96063ae3536e0240eddcf38 100644 (file)
--- a/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
+++ b/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
@@ -41,6 +41,9 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.acmetensortoys.watchviz.render.Grid;
+import com.acmetensortoys.watchviz.render.WholeMax;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayDeque;
 import java.util.Date;
@@ -76,8 +79,8 @@ public class MainActivity extends WearableActivity
         }
     }
     {
-        cyclercbq.add(RenderWholeScreenMax.class);
-        cyclercbq.add(RenderGrid.class);
+        cyclercbq.add(WholeMax.class);
+        cyclercbq.add(Grid.class);
     }
 
     // The surface to which this callback is bound is created only after audio permissions

diff --git a/app/src/main/java/com/acmetensortoys/watchviz/RenderGrid.java b/app/src/main/java/com/acmetensortoys/watchviz/render/Grid.java
similarity index 89%
rename from app/src/main/java/com/acmetensortoys/watchviz/RenderGrid.java
rename to app/src/main/java/com/acmetensortoys/watchviz/render/Grid.java
index 254067d81ef28222ce768e170d1ee9b531bf9550..004ded8b2b637f6881571ecf1f0a7a3212bde4af 100644 (file)
--- a/app/src/main/java/com/acmetensortoys/watchviz/RenderGrid.java
+++ b/app/src/main/java/com/acmetensortoys/watchviz/render/Grid.java
@@ -1,16 +1,18 @@
-package com.acmetensortoys.watchviz;
+package com.acmetensortoys.watchviz.render;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 
-public final class RenderGrid extends RenderCB {
+import com.acmetensortoys.watchviz.RenderCB;
+
+public final class Grid extends RenderCB {
     private boolean doDebug;
     private final Paint p = new Paint();
     private final Paint dbp = new Paint();
     private float[] hsv = new float[]{0.0f, 1.0f, 1.0f};
 
-    public RenderGrid()
+    public Grid()
     {
         dbp.setColor(Color.WHITE);
     }

diff --git a/app/src/main/java/com/acmetensortoys/watchviz/RenderWholeScreenMax.java b/app/src/main/java/com/acmetensortoys/watchviz/render/WholeMax.java
similarity index 87%
rename from app/src/main/java/com/acmetensortoys/watchviz/RenderWholeScreenMax.java
rename to app/src/main/java/com/acmetensortoys/watchviz/render/WholeMax.java
index fb84033bf77ddcaaa0732c23b079c3186c240088..f2af121163497a5165215849649fe00d52d671b5 100644 (file)
--- a/app/src/main/java/com/acmetensortoys/watchviz/RenderWholeScreenMax.java
+++ b/app/src/main/java/com/acmetensortoys/watchviz/render/WholeMax.java
@@ -1,18 +1,20 @@
-package com.acmetensortoys.watchviz;
+package com.acmetensortoys.watchviz.render;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 
+import com.acmetensortoys.watchviz.RenderCB;
+
 import java.util.Locale;
 
-public final class RenderWholeScreenMax extends RenderCB {
+public final class WholeMax extends RenderCB {
     private boolean doDebug;
     private final Paint dbp = new Paint();
     private float[] hsv = new float[]{0.0f, 1.0f, 1.0f};
 
-    public RenderWholeScreenMax()
+    public WholeMax()
     {
         dbp.setColor(Color.WHITE);
     }
@@ -26,7 +28,7 @@ public final class RenderWholeScreenMax extends RenderCB {
     public void render(Canvas cv, float[] samples) {
         float msamp = 0.0f;
         int mix = -1;
-            /* Restrict search to lowest half in agreement with RenderGrid */
+            /* Restrict search to lowest half in agreement with Grid */
         for (int i = 0; i < samples.length/2; i += 2) {
             if (samples[i] > msamp) {
                 msamp = samples[i];