aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.idea/workspace.xml189
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/Board.java9
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/Car.java11
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java26
4 files changed, 92 insertions, 143 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 11a6c42..d00696e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -42,59 +42,20 @@
<file leaf-file-name="FullscreenActivity.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.52034885" vertical-offset="721" max-vertical-offset="1065">
- <caret line="71" column="51" selection-start-line="71" selection-start-column="51" selection-end-line="71" selection-end-column="51" />
+ <state vertical-scroll-proportion="0.86918604" vertical-offset="601" max-vertical-offset="1065">
+ <caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Board.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="569" max-vertical-offset="900">
- <caret line="62" column="5" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
- <folding>
- <element signature="e#1618#1619#0" expanded="true" />
- <element signature="e#1652#1653#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Car.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="1994" max-vertical-offset="2325">
- <caret line="64" column="72" selection-start-line="64" selection-start-column="72" selection-end-line="64" selection-end-column="72" />
- <folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="activity_fullscreen.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml">
- <provider editor-type-id="android-designer">
- <state />
- </provider>
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-4.6153846" vertical-offset="0" max-vertical-offset="300">
- <caret line="8" column="29" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -1356,9 +1317,9 @@
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Coordinate.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_fullscreen.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/DriveListener.java" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java" />
</list>
</option>
@@ -1729,12 +1690,12 @@
<state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="720">
<caret line="19" column="41" selection-start-line="19" selection-start-column="41" selection-end-line="19" selection-end-column="41" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1744,8 +1705,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="870" max-vertical-offset="2280">
<caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
<folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1771,12 +1732,12 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="645">
<caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1786,8 +1747,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="1425" max-vertical-offset="2475">
<caret line="95" column="33" selection-start-line="95" selection-start-column="33" selection-end-line="95" selection-end-column="33" />
<folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1813,12 +1774,12 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="645">
<caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1828,8 +1789,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="1284" max-vertical-offset="2475">
<caret line="95" column="33" selection-start-line="95" selection-start-column="33" selection-end-line="95" selection-end-column="33" />
<folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1855,12 +1816,12 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="720">
<caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1877,8 +1838,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="1284" max-vertical-offset="2475">
<caret line="95" column="33" selection-start-line="95" selection-start-column="33" selection-end-line="95" selection-end-column="33" />
<folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1904,12 +1865,12 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="735">
<caret line="38" column="59" selection-start-line="38" selection-start-column="59" selection-end-line="38" selection-end-column="59" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1926,8 +1887,8 @@
<state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2235">
<caret line="138" column="17" selection-start-line="138" selection-start-column="17" selection-end-line="138" selection-end-column="17" />
<folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
</folding>
</state>
</provider>
@@ -2031,17 +1992,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="1139" max-vertical-offset="2325">
- <caret line="64" column="72" selection-start-line="64" selection-start-column="72" selection-end-line="64" selection-end-column="72" />
- <folding>
- <element signature="e#1261#1262#0" expanded="true" />
- <element signature="e#1300#1301#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/DriveListener.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.1744186" vertical-offset="0" max-vertical-offset="344">
@@ -2050,28 +2000,43 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Car.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.36253777" vertical-offset="0" max-vertical-offset="2160">
+ <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ <folding>
+ <element signature="e#1104#1105#0" expanded="true" />
+ <element signature="e#1143#1144#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/Board.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0" vertical-offset="569" max-vertical-offset="900">
- <caret line="62" column="5" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
+ <state vertical-scroll-proportion="0.9063444" vertical-offset="0" max-vertical-offset="900">
+ <caret line="26" column="25" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="25" />
<folding>
- <element signature="e#1618#1619#0" expanded="true" />
- <element signature="e#1652#1653#0" expanded="true" />
+ <element signature="e#441#892#0" expanded="true" />
+ <element signature="e#885#886#0" expanded="true" />
+ <element signature="e#914#915#0" expanded="true" />
+ <element signature="e#954#955#0" expanded="true" />
+ <element signature="e#1470#1471#0" expanded="true" />
+ <element signature="e#1504#1505#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.52034885" vertical-offset="721" max-vertical-offset="1065">
- <caret line="71" column="51" selection-start-line="71" selection-start-column="51" selection-end-line="71" selection-end-column="51" />
+ <state vertical-scroll-proportion="0.86918604" vertical-offset="601" max-vertical-offset="1065">
+ <caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
<folding>
- <element signature="e#2286#2574#0" expanded="true" />
- <element signature="e#2563#2564#0" expanded="true" />
- <element signature="e#2690#2910#0" expanded="true" />
- <element signature="e#2899#2900#0" expanded="true" />
- <element signature="e#3015#3185#0" expanded="true" />
- <element signature="e#3174#3175#0" expanded="true" />
+ <element signature="e#2162#2382#0" expanded="true" />
+ <element signature="e#2371#2372#0" expanded="true" />
+ <element signature="e#2646#2934#0" expanded="true" />
+ <element signature="e#2923#2924#0" expanded="true" />
+ <element signature="e#2969#3206#0" expanded="true" />
+ <element signature="e#3195#3196#0" expanded="true" />
</folding>
</state>
</provider>
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);
+ }
}
});
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-14 06:21:53 +0000