update to work in latest Android Studio version

akatkov7 · Jan 23, 2017 · 79367c5 · 79367c5
1 parent 3f66335
commit 79367c5
Show file tree

Hide file tree

Showing 64 changed files with 502 additions and 135 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
+    defaultConfig {
+        applicationId "com.example.eruption"
+        minSdkVersion 15
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    testCompile 'junit:junit:4.12'
+}
diff --git a/proguard-project.txt → app/proguard-rules.pro b/proguard-project.txt → app/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /Users/akatkov/Documents/AndroidSDK/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

diff --git a/app/src/androidTest/java/com/example/eruption/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/eruption/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.example.eruption;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.example.eruption", appContext.getPackageName());
+    }
+}
diff --git a/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/AndroidManifest.xml → app/src/main/AndroidManifest.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.eruption"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+    package="com.example.eruption">
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/eruption_icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         <activity
-            android:name="com.example.eruption.MainActivity"
-            android:screenOrientation="portrait" >
+            android:name=".MainActivity"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity android:name="com.example.eruption.TitleMenu" >
         </activity>

diff --git a/src/com/example/eruption/Box.java → ...c/main/java/com/example/eruption/Box.java b/src/com/example/eruption/Box.java → ...c/main/java/com/example/eruption/Box.java
diff --git a/src/com/example/eruption/Collidable.java → ...java/com/example/eruption/Collidable.java b/src/com/example/eruption/Collidable.java → ...java/com/example/eruption/Collidable.java
diff --git a/src/com/example/eruption/GameSelect.java → ...java/com/example/eruption/GameSelect.java b/src/com/example/eruption/GameSelect.java → ...java/com/example/eruption/GameSelect.java
diff --git a/...com/example/eruption/GameSurfaceView.java → ...com/example/eruption/GameSurfaceView.java b/...com/example/eruption/GameSurfaceView.java → ...com/example/eruption/GameSurfaceView.java
diff --git a/src/com/example/eruption/GameThread.java → ...java/com/example/eruption/GameThread.java b/src/com/example/eruption/GameThread.java → ...java/com/example/eruption/GameThread.java
diff --git a/src/com/example/eruption/Ground.java → ...ain/java/com/example/eruption/Ground.java b/src/com/example/eruption/Ground.java → ...ain/java/com/example/eruption/Ground.java
diff --git a/src/com/example/eruption/Lava.java → .../main/java/com/example/eruption/Lava.java b/src/com/example/eruption/Lava.java → .../main/java/com/example/eruption/Lava.java
diff --git a/src/com/example/eruption/LoginMenu.java → .../java/com/example/eruption/LoginMenu.java b/src/com/example/eruption/LoginMenu.java → .../java/com/example/eruption/LoginMenu.java
diff --git a/src/com/example/eruption/MainActivity.java → ...va/com/example/eruption/MainActivity.java b/src/com/example/eruption/MainActivity.java → ...va/com/example/eruption/MainActivity.java
diff --git a/src/com/example/eruption/PauseScreen.java → ...ava/com/example/eruption/PauseScreen.java b/src/com/example/eruption/PauseScreen.java → ...ava/com/example/eruption/PauseScreen.java
diff --git a/src/com/example/eruption/Player.java → ...ain/java/com/example/eruption/Player.java b/src/com/example/eruption/Player.java → ...ain/java/com/example/eruption/Player.java
diff --git a/src/com/example/eruption/SignUpMenu.java → ...java/com/example/eruption/SignUpMenu.java b/src/com/example/eruption/SignUpMenu.java → ...java/com/example/eruption/SignUpMenu.java
diff --git a/src/com/example/eruption/TitleMenu.java → .../java/com/example/eruption/TitleMenu.java b/src/com/example/eruption/TitleMenu.java → .../java/com/example/eruption/TitleMenu.java
diff --git a/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml b/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml
diff --git a/res/layout/gameselect.xml → app/src/main/res/layout/gameselect.xml b/res/layout/gameselect.xml → app/src/main/res/layout/gameselect.xml
diff --git a/res/layout/loginmenu.xml → app/src/main/res/layout/loginmenu.xml b/res/layout/loginmenu.xml → app/src/main/res/layout/loginmenu.xml
diff --git a/res/layout/pausescreen.xml → app/src/main/res/layout/pausescreen.xml b/res/layout/pausescreen.xml → app/src/main/res/layout/pausescreen.xml
diff --git a/res/layout/signupmenu.xml → app/src/main/res/layout/signupmenu.xml b/res/layout/signupmenu.xml → app/src/main/res/layout/signupmenu.xml
diff --git a/res/layout/titlemenu.xml → app/src/main/res/layout/titlemenu.xml b/res/layout/titlemenu.xml → app/src/main/res/layout/titlemenu.xml
diff --git a/res/menu/main.xml → app/src/main/res/menu/main.xml b/res/menu/main.xml → app/src/main/res/menu/main.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/res/values/dimens.xml → app/src/main/res/values/dimens.xml b/res/values/dimens.xml → app/src/main/res/values/dimens.xml
@@ -1,7 +1,5 @@
 <resources>
-
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-
 </resources>
diff --git a/res/values/strings.xml → app/src/main/res/values/strings.xml b/res/values/strings.xml → app/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Eruption</string>
     <string name="action_settings">Settings</string>
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/app/src/test/java/com/example/eruption/ExampleUnitTest.java b/app/src/test/java/com/example/eruption/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.example.eruption;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
diff --git a/bin/AvalancheGame.apk b/bin/AvalancheGame.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/dexedLibs/android-support-v4-dce7614befcc9c90ad8d3ffd0d3f3fef.jar b/bin/dexedLibs/android-support-v4-dce7614befcc9c90ad8d3ffd0d3f3fef.jar
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<items version="2" >
+
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-fragment/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="2a53c4f3518116b8c6aee0e477233f0f7da8616f">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-fragment-25.1.0_13019e55d7b0b629bdc6feaa3ed1aaa96618cd15.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="f02263e35e52668dd17b73bf961437e3d562b35f">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-media-compat-25.1.0_bc2a3696cce8e48b8528cc7d5ee16b257551f2bf.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="0a0ef86b7fa568a52bf6214a0326ca1f1d618da7">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-core-utils-25.1.0_2817f83a77fa4169deb4a680c448f8e9cd89e9d4.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="1630658fbc2d222b988603c27b4a4249586fbfe7">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-25.1.0_dcca5463055e7988b4bd155d003b76d723a54121.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="e79aa3d9a16f8c9f16377c0608de70a8f31e5d80">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-vector-drawable-25.1.0_aa124f5b63e6cbfdabdfaa49db5c3dfe81d66fff.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="d7c42c80f6509b9ea4db28ca7859ffae08ec5741">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-25.1.0_039f82566b03661a71fda7ef6948aed17e6c4baa.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/AndroidSDK/sdk/extras/android/m2repository/com/android/support/support-annotations/25.1.0/support-annotations-25.1.0.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="64cb6b229a8bdfd907bc8dd46839a0053e4c018d">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/support-annotations-25.1.0_57417c58b34adccc83be747f6b4ddc9d6543b196.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="aee64634871d88a419d59eb743c1258a60f19700">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-core-ui-25.1.0_36aa5929ac94099c803f8ff9d331adb12ad3c9cd.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="6fb6ac3e8d3b9013819920d9ea11f3803c4c0033">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-25.1.0_36c93e8bba71283f4a93e57bf70ae9c5be9bde9d.jar" />
+    </item>
+    <item
+        is-multidex="false"
+        jar="/Users/akatkov/Documents/Eruption/app/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.0/jars/classes.jar"
+        jumboMode="false"
+        optimize="true"
+        revision="25.0.0"
+        sha1="ca3c7aa31e2726a400a6e552b93cb9f63c9a1e6d">
+        <dex dex="/Users/akatkov/Documents/Eruption/app/build/intermediates/pre-dexed/debug/com.android.support-support-compat-25.1.0_82dd9e024cf75816c97091c8179e6e57cfad1faf.jar" />
+    </item>
+
+</items>
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip