diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7d95eba..5d35779 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
+
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27143e0..a6d4e93 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
android:theme="@style/AppTheme">
+ android:label="@string/app_name"
+ android:theme="@style/DeltaWings">
@@ -21,12 +22,16 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java
new file mode 100644
index 0000000..e9b48db
--- /dev/null
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java
@@ -0,0 +1,13 @@
+package net.DeltaWings.Android.Hangman;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class AboutActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_about);
+ }
+}
diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java
index 88f4e47..035f8ad 100644
--- a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java
@@ -1,6 +1,7 @@
package net.DeltaWings.Android.Hangman;
import android.animation.ObjectAnimator;
+import android.app.Activity;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
index 1630b93..74d9ecd 100644
--- a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
@@ -13,6 +13,11 @@ public class MainActivity extends AppCompatActivity {
public static MainActivity instance;
+ public static MainActivity getInstance() {
+ return instance;
+ }
+ public boolean single = true;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
instance = this;
diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java
index 46d24b4..34ec406 100644
--- a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java
@@ -1,6 +1,8 @@
package net.DeltaWings.Android.Hangman.Util;
import java.util.List;
+import net.DeltaWings.Android.Hangman.MainActivity;
+import net.DeltaWings.Android.Hangman.Util.GameUtil;
public class ConnectionUtil {
@@ -10,23 +12,44 @@ public class ConnectionUtil {
private String userID = null;
private String jsp = "jsp";
public int percent = 0;
+ private boolean single = MainActivity.getInstance().single;
+ private GameUtil gameUtil = null;
- public ConnectionUtil ConnectionUtil() {
+ public ConnectionUtil() {
+ //check gamemode
+ if(single) {
+ gameUtil = new GameUtil();
+ } else {
+ //init connection
+ //send user name, generated userID
+ }
- return this;
+
}
public void closeConnection() {
-
+ if(single) {
+ gameUtil = null;
+ } else {
+ //send null username and null userID
+ }
+
}
public boolean sendData(List