kauron/DungeonManager
kauron/DungeonManager
Archived
1
0
Fork 0
Code Releases Activity

Adaptation to smaller screens

Browse source
This commit is contained in:
Carlos Galindo 2015-02-21 23:05:04 +01:00
parent 84b93fe74d
commit 847f6dceed
2 changed files with 142 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/ddns/kauron/dungeonmanager/MainActivity.java
View file

@ -321,22 +321,22 @@ public class MainActivity extends ActionBarActivity
//attacks //attacks
((TextView) findViewById(R.id.FUE)).setText( ((TextView) findViewById(R.id.FUE)).setText(
getString(R.string.FUE) + ": " + player.getFue() getString(R.string.FUE) + ":" + player.getFue()
); );
((TextView) findViewById(R.id.CON)).setText( ((TextView) findViewById(R.id.CON)).setText(
getString(R.string.CON) + ": " + player.getCon() getString(R.string.CON) + ":" + player.getCon()
); );
((TextView) findViewById(R.id.DES)).setText( ((TextView) findViewById(R.id.DES)).setText(
getString(R.string.DES) + ": " + player.getDes() getString(R.string.DES) + ":" + player.getDes()
); );
((TextView) findViewById(R.id.INT)).setText( ((TextView) findViewById(R.id.INT)).setText(
getString(R.string.INT) + ": " + player.getInt() getString(R.string.INT) + ":" + player.getInt()
); );
((TextView) findViewById(R.id.SAB)).setText( ((TextView) findViewById(R.id.SAB)).setText(
getString(R.string.SAB) + ": " + player.getSab() getString(R.string.SAB) + ":" + player.getSab()
); );
((TextView) findViewById(R.id.CAR)).setText( ((TextView) findViewById(R.id.CAR)).setText(
getString(R.string.CAR) + ": " + player.getCar() getString(R.string.CAR) + ":" + player.getCar()
); );
//defenses //defenses

33
app/src/main/res/layout/activity_main.xml
View file

@ -16,15 +16,16 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" /> android:layout_alignParentEnd="true" />
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/pgCurrent"
android:id="@+id/scroll1">
<RelativeLayout <RelativeLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:id="@+id/basicInfoContainer">
android:layout_toLeftOf="@+id/pgCurrent"
android:layout_toStartOf="@+id/pgCurrent"
android:id="@+id/basicInfoContainer"
android:layout_alignBottom="@+id/pgCurrent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -80,12 +81,14 @@
android:layout_alignTop="@+id/lvlText" android:layout_alignTop="@+id/lvlText"
android:layout_marginLeft="10dp" /> android:layout_marginLeft="10dp" />
</RelativeLayout> </RelativeLayout>
</HorizontalScrollView>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/basicInfoContainer" android:layout_below="@+id/scroll1"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:id="@+id/curativeEffortsContainer"> android:id="@+id/curativeEffortsContainer">
@ -109,6 +112,7 @@
android:id="@+id/titleAttack" android:id="@+id/titleAttack"
android:text="@string/attack" android:text="@string/attack"
android:textAllCaps="true" android:textAllCaps="true"
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -118,9 +122,11 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="8dip" android:paddingLeft="8dip"
android:paddingRight="8dip"/> android:paddingRight="8dip"/>
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<GridLayout <GridLayout
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/attackGrid" android:id="@+id/attackGrid"
android:columnCount="3" android:columnCount="3"
@ -192,6 +198,7 @@
android:id="@+id/CAR" android:id="@+id/CAR"
android:hint="@string/CAR" /> android:hint="@string/CAR" />
</GridLayout> </GridLayout>
</HorizontalScrollView>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -228,7 +235,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace" android:typeface="monospace"
android:ems="4" android:ems="5"
android:layout_row="0" android:layout_row="0"
android:layout_column="0" android:layout_column="0"
android:id="@+id/CA" android:id="@+id/CA"
@ -239,7 +246,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace" android:typeface="monospace"
android:ems="4" android:ems="5"
android:layout_row="0" android:layout_row="0"
android:layout_column="1" android:layout_column="1"
android:id="@+id/FORT" android:id="@+id/FORT"
@ -250,7 +257,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace" android:typeface="monospace"
android:ems="4" android:ems="5"
android:layout_row="1" android:layout_row="1"
android:layout_column="0" android:layout_column="0"
android:id="@+id/REF" android:id="@+id/REF"
@ -261,7 +268,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace" android:typeface="monospace"
android:ems="4" android:ems="5"
android:layout_row="1" android:layout_row="1"
android:layout_column="1" android:layout_column="1"
android:id="@+id/VOL" android:id="@+id/VOL"