diff --git a/app/src/main/java/com/ddns/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/ddns/kauron/dungeonmanager/MainActivity.java index 55b3d7a..f1cf568 100644 --- a/app/src/main/java/com/ddns/kauron/dungeonmanager/MainActivity.java +++ b/app/src/main/java/com/ddns/kauron/dungeonmanager/MainActivity.java @@ -321,22 +321,22 @@ public class MainActivity extends ActionBarActivity //attacks ((TextView) findViewById(R.id.FUE)).setText( - getString(R.string.FUE) + ": " + player.getFue() + getString(R.string.FUE) + ":" + player.getFue() ); ((TextView) findViewById(R.id.CON)).setText( - getString(R.string.CON) + ": " + player.getCon() + getString(R.string.CON) + ":" + player.getCon() ); ((TextView) findViewById(R.id.DES)).setText( - getString(R.string.DES) + ": " + player.getDes() + getString(R.string.DES) + ":" + player.getDes() ); ((TextView) findViewById(R.id.INT)).setText( - getString(R.string.INT) + ": " + player.getInt() + getString(R.string.INT) + ":" + player.getInt() ); ((TextView) findViewById(R.id.SAB)).setText( - getString(R.string.SAB) + ": " + player.getSab() + getString(R.string.SAB) + ":" + player.getSab() ); ((TextView) findViewById(R.id.CAR)).setText( - getString(R.string.CAR) + ": " + player.getCar() + getString(R.string.CAR) + ":" + player.getCar() ); //defenses diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6bf4163..b7e16e7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,76 +16,79 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" /> - - - + + android:id="@+id/basicInfoContainer"> - + - + - + + + + + + + - - @@ -109,6 +112,7 @@ 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" @@ -118,80 +122,83 @@ android:gravity="center_vertical" android:paddingLeft="8dip" android:paddingRight="8dip"/> - - - - + + android:id="@+id/attackGrid" + android:columnCount="3" + android:rowCount="2"> - + - + - + - + - - + + + + +