Improved layouts
This commit is contained in:
Carlos Galindo
parent
7a20121c10
commit
35c8db2c10
7 changed files with 146 additions and 111 deletions
|
|
@ -4,7 +4,7 @@
|
|||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
tools:context="com.ddns.kauron.com.kauron.dungeonmanager.Introduction">
|
||||
tools:context=".Introduction">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -15,20 +15,25 @@
|
|||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPersonName"
|
||||
android:ems="10"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:layout_weight="0.5"
|
||||
android:id="@+id/editNameIntro"
|
||||
android:hint="@string/adventurer_name"/>
|
||||
android:hint="@string/adventurer_name"
|
||||
android:nextFocusDown="@+id/editPxIntro"
|
||||
android:nextFocusForward="@+id/editPxIntro"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="10"
|
||||
android:id="@+id/editPxIntro"
|
||||
android:hint="@string/px"
|
||||
android:layout_weight="1"/>
|
||||
android:layout_weight="1"
|
||||
android:nextFocusDown="@+id/FUE"
|
||||
android:nextFocusForward="@+id/FUE"
|
||||
android:nextFocusLeft="@+id/FUE"
|
||||
android:nextFocusRight="@+id/FUE"
|
||||
android:nextFocusUp="@+id/FUE"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -48,8 +53,7 @@
|
|||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/raceSpinner"
|
||||
android:layout_alignTop="@+id/classSpinner" />
|
||||
android:id="@+id/raceSpinner"/>
|
||||
</LinearLayout>
|
||||
|
||||
<GridLayout
|
||||
|
|
@ -68,7 +72,8 @@
|
|||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/FUE"
|
||||
android:hint="@string/FUE" />
|
||||
android:hint="@string/FUE"
|
||||
android:nextFocusDown="@+id/DES"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -80,7 +85,8 @@
|
|||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/CON"
|
||||
android:hint="@string/CON" />
|
||||
android:hint="@string/CON"
|
||||
android:nextFocusDown="@+id/INT" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -92,7 +98,8 @@
|
|||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/DES"
|
||||
android:hint="@string/DES" />
|
||||
android:hint="@string/DES"
|
||||
android:nextFocusDown="@+id/SAB"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -104,7 +111,8 @@
|
|||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/INT"
|
||||
android:hint="@string/INT" />
|
||||
android:hint="@string/INT"
|
||||
android:nextFocusDown="@+id/CAR"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -116,19 +124,21 @@
|
|||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/SAB"
|
||||
android:hint="@string/SAB" />
|
||||
android:hint="@string/SAB"
|
||||
android:nextFocusDown="@+id/CON"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
android:imeOptions="actionDone"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/CAR"
|
||||
android:hint="@string/CAR" />
|
||||
android:hint="@string/CAR"/>
|
||||
</GridLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -93,20 +93,36 @@
|
|||
</HorizontalScrollView>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/titlePgBar"
|
||||
android:text="@string/pg"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="match_parent"
|
||||
<LinearLayout
|
||||
android:layout_width="fill_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"/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/titlePgBar"
|
||||
android:text="@string/pg"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:textSize="14sp"
|
||||
android:paddingLeft="8dip"
|
||||
android:paddingRight="8dip"
|
||||
android:layout_weight="1"/>
|
||||
<!--TODO: USE this-->
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:id="@+id/currentPg"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:textAllCaps="true"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
|
|
@ -114,26 +130,33 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:id="@+id/pgBar"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/titleCurativeEffortsBar"
|
||||
android:text="@string/curative_efforts"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="match_parent"
|
||||
<LinearLayout
|
||||
android:layout_width="fill_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"/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:id="@+id/curativeEffortsText"/>
|
||||
<TextView
|
||||
android:id="@+id/titleCurativeEffortsBar"
|
||||
android:text="@string/curative_efforts"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:textSize="14sp"
|
||||
android:paddingLeft="8dip"
|
||||
android:paddingRight="8dip"/>
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:gravity="right"
|
||||
android:id="@+id/currentCurativeEfforts"
|
||||
android:textAllCaps="true"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
|
|
@ -141,20 +164,36 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:id="@+id/curativeEffortsBar"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/titleXpBar"
|
||||
android:text="@string/px"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="match_parent"
|
||||
<LinearLayout
|
||||
android:layout_width="fill_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"/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/titleXpBar"
|
||||
android:text="@string/px"
|
||||
android:textAllCaps="true"
|
||||
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:textSize="14sp"
|
||||
android:paddingLeft="8dip"
|
||||
android:paddingRight="8dip"
|
||||
android:layout_weight="1"/>
|
||||
<!--TODO: USE this-->
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:id="@+id/currentXp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:textAllCaps="true"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
|
|
|
|||
Reference in a new issue