rename the project to eruption, started some refactoring for readability

akatkov7 · Oct 8, 2014 · d0189d4 · d0189d4
1 parent b9d3772
commit d0189d4
Show file tree

Hide file tree

Showing 33 changed files with 1,326 additions and 872 deletions.
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>AvalancheGame</name>
+	<name>Eruption</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -10,8 +10,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:debuggable="true"
+        android:icon="@drawable/eruption_icon"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         <activity

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -10,8 +10,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:debuggable="true"
+        android:icon="@drawable/eruption_icon"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
         <activity

diff --git a/bin/AvalancheGame.apk b/bin/AvalancheGame.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/example/avalanchegame/BuildConfig.class b/bin/classes/com/example/avalanchegame/BuildConfig.class
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView$GameThread.class
diff --git a/bin/classes/com/example/avalanchegame/CustomSurfaceView.class b/bin/classes/com/example/avalanchegame/CustomSurfaceView.class
diff --git a/bin/classes/com/example/avalanchegame/MainActivity.class b/bin/classes/com/example/avalanchegame/MainActivity.class
diff --git a/bin/classes/com/example/avalanchegame/Player.class b/bin/classes/com/example/avalanchegame/Player.class
diff --git a/bin/classes/com/example/avalanchegame/R$attr.class b/bin/classes/com/example/avalanchegame/R$attr.class
diff --git a/bin/classes/com/example/avalanchegame/R$dimen.class b/bin/classes/com/example/avalanchegame/R$dimen.class
diff --git a/bin/classes/com/example/avalanchegame/R$drawable.class b/bin/classes/com/example/avalanchegame/R$drawable.class
diff --git a/bin/classes/com/example/avalanchegame/R$id.class b/bin/classes/com/example/avalanchegame/R$id.class
diff --git a/bin/classes/com/example/avalanchegame/R$layout.class b/bin/classes/com/example/avalanchegame/R$layout.class
diff --git a/bin/classes/com/example/avalanchegame/R$menu.class b/bin/classes/com/example/avalanchegame/R$menu.class
diff --git a/bin/classes/com/example/avalanchegame/R$string.class b/bin/classes/com/example/avalanchegame/R$string.class
diff --git a/bin/classes/com/example/avalanchegame/R$style.class b/bin/classes/com/example/avalanchegame/R$style.class
diff --git a/bin/classes/com/example/avalanchegame/R.class b/bin/classes/com/example/avalanchegame/R.class
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/example/avalanchegame/R.java b/gen/com/example/avalanchegame/R.java
@@ -21,7 +21,8 @@ public static final class dimen {
         public static final int activity_vertical_margin=0x7f040001;
     }
     public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
+        public static final int eruption_icon=0x7f020000;
+        public static final int ic_launcher=0x7f020001;
     }
     public static final class id {
         public static final int action_settings=0x7f08000c;
@@ -52,7 +53,6 @@ public static final class menu {
     public static final class string {
         public static final int action_settings=0x7f050001;
         public static final int app_name=0x7f050000;
-        public static final int hello_world=0x7f050002;
     }
     public static final class style {
         /** 

diff --git a/res/drawable-xxhdpi/eruption_icon.png b/res/drawable-xxhdpi/eruption_icon.png
diff --git a/res/layout/pausescreen.xml b/res/layout/pausescreen.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:onClick="backToGame"
-        android:text="Back to game" />
+        android:text="New Game" />
 
     <Button
         android:id="@+id/exit"
@@ -19,6 +19,6 @@
         android:layout_below="@id/backToGame"
         android:layout_centerInParent="true"
         android:onClick="exit"
-        android:text="Exit" />
+        android:text="Back to Main Menu" />
 
 </RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">AvalancheGame</string>
+    <string name="app_name">Eruption</string>
     <string name="action_settings">Settings</string>
-    <string name="hello_world">Hello world!</string>
 
 </resources>