From 8a781561e308f8a645cdcb3fdc4d024ce4e254c5 Mon Sep 17 00:00:00 2001
From: Carlos Galindo <carlos.s.galindo@gmail.com>
Date: Wed, 25 Feb 2015 21:55:20 +0100
Subject: [PATCH] Minor debugging Added TODO's and scrollview's to the main
 activity

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../kauron/dungeonmanager/Introduction.java   |   4 +-
 .../kauron/dungeonmanager/MainActivity.java   |  17 +-
 .../com/kauron/dungeonmanager/Player.java     |  29 +-
 .../java/com/kauron/dungeonmanager/Power.java |   1 +
 app/src/main/res/layout/activity_main.xml     | 492 +++++++++---------
 app/src/main/res/menu/menu_main.xml           |   5 +
 app/src/main/res/values/strings.xml           |   1 +
 9 files changed, 291 insertions(+), 264 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 286a855..622ec8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.kauron.dungeonmanager'
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName '0.2'
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34c8a62..6ac8b4a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kauron.dungeonmanager" >
+    package="com.kauron.dungeonmanager">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
index 2280a7f..22ebf13 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
@@ -91,7 +91,7 @@ public class Introduction extends ActionBarActivity {
         int classInt = classSpinner.getSelectedItemPosition();
         int raceInt = raceSpinner.getSelectedItemPosition();
 
-        int pxInt = 0;
+        int pxInt = -1;
         if (!level.getText().toString().isEmpty())
             pxInt = Integer.parseInt(level.getText().toString());
 
@@ -114,7 +114,7 @@ public class Introduction extends ActionBarActivity {
                     !nameString.isEmpty() &&
                     classInt != Player.NULL &&
                     raceInt != Player.NULL &&
-                    pxInt != 0 &&
+                    pxInt != -1 &&
                     car != 0 &&
                     fue != 0 &&
                     con != 0 &&
diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
index f736d72..fd5cce7 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
@@ -117,6 +117,9 @@ public class MainActivity extends ActionBarActivity{
                     try {
                         if (player.addPx(Integer.parseInt(input.getText().toString()))) {
                             //levelUp
+                            //TODO: update defenses
+                            //TODO: add attack points when necessary
+                            //TODO: update currentPg button
                             player.setMaxPgOnLevelUp();
                             ((TextView) findViewById(R.id.lvl)).setText(
                                     String.valueOf(player.getLevel())
@@ -133,6 +136,14 @@ public class MainActivity extends ActionBarActivity{
             });
             alert.show();
             return true;
+        } else if (id == R.id.action_download) {
+            //TODO: create self-updater
+            Toast.makeText(
+                    getApplicationContext(),
+                    "This function is not ready yet",
+                    Toast.LENGTH_LONG
+            ).show();
+            return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -457,7 +468,7 @@ public class MainActivity extends ActionBarActivity{
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (input.getText().toString().isEmpty()){
+                        if (input.getText().toString().isEmpty()) {
                             Toast.makeText(
                                     getApplicationContext(),
                                     R.string.empty_field,
@@ -471,4 +482,8 @@ public class MainActivity extends ActionBarActivity{
                 });
         dialog.show();
     }
+
+    //TODO: show on screen the max pg's
+
+    //TODO: show the current px and progress bar
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kauron/dungeonmanager/Player.java b/app/src/main/java/com/kauron/dungeonmanager/Player.java
index a23435f..c55c187 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Player.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Player.java
@@ -11,12 +11,14 @@ public class Player {
             "Sacerdote Rúnico", "Señor de la guerra"
     };
 
-    /**
-     * Values for classes
-     */
-    public static final int NULL = 0, ARDIENTE = 1, BRUJO = 2, BUSCADOR = 3, CLÉRIGO = 4,
-            EXPLORADOR = 5, GUERRERO = 6, MAGO = 7, MENTE_DE_BATALLA = 8, MONJE = 9, PALADÍN = 10,
-            PÍCARO = 11, PSIÓNICO = 12, SACERDOTE_RÚNICO = 13, SEÑOR_DE_LA_GUERRA = 14;
+    public static final int NULL = 0;
+
+//    /**
+//     * Values for classes
+//     */
+//    public static final int ARDIENTE = 1, BRUJO = 2, BUSCADOR = 3, CLÉRIGO = 4,
+//            EXPLORADOR = 5, GUERRERO = 6, MAGO = 7, MENTE_DE_BATALLA = 8, MONJE = 9, PALADÍN = 10,
+//            PÍCARO = 11, PSIÓNICO = 12, SACERDOTE_RÚNICO = 13, SEÑOR_DE_LA_GUERRA = 14;
 
     /**
      * Values for level - px computation
@@ -68,12 +70,12 @@ public class Player {
     public static final int CA = 0, FORT = 1, REF = 2, VOL = 3;
 
     //TODO: develop abilities
-    /**
-     * Values for abilities
-     */
-    public static final int ACROBACIAS = 1, AGUANTE = 2, ARCANOS = 3, ATLETISMO = 4, DIPLOMACIA = 5,
-        DUNGEONS = 6, ENGAÑAR = 7, HISTORIA  = 8, HURTO = 9, INTIMIDAR = 10, NATURALEZA = 11,
-        PERCEPCIÓN = 12, PERSPICACIA = 13, RECURSOS = 14, RELIGIÓN = 15, SANAR = 16, SIGILO = 17;
+//    /**
+//     * Values for abilities
+//     */
+//    public static final int ACROBACIAS = 1, AGUANTE = 2, ARCANOS = 3, ATLETISMO = 4, DIPLOMACIA = 5,
+//        DUNGEONS = 6, ENGAÑAR = 7, HISTORIA  = 8, HURTO = 9, INTIMIDAR = 10, NATURALEZA = 11,
+//        PERCEPCIÓN = 12, PERSPICACIA = 13, RECURSOS = 14, RELIGIÓN = 15, SANAR = 16, SIGILO = 17;
 
     /**
      * Names for the abilities
@@ -96,8 +98,9 @@ public class Player {
     private int classInt, raceInt;
     private String name;
     private int level;
-
+    //TODO: use dice class
     private int[] atk, def, abilities;
+    //TODO: implement fully operational powers displayed as cards
     private Power[] powers;
 
     public Player(
diff --git a/app/src/main/java/com/kauron/dungeonmanager/Power.java b/app/src/main/java/com/kauron/dungeonmanager/Power.java
index 1237ac6..c649599 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Power.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Power.java
@@ -6,6 +6,7 @@ public class Power {
     private boolean used;
     private int type;
     private String name;
+    private int atk, def, damage;
 
 
     public Power(String name, int type){
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1398e6d..b52a70d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,136 +1,237 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/pgCurrent"
-        android:textSize="40sp"
-        android:onClick="damage"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/pgCurrent"
-        android:onClick="selectPlayer"
-        android:id="@+id/scroll1">
-        <RelativeLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/basicInfoContainer">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/adventurer_name"
-                android:id="@+id/nameText"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/race_name"
-                android:id="@+id/raceText"
-                android:layout_alignTop="@+id/classText"
-                android:layout_toRightOf="@+id/classText"
-                android:layout_toEndOf="@+id/classText"
-                android:layout_marginLeft="10dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/class_name"
-                android:id="@+id/classText"
-                android:layout_below="@+id/nameText"
-                android:layout_alignParentStart="false"
-                android:layout_alignParentLeft="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/level"
-                android:id="@+id/lvlText"
-                android:layout_alignParentBottom="false"
-                android:layout_toRightOf="@+id/raceText"
-                android:layout_toEndOf="@+id/raceText"
-                android:layout_alignTop="@+id/raceText"
-                android:layout_marginLeft="10dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:id="@+id/lvl"
-                android:layout_alignParentBottom="false"
-                android:layout_toRightOf="@+id/lvlText"
-                android:layout_toEndOf="@+id/lvlText"
-                android:layout_alignTop="@+id/lvlText"
-                android:layout_marginLeft="10dp" />
-        </RelativeLayout>
-    </HorizontalScrollView>
-
-
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context=".MainActivity">
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/scroll1"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:id="@+id/curativeEffortsContainer">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/curativeEffortsText"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/attackContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_below="@+id/curativeEffortsContainer"
         android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/titleAttack"
-            android:text="@string/attack"
-            android:textAllCaps="true"
-            android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
-            android:layout_marginBottom="5dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="14sp"
-            android:gravity="center_vertical"
-            android:paddingLeft="8dip"
-            android:paddingRight="8dip"/>
-        <HorizontalScrollView
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <GridLayout
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/attackGrid"
-                android:columnCount="3"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/pgCurrent"
+                android:textSize="40sp"
+                android:onClick="damage" />
+
+            <HorizontalScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:onClick="selectPlayer"
+                android:id="@+id/scroll1">
+                <RelativeLayout
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/basicInfoContainer">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/adventurer_name"
+                        android:id="@+id/nameText"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/race_name"
+                        android:id="@+id/raceText"
+                        android:layout_alignTop="@+id/classText"
+                        android:layout_toRightOf="@+id/classText"
+                        android:layout_toEndOf="@+id/classText"
+                        android:layout_marginLeft="10dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/class_name"
+                        android:id="@+id/classText"
+                        android:layout_below="@+id/nameText"
+                        android:layout_alignParentStart="false"
+                        android:layout_alignParentLeft="true" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="@string/level"
+                        android:id="@+id/lvlText"
+                        android:layout_alignParentBottom="false"
+                        android:layout_toRightOf="@+id/raceText"
+                        android:layout_toEndOf="@+id/raceText"
+                        android:layout_alignTop="@+id/raceText"
+                        android:layout_marginLeft="10dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:id="@+id/lvl"
+                        android:layout_alignParentBottom="false"
+                        android:layout_toRightOf="@+id/lvlText"
+                        android:layout_toEndOf="@+id/lvlText"
+                        android:layout_alignTop="@+id/lvlText"
+                        android:layout_marginLeft="10dp" />
+                </RelativeLayout>
+            </HorizontalScrollView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/curativeEffortsContainer">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/curativeEffortsText"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/attackContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/titleAttack"
+                android:text="@string/attack"
+                android:textAllCaps="true"
+                android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
+                android:layout_marginBottom="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="14sp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dip"
+                android:paddingRight="8dip"/>
+            <HorizontalScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <GridLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/attackGrid"
+                    android:columnCount="3"
+                    android:rowCount="2">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="0"
+                        android:layout_column="0"
+                        android:id="@+id/FUE"
+                        android:hint="@string/FUE" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="1"
+                        android:layout_column="0"
+                        android:id="@+id/CON"
+                        android:hint="@string/CON" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="0"
+                        android:layout_column="1"
+                        android:id="@+id/DES"
+                        android:hint="@string/DES" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="1"
+                        android:layout_column="1"
+                        android:id="@+id/INT"
+                        android:hint="@string/INT" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="0"
+                        android:layout_column="2"
+                        android:id="@+id/SAB"
+                        android:hint="@string/SAB" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:typeface="monospace"
+                        android:ems="4"
+                        android:layout_row="1"
+                        android:layout_column="2"
+                        android:id="@+id/CAR"
+                        android:hint="@string/CAR" />
+                </GridLayout>
+            </HorizontalScrollView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/defenseContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/titleDefense"
+                android:text="@string/defense"
+                android:textAllCaps="true"
+                android:layout_marginBottom="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="14sp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dip"
+                android:paddingRight="8dip"/>
+
+            <GridLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/defenseGrid"
+                android:columnCount="2"
                 android:rowCount="2">
 
                 <TextView
@@ -138,144 +239,45 @@
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:typeface="monospace"
-                    android:ems="4"
+                    android:ems="5"
                     android:layout_row="0"
                     android:layout_column="0"
-                    android:id="@+id/FUE"
-                    android:hint="@string/FUE" />
+                    android:id="@+id/CA"
+                    android:hint="@string/CA" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:typeface="monospace"
-                    android:ems="4"
+                    android:ems="5"
+                    android:layout_row="0"
+                    android:layout_column="1"
+                    android:id="@+id/FORT"
+                    android:hint="@string/FORT" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:typeface="monospace"
+                    android:ems="5"
                     android:layout_row="1"
                     android:layout_column="0"
-                    android:id="@+id/CON"
-                    android:hint="@string/CON" />
+                    android:id="@+id/REF"
+                    android:hint="@string/REF" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:typeface="monospace"
-                    android:ems="4"
-                    android:layout_row="0"
-                    android:layout_column="1"
-                    android:id="@+id/DES"
-                    android:hint="@string/DES" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:typeface="monospace"
-                    android:ems="4"
+                    android:ems="5"
                     android:layout_row="1"
                     android:layout_column="1"
-                    android:id="@+id/INT"
-                    android:hint="@string/INT" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:typeface="monospace"
-                    android:ems="4"
-                    android:layout_row="0"
-                    android:layout_column="2"
-                    android:id="@+id/SAB"
-                    android:hint="@string/SAB" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:typeface="monospace"
-                    android:ems="4"
-                    android:layout_row="1"
-                    android:layout_column="2"
-                    android:id="@+id/CAR"
-                    android:hint="@string/CAR" />
+                    android:id="@+id/VOL"
+                    android:hint="@string/VOL" />
             </GridLayout>
-        </HorizontalScrollView>
+        </LinearLayout>
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/defenseContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_below="@+id/attackContainer"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/titleDefense"
-            android:text="@string/defense"
-            android:textAllCaps="true"
-            android:layout_marginBottom="5dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="14sp"
-            android:gravity="center_vertical"
-            android:paddingLeft="8dip"
-            android:paddingRight="8dip"/>
-
-        <GridLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/defenseGrid"
-            android:columnCount="2"
-            android:rowCount="2">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:typeface="monospace"
-                android:ems="5"
-                android:layout_row="0"
-                android:layout_column="0"
-                android:id="@+id/CA"
-                android:hint="@string/CA" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:typeface="monospace"
-                android:ems="5"
-                android:layout_row="0"
-                android:layout_column="1"
-                android:id="@+id/FORT"
-                android:hint="@string/FORT" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:typeface="monospace"
-                android:ems="5"
-                android:layout_row="1"
-                android:layout_column="0"
-                android:id="@+id/REF"
-                android:hint="@string/REF" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:typeface="monospace"
-                android:ems="5"
-                android:layout_row="1"
-                android:layout_column="1"
-                android:id="@+id/VOL"
-                android:hint="@string/VOL" />
-        </GridLayout>
-    </LinearLayout>
-
-
-</RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 3990e01..7884054 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -56,6 +56,11 @@
         android:orderInCategory="20"
         app:showAsAction="never"
         android:icon="@drawable/ic_action_edit"/>
+    <item
+        android:id="@+id/action_download"
+        android:title="@string/action_download"
+        android:orderInCategory="25"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_reset"
         android:title="@string/action_reset"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d9527c..e9bab52 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,4 +71,5 @@
     <string name="empty_field">Please input something</string>
     <string name="dialog_resolve_max_pg_title">Alert</string>
     <string name="dialog_resolve_max_pg_message">Couldn\'t compute your max PG based on your level</string>
+    <string name="action_download">Update app</string>
 </resources>