From e23359aa2c1566785a09ca5bbca675bc032565dc Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 23 Apr 2015 17:00:23 +0200
Subject: FullScreenActivity -> GamePlayActivity

---
 app/src/main/AndroidManifest.xml                   |  2 +-
 .../camilstaps/rushhour/FullscreenActivity.java    | 65 ----------------------
 .../com/camilstaps/rushhour/GamePlayActivity.java  | 65 ++++++++++++++++++++++
 3 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
 create mode 100644 app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java

(limited to 'app/src')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 391a9fd..3c610a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".FullscreenActivity"
+            android:name=".GamePlayActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:theme="@style/FullscreenTheme"
diff --git a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
deleted file mode 100644
index 11fd1b1..0000000
--- a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.camilstaps.rushhour;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.media.AudioManager;
-import android.media.SoundPool;
-import android.os.Bundle;
-import android.view.ViewTreeObserver;
-import android.widget.RelativeLayout;
-
-public class FullscreenActivity extends Activity {
-
-    private SoundPool soundPool;
-    private int soundBackgroundId, soundCarDriveId;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_fullscreen);
-
-        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)));
-        board.add(new Car(new Coordinate(4,0), new Coordinate(4,2), Color.rgb(198, 134,221)));
-        board.add(new Car(new Coordinate(0,2), new Coordinate(1,2), Color.RED));
-        board.add(new Car(new Coordinate(5,2), new Coordinate(5,3), Color.rgb(255,165,0)));
-        board.add(new Car(new Coordinate(0,3), new Coordinate(0,4), Color.rgb(158,231,246)));
-        board.add(new Car(new Coordinate(1,3), new Coordinate(2,3), Color.rgb(245,158,246)));
-        board.add(new Car(new Coordinate(3,3), new Coordinate(4,3), Color.rgb(150,126,196)));
-        board.add(new Car(new Coordinate(1,4), new Coordinate(2,4), Color.GREEN));
-        board.add(new Car(new Coordinate(3,4), new Coordinate(3,5), Color.BLACK));
-        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)));
-
-        soundPool = new SoundPool(2, AudioManager.STREAM_MUSIC, 0);
-        soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
-            @Override
-            public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
-                if (sampleId == soundBackgroundId) {
-                    soundPool.play(soundBackgroundId, 1, 1, 2, -1, 1);
-                }
-            }
-        });
-        soundCarDriveId = soundPool.load(this, R.raw.car_drive, 1);
-        soundBackgroundId = soundPool.load(this, R.raw.tune, 2);
-
-        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(soundCarDriveId, 1, 1, 1, 0, 1);
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
new file mode 100644
index 0000000..1c0b2ab
--- /dev/null
+++ b/app/src/main/java/com/camilstaps/rushhour/GamePlayActivity.java
@@ -0,0 +1,65 @@
+package com.camilstaps.rushhour;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.media.AudioManager;
+import android.media.SoundPool;
+import android.os.Bundle;
+import android.view.ViewTreeObserver;
+import android.widget.RelativeLayout;
+
+public class GamePlayActivity extends Activity {
+
+    private SoundPool soundPool;
+    private int soundBackgroundId, soundCarDriveId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_fullscreen);
+
+        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)));
+        board.add(new Car(new Coordinate(4,0), new Coordinate(4,2), Color.rgb(198, 134,221)));
+        board.add(new Car(new Coordinate(0,2), new Coordinate(1,2), Color.RED));
+        board.add(new Car(new Coordinate(5,2), new Coordinate(5,3), Color.rgb(255,165,0)));
+        board.add(new Car(new Coordinate(0,3), new Coordinate(0,4), Color.rgb(158,231,246)));
+        board.add(new Car(new Coordinate(1,3), new Coordinate(2,3), Color.rgb(245,158,246)));
+        board.add(new Car(new Coordinate(3,3), new Coordinate(4,3), Color.rgb(150,126,196)));
+        board.add(new Car(new Coordinate(1,4), new Coordinate(2,4), Color.GREEN));
+        board.add(new Car(new Coordinate(3,4), new Coordinate(3,5), Color.BLACK));
+        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)));
+
+        soundPool = new SoundPool(2, AudioManager.STREAM_MUSIC, 0);
+        soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
+            @Override
+            public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
+                if (sampleId == soundBackgroundId) {
+                    soundPool.play(soundBackgroundId, 1, 1, 2, -1, 1);
+                }
+            }
+        });
+        soundCarDriveId = soundPool.load(this, R.raw.car_drive, 1);
+        soundBackgroundId = soundPool.load(this, R.raw.tune, 2);
+
+        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(soundCarDriveId, 1, 1, 1, 0, 1);
+            }
+        });
+    }
+}
-- 
cgit v1.2.3