aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamil Staps2015-04-29 12:59:03 +0200
committerCamil Staps2015-04-29 12:59:03 +0200
commit78a94aebcc79f1442d033a608db6deb0eb088a5a (patch)
treeb07b60acd71b6ffbe83b2044d349e9792e33b3fa
parentCleanup; victory sound (diff)
Comments
-rwxr-xr-xapp/src/main/java/com/camilstaps/rushhour/BoardLoader.java5
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/FinishedActivity.java4
-rwxr-xr-xapp/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java5
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/HighScoreList.java2
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/MainActivity.java3
-rw-r--r--app/src/main/java/com/camilstaps/rushhour/TheSoundPool.java1
6 files changed, 17 insertions, 3 deletions
diff --git a/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java b/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
index 0f9cd6f..c5ae6aa 100755
--- a/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
+++ b/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
@@ -34,6 +34,11 @@ public class BoardLoader {
public BoardLoader()
{}
+ /**
+ * Load a board from a file
+ * @param file
+ * @return
+ */
public Board loadBoard(InputStream file)
{
/*
diff --git a/app/src/main/java/com/camilstaps/rushhour/FinishedActivity.java b/app/src/main/java/com/camilstaps/rushhour/FinishedActivity.java
index e0f3c37..f7f7450 100644
--- a/app/src/main/java/com/camilstaps/rushhour/FinishedActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/FinishedActivity.java
@@ -23,6 +23,10 @@ import com.camilstaps.rushhour.R;
import java.util.ArrayList;
+/**
+ * The user has finished the game / wants to see the highscores
+ * @author Camil Staps
+ */
public class FinishedActivity extends ActionBarActivity {
Context context;
diff --git a/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
index 8399446..90c5a63 100755
--- a/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
@@ -20,8 +20,6 @@ package com.camilstaps.rushhour;
import android.app.Activity;
import android.content.Intent;
-import android.media.AudioManager;
-import android.media.SoundPool;
import android.os.Bundle;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -29,6 +27,9 @@ import android.widget.RelativeLayout;
import java.io.InputStream;
+/**
+ * Playing the game
+ */
public class GamePlayActivity extends Activity implements Board.SolveListener {
Board board;
diff --git a/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java b/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
index 5baba82..9576a52 100644
--- a/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
+++ b/app/src/main/java/com/camilstaps/rushhour/HighScoreList.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Set;
/**
- *
+ * A list of highscores from SharedPreferences
* @author Created by halzyn on 23-4-15.
*/
public class HighScoreList {
diff --git a/app/src/main/java/com/camilstaps/rushhour/MainActivity.java b/app/src/main/java/com/camilstaps/rushhour/MainActivity.java
index e0a511f..1e578ca 100644
--- a/app/src/main/java/com/camilstaps/rushhour/MainActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/MainActivity.java
@@ -24,6 +24,9 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
+/**
+ * Launcher activity
+ */
public class MainActivity extends ActionBarActivity {
@Override
diff --git a/app/src/main/java/com/camilstaps/rushhour/TheSoundPool.java b/app/src/main/java/com/camilstaps/rushhour/TheSoundPool.java
index c727979..5713136 100644
--- a/app/src/main/java/com/camilstaps/rushhour/TheSoundPool.java
+++ b/app/src/main/java/com/camilstaps/rushhour/TheSoundPool.java
@@ -5,6 +5,7 @@ import android.media.AudioManager;
import android.media.SoundPool;
/**
+ * Wrapper for SoundPool for app-wide sounds
* Created by camilstaps on 29-4-15.
*/
public class TheSoundPool {