diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9076de5..59436c9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/app/app.iml b/app/app.iml
index 699ce6f..d7fff0f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -86,11 +86,11 @@
-
-
+
+
diff --git a/app/src/main/java/com/kauron/dungeonmanager/AttackAdapter.java b/app/src/main/java/com/kauron/dungeonmanager/AttackAdapter.java
new file mode 100644
index 0000000..f141034
--- /dev/null
+++ b/app/src/main/java/com/kauron/dungeonmanager/AttackAdapter.java
@@ -0,0 +1,22 @@
+package com.kauron.dungeonmanager;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+class AttackAdapter extends ArrayAdapter {
+ AttackAdapter(Context context, Power[] powers) {
+ super(context, R.layout.attack_row, powers);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ LayoutInflater mInflater = LayoutInflater.from(getContext());
+ View mView = mInflater.inflate(R.layout.attack_row, parent, false);
+
+ Power attack = getItem(position);
+ return mView;
+ }
+}
diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
index 7c5c0ea..a4e448e 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
@@ -9,6 +9,7 @@ import android.graphics.PorterDuff;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.os.Handler;
+import android.support.v7.widget.Toolbar;
import android.text.InputType;
import android.view.Menu;
import android.view.MenuItem;
@@ -22,7 +23,7 @@ import android.widget.TextView;
import com.nispok.snackbar.Snackbar;
import com.nispok.snackbar.SnackbarManager;
-public class MainActivity extends ActionBarActivity{
+public class MainActivity extends ActionBarActivity {
public static final int CURRENT_PG = 1, NULL = 0;
@@ -35,11 +36,14 @@ public class MainActivity extends ActionBarActivity{
private Button pgCurrent;
private TextView currentPg, currentXp, currentCurativeEfforts, lvl;
private SharedPreferences p;
+ private Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
setContentView(R.layout.activity_main);
p = getSharedPreferences("basics", MODE_PRIVATE);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 19e84c0..a57b37f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,15 +1,23 @@
-
+
+
+
@@ -402,4 +410,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index cb8d696..ac2b636 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -1,4 +1,4 @@
-
+
+
-
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/attack_row.xml b/app/src/main/res/layout/attack_row.xml
new file mode 100644
index 0000000..481b91a
--- /dev/null
+++ b/app/src/main/res/layout/attack_row.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5d05ec0..d551d95 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-