Cleanup

3 files changed, 15 insertions, 31 deletions

diff --git a/app/src/main/java/com/camilstaps/rushhour/Board.java b/app/src/main/java/com/camilstaps/rushhour/Board.java
index e99c438..eeb2580 100644
--- a/app/src/main/java/com/camilstaps/rushhour/Board.java
+++ b/app/src/main/java/com/camilstaps/rushhour/Board.java
@@ -24,12 +24,9 @@ public class Board {
         public void onMove(Car car, int offset) {
             Coordinate newC = car.wouldMoveTo(offset);
             if (newC.getY() > DIMENSION - 1 || newC.getX() > DIMENSION - 1 || newC.getX() < 0 || newC.getY() < 0) return;
-            for (Car iter : cars) {
-                if (iter.occupies(newC)) {
-                    Log.d("Board", "Can't move");
+            for (Car iter : cars)
+                if (iter.occupies(newC))
                     return;
-                }
-            }
             car.move(offset);
             driveListener.onDrive();
         }
@@ -51,8 +48,6 @@ public class Board {
     }
 
     public void addToLayout(Context context, ViewGroup layout) {
-        Log.d("Board", Integer.toString(layout.getWidth()));
-
         for (Car car : cars) {
             layout.addView(car.getImageView(context, (layout.getWidth() - layout.getPaddingLeft() - layout.getPaddingRight()) / DIMENSION));
         }
diff --git a/app/src/main/java/com/camilstaps/rushhour/Car.java b/app/src/main/java/com/camilstaps/rushhour/Car.java
index aa654f8..2dce203 100644
--- a/app/src/main/java/com/camilstaps/rushhour/Car.java
+++ b/app/src/main/java/com/camilstaps/rushhour/Car.java
@@ -16,7 +16,6 @@ import android.widget.TableLayout;
  */
 public class Car {
 
-    //private int startCoordinate.getX(), startCoordinate.getY(), endCoordinate.getX(), endCoordinate.getY();
     private Coordinate startCoordinate, endCoordinate;
     private final int colour;
 
@@ -42,20 +41,10 @@ public class Car {
         this.colour = colour;
     }
 
-    public int getColour() { return colour; }
-
     public void setMoveListener(MoveListener listener) {
         moveListener = listener;
     }
 
-    private int getWidth() {
-        return (SIZE + MARGIN) * (endCoordinate.getX() - startCoordinate.getX()) + SIZE;
-    }
-
-    private int getHeight() {
-        return (SIZE + MARGIN) * (endCoordinate.getY() - startCoordinate.getY()) + SIZE;
-    }
-
     public void setLayoutParams() {
         ViewGroup.MarginLayoutParams marginParams = new RelativeLayout.LayoutParams(calculatedWidth, calculatedHeight);
         marginParams.setMargins((int) (startCoordinate.getX() * (widthPerCell + MARGIN) + MARGIN), (int) (startCoordinate.getY() * (widthPerCell + MARGIN) + MARGIN), MARGIN, MARGIN);
diff --git a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
index 620f2b2..495c996 100644
--- a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
@@ -31,9 +31,6 @@ public class FullscreenActivity extends Activity {
 
         setContentView(R.layout.activity_fullscreen);
 
-        final RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
-        Log.d("FA", boardLayout.toString());
-
         final Board board = new Board();
         board.add(new Car(new Coordinate(0,0), new Coordinate(2,0), Color.YELLOW));
         board.add(new Car(new Coordinate(3,0), new Coordinate(3,1), Color.rgb(128,223,182)));
@@ -48,15 +45,6 @@ public class FullscreenActivity extends Activity {
         board.add(new Car(new Coordinate(5,4), new Coordinate(5,5), Color.rgb(219,202,161)));
         board.add(new Car(new Coordinate(0,5), new Coordinate(2,5), Color.rgb(25,195,167)));
 
-        ViewTreeObserver vto = boardLayout.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                boardLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                board.addToLayout(getBaseContext(), boardLayout);
-            }
-        });
-
         soundPool = new SoundPool(2, AudioManager.STREAM_MUSIC, 0);
         soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
             @Override
@@ -66,10 +54,22 @@ public class FullscreenActivity extends Activity {
         });
         soundBackgroundId = soundPool.load(this, R.raw.car_drive, 1);
 
+        final RelativeLayout boardLayout = (RelativeLayout) findViewById(R.id.board);
+        ViewTreeObserver vto = boardLayout.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                boardLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                board.addToLayout(getBaseContext(), boardLayout);
+            }
+        });
+
         board.setDriveListener(new DriveListener() {
             @Override
             public void onDrive() {
-                soundPool.play(soundBackgroundId, 1, 1, 1, 0, 1f);
+                if (soundBackgroundLoaded) {
+                    soundPool.play(soundBackgroundId, 1, 1, 1, 0, 1f);
+                }
             }
         });
     }