Merge pull request #16 from ByteHamster/fixes

Small fixes

Author: ByteHamster

app/src/main/java/com/bytehamster/flowitgame/Main.java

@@ -113,11 +113,11 @@ private void switchState() {
     protected void onResume() {
         super.onResume();
 
-        new Handler().postDelayed(() -> {
+        glSurfaceView.postDelayed(() -> {
             glSurfaceView.getRenderer().onResume();
             glSurfaceView.onResume();
             glSurfaceView.invalidate();
-        }, 200);
+        }, 500);
     }
 
     @Override

app/src/main/java/com/bytehamster/flowitgame/filler/BombFiller.java

@@ -26,19 +26,19 @@ public void run() {
                 fillTo = Converter.convertColor(levelData.fieldAt(col, row).getColor());
 
                 try {
-                    Thread.sleep(100);
+                    sleep(100);
                     state.playSound(R.raw.fill);
 
                     doFill(col, row);
 
-                    Thread.sleep(100);
+                    sleep(100);
 
                     doFill(col + 1, row);
                     doFill(col, row + 1);
                     doFill(col - 1, row);
                     doFill(col, row - 1);
 
-                    Thread.sleep(100);
+                    sleep(100);
 
                     doFill(col + 1, row - 1);
                     doFill(col + 1, row + 1);

app/src/main/java/com/bytehamster/flowitgame/filler/DirectionFiller.java

@@ -56,12 +56,7 @@ private void doFill(int col, int row) {
             somethingWasFilled = true;
             f.setModifier(fillTo);
             state.playSound(R.raw.fill);
-
-            try {
-                Thread.sleep(40);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+            sleep(40);
 
             x += dx;
             y += dy;

app/src/main/java/com/bytehamster/flowitgame/filler/Filler.java

@@ -5,6 +5,7 @@
 
 public abstract class Filler {
     private Runnable onFinished = null;
+    private long lastAction = 0;
 
     public abstract void fill();
 
@@ -18,27 +19,40 @@ public static Filler get(Level levelData, int col, int row, State state) {
                 return new FloodFiller(levelData, col, row, state);
             case BOMB:
                 return new BombFiller(levelData, col, row, state);
-            case UP:
-                return new DirectionFiller(levelData, col, row, 0, -1, state);
-            case RIGHT:
-                return new DirectionFiller(levelData, col, row, 1, 0, state);
-            case LEFT:
-                return new DirectionFiller(levelData, col, row, -1, 0, state);
-            case DOWN:
-                return new DirectionFiller(levelData, col, row, 0, 1, state);
+            case UP: // Fall-through
             case ROTATE_UP:
                 return new DirectionFiller(levelData, col, row, 0, -1, state);
+            case RIGHT: // Fall-through
             case ROTATE_RIGHT:
                 return new DirectionFiller(levelData, col, row, 1, 0, state);
+            case LEFT: // Fall-through
             case ROTATE_LEFT:
                 return new DirectionFiller(levelData, col, row, -1, 0, state);
+            case DOWN: // Fall-through
             case ROTATE_DOWN:
                 return new DirectionFiller(levelData, col, row, 0, 1, state);
             default:
                 return null;
         }
     }
 
+    protected void sleep(long milliseconds) {
+        long timePassed = System.currentTimeMillis() - lastAction;
+        long timeLeft = milliseconds - timePassed;
+        if (lastAction == 0) {
+            timeLeft = milliseconds;
+        }
+        lastAction = System.currentTimeMillis();
+        if (timeLeft <= 0) {
+            return;
+        }
+        try {
+            Thread.sleep(timeLeft);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void setOnFinished(Runnable onFinished) {
         this.onFinished = onFinished;
     }

app/src/main/java/com/bytehamster/flowitgame/filler/FloodFiller.java

@@ -75,10 +75,10 @@ private void floodBFS(final int col, final int row) throws InterruptedException
                 if (!neighbor.getField().isVisited()) {
                     neighbor.getField().setVisited(true);
 
-                    if(neighbor.getField().getModifier() == fillFrom) {
+                    if (neighbor.getField().getModifier() == fillFrom) {
                         if (lastDistance != neighbor.distance) {
                             lastDistance = neighbor.distance;
-                            Thread.sleep(60);
+                            sleep(60);
                             state.playSound(R.raw.fill);
                         }
                         neighbor.getField().setModifier(fillTo);