Switched to playersList
The players are generated brand-new, as if they were just created
This commit is contained in:
Carlos Galindo
parent
ce44393121
commit
aebb20542e
14 changed files with 440 additions and 262 deletions
|
|
@ -1,168 +1,211 @@
|
|||
<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"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
<LinearLayout
|
||||
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:orientation="vertical"
|
||||
tools:context=".Introduction">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/firstLayout"
|
||||
android:orientation="horizontal">
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:background="@color/primary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<EditText
|
||||
<RelativeLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:layout_weight="0.5"
|
||||
android:id="@+id/editNameIntro"
|
||||
android:hint="@string/adventurer_name"
|
||||
android:nextFocusDown="@+id/editPxIntro"
|
||||
android:nextFocusForward="@+id/editPxIntro"/>
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:id="@+id/editPxIntro"
|
||||
android:hint="@string/px"
|
||||
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>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="Character creation"/>
|
||||
</RelativeLayout>
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:id="@+id/secondLayout"
|
||||
android:layout_below="@+id/firstLayout">
|
||||
android:id="@+id/finish_button"
|
||||
android:onClick="finishButton"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="Save character" />
|
||||
|
||||
<Spinner
|
||||
<ScrollView
|
||||
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">
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/classSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
android:id="@+id/firstLayout"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Spinner
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:layout_weight="0.5"
|
||||
android:id="@+id/editNameIntro"
|
||||
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:id="@+id/editPxIntro"
|
||||
android:hint="@string/px"
|
||||
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
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/raceSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
</LinearLayout>
|
||||
android:orientation="horizontal"
|
||||
android:id="@+id/secondLayout"
|
||||
android:layout_below="@+id/firstLayout">
|
||||
|
||||
<GridLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/secondLayout"
|
||||
android:id="@+id/thirdLayout"
|
||||
android:columnCount="3">
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/classSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/raceSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
</LinearLayout>
|
||||
|
||||
<GridLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
android:layout_below="@+id/secondLayout"
|
||||
android:id="@+id/thirdLayout"
|
||||
android:columnCount="3">
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="0"
|
||||
android:layout_row="0"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/FUE"
|
||||
android:hint="@string/FUE"
|
||||
android:nextFocusDown="@+id/DES"/>
|
||||
android:id="@+id/FUE"
|
||||
android:hint="@string/FUE"
|
||||
android:nextFocusDown="@+id/DES"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="0"
|
||||
android:layout_row="1"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/CON"
|
||||
android:hint="@string/CON"
|
||||
android:nextFocusDown="@+id/INT" />
|
||||
android:id="@+id/CON"
|
||||
android:hint="@string/CON"
|
||||
android:nextFocusDown="@+id/INT" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="1"
|
||||
android:layout_row="0"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/DES"
|
||||
android:hint="@string/DES"
|
||||
android:nextFocusDown="@+id/SAB"/>
|
||||
android:id="@+id/DES"
|
||||
android:hint="@string/DES"
|
||||
android:nextFocusDown="@+id/SAB"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="1"
|
||||
android:layout_row="1"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/INT"
|
||||
android:hint="@string/INT"
|
||||
android:nextFocusDown="@+id/CAR"/>
|
||||
android:id="@+id/INT"
|
||||
android:hint="@string/INT"
|
||||
android:nextFocusDown="@+id/CAR"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="2"
|
||||
android:layout_row="0"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/SAB"
|
||||
android:hint="@string/SAB"
|
||||
android:nextFocusDown="@+id/CON"/>
|
||||
android:id="@+id/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"
|
||||
<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:layout_row="1"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/CAR"
|
||||
android:hint="@string/CAR"/>
|
||||
</GridLayout>
|
||||
android:id="@+id/CAR"
|
||||
android:hint="@string/CAR"/>
|
||||
</GridLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_below="@+id/thirdLayout"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true">
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_below="@+id/thirdLayout"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:visibility="gone">
|
||||
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/new_attack"
|
||||
android:id="@+id/new_attack_button" />
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/new_attack"
|
||||
android:id="@+id/new_attack_button" />
|
||||
|
||||
<ListView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/listView" />
|
||||
</LinearLayout>
|
||||
<ListView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/listView" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -52,7 +52,6 @@
|
|||
<HorizontalScrollView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:onClick="selectPlayer"
|
||||
android:id="@+id/scroll1">
|
||||
<RelativeLayout
|
||||
android:orientation="vertical"
|
||||
|
|
@ -139,7 +138,7 @@
|
|||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:id="@+id/currentPg"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -165,7 +164,7 @@
|
|||
android:textStyle="bold"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:text="0"/>
|
||||
android:text="@string/zero"/>
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -199,7 +198,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:id="@+id/currentCurativeEfforts"
|
||||
android:textAllCaps="true"/>
|
||||
</LinearLayout>
|
||||
|
|
@ -232,7 +231,7 @@
|
|||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:id="@+id/currentXp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -251,7 +250,6 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:onClick="onAttackClick"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
|
|
@ -6,4 +6,37 @@
|
|||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
tools:context="com.kauron.dungeonmanager.PowerEditor">
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:capitalize="words" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText2"
|
||||
android:capitalize="words"
|
||||
android:layout_below="@+id/editText"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignRight="@+id/editText"
|
||||
android:layout_alignEnd="@+id/editText" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText3"
|
||||
android:capitalize="words"
|
||||
android:layout_below="@+id/editText2"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignRight="@+id/editText2"
|
||||
android:layout_alignEnd="@+id/editText2" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -33,20 +33,13 @@
|
|||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:orientation="vertical">
|
||||
<Button
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/new_character"
|
||||
android:id="@+id/newCharacter"
|
||||
android:onClick="onNewClick"/>
|
||||
|
||||
<Button
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/load_character"
|
||||
android:id="@+id/loadCharacter"
|
||||
android:onClick="onLoadClick"/>
|
||||
|
||||
android:layout_height="fill_parent"
|
||||
android:id="@+id/no_players_text"
|
||||
android:text="@string/no_players"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"/>
|
||||
<ListView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/relativeLayout"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -15,16 +18,41 @@
|
|||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/progressBar"
|
||||
android:layout_below="@+id/name"
|
||||
android:paddingTop="3dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
android:layout_alignParentStart="true"
|
||||
android:id="@+id/progressBar"
|
||||
android:orientation="horizontal">
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/negPgBar"
|
||||
android:layout_weight="2"
|
||||
android:rotation="180"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAllCaps="true"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:text="@string/zero"/>
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/pgBar"
|
||||
android:layout_weight="1"
|
||||
tools:progress="30"
|
||||
tools:progressTint="#FF0"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -41,7 +69,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
tools:text="LVL 1"
|
||||
tools:text="Level 1"
|
||||
android:id="@+id/level"
|
||||
android:layout_above="@+id/progressBar"
|
||||
android:layout_alignParentRight="true"
|
||||
|
|
|
|||
Reference in a new issue