Merge pull request #3 from muhi28/develop

README.md

@@ -1 +1,2 @@
 # Wuermer-und-Aufzuege
+test

android/AndroidManifest.xml

@@ -2,25 +2,73 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mygdx.game"
     android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
+    <uses-feature
+        android:name="android.hardware.sensor.accelerometer"
+        android:required="true" />
+
+    <uses-sdk
+        android:minSdkVersion="15"
+        android:targetSdkVersion="25" />
+
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/GdxTheme" >
+        android:theme="@style/GdxTheme">
+
         <activity
             android:name="com.mygdx.game.AndroidLauncher"
-            android:label="@string/app_name" 
-            android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
+
+        <activity
+            android:name=".activities.SplashScreen"
+            android:label="@string/app_name"
+            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=".activities.MainMenu"
+
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".activities.CharacterSelect"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".activities.Instruction"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activities.Network"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activities.MainGameActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+
+        <service android:name=".netwoking.ServerIntent" />
+
+        <activity
+            android:name=".activities.OptionActivity"
+            android:label="@string/title_activity_option" />
     </application>
 
 </manifest>

android/assets/Spielbrett1.tmx

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="left-up" width="32" height="32" tilewidth="32" tileheight="32" nextobjectid="126">
+ <tileset firstgid="1" name="Hintergrund" tilewidth="32" tileheight="32" tilecount="150" columns="15">
+  <image source="179023303[1].jpg" width="504" height="339"/>
+ </tileset>
+ <tileset firstgid="151" name="Spielbrett-Raster" tilewidth="32" tileheight="32" tilecount="169" columns="13">
+  <image source="Schachbrett-bw.png" width="445" height="445"/>
+ </tileset>
+ <layer name="Hintergrund" width="32" height="32">
+  <data encoding="base64" compression="zlib">
+   eJztzzEBAAAIA6CFsYH9u9nCPRwEYJJM0ZY17/7+/v7+/v7+/v7+/v7+Xw49Nq4B
+  </data>
+ </layer>
+ <layer name="Spielbrett" width="32" height="32">
+  <data encoding="base64" compression="zlib">
+   eJzt0SEOACAMQ9Hd/1YQsBA4ETUzyM3Bf0lFZVMzAMCtKV0pSg30rKVsZSgz0LOiu71nRXd7z+J//ud//uf/P/8HXncA+svJgQ==
+  </data>
+ </layer>
+ <objectgroup name="Spielfeld">
+  <object id="59" name="Feld1" x="224" y="768" width="64" height="64"/>
+  <object id="60" name="Feld2" x="288" y="768" width="64" height="64"/>
+  <object id="61" name="Feld3" x="352" y="768" width="64" height="64"/>
+  <object id="62" name="Feld4" x="416" y="768" width="64" height="64"/>
+  <object id="63" name="Feld5" x="480" y="768" width="64" height="64"/>
+  <object id="64" name="Feld6" x="544" y="768" width="64" height="64"/>
+  <object id="65" name="Feld7" x="608" y="768" width="64" height="64"/>
+  <object id="66" name="Feld8" x="672" y="768" width="64" height="64"/>
+  <object id="67" name="Feld9" x="672" y="704" width="64" height="64"/>
+  <object id="68" name="Feld10" x="608" y="704" width="64" height="64"/>
+  <object id="69" name="Feld11" x="544" y="704" width="64" height="64"/>
+  <object id="70" name="Feld12" x="480" y="704" width="64" height="64"/>
+  <object id="71" name="Feld13" x="416" y="704" width="64" height="64"/>
+  <object id="72" name="Feld14" x="352" y="704" width="64" height="64"/>
+  <object id="73" name="Feld15" x="288" y="704" width="64" height="64"/>
+  <object id="74" name="Feld16" x="224" y="704" width="64" height="64"/>
+  <object id="75" name="Feld17" x="224" y="640" width="64" height="64"/>
+  <object id="76" name="Feld18" x="288" y="640" width="64" height="64"/>
+  <object id="77" name="Feld19" x="352" y="640" width="64" height="64"/>
+  <object id="78" name="Feld20" x="416" y="640" width="64" height="64"/>
+  <object id="79" name="Feld21" x="480" y="640" width="64" height="64"/>
+  <object id="80" name="Feld22" x="544" y="640" width="64" height="64"/>
+  <object id="81" name="Feld23" x="608" y="640" width="64" height="64"/>
+  <object id="82" name="Feld24" x="672" y="640" width="64" height="64"/>
+  <object id="83" name="Feld25" x="672" y="576" width="64" height="64"/>
+  <object id="84" name="Feld26" x="608" y="576" width="64" height="64"/>
+  <object id="85" name="Feld27" x="544" y="576" width="64" height="64"/>
+  <object id="86" name="Feld28" x="480" y="576" width="64" height="64"/>
+  <object id="87" name="Feld29" x="416" y="576" width="64" height="64"/>
+  <object id="88" name="Feld30" x="352" y="576" width="64" height="64"/>
+  <object id="89" name="Feld31" x="288" y="576" width="64" height="64"/>
+  <object id="90" name="Feld32" x="224" y="576" width="64" height="64"/>
+  <object id="93" name="Feld33" x="224" y="512" width="64" height="64"/>
+  <object id="94" name="Feld34" x="288" y="512" width="64" height="64"/>
+  <object id="95" name="Feld35" x="352" y="512" width="64" height="64"/>
+  <object id="96" name="Feld36" x="416" y="512" width="64" height="64"/>
+  <object id="97" name="Feld37" x="480" y="512" width="64" height="64"/>
+  <object id="98" name="Feld38" x="544" y="512" width="64" height="64"/>
+  <object id="99" name="Feld39" x="608" y="512" width="64" height="64"/>
+  <object id="100" name="Feld40" x="672" y="512" width="64" height="64"/>
+  <object id="101" name="Feld41" x="672" y="448" width="64" height="64"/>
+  <object id="102" name="Feld42" x="608" y="448" width="64" height="64"/>
+  <object id="103" name="Feld43" x="544" y="448" width="64" height="64"/>
+  <object id="104" name="Feld44" x="480" y="448" width="64" height="64"/>
+  <object id="105" name="Feld45" x="416" y="448" width="64" height="64"/>
+  <object id="106" name="Feld46" x="352" y="448" width="64" height="64"/>
+  <object id="107" name="Feld47" x="288" y="448" width="64" height="64"/>
+  <object id="108" name="Feld48" x="224" y="448" width="64" height="64"/>
+  <object id="109" name="Feld49" x="224" y="384" width="64" height="64"/>
+  <object id="110" name="Field50" x="288" y="384" width="64" height="64"/>
+  <object id="111" name="Field51" x="352" y="384" width="64" height="64"/>
+  <object id="112" name="Field52" x="416" y="384" width="64" height="64"/>
+  <object id="113" name="Field53" x="480" y="384" width="64" height="64"/>
+  <object id="114" name="Field54" x="544" y="384" width="64" height="64"/>
+  <object id="115" name="Field55" x="608" y="384" width="64" height="64"/>
+  <object id="116" name="Field56" x="672" y="384" width="64" height="64"/>
+  <object id="117" name="Field57" x="672" y="320" width="64" height="64"/>
+  <object id="118" name="Field58" x="608" y="320" width="64" height="64"/>
+  <object id="119" name="Field59" x="544" y="320" width="64" height="64"/>
+  <object id="120" name="Field60" x="480" y="320" width="64" height="64"/>
+  <object id="121" name="Field61" x="416" y="320" width="64" height="64"/>
+  <object id="122" name="Field62" x="352" y="320" width="64" height="64"/>
+  <object id="123" name="Field63" x="288" y="320" width="64" height="64"/>
+  <object id="124" name="Field64" x="224" y="320" width="64" height="64"/>
+ </objectgroup>
+</map>

android/build.gradle

@@ -12,23 +12,35 @@ android {
             jniLibs.srcDirs = ['libs']
         }
 
-        instrumentTest.setRoot('tests')
+        test {
+            java.srcDirs = ['src/test/java']
+        }
+
+        instrumentTest.setRoot('src/androidtest/java')
     }
+
+
+
     packagingOptions {
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
     defaultConfig {
         applicationId "com.mygdx.game"
-        minSdkVersion 9
+        minSdkVersion 18
         targetSdkVersion 25
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    lintOptions {
+        textReport true
+        textOutput 'stdout'
+        disable 'InvalidPackage'
     }
 }
 
-
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
-task copyAndroidNatives() { 
+task copyAndroidNatives() {
     file("libs/armeabi/").mkdirs();
     file("libs/armeabi-v7a/").mkdirs();
     file("libs/arm64-v8a/").mkdirs();
@@ -37,12 +49,12 @@ task copyAndroidNatives() {
 
     configurations.natives.files.each { jar ->
         def outputDir = null
-        if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")        
-        if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-        if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
-        if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-        if(outputDir != null) {
+        if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
+        if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
+        if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
+        if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
+        if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
+        if (outputDir != null) {
             copy {
                 from zipTree(jar)
                 into outputDir
@@ -90,8 +102,8 @@ eclipse {
     }
 
     classpath {
-        plusConfigurations += [ project.configurations.compile ]        
-        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'       
+        plusConfigurations += [project.configurations.compile]
+        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'
     }
 
     project {
@@ -108,8 +120,7 @@ eclipse {
 // sets up the Android Idea project, using the old Ant based build.
 idea {
     module {
-        sourceDirs += file("src");
-        scopes = [ COMPILE: [plus:[project.configurations.compile]]]        
+        sourceDirs += file("src"); scopes = [COMPILE: [plus: [project.configurations.compile]]]
 
         iml {
             withXml {
@@ -119,11 +130,48 @@ idea {
                 builder.component(name: "FacetManager") {
                     facet(type: "android", name: "Android") {
                         configuration {
-                            option(name: "UPDATE_PROPERTY_FILES", value:"true")
+                            option(name: "UPDATE_PROPERTY_FILES", value: "true")
                         }
                     }
                 }
             }
         }
     }
 }
+
+
+
+apply plugin: 'jacoco'
+jacoco {
+    toolVersion = '0.7.6.201602180812'
+}
+
+// Edit covered scope if needed
+// For my part I like having the coverage of both application and tests
+def coverageSourceDirs = [
+        'src'
+]
+
+task jacocoTestReport(type: JacocoReport, dependsOn: "test") {
+    group = "Reporting"
+
+    description = "Generate Jacoco coverage reports "
+
+    classDirectories = fileTree(
+            dir: '../android/build/intermediates/classes',
+            excludes: ['**/R.class',
+                       '**/R$*.class',
+                       '**/*$ViewInjector*.*',
+                       '**/BuildConfig.*',
+                       '**/Manifest*.*']
+    )
+
+    additionalSourceDirs = files(coverageSourceDirs)
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files('../android/build/jacoco/testReleaseUnitTest.exec ')
+
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+}

android/proguard-project.txt

@@ -34,7 +34,7 @@
    <init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);
 }
 
--keepclassmembers class com.badlogic.gdx.physics.box2d.World {
+-keepclassmembers class com.badlogic.gdx.physics.box2d.com.mygdx.game.MyWorld {
    boolean contactFilter(long, long);
    void    beginContact(long);
    void    endContact(long);

android/project.properties

@@ -9,6 +9,5 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-19

android/res/layout/activity_option.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/background2">
+
+    <Switch
+        android:id="@+id/mySwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_marginTop="251dp"
+        android:text="Musik Menue"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <Button
+        android:id="@+id/back_button"
+        style="@android:style/Widget.Holo.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="26dp"
+        android:text="Zurück"
+        android:layout_alignParentBottom="true"
+        android:layout_alignLeft="@+id/mySwitch"
+        android:layout_alignStart="@+id/mySwitch"
+        android:layout_marginLeft="25dp"
+        android:layout_marginStart="25dp"
+        android:onClick="onClickBackButton" />
+
+    <Switch
+        android:id="@+id/switchGameMusic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/mySwitch"
+        android:layout_alignRight="@+id/mySwitch"
+        android:layout_below="@+id/mySwitch"
+        android:layout_marginTop="31dp"
+        android:text="Musik Spiel"
+        android:layout_alignLeft="@+id/mySwitch"
+        android:layout_alignStart="@+id/mySwitch" />
+
+    <Switch
+        android:id="@+id/switchEffects"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/switchGameMusic"
+        android:layout_alignRight="@+id/switchGameMusic"
+        android:layout_below="@+id/switchGameMusic"
+        android:layout_marginTop="24dp"
+        android:text="Effekte"
+        android:layout_alignLeft="@+id/switchGameMusic"
+        android:layout_alignStart="@+id/switchGameMusic" />
+
+</RelativeLayout>